@schoolai/shipyard 3.7.0 → 3.8.0-rc.20260529.0

package/dist/chunk-CMGJGK6R.js

@@ -0,0 +1,382 @@
+#!/usr/bin/env node
+
+// src/shared/capabilities/skills.ts
+import { readdir, readFile, stat } from "fs/promises";
+import { homedir } from "os";
+import { dirname, join, parse } from "path";
+
+// src/shared/capabilities/skill-compat.ts
+function classifySkill(skill, mirrorEnabled) {
+  const path = skill.path;
+  if (!path) {
+    const fallback2 = skill.sourceAgent === "codex" ? "codex" : skill.sourceAgent === "cursor" ? "cursor" : "claude-code";
+    return {
+      compatibleAgents: [fallback2],
+      bodyResolution: "unreachable"
+    };
+  }
+  if (mirrorEnabled) {
+    return {
+      compatibleAgents: ["claude-code", "codex", "cursor"],
+      bodyResolution: "mirror"
+    };
+  }
+  if (path.includes("/cursor-skills/") || path.includes("/.cursor/")) {
+    return {
+      compatibleAgents: ["cursor"],
+      bodyResolution: "native"
+    };
+  }
+  if (path.includes("/.codex/") || path.includes("/.agents/")) {
+    return {
+      compatibleAgents: ["codex"],
+      bodyResolution: "native"
+    };
+  }
+  if (path.includes("/.claude/")) {
+    return {
+      compatibleAgents: ["claude-code", "codex", "cursor"],
+      bodyResolution: "pass-in"
+    };
+  }
+  const fallback = skill.sourceAgent === "codex" ? "codex" : skill.sourceAgent === "cursor" ? "cursor" : "claude-code";
+  return {
+    compatibleAgents: [fallback],
+    bodyResolution: "unreachable"
+  };
+}
+
+// src/shared/capabilities/skills.ts
+function parseSkillFrontmatter(content, fallbackName) {
+  const match = /^---\n([\s\S]*?)\n---/.exec(content);
+  if (!match?.[1]) return { name: fallbackName, description: "" };
+  const frontmatter = match[1];
+  const nameMatch = /^name:\s*["']?(.+?)["']?\s*$/m.exec(frontmatter);
+  const descMatch = /^description:\s*["']?(.+?)["']?\s*$/m.exec(frontmatter);
+  const name = nameMatch?.[1]?.trim() ?? fallbackName;
+  const description = descMatch?.[1]?.trim() ?? "";
+  return { name, description };
+}
+function sourceAgentForPath(path) {
+  if (path.includes("/cursor-skills/") || path.includes("/.cursor/")) {
+    return "cursor";
+  }
+  if (path.includes("/.codex/") || path.includes("/.agents/")) {
+    return "codex";
+  }
+  return "claude-code";
+}
+async function readSkillsFromDir(dirPath) {
+  try {
+    const entries = await readdir(dirPath, { withFileTypes: true });
+    const skills = [];
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const skillDir = join(dirPath, entry.name);
+      const skillFile = join(skillDir, "SKILL.md");
+      try {
+        const [content, st] = await Promise.all([readFile(skillFile, "utf-8"), stat(skillFile)]);
+        const parsed = parseSkillFrontmatter(content, entry.name);
+        skills.push({
+          ...parsed,
+          path: skillFile,
+          bodyBytes: st.size,
+          sourceAgent: sourceAgentForPath(skillFile)
+        });
+      } catch {
+        skills.push({
+          name: entry.name,
+          description: "",
+          sourceAgent: sourceAgentForPath(skillDir)
+        });
+      }
+    }
+    return skills;
+  } catch {
+    return [];
+  }
+}
+async function readSkillsRecursive(dirPath, depth = 0, maxDepth = 4) {
+  if (depth > maxDepth) return [];
+  const skills = [];
+  try {
+    const entries = await readdir(dirPath, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const subDir = join(dirPath, entry.name);
+      const skillFile = join(subDir, "SKILL.md");
+      try {
+        const [content, st] = await Promise.all([readFile(skillFile, "utf-8"), stat(skillFile)]);
+        const parsed = parseSkillFrontmatter(content, entry.name);
+        skills.push({
+          ...parsed,
+          path: skillFile,
+          bodyBytes: st.size,
+          sourceAgent: sourceAgentForPath(skillFile)
+        });
+      } catch {
+        const nested = await readSkillsRecursive(subDir, depth + 1, maxDepth);
+        skills.push(...nested);
+      }
+    }
+  } catch {
+  }
+  return skills;
+}
+async function readPluginSkills() {
+  const skills = [];
+  try {
+    const settingsPath = join(homedir(), ".claude", "settings.json");
+    const settingsRaw = await readFile(settingsPath, "utf-8");
+    const settings = JSON.parse(settingsRaw);
+    if (!settings.enabledPlugins) return [];
+    const installedPath = join(homedir(), ".claude", "plugins", "installed_plugins.json");
+    const installedRaw = await readFile(installedPath, "utf-8");
+    const installed = JSON.parse(installedRaw);
+    if (!installed.plugins) return [];
+    for (const [pluginId, enabled] of Object.entries(settings.enabledPlugins)) {
+      if (!enabled) continue;
+      const installs = installed.plugins[pluginId];
+      if (!installs || installs.length === 0) continue;
+      const installPath = installs[0]?.installPath;
+      if (!installPath) continue;
+      const skillsDir = join(installPath, "skills");
+      const pluginSkills = await readSkillsRecursive(skillsDir);
+      skills.push(...pluginSkills);
+    }
+  } catch {
+  }
+  return skills;
+}
+async function readCodexPluginCacheSkills() {
+  const cacheRoot = join(homedir(), ".codex", "plugins", "cache");
+  const out = [];
+  try {
+    const entries = await readdir(cacheRoot, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const skillsDir = join(cacheRoot, entry.name, "skills");
+      const found = await readSkillsRecursive(skillsDir, 0, 2);
+      out.push(...found);
+    }
+  } catch {
+  }
+  return out;
+}
+async function readCodexUserSkillsDir() {
+  const dirPath = join(homedir(), ".codex", "skills");
+  try {
+    const entries = await readdir(dirPath, { withFileTypes: true });
+    const skills = [];
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      if (entry.name === ".system") continue;
+      const skillDir = join(dirPath, entry.name);
+      const skillFile = join(skillDir, "SKILL.md");
+      try {
+        const [content, st] = await Promise.all([readFile(skillFile, "utf-8"), stat(skillFile)]);
+        const parsed = parseSkillFrontmatter(content, entry.name);
+        skills.push({
+          ...parsed,
+          path: skillFile,
+          bodyBytes: st.size,
+          sourceAgent: "codex"
+        });
+      } catch {
+        skills.push({
+          name: entry.name,
+          description: "",
+          sourceAgent: "codex"
+        });
+      }
+    }
+    return skills;
+  } catch {
+    return [];
+  }
+}
+async function readAncestorAgentsSkills(startDir) {
+  let dir = startDir;
+  for (let i = 0; i < 32; i += 1) {
+    const candidate = join(dir, ".agents", "skills");
+    const found = await readSkillsFromDir(candidate);
+    if (found.length > 0) return found;
+    try {
+      const gitMarker = await stat(join(dir, ".git"));
+      if (gitMarker) return [];
+    } catch {
+    }
+    const parent = dirname(dir);
+    if (parent === dir || parent === parse(dir).root) return [];
+    dir = parent;
+  }
+  return [];
+}
+function inferPluginName(path) {
+  const match = /\/\.(?:claude|codex)\/plugins\/cache\/(.+?)\/skills\//.exec(path);
+  if (!match?.[1]) return null;
+  const segments = match[1].split("/").filter(Boolean);
+  if (segments.length === 0) return null;
+  if (segments.length === 1) return segments[0] ?? null;
+  if (segments.length === 2) return segments[0] ?? null;
+  return segments[1] ?? null;
+}
+async function detectSkills(environments, lastKnown, mirrorEnabled = false) {
+  try {
+    return await detectSkillsInner(environments, mirrorEnabled);
+  } catch (err) {
+    const { logger } = await import("./logger-QHPTO22N.js");
+    if (lastKnown && lastKnown.length > 0) {
+      logger.warn(
+        { err, lastKnownCount: lastKnown.length },
+        "detectSkills threw \u2014 preserving lastKnown"
+      );
+      return lastKnown;
+    }
+    logger.debug({ err }, "detectSkills threw with no lastKnown \u2014 returning []");
+    return [];
+  }
+}
+function tag(skills, tier) {
+  return skills.map((s) => ({ ...s, __tier: tier }));
+}
+async function detectSkillsInner(environments, mirrorEnabled) {
+  const home = homedir();
+  const codexSystemDir = join(home, ".codex", "skills", ".system");
+  const agentsUserDir = join(home, ".agents", "skills");
+  const claudeUserDir = join(home, ".claude", "skills");
+  const [userClaude, pluginClaude, codexSystem, codexUser, agentsUser, pluginCodex] = await Promise.all([
+    readSkillsFromDir(claudeUserDir),
+    readPluginSkills(),
+    readSkillsFromDir(codexSystemDir),
+    readCodexUserSkillsDir(),
+    readSkillsFromDir(agentsUserDir),
+    readCodexPluginCacheSkills()
+  ]);
+  const projectClaude = [];
+  const projectCodex = [];
+  for (const env of environments) {
+    const [claude, codex] = await Promise.all([
+      readSkillsFromDir(join(env.path, ".claude", "skills")),
+      readAncestorAgentsSkills(env.path)
+    ]);
+    projectClaude.push(...claude);
+    projectCodex.push(...codex);
+    await new Promise((resolve) => {
+      setImmediate(resolve);
+    });
+  }
+  const tiered = [
+    ...tag(userClaude, "user"),
+    ...tag(codexSystem, "user"),
+    ...tag(codexUser, "user"),
+    ...tag(agentsUser, "user"),
+    ...tag(pluginClaude, "plugin"),
+    ...tag(pluginCodex, "plugin"),
+    ...tag(projectClaude, "project"),
+    ...tag(projectCodex, "project")
+  ];
+  const byName = /* @__PURE__ */ new Map();
+  for (const skill of tiered) {
+    const bucket = byName.get(skill.name);
+    if (bucket) {
+      bucket.push(skill);
+    } else {
+      byName.set(skill.name, [skill]);
+    }
+  }
+  const resolved = [];
+  for (const [, candidates] of byName) {
+    resolved.push(...resolveBucket(candidates));
+  }
+  return resolved.map((skill) => {
+    const { compatibleAgents, bodyResolution } = classifySkill(skill, mirrorEnabled);
+    return { ...skill, compatibleAgents, bodyResolution };
+  });
+}
+function resolveBucket(candidates) {
+  if (candidates.length === 1) {
+    const only = candidates[0];
+    return only ? [stripTier(only)] : [];
+  }
+  const winners = pickHighestTier(candidates);
+  if (winners.length === 1) {
+    const w = winners[0];
+    return w ? [stripTier(w)] : [];
+  }
+  const claudeWinners = winners.filter((c) => c.sourceAgent === "claude-code");
+  const codexWinners = winners.filter((c) => c.sourceAgent === "codex");
+  if (claudeWinners.length > 0 && codexWinners.length > 0) {
+    return resolveCrossAgentCollision(claudeWinners, codexWinners);
+  }
+  return resolveSameAgentCollision(winners);
+}
+function canonicalWinner(candidates) {
+  let best;
+  for (const c of candidates) {
+    if (!best) {
+      best = c;
+    } else if (!best.path && c.path) {
+      best = c;
+    } else if (best.path && c.path && c.path < best.path) {
+      best = c;
+    }
+  }
+  return best;
+}
+function resolveCrossAgentCollision(claudeWinners, codexWinners) {
+  const out = [];
+  const bestClaude = canonicalWinner(claudeWinners);
+  const bestCodex = canonicalWinner(codexWinners);
+  if (bestClaude) out.push(applyPluginNamespace(stripTier(bestClaude)));
+  if (bestCodex) out.push(applyPluginNamespace(stripTier(bestCodex)));
+  return out;
+}
+function applyPluginNamespace(skill) {
+  if (!skill.path) return skill;
+  const pluginId = inferPluginName(skill.path);
+  if (pluginId === null) return skill;
+  return { ...skill, namespace: pluginId };
+}
+function resolveSameAgentCollision(winners) {
+  const buckets = /* @__PURE__ */ new Map();
+  for (const candidate of winners) {
+    const pluginId = candidate.path ? inferPluginName(candidate.path) : null;
+    const bucket = buckets.get(pluginId);
+    if (bucket) {
+      bucket.push(candidate);
+    } else {
+      buckets.set(pluginId, [candidate]);
+    }
+  }
+  const out = [];
+  for (const [pluginId, candidates] of buckets) {
+    const winner = canonicalWinner(candidates);
+    if (!winner) continue;
+    const base = stripTier(winner);
+    out.push(pluginId !== null ? { ...base, namespace: pluginId } : base);
+  }
+  return out;
+}
+function pickHighestTier(candidates) {
+  const order = { user: 0, plugin: 1, project: 2 };
+  let bestRank = Number.POSITIVE_INFINITY;
+  for (const c of candidates) {
+    const r = order[c.__tier];
+    if (r < bestRank) bestRank = r;
+  }
+  return candidates.filter((c) => order[c.__tier] === bestRank);
+}
+function stripTier(skill) {
+  const { __tier, ...rest } = skill;
+  void __tier;
+  return rest;
+}
+var _resolveBucketForTesting = resolveBucket;
+
+export {
+  classifySkill,
+  detectSkills,
+  _resolveBucketForTesting
+};
+//# sourceMappingURL=chunk-CMGJGK6R.js.map

package/dist/chunk-CMGJGK6R.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/capabilities/skills.ts","../src/shared/capabilities/skill-compat.ts"],"sourcesContent":["import { readdir, readFile, stat } from 'node:fs/promises';\nimport { homedir } from 'node:os';\nimport { dirname, join, parse } from 'node:path';\nimport type { GitRepoInfo, SkillInfo } from '@shipyard/session';\n\nimport { classifySkill } from './skill-compat.js';\n\n/**\n * Extract name and description from a SKILL.md YAML frontmatter.\n * Expects `---\\nname: ...\\ndescription: \"...\"\\n---` at the top.\n */\nfunction parseSkillFrontmatter(\n  content: string,\n  fallbackName: string\n): { name: string; description: string } {\n  const match = /^---\\n([\\s\\S]*?)\\n---/.exec(content);\n  if (!match?.[1]) return { name: fallbackName, description: '' };\n\n  const frontmatter = match[1];\n  const nameMatch = /^name:\\s*[\"']?(.+?)[\"']?\\s*$/m.exec(frontmatter);\n  const descMatch = /^description:\\s*[\"']?(.+?)[\"']?\\s*$/m.exec(frontmatter);\n\n  const name = nameMatch?.[1]?.trim() ?? fallbackName;\n  const description = descMatch?.[1]?.trim() ?? '';\n\n  return { name, description };\n}\n\n/**\n * Infer the sourceAgent for a skill from its on-disk path.\n *\n * Paths anywhere under `.codex/` or `.agents/` (including plugin caches\n * like `.codex/plugins/cache/<marketplace>/<plugin>/<version>/skills/...`)\n * are tagged 'codex'. Paths anywhere under `.cursor/` or under the\n * Shipyard-owned cursor skills root (`~/.shipyard/cursor-skills/<taskId>/`,\n * written by `cursor-skill-writer.ts`) are tagged 'cursor'. Paths\n * anywhere under `.claude/` are tagged 'claude-code'. Anything else\n * (e.g. project `.claude/skills/` or `.agents/skills/`) is matched by the\n * same fragments. Defaults to 'claude-code' if no marker is found.\n */\nfunction sourceAgentForPath(path: string): 'claude-code' | 'codex' | 'cursor' {\n  if (path.includes('/cursor-skills/') || path.includes('/.cursor/')) {\n    return 'cursor';\n  }\n  if (path.includes('/.codex/') || path.includes('/.agents/')) {\n    return 'codex';\n  }\n  return 'claude-code';\n}\n\n/**\n * Read a single skill directory (one level deep). Each child directory\n * must contain a `SKILL.md`. Per-file errors are swallowed (we accept the\n * skill with empty description if SKILL.md is missing/unreadable, to\n * preserve historical behaviour). Captures `bodyBytes` via stat.\n */\nasync function readSkillsFromDir(dirPath: string): Promise<SkillInfo[]> {\n  try {\n    const entries = await readdir(dirPath, { withFileTypes: true });\n    const skills: SkillInfo[] = [];\n\n    for (const entry of entries) {\n      if (!entry.isDirectory()) continue;\n      const skillDir = join(dirPath, entry.name);\n      const skillFile = join(skillDir, 'SKILL.md');\n      try {\n        const [content, st] = await Promise.all([readFile(skillFile, 'utf-8'), stat(skillFile)]);\n        const parsed = parseSkillFrontmatter(content, entry.name);\n        skills.push({\n          ...parsed,\n          path: skillFile,\n          bodyBytes: st.size,\n          sourceAgent: sourceAgentForPath(skillFile),\n        });\n      } catch {\n        skills.push({\n          name: entry.name,\n          description: '',\n          sourceAgent: sourceAgentForPath(skillDir),\n        });\n      }\n    }\n\n    return skills;\n  } catch {\n    return [];\n  }\n}\n\n/**\n * Recursively walk a directory looking for SKILL.md files. Used for\n * plugin skill bundles which may nest by category. Capped at the natural\n * filesystem structure — readers swallow per-dir errors.\n */\nasync function readSkillsRecursive(dirPath: string, depth = 0, maxDepth = 4): Promise<SkillInfo[]> {\n  if (depth > maxDepth) return [];\n  const skills: SkillInfo[] = [];\n  try {\n    const entries = await readdir(dirPath, { withFileTypes: true });\n    for (const entry of entries) {\n      if (!entry.isDirectory()) continue;\n      const subDir = join(dirPath, entry.name);\n      const skillFile = join(subDir, 'SKILL.md');\n      try {\n        const [content, st] = await Promise.all([readFile(skillFile, 'utf-8'), stat(skillFile)]);\n        const parsed = parseSkillFrontmatter(content, entry.name);\n        skills.push({\n          ...parsed,\n          path: skillFile,\n          bodyBytes: st.size,\n          sourceAgent: sourceAgentForPath(skillFile),\n        });\n      } catch {\n        const nested = await readSkillsRecursive(subDir, depth + 1, maxDepth);\n        skills.push(...nested);\n      }\n    }\n  } catch {}\n  return skills;\n}\n\n/**\n * Read Claude plugin skills from the installed-plugins manifest.\n * Only enabled plugins contribute skills. Each plugin's `<installPath>/skills`\n * is walked recursively.\n */\nasync function readPluginSkills(): Promise<SkillInfo[]> {\n  const skills: SkillInfo[] = [];\n  try {\n    const settingsPath = join(homedir(), '.claude', 'settings.json');\n    const settingsRaw = await readFile(settingsPath, 'utf-8');\n    // eslint-disable-next-line no-restricted-syntax -- JSON.parse returns unknown; checking enabledPlugins field only\n    const settings = JSON.parse(settingsRaw) as { enabledPlugins?: Record<string, boolean> };\n    if (!settings.enabledPlugins) return [];\n\n    const installedPath = join(homedir(), '.claude', 'plugins', 'installed_plugins.json');\n    const installedRaw = await readFile(installedPath, 'utf-8');\n    // eslint-disable-next-line no-restricted-syntax -- JSON.parse returns unknown; checking plugins field only\n    const installed = JSON.parse(installedRaw) as {\n      plugins?: Record<string, Array<{ installPath?: string }>>;\n    };\n    if (!installed.plugins) return [];\n\n    for (const [pluginId, enabled] of Object.entries(settings.enabledPlugins)) {\n      if (!enabled) continue;\n      const installs = installed.plugins[pluginId];\n      if (!installs || installs.length === 0) continue;\n      const installPath = installs[0]?.installPath;\n      if (!installPath) continue;\n\n      const skillsDir = join(installPath, 'skills');\n      const pluginSkills = await readSkillsRecursive(skillsDir);\n      skills.push(...pluginSkills);\n    }\n  } catch {}\n  return skills;\n}\n\n/**\n * Enumerate Codex plugin skill bundles under `~/.codex/plugins/cache/`.\n *\n * Walk one level into the cache root to find plugin dirs, then look for a\n * `skills/` subdir under each. We do NOT recursive-watch this tree (a\n * plugin cache can hold hundreds of files) — this enumeration runs at\n * detect time only. The skills/ subdir itself is read recursively, capped\n * at 2 levels per the plan.\n */\nasync function readCodexPluginCacheSkills(): Promise<SkillInfo[]> {\n  const cacheRoot = join(homedir(), '.codex', 'plugins', 'cache');\n  const out: SkillInfo[] = [];\n  try {\n    const entries = await readdir(cacheRoot, { withFileTypes: true });\n    for (const entry of entries) {\n      if (!entry.isDirectory()) continue;\n      const skillsDir = join(cacheRoot, entry.name, 'skills');\n      const found = await readSkillsRecursive(skillsDir, 0, 2);\n      out.push(...found);\n    }\n  } catch {}\n  return out;\n}\n\n/**\n * Read `~/.codex/skills/` (deprecated user dir), skipping the `.system`\n * subdirectory — the system bundle is read separately via\n * `readCodexSystemBundle`. Without this skip, every system skill would be\n * surfaced twice.\n */\nasync function readCodexUserSkillsDir(): Promise<SkillInfo[]> {\n  const dirPath = join(homedir(), '.codex', 'skills');\n  try {\n    const entries = await readdir(dirPath, { withFileTypes: true });\n    const skills: SkillInfo[] = [];\n    for (const entry of entries) {\n      if (!entry.isDirectory()) continue;\n      if (entry.name === '.system') continue;\n      const skillDir = join(dirPath, entry.name);\n      const skillFile = join(skillDir, 'SKILL.md');\n      try {\n        const [content, st] = await Promise.all([readFile(skillFile, 'utf-8'), stat(skillFile)]);\n        const parsed = parseSkillFrontmatter(content, entry.name);\n        skills.push({\n          ...parsed,\n          path: skillFile,\n          bodyBytes: st.size,\n          sourceAgent: 'codex',\n        });\n      } catch {\n        skills.push({\n          name: entry.name,\n          description: '',\n          sourceAgent: 'codex',\n        });\n      }\n    }\n    return skills;\n  } catch {\n    return [];\n  }\n}\n\n/**\n * Walk parent directories from `startDir` to a filesystem boundary\n * looking for a `.agents/skills/` directory. Stops at a git root (file or\n * dir named `.git`) or the filesystem root. Returns skills from the first\n * `.agents/skills/` encountered; nested envs share their nearest ancestor\n * skill set.\n *\n * Pattern mirrors `findProjectRoot` in `apps/daemon/src/shared/fs-utils.ts`.\n */\nasync function readAncestorAgentsSkills(startDir: string): Promise<SkillInfo[]> {\n  let dir = startDir;\n  for (let i = 0; i < 32; i += 1) {\n    const candidate = join(dir, '.agents', 'skills');\n    const found = await readSkillsFromDir(candidate);\n    if (found.length > 0) return found;\n    /**\n     * Stop at git boundary even if no .agents/skills found — don't escape\n     * out of the repo into unrelated user/home directories.\n     */\n    try {\n      const gitMarker = await stat(join(dir, '.git'));\n      if (gitMarker) return [];\n    } catch {}\n    const parent = dirname(dir);\n    if (parent === dir || parent === parse(dir).root) return [];\n    dir = parent;\n  }\n  return [];\n}\n\n/**\n * Extract the plugin id from a skill path, IF the skill is provided by a\n * plugin. Returns null for user/project/system/pathless cases — those are\n * not plugin-namespaced as far as the agent runtimes are concerned.\n *\n * - `~/.claude/plugins/cache/<plugin-id>/skills/...` → `<plugin-id>`\n * - `~/.claude/plugins/cache/<marketplace>/<plugin-id>/<version>/skills/...` → `<plugin-id>`\n * - `~/.codex/plugins/cache/<marketplace>/<plugin-id>/<version>/skills/...` → `<plugin-id>`\n * - everything else → null\n *\n * The Claude Code SDK's `Options.skills` allowlist accepts bare skill names\n * or `plugin:name` for plugin-provided skills (sdk.d.ts:1629). Codex follows\n * the same convention. Synthetic prefixes like `project:` or `user:` are\n * NOT recognized by either runtime — emitting them produces \"Skill X is\n * not in this session's skills allowlist\" at invocation time. Returning\n * null here means the caller will not prefix the SDK name with a synthetic\n * tag.\n */\nfunction inferPluginName(path: string): string | null {\n  const match = /\\/\\.(?:claude|codex)\\/plugins\\/cache\\/(.+?)\\/skills\\//.exec(path);\n  if (!match?.[1]) return null;\n\n  const segments = match[1].split('/').filter(Boolean);\n  if (segments.length === 0) return null;\n  if (segments.length === 1) return segments[0] ?? null;\n  /** Legacy plugin/version caches still use the first segment as the id. */\n  if (segments.length === 2) return segments[0] ?? null;\n\n  /**\n   * Current plugin caches are marketplace-scoped:\n   *   cache/<marketplace>/<plugin-id>/<version>/skills/...\n   * The runtime allowlist wants `<plugin-id>:<skill>`, not the marketplace\n   * owner. Legacy one-segment caches remain supported above.\n   */\n  return segments[1] ?? null;\n}\n\n/**\n * Detect skills across user/plugin/project sources for both agents.\n *\n * `lastKnown` preserves the previously-detected list when this function\n * throws (rare — inner readers swallow errors — but defense in depth).\n * Mirror of the `lastKnownAgents` pattern in `agents.ts`.\n *\n * `mirrorEnabled` controls how `classifySkill` computes `bodyResolution`\n * and `compatibleAgents` on the returned skills. Defaults to `false`.\n * TODO: wire from `skills.mirror.enabled` user pref once step 11 lands.\n */\nexport async function detectSkills(\n  environments: GitRepoInfo[],\n  lastKnown?: SkillInfo[],\n  mirrorEnabled = false\n): Promise<SkillInfo[]> {\n  try {\n    return await detectSkillsInner(environments, mirrorEnabled);\n  } catch (err) {\n    /**\n     * Preserve \"always resolves\" contract — inner readers already swallow\n     * per-file errors. Never rethrow because the Promise.all in\n     * detectCapabilities would tear down the whole refresh for a single\n     * slice's failure.\n     */\n    const { logger } = await import('../logger.js');\n    if (lastKnown && lastKnown.length > 0) {\n      logger.warn(\n        { err, lastKnownCount: lastKnown.length },\n        'detectSkills threw — preserving lastKnown'\n      );\n      return lastKnown;\n    }\n    logger.debug({ err }, 'detectSkills threw with no lastKnown — returning []');\n    return [];\n  }\n}\n\ntype Tier = 'user' | 'plugin' | 'project';\n\ninterface TieredSkill extends SkillInfo {\n  __tier: Tier;\n}\n\n/**\n * Re-exported for unit tests in `skills.test.ts`. Underscored to flag\n * that the symbol is part of the test contract, not the public API.\n */\nexport type _TieredSkillForTesting = TieredSkill;\n\nfunction tag(skills: SkillInfo[], tier: Tier): TieredSkill[] {\n  return skills.map((s) => ({ ...s, __tier: tier }));\n}\n\nasync function detectSkillsInner(\n  environments: GitRepoInfo[],\n  mirrorEnabled: boolean\n): Promise<SkillInfo[]> {\n  const home = homedir();\n\n  const codexSystemDir = join(home, '.codex', 'skills', '.system');\n  const agentsUserDir = join(home, '.agents', 'skills');\n  const claudeUserDir = join(home, '.claude', 'skills');\n\n  const [userClaude, pluginClaude, codexSystem, codexUser, agentsUser, pluginCodex] =\n    await Promise.all([\n      readSkillsFromDir(claudeUserDir),\n      readPluginSkills(),\n      readSkillsFromDir(codexSystemDir),\n      readCodexUserSkillsDir(),\n      readSkillsFromDir(agentsUserDir),\n      readCodexPluginCacheSkills(),\n    ]);\n\n  const projectClaude: SkillInfo[] = [];\n  const projectCodex: SkillInfo[] = [];\n  /*\n   * Sequential per-environment scan with event-loop yield. Promise.all over\n   * 16+ worktrees saturated libuv's I/O thread pool — each env triggers a\n   * 32-deep ancestor walk plus per-skill-dir readFile fan-out. Yielding\n   * between envs trades wall-clock for event-loop responsiveness, matching\n   * the orphan-pruner.ts:71-73 tradeoff.\n   */\n  for (const env of environments) {\n    const [claude, codex] = await Promise.all([\n      readSkillsFromDir(join(env.path, '.claude', 'skills')),\n      readAncestorAgentsSkills(env.path),\n    ]);\n    projectClaude.push(...claude);\n    projectCodex.push(...codex);\n    await new Promise<void>((resolve) => {\n      setImmediate(resolve);\n    });\n  }\n\n  /**\n   * Tier order: user > plugin > project. Within \"user\" we keep both\n   * Claude- and Codex-source entries (they live in different dirs and\n   * have independent name spaces in the no-collision case).\n   */\n  const tiered: TieredSkill[] = [\n    ...tag(userClaude, 'user'),\n    ...tag(codexSystem, 'user'),\n    ...tag(codexUser, 'user'),\n    ...tag(agentsUser, 'user'),\n    ...tag(pluginClaude, 'plugin'),\n    ...tag(pluginCodex, 'plugin'),\n    ...tag(projectClaude, 'project'),\n    ...tag(projectCodex, 'project'),\n  ];\n\n  /**\n   * Bucket candidates by name. Same-name appearances are either:\n   *   (a) the same skill at different tiers (user > plugin > project) —\n   *       drop lower tiers without namespacing.\n   *   (b) different sources at the same effective scope (two plugins,\n   *       or one Claude + one Codex) — preserve invocable variants.\n   */\n  const byName = new Map<string, TieredSkill[]>();\n  for (const skill of tiered) {\n    const bucket = byName.get(skill.name);\n    if (bucket) {\n      bucket.push(skill);\n    } else {\n      byName.set(skill.name, [skill]);\n    }\n  }\n\n  const resolved: SkillInfo[] = [];\n  for (const [, candidates] of byName) {\n    resolved.push(...resolveBucket(candidates));\n  }\n\n  return resolved.map((skill) => {\n    const { compatibleAgents, bodyResolution } = classifySkill(skill, mirrorEnabled);\n    return { ...skill, compatibleAgents, bodyResolution };\n  });\n}\n\n/**\n * Resolve a single name-bucket into one or more `SkillInfo` entries.\n *\n * - Single candidate → emit as-is.\n * - Multiple candidates with one highest-tier survivor → emit the survivor.\n * - Cross-agent collision after tier collapse → one canonical entry per agent.\n * - Same-agent collision after tier collapse → one canonical entry per SDK-valid plugin id,\n *   plus one bare entry for non-plugin candidates.\n */\nfunction resolveBucket(candidates: TieredSkill[]): SkillInfo[] {\n  if (candidates.length === 1) {\n    const only = candidates[0];\n    return only ? [stripTier(only)] : [];\n  }\n\n  const winners = pickHighestTier(candidates);\n  if (winners.length === 1) {\n    const w = winners[0];\n    return w ? [stripTier(w)] : [];\n  }\n\n  const claudeWinners = winners.filter((c) => c.sourceAgent === 'claude-code');\n  const codexWinners = winners.filter((c) => c.sourceAgent === 'codex');\n\n  if (claudeWinners.length > 0 && codexWinners.length > 0) {\n    return resolveCrossAgentCollision(claudeWinners, codexWinners);\n  }\n\n  return resolveSameAgentCollision(winners);\n}\n\n/**\n * Pick the lexicographically smallest path from a list of tiered skills.\n * Stable across different scan orders so the wire shape doesn't flap\n * between daemon restarts. Skills without a `path` (produced by the\n * SKILL.md-read-failure fallback in `readSkillsFromDir`) rank last —\n * a path-bearing entry is always preferred over a pathless one.\n */\nfunction canonicalWinner(candidates: TieredSkill[]): TieredSkill | undefined {\n  let best: TieredSkill | undefined;\n  for (const c of candidates) {\n    if (!best) {\n      best = c;\n    } else if (!best.path && c.path) {\n      best = c;\n    } else if (best.path && c.path && c.path < best.path) {\n      best = c;\n    }\n  }\n  return best;\n}\n\nfunction resolveCrossAgentCollision(\n  claudeWinners: TieredSkill[],\n  codexWinners: TieredSkill[]\n): SkillInfo[] {\n  const out: SkillInfo[] = [];\n  /**\n   * Lex-smallest path wins per agent so the choice is stable across scan\n   * orders (e.g. different worktree enumeration sequences under Promise.all).\n   * Each winner is emitted bare unless it actually lives under a plugin —\n   * `sourceAgent` already differentiates the Claude vs Codex variant in the\n   * UI, so a synthetic `claude-code:` / `codex:` prefix would be both\n   * redundant and invalid at the SDK boundary.\n   */\n  const bestClaude = canonicalWinner(claudeWinners);\n  const bestCodex = canonicalWinner(codexWinners);\n  if (bestClaude) out.push(applyPluginNamespace(stripTier(bestClaude)));\n  if (bestCodex) out.push(applyPluginNamespace(stripTier(bestCodex)));\n  return out;\n}\n\n/**\n * Stamp `namespace` only when the skill lives under a plugin install. The\n * value is the SDK-recognized plugin id (matches `Options.skills` syntax:\n * bare `name` or `plugin:name`). Synthetic categories like 'user' or\n * 'project' are never written here — see `inferPluginName` for why.\n */\nfunction applyPluginNamespace(skill: SkillInfo): SkillInfo {\n  if (!skill.path) return skill;\n  const pluginId = inferPluginName(skill.path);\n  if (pluginId === null) return skill;\n  return { ...skill, namespace: pluginId };\n}\n\n/**\n * Dedup same-agent collisions. Two distinct collapse classes:\n *\n *   - Plugin collisions: two plugins ship a skill with the same name. The\n *     `plugin:name` form disambiguates them on the wire AND at SDK\n *     invocation, so we keep one entry per plugin id.\n *   - Non-plugin dedup: 700 worktrees each carry the same project-tier\n *     skill (e.g. `code-review`) and the naive \"one entry per candidate\"\n *     shape ballooned the capability snapshot past the 5 MiB daemon-control\n *     channel cap, bricking the composer (#composer-bricked, 2026-05-22).\n *     Collapse all of them to the canonical winner; no namespace stamp,\n *     because synthetic prefixes like `project:` or `user:` are NOT valid\n *     SDK skill identifiers (Claude SDK accepts only bare `name` or\n *     `plugin:name` — sdk.d.ts:1629).\n *\n * Canonical winner per bucket = `canonicalWinner()` (lex-smallest path;\n * path-bearing beats pathless). Pathless candidates with no resolvable\n * plugin id collapse into the same non-plugin bucket as path-bearing ones;\n * if every SKILL.md failed to read, the canonical winner is the pathless\n * fallback and the skill remains visible (just without a namespace).\n */\nfunction resolveSameAgentCollision(winners: TieredSkill[]): SkillInfo[] {\n  /**\n   * Bucket key: the SDK-valid plugin id when the path is plugin-provided,\n   * otherwise `null` for everything else (user/project/system/pathless).\n   * All non-plugin candidates share the `null` bucket and collapse to one\n   * canonical entry.\n   */\n  const buckets = new Map<string | null, TieredSkill[]>();\n  for (const candidate of winners) {\n    const pluginId = candidate.path ? inferPluginName(candidate.path) : null;\n    const bucket = buckets.get(pluginId);\n    if (bucket) {\n      bucket.push(candidate);\n    } else {\n      buckets.set(pluginId, [candidate]);\n    }\n  }\n\n  const out: SkillInfo[] = [];\n  for (const [pluginId, candidates] of buckets) {\n    const winner = canonicalWinner(candidates);\n    if (!winner) continue;\n    const base = stripTier(winner);\n    out.push(pluginId !== null ? { ...base, namespace: pluginId } : base);\n  }\n  return out;\n}\n\nfunction pickHighestTier(candidates: TieredSkill[]): TieredSkill[] {\n  const order: Record<Tier, number> = { user: 0, plugin: 1, project: 2 };\n  let bestRank = Number.POSITIVE_INFINITY;\n  for (const c of candidates) {\n    const r = order[c.__tier];\n    if (r < bestRank) bestRank = r;\n  }\n  return candidates.filter((c) => order[c.__tier] === bestRank);\n}\n\nfunction stripTier(skill: TieredSkill): SkillInfo {\n  const { __tier, ...rest } = skill;\n  void __tier;\n  return rest;\n}\n\n/**\n * Re-exported for unit tests in `skills.test.ts`. Underscored to flag\n * that the symbol is part of the test contract, not the public API.\n */\nexport const _resolveBucketForTesting = resolveBucket;\n","import type { SkillBodyResolution, SkillCompatibleAgent, SkillInfo } from '@shipyard/session';\n\n/**\n * Classify a detected skill's reach across agent runtimes.\n *\n * Pure function — given a `SkillInfo` and whether the user has the skill\n * mirror enabled, returns the set of agents that can invoke this skill and\n * how the body is reached (native, pass-in, mirror, unreachable).\n *\n * The detector calls this on every surviving skill after dedup and\n * overwrites `compatibleAgents` + `bodyResolution` with the result.\n *\n * Source classification:\n *   - Claude-pathed (`/.claude/skills/`) — Claude resolves natively. Codex\n *     can reach via `[$name](skill://path)` pass-in (see\n *     `codex-rs/core-skills/src/injection.rs`).\n *   - Codex-pathed (`/.codex/skills/` or `/.agents/skills/`) — Codex\n *     resolves natively. Claude's SDK accepts only names from its own\n *     resolver's known set; without mirror, Claude cannot invoke it.\n *   - Mirror on for path-backed skills — both runtimes resolve natively\n *     because symlinks make every skill present in both indexed directories.\n *\n * TODO: wire `mirrorEnabled` from `skills.mirror.enabled` user pref once\n * step 11 lands (skills-mirror subsystem).\n */\nexport function classifySkill(\n  skill: SkillInfo,\n  mirrorEnabled: boolean\n): { compatibleAgents: SkillCompatibleAgent[]; bodyResolution: SkillBodyResolution } {\n  const path = skill.path;\n  if (!path) {\n    const fallback: SkillCompatibleAgent =\n      skill.sourceAgent === 'codex'\n        ? 'codex'\n        : skill.sourceAgent === 'cursor'\n          ? 'cursor'\n          : 'claude-code';\n    return {\n      compatibleAgents: [fallback],\n      bodyResolution: 'unreachable',\n    };\n  }\n\n  if (mirrorEnabled) {\n    return {\n      compatibleAgents: ['claude-code', 'codex', 'cursor'],\n      bodyResolution: 'mirror',\n    };\n  }\n\n  /**\n   * Cursor first — `~/.shipyard/cursor-skills/<taskId>/...` is written by\n   * the daemon at spawn time; tag those before falling through to codex/claude.\n   */\n  if (path.includes('/cursor-skills/') || path.includes('/.cursor/')) {\n    return {\n      compatibleAgents: ['cursor'],\n      bodyResolution: 'native',\n    };\n  }\n\n  /**\n   * Codex first — `.codex/plugins/cache/.../skills/...` would otherwise be\n   * missed because it does not contain `/.codex/skills/`.\n   */\n  if (path.includes('/.codex/') || path.includes('/.agents/')) {\n    return {\n      compatibleAgents: ['codex'],\n      bodyResolution: 'native',\n    };\n  }\n\n  if (path.includes('/.claude/')) {\n    return {\n      compatibleAgents: ['claude-code', 'codex', 'cursor'],\n      bodyResolution: 'pass-in',\n    };\n  }\n\n  const fallback: SkillCompatibleAgent =\n    skill.sourceAgent === 'codex'\n      ? 'codex'\n      : skill.sourceAgent === 'cursor'\n        ? 'cursor'\n        : 'claude-code';\n  return {\n    compatibleAgents: [fallback],\n    bodyResolution: 'unreachable',\n  };\n}\n"],"mappings":"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","names":["fallback"]}

package/dist/{chunk-VPMN47TL.js → chunk-CNR7O5YH.js}

@@ -13772,7 +13772,6 @@ function date4(params) {
 config(en_default());
 
 export {
-  toJSONSchema,
   external_exports
 };
-//# sourceMappingURL=chunk-VPMN47TL.js.map
+//# sourceMappingURL=chunk-CNR7O5YH.js.map

package/dist/{chunk-2J3WSIAF.js → chunk-EF2DAODF.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   getShipyardHome
-} from "./chunk-PI77CUEP.js";
+} from "./chunk-KITSAHTX.js";
 import {
   external_exports
-} from "./chunk-VPMN47TL.js";
+} from "./chunk-CNR7O5YH.js";
 
 // src/services/bootstrap/auth.ts
 import { mkdir, readFile, unlink, writeFile } from "fs/promises";
@@ -14,6 +14,7 @@ var ShipyardConfigSchema = external_exports.object({
     token: external_exports.string(),
     userId: external_exports.string(),
     displayName: external_exports.string(),
+    avatarUrl: external_exports.string().nullable().optional(),
     providers: external_exports.array(external_exports.string()),
     expiresAt: external_exports.number(),
     signalingUrl: external_exports.string()
@@ -51,6 +52,7 @@ async function loadAuthToken(envOverrides) {
       token: envToken,
       userId: envOverrides?.SHIPYARD_USER_ID ?? "",
       displayName: envOverrides?.SHIPYARD_USER_DISPLAY_NAME ?? "",
+      avatarUrl: null,
       signalingUrl: envOverrides?.SHIPYARD_SIGNALING_URL
     };
   }
@@ -64,9 +66,22 @@ async function loadAuthToken(envOverrides) {
     token: config.auth.token,
     userId: config.auth.userId,
     displayName: config.auth.displayName,
+    avatarUrl: config.auth.avatarUrl ?? extractTokenAvatarUrl(config.auth.token),
     signalingUrl: config.auth.signalingUrl
   };
 }
+function extractTokenAvatarUrl(token) {
+  try {
+    const payloadB64 = token.split(".")[1];
+    if (!payloadB64) return null;
+    const payload = JSON.parse(Buffer.from(payloadB64, "base64url").toString());
+    if (payload === null || typeof payload !== "object") return null;
+    const avatarUrl = Reflect.get(payload, "avatarUrl");
+    return typeof avatarUrl === "string" ? avatarUrl : null;
+  } catch {
+    return null;
+  }
+}
 
 export {
   getConfigPath,
@@ -75,4 +90,4 @@ export {
   deleteConfig,
   loadAuthToken
 };
-//# sourceMappingURL=chunk-2J3WSIAF.js.map
+//# sourceMappingURL=chunk-EF2DAODF.js.map

package/dist/chunk-EF2DAODF.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/services/bootstrap/auth.ts"],"sourcesContent":["import { mkdir, readFile, unlink, writeFile } from 'node:fs/promises';\nimport { dirname, join } from 'node:path';\nimport { z } from 'zod';\nimport { getShipyardHome } from '../../shared/env.js';\n\nconst ShipyardConfigSchema = z.object({\n  auth: z.object({\n    token: z.string(),\n    userId: z.string(),\n    displayName: z.string(),\n    avatarUrl: z.string().nullable().optional(),\n    providers: z.array(z.string()),\n    expiresAt: z.number(),\n    signalingUrl: z.string(),\n  }),\n});\n\nexport type ShipyardConfig = z.infer<typeof ShipyardConfigSchema>;\n\nexport function getConfigPath(): string {\n  return join(getShipyardHome(), 'config.json');\n}\n\nexport async function readConfig(): Promise<ShipyardConfig | null> {\n  try {\n    const raw = await readFile(getConfigPath(), 'utf-8');\n    return ShipyardConfigSchema.parse(JSON.parse(raw));\n  } catch {\n    return null;\n  }\n}\n\nexport async function writeConfig(config: ShipyardConfig): Promise<void> {\n  await mkdir(dirname(getConfigPath()), { recursive: true, mode: 0o700 });\n  await writeFile(getConfigPath(), `${JSON.stringify(config, null, 2)}\\n`, { mode: 0o600 });\n}\n\nexport async function deleteConfig(): Promise<boolean> {\n  try {\n    await unlink(getConfigPath());\n    return true;\n  } catch {\n    return false;\n  }\n}\n\nexport type AuthResult =\n  | {\n      status: 'ok';\n      token: string;\n      userId: string;\n      displayName: string;\n      avatarUrl: string | null;\n      signalingUrl?: string;\n    }\n  | { status: 'expired' }\n  | { status: 'missing' };\n\nexport interface AuthEnvOverrides {\n  SHIPYARD_USER_TOKEN?: string;\n  SHIPYARD_USER_ID?: string;\n  SHIPYARD_USER_DISPLAY_NAME?: string;\n  SHIPYARD_SIGNALING_URL?: string;\n}\n\n/**\n * Load auth token from validated env (CI override) or config file.\n */\nexport async function loadAuthToken(envOverrides?: AuthEnvOverrides): Promise<AuthResult> {\n  const envToken = envOverrides?.SHIPYARD_USER_TOKEN;\n  if (envToken) {\n    return {\n      status: 'ok',\n      token: envToken,\n      userId: envOverrides?.SHIPYARD_USER_ID ?? '',\n      displayName: envOverrides?.SHIPYARD_USER_DISPLAY_NAME ?? '',\n      avatarUrl: null,\n      signalingUrl: envOverrides?.SHIPYARD_SIGNALING_URL,\n    };\n  }\n\n  const config = await readConfig();\n  if (!config?.auth?.token) return { status: 'missing' };\n\n  if (config.auth.expiresAt < Date.now()) {\n    return { status: 'expired' };\n  }\n\n  return {\n    status: 'ok',\n    token: config.auth.token,\n    userId: config.auth.userId,\n    displayName: config.auth.displayName,\n    avatarUrl: config.auth.avatarUrl ?? extractTokenAvatarUrl(config.auth.token),\n    signalingUrl: config.auth.signalingUrl,\n  };\n}\n\nfunction extractTokenAvatarUrl(token: string): string | null {\n  try {\n    const payloadB64 = token.split('.')[1];\n    if (!payloadB64) return null;\n    const payload: unknown = JSON.parse(Buffer.from(payloadB64, 'base64url').toString());\n    if (payload === null || typeof payload !== 'object') return null;\n    const avatarUrl = Reflect.get(payload, 'avatarUrl');\n    return typeof avatarUrl === 'string' ? avatarUrl : null;\n  } catch {\n    return null;\n  }\n}\n"],"mappings":";;;;;;;;;AAAA,SAAS,OAAO,UAAU,QAAQ,iBAAiB;AACnD,SAAS,SAAS,YAAY;AAI9B,IAAM,uBAAuB,iBAAE,OAAO;AAAA,EACpC,MAAM,iBAAE,OAAO;AAAA,IACb,OAAO,iBAAE,OAAO;AAAA,IAChB,QAAQ,iBAAE,OAAO;AAAA,IACjB,aAAa,iBAAE,OAAO;AAAA,IACtB,WAAW,iBAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,IAC1C,WAAW,iBAAE,MAAM,iBAAE,OAAO,CAAC;AAAA,IAC7B,WAAW,iBAAE,OAAO;AAAA,IACpB,cAAc,iBAAE,OAAO;AAAA,EACzB,CAAC;AACH,CAAC;AAIM,SAAS,gBAAwB;AACtC,SAAO,KAAK,gBAAgB,GAAG,aAAa;AAC9C;AAEA,eAAsB,aAA6C;AACjE,MAAI;AACF,UAAM,MAAM,MAAM,SAAS,cAAc,GAAG,OAAO;AACnD,WAAO,qBAAqB,MAAM,KAAK,MAAM,GAAG,CAAC;AAAA,EACnD,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,eAAsB,YAAY,QAAuC;AACvE,QAAM,MAAM,QAAQ,cAAc,CAAC,GAAG,EAAE,WAAW,MAAM,MAAM,IAAM,CAAC;AACtE,QAAM,UAAU,cAAc,GAAG,GAAG,KAAK,UAAU,QAAQ,MAAM,CAAC,CAAC;AAAA,GAAM,EAAE,MAAM,IAAM,CAAC;AAC1F;AAEA,eAAsB,eAAiC;AACrD,MAAI;AACF,UAAM,OAAO,cAAc,CAAC;AAC5B,WAAO;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAwBA,eAAsB,cAAc,cAAsD;AACxF,QAAM,WAAW,cAAc;AAC/B,MAAI,UAAU;AACZ,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,OAAO;AAAA,MACP,QAAQ,cAAc,oBAAoB;AAAA,MAC1C,aAAa,cAAc,8BAA8B;AAAA,MACzD,WAAW;AAAA,MACX,cAAc,cAAc;AAAA,IAC9B;AAAA,EACF;AAEA,QAAM,SAAS,MAAM,WAAW;AAChC,MAAI,CAAC,QAAQ,MAAM,MAAO,QAAO,EAAE,QAAQ,UAAU;AAErD,MAAI,OAAO,KAAK,YAAY,KAAK,IAAI,GAAG;AACtC,WAAO,EAAE,QAAQ,UAAU;AAAA,EAC7B;AAEA,SAAO;AAAA,IACL,QAAQ;AAAA,IACR,OAAO,OAAO,KAAK;AAAA,IACnB,QAAQ,OAAO,KAAK;AAAA,IACpB,aAAa,OAAO,KAAK;AAAA,IACzB,WAAW,OAAO,KAAK,aAAa,sBAAsB,OAAO,KAAK,KAAK;AAAA,IAC3E,cAAc,OAAO,KAAK;AAAA,EAC5B;AACF;AAEA,SAAS,sBAAsB,OAA8B;AAC3D,MAAI;AACF,UAAM,aAAa,MAAM,MAAM,GAAG,EAAE,CAAC;AACrC,QAAI,CAAC,WAAY,QAAO;AACxB,UAAM,UAAmB,KAAK,MAAM,OAAO,KAAK,YAAY,WAAW,EAAE,SAAS,CAAC;AACnF,QAAI,YAAY,QAAQ,OAAO,YAAY,SAAU,QAAO;AAC5D,UAAM,YAAY,QAAQ,IAAI,SAAS,WAAW;AAClD,WAAO,OAAO,cAAc,WAAW,YAAY;AAAA,EACrD,QAAQ;AACN,WAAO;AAAA,EACT;AACF;","names":[]}