@danieljvdm/dev-kit 0.6.0 → 0.7.0

package/src/catalog-manager.ts

@@ -1,6 +1,6 @@
-import { applyEdits, modify, parse as parseJsonc, type ParseError } from "jsonc-parser";
 import { Effect, FileSystem, Path, Schema } from "effect";
 import { Prompt } from "effect/unstable/cli";
+import { applyEdits, modify, parse as parseJsonc, type ParseError } from "jsonc-parser";
 
 import { isInteractiveTerminal, printLine, printStatus } from "./cli-ui.ts";
 import {
@@ -10,11 +10,7 @@ import {
   type SkillSourcesLock,
   type SkillSourcesManifest,
 } from "./source-manifest.ts";
-import {
-  inspectCatalogRepository,
-  refreshSkillCatalog,
-  type CatalogInspection,
-} from "./vendor.ts";
+import { inspectCatalogRepository, refreshSkillCatalog, type CatalogInspection } from "./vendor.ts";
 
 type CatalogPaths = {
   readonly repoDir: string;
@@ -52,6 +48,7 @@ const resolvePaths = Effect.fn("resolveCatalogManagerPaths")(function* (
 ) {
   const path = yield* Path.Path;
   const repoDir = path.resolve(options.repoDir ?? ".");
+
   return {
     repoDir,
     sourcesPath: path.resolve(repoDir, options.sourcesPath ?? "skill-sources.jsonc"),
@@ -64,35 +61,38 @@ const readJsonc = Effect.fn("readCatalogManagerJsonc")(function* <A>(
   schema: Schema.ConstraintDecoder<A>,
 ) {
   const fs = yield* FileSystem.FileSystem;
+
   if (!(yield* fs.exists(filePath))) {
     return yield* new CatalogManagerError({ message: `file not found: ${filePath}` });
   }
   const raw = yield* fs.readFileString(filePath);
   const errors: Array<ParseError> = [];
   const parsed = parseJsonc(raw, errors, { allowTrailingComma: true });
+
   if (errors.length > 0) {
     return yield* new CatalogManagerError({ message: `could not parse ${filePath}` });
   }
   const value = yield* Schema.decodeUnknownEffect(schema)(parsed).pipe(
     Effect.mapError((error) => new CatalogManagerError({ message: error.message })),
   );
+
   return { raw, value };
 });
 
-const readState = Effect.fn("readCatalogManagerState")(function* (
-  options: CatalogCommandOptions,
-) {
+const readState = Effect.fn("readCatalogManagerState")(function* (options: CatalogCommandOptions) {
   const fs = yield* FileSystem.FileSystem;
   const paths = yield* resolvePaths(options);
   const sources = yield* readJsonc(paths.sourcesPath, SkillSourcesManifestSchema);
   const lock = (yield* fs.exists(paths.lockfilePath))
     ? yield* readJsonc(paths.lockfilePath, SkillSourcesLockSchema)
     : undefined;
+
   return { ...paths, sources, lock };
 });
 
 const compactDescription = (description: string): string => {
   const first = description.match(/^.*?[.!?](?:\s|$)/)?.[0]?.trim() ?? description;
+
   return first.length > 90 ? `${first.slice(0, 87).trimEnd()}…` : first;
 };
 
@@ -103,6 +103,7 @@ const selectSkills = Effect.fn("selectCatalogSkills")(function* (
 ) {
   const available = new Set(inspection.skills.map((skill) => skill.name));
   const unknown = requested.filter((skill) => !available.has(skill));
+
   if (unknown.length > 0) {
     return yield* new CatalogManagerError({
       message: `repository does not contain: ${unknown.join(", ")}`,
@@ -110,9 +111,11 @@ const selectSkills = Effect.fn("selectCatalogSkills")(function* (
   }
   if (all) {
     const selected = inspection.skills.map((skill) => skill.name);
+
     return { include: selected, selected };
   }
-  if (requested.length > 0) return { include: [...new Set(requested)], selected: [...new Set(requested)] };
+  if (requested.length > 0)
+    return { include: [...new Set(requested)], selected: [...new Set(requested)] };
   if (!(yield* isInteractiveTerminal)) {
     return yield* new CatalogManagerError({
       message: "choose skills with --skill <name>, or pass --all",
@@ -127,6 +130,7 @@ const selectSkills = Effect.fn("selectCatalogSkills")(function* (
     })),
     min: 1,
   });
+
   return { include: selected, selected };
 });
 
@@ -138,6 +142,7 @@ const refreshWithRollback = Effect.fn("refreshCatalogWithRollback")(function* (
   pinSourceIds: ReadonlyArray<string>,
 ) {
   const fs = yield* FileSystem.FileSystem;
+
   yield* refreshSkillCatalog({
     repoDir: paths.repoDir,
     sourcesPath: paths.sourcesPath,
@@ -153,6 +158,7 @@ const refreshWithRollback = Effect.fn("refreshCatalogWithRollback")(function* (
         } else {
           yield* fs.writeFileString(paths.lockfilePath, previousLock);
         }
+
         return yield* Effect.failCause(cause);
       }),
     ),
@@ -172,11 +178,14 @@ const writeAndRefresh = Effect.fn("writeAndRefreshCatalog")(function* (
   pinSourceIds: ReadonlyArray<string> = [],
 ) {
   const fs = yield* FileSystem.FileSystem;
+
   if (nextSources === state.sources.raw) {
     yield* printStatus("info", "Catalog already contains that selection");
+
     return;
   }
   const previousLock = state.lock?.raw;
+
   yield* fs.writeFileString(state.sourcesPath, nextSources);
   yield* refreshWithRollback(state, state.sources.raw, previousLock, updateSourceIds, pinSourceIds);
 });
@@ -195,14 +204,11 @@ export const addCatalogSource = Effect.fn("addCatalogSource")(function* (
     ...(options.ref ? { ref: options.ref } : {}),
     ...(options.skillsPath ? { skillsPath: options.skillsPath } : {}),
   });
-  const selection = yield* selectSkills(
-    inspection,
-    options.skills ?? [],
-    options.all ?? false,
-  );
+  const selection = yield* selectSkills(inspection, options.skills ?? [], options.all ?? false);
   const sources = state.sources.value.sources;
   const byId = sources.findIndex((source) => source.id === inspection.id);
   const byRepository = sources.findIndex((source) => source.repository === inspection.repository);
+
   if (byId >= 0 && sources[byId]?.repository !== inspection.repository) {
     return yield* new CatalogManagerError({
       message: `source id ${inspection.id} is already used by ${sources[byId]?.repository}`,
@@ -215,21 +221,34 @@ export const addCatalogSource = Effect.fn("addCatalogSource")(function* (
   }
   const existingIndex = byId >= 0 ? byId : byRepository;
   let next = state.sources.raw;
+
   if (existingIndex >= 0) {
     const existing = sources[existingIndex];
+
     if (existing === undefined) {
       return yield* new CatalogManagerError({ message: "catalog source index is out of bounds" });
     }
-    const approved = state.lock?.value.sources.find((source) => source.id === existing.id)?.skills ?? [];
+    const approved =
+      state.lock?.value.sources.find((source) => source.id === existing.id)?.skills ?? [];
     const currentInclude = existing.include.includes("*") ? approved : existing.include;
     const include = [...new Set([...currentInclude, ...selection.include])].sort();
     const exclude = (existing.exclude ?? []).filter((skill) => !selection.selected.includes(skill));
-    next = applyEdits(next, modify(next, ["sources", existingIndex, "include"], include, { formattingOptions }));
+
+    next = applyEdits(
+      next,
+      modify(next, ["sources", existingIndex, "include"], include, { formattingOptions }),
+    );
     if (exclude.length > 0 || existing.exclude !== undefined) {
-      next = applyEdits(next, modify(next, ["sources", existingIndex, "exclude"], exclude, { formattingOptions }));
+      next = applyEdits(
+        next,
+        modify(next, ["sources", existingIndex, "exclude"], exclude, { formattingOptions }),
+      );
     }
     if (existing.ref === "HEAD" && inspection.ref !== "HEAD") {
-      next = applyEdits(next, modify(next, ["sources", existingIndex, "ref"], inspection.ref, { formattingOptions }));
+      next = applyEdits(
+        next,
+        modify(next, ["sources", existingIndex, "ref"], inspection.ref, { formattingOptions }),
+      );
     }
   } else {
     const source: ExternalSkillSource = {
@@ -241,16 +260,20 @@ export const addCatalogSource = Effect.fn("addCatalogSource")(function* (
       ...(options.licensePath
         ? { licensePath: options.licensePath }
         : inspection.licensePath
-        ? { licensePath: inspection.licensePath }
-        : {}),
+          ? { licensePath: inspection.licensePath }
+          : {}),
       ...(options.stripFrontmatter?.length
         ? { stripFrontmatter: [...new Set(options.stripFrontmatter)] }
         : {}),
     };
-    next = applyEdits(next, modify(next, ["sources", sources.length], source, {
-      formattingOptions,
-      isArrayInsertion: true,
-    }));
+
+    next = applyEdits(
+      next,
+      modify(next, ["sources", sources.length], source, {
+        formattingOptions,
+        isArrayInsertion: true,
+      }),
+    );
   }
   if (options.dryRun) {
     yield* printStatus(
@@ -258,6 +281,7 @@ export const addCatalogSource = Effect.fn("addCatalogSource")(function* (
       existingIndex >= 0 ? "Would update catalog source" : "Would add catalog source",
       `${inspection.id} · ${selection.selected.length} skill${selection.selected.length === 1 ? "" : "s"}`,
     );
+
     return;
   }
   yield* writeAndRefresh(state, next, [inspection.id]);
@@ -273,29 +297,47 @@ export const removeCatalogEntry = Effect.fn("removeCatalogEntry")(function* (
   let next = state.sources.raw;
   let label: string;
   let pinSourceIds: ReadonlyArray<string> = [];
+
   if (sourceIndex >= 0) {
-    next = applyEdits(next, modify(next, ["sources", sourceIndex], undefined, { formattingOptions }));
+    next = applyEdits(
+      next,
+      modify(next, ["sources", sourceIndex], undefined, { formattingOptions }),
+    );
     label = `source ${name}`;
   } else {
     const owner = state.lock?.value.sources.find((source) => source.skills.includes(name));
-    if (!owner) return yield* new CatalogManagerError({ message: `catalog entry not found: ${name}` });
+
+    if (!owner)
+      return yield* new CatalogManagerError({ message: `catalog entry not found: ${name}` });
     const index = sources.findIndex((source) => source.id === owner.id);
     const source = sources[index];
-    if (!source) return yield* new CatalogManagerError({ message: `source not found: ${owner.id}` });
+
+    if (!source)
+      return yield* new CatalogManagerError({ message: `source not found: ${owner.id}` });
     if (source.include.includes("*")) {
       const exclude = [...new Set([...(source.exclude ?? []), name])];
-      next = applyEdits(next, modify(next, ["sources", index, "exclude"], exclude, { formattingOptions }));
+
+      next = applyEdits(
+        next,
+        modify(next, ["sources", index, "exclude"], exclude, { formattingOptions }),
+      );
     } else {
       const include = source.include.filter((skill) => skill !== name);
-      next = include.length === 0
-        ? applyEdits(next, modify(next, ["sources", index], undefined, { formattingOptions }))
-        : applyEdits(next, modify(next, ["sources", index, "include"], include, { formattingOptions }));
+
+      next =
+        include.length === 0
+          ? applyEdits(next, modify(next, ["sources", index], undefined, { formattingOptions }))
+          : applyEdits(
+              next,
+              modify(next, ["sources", index, "include"], include, { formattingOptions }),
+            );
     }
     label = `skill ${name}`;
     pinSourceIds = [owner.id];
   }
   if (options.dryRun) {
     yield* printStatus("plan", "Would remove catalog entry", label);
+
     return;
   }
   if (!options.yes) {
@@ -308,8 +350,10 @@ export const removeCatalogEntry = Effect.fn("removeCatalogEntry")(function* (
       message: `Remove ${label} from the approved catalog?`,
       initial: false,
     });
+
     if (!confirmed) {
       yield* printStatus("info", "Cancelled");
+
       return;
     }
   }
@@ -320,14 +364,19 @@ export const listCatalogSources = Effect.fn("listCatalogSources")(function* (
   options: CatalogCommandOptions,
 ) {
   const state = yield* readState(options);
+
   if (state.sources.value.sources.length === 0) {
     yield* printStatus("info", "Catalog has no external sources");
+
     return;
   }
   for (const source of state.sources.value.sources) {
     const locked = state.lock?.value.sources.find((candidate) => candidate.id === source.id);
+
     yield* printLine(`${source.id}  ${source.repository}`);
-    yield* printLine(`  ${locked?.skills.length ?? 0} skills · ${locked?.resolved.slice(0, 12) ?? "not refreshed"}`);
+    yield* printLine(
+      `  ${locked?.skills.length ?? 0} skills · ${locked?.resolved.slice(0, 12) ?? "not refreshed"}`,
+    );
   }
 });
 
@@ -337,8 +386,11 @@ export const showCatalogSource = Effect.fn("showCatalogSource")(function* (
 ) {
   const state = yield* readState(options);
   const source = state.sources.value.sources.find((candidate) => candidate.id === id);
-  if (!source) return yield* new CatalogManagerError({ message: `catalog source not found: ${id}` });
+
+  if (!source)
+    return yield* new CatalogManagerError({ message: `catalog source not found: ${id}` });
   const locked = state.lock?.value.sources.find((candidate) => candidate.id === id);
+
   yield* printLine(source.id);
   yield* printLine(`Repository: ${source.repository}`);
   yield* printLine(`Tracking: ${source.ref}`);

package/src/catalog.ts

@@ -1,12 +1,9 @@
-import { parse as parseJsonc, type ParseError } from "jsonc-parser";
 import { Effect, FileSystem, Path, Schema, Stream } from "effect";
 import { ChildProcess } from "effect/unstable/process";
+import { parse as parseJsonc, type ParseError } from "jsonc-parser";
 
+import { discoverPackageSkills, resolvePackageSkillSelector } from "./package-skill-source.ts";
 import { observePath, type Digest } from "./path-digest.ts";
-import {
-  discoverPackageSkills,
-  resolvePackageSkillSelector,
-} from "./package-skill-source.ts";
 import {
   SkillSourcesLockSchema,
   type LockedSkillSource,
@@ -52,10 +49,7 @@ class CatalogError extends Schema.TaggedErrorClass<CatalogError>()("CatalogError
   message: Schema.String,
 }) {}
 
-const runGit = Effect.fn("runCatalogGit")(function* (
-  cwd: string,
-  args: ReadonlyArray<string>,
-) {
+const runGit = Effect.fn("runCatalogGit")(function* (cwd: string, args: ReadonlyArray<string>) {
   const child = yield* ChildProcess.make("git", args, {
     cwd,
     stderr: "pipe",
@@ -65,11 +59,13 @@ const runGit = Effect.fn("runCatalogGit")(function* (
     Stream.mkString(Stream.decodeText(child.all)),
     child.exitCode,
   ]);
+
   if (exitCode !== 0) {
     return yield* new CatalogError({
       message: `git ${args.join(" ")} failed: ${output.trim()}`,
     });
   }
+
   return output.trim();
 });
 
@@ -77,13 +73,16 @@ const readCatalogLock = Effect.fn("readCatalogLock")(function* (packageRoot: str
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const lockPath = path.join(packageRoot, "skill-sources.lock.json");
+
   if (!(yield* fs.exists(lockPath))) return undefined;
   const raw = yield* fs.readFileString(lockPath);
   const errors: Array<ParseError> = [];
   const value = parseJsonc(raw, errors, { allowTrailingComma: true });
+
   if (errors.length > 0) {
     return yield* new CatalogError({ message: `invalid skill catalog lock: ${lockPath}` });
   }
+
   return yield* Schema.decodeUnknownEffect(SkillSourcesLockSchema)(value).pipe(
     Effect.mapError((error) => new CatalogError({ message: error.message })),
   );
@@ -93,13 +92,16 @@ const readDescription = Effect.fn("readSkillDescription")(function* (skillPath:
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const text = yield* fs.readFileString(path.join(skillPath, "SKILL.md"));
-  return text
-    .match(/^---\r?\n([\s\S]*?)\r?\n---/)?.[1]
-    ?.split(/\r?\n/)
-    .find((line) => line.startsWith("description:"))
-    ?.slice("description:".length)
-    .trim()
-    .replace(/^(['"])(.*)\1$/, "$2") ?? "";
+
+  return (
+    text
+      .match(/^---\r?\n([\s\S]*?)\r?\n---/)?.[1]
+      ?.split(/\r?\n/)
+      .find((line) => line.startsWith("description:"))
+      ?.slice("description:".length)
+      .trim()
+      .replace(/^(['"])(.*)\1$/, "$2") ?? ""
+  );
 });
 
 export const loadSkillCatalog = Effect.fn("loadSkillCatalog")(function* (
@@ -110,10 +112,12 @@ export const loadSkillCatalog = Effect.fn("loadSkillCatalog")(function* (
   const path = yield* Path.Path;
   const skillsDir = path.join(packageRoot, "skills");
   const skills: Array<CatalogSkill> = [];
+
   if (yield* fs.exists(skillsDir)) {
     for (const name of (yield* fs.readDirectory(skillsDir)).sort()) {
       const skillPath = path.join(skillsDir, name);
-      if ((yield* fs.exists(path.join(skillPath, "SKILL.md")))) {
+
+      if (yield* fs.exists(path.join(skillPath, "SKILL.md"))) {
         skills.push({
           name,
           selector: name,
@@ -125,6 +129,7 @@ export const loadSkillCatalog = Effect.fn("loadSkillCatalog")(function* (
     }
   }
   const lock = yield* readCatalogLock(packageRoot);
+
   for (const source of lock?.sources ?? []) {
     for (const name of source.skills) {
       skills.push({
@@ -137,6 +142,7 @@ export const loadSkillCatalog = Effect.fn("loadSkillCatalog")(function* (
     }
   }
   const discovery = yield* discoverPackageSkills(projectDir);
+
   for (const candidate of discovery.candidates) {
     skills.push({
       name: candidate.name,
@@ -148,19 +154,22 @@ export const loadSkillCatalog = Effect.fn("loadSkillCatalog")(function* (
     });
   }
   const duplicates = skills.filter(
-    (skill, index) => skills.findIndex((candidate) => candidate.selector === skill.selector) !== index,
+    (skill, index) =>
+      skills.findIndex((candidate) => candidate.selector === skill.selector) !== index,
   );
+
   if (duplicates.length > 0) {
     return yield* new CatalogError({
       message: `duplicate catalog skill selector: ${duplicates[0]?.selector ?? "unknown"}`,
     });
   }
-  const externalFamilies = (lock?.sources ?? []).map((source) =>
-    [source.id, source.skills] as const
+  const externalFamilies = (lock?.sources ?? []).map(
+    (source) => [source.id, source.skills] as const,
   );
   const duplicateFamily = externalFamilies.find(
     ([id], index) => externalFamilies.findIndex(([candidate]) => candidate === id) !== index,
   );
+
   if (duplicateFamily !== undefined) {
     return yield* new CatalogError({
       message: `duplicate catalog family: ${duplicateFamily[0]}`,
@@ -170,6 +179,7 @@ export const loadSkillCatalog = Effect.fn("loadSkillCatalog")(function* (
     effect: ["effect-ts", "effect-atom-data-fetching"],
     ...Object.fromEntries(externalFamilies),
   };
+
   return {
     skills: skills.sort((left, right) => left.selector.localeCompare(right.selector)),
     families,
@@ -180,14 +190,18 @@ export const loadSkillCatalog = Effect.fn("loadSkillCatalog")(function* (
 const stripFrontmatterKeys = (text: string, keys: ReadonlyArray<string>): string => {
   if (keys.length === 0) return text;
   const frontmatter = text.match(/^---\r?\n([\s\S]*?)\r?\n---(\r?\n|$)/);
+
   if (!frontmatter?.[1]) return text;
   const stripped = new Set(keys);
   let skipping = false;
   const lines = frontmatter[1].split(/\r?\n/).filter((line) => {
     const key = line.match(/^([A-Za-z0-9_-]+):/)?.[1];
+
     if (key) skipping = stripped.has(key);
+
     return !skipping;
   });
+
   return `---\n${lines.join("\n")}\n---${frontmatter[2]}${text.slice(frontmatter[0].length)}`;
 };
 
@@ -208,6 +222,7 @@ const materializeSource = Effect.fn("materializeCatalogSource")(function* (
       );
   const checkout = path.join(root, "checkout");
   const ready = path.join(root, ".ready");
+
   if (!(yield* fs.exists(ready))) {
     yield* fs.remove(root, { force: true, recursive: true });
     yield* fs.makeDirectory(checkout, { recursive: true });
@@ -216,23 +231,33 @@ const materializeSource = Effect.fn("materializeCatalogSource")(function* (
     yield* runGit(checkout, ["fetch", "--quiet", "--depth", "1", "origin", source.resolved]);
     yield* runGit(checkout, ["checkout", "--quiet", "--detach", "FETCH_HEAD"]);
     const actual = yield* runGit(checkout, ["rev-parse", "HEAD"]);
+
     if (actual !== source.resolved) {
-      return yield* new CatalogError({ message: `source ${source.id} resolved to ${actual}, expected ${source.resolved}` });
+      return yield* new CatalogError({
+        message: `source ${source.id} resolved to ${actual}, expected ${source.resolved}`,
+      });
     }
     const symlinks = yield* runGit(checkout, ["ls-files", "--stage", "--", source.skillsPath]);
+
     if (symlinks.split(/\r?\n/).some((line) => line.startsWith("120000 "))) {
-      return yield* new CatalogError({ message: `source ${source.id} contains symlinks; refusing to install it` });
+      return yield* new CatalogError({
+        message: `source ${source.id} contains symlinks; refusing to install it`,
+      });
     }
     for (const skill of source.skills) {
       const from = path.join(checkout, source.skillsPath, skill);
       const to = path.join(root, "skills", skill);
       const observation = yield* observePath(from);
+
       if (observation.kind !== "directory") {
-        return yield* new CatalogError({ message: `source ${source.id} is missing skill ${skill}` });
+        return yield* new CatalogError({
+          message: `source ${source.id} is missing skill ${skill}`,
+        });
       }
       yield* fs.copy(from, to, { overwrite: true });
       if (source.stripFrontmatter?.length) {
         const document = path.join(to, "SKILL.md");
+
         yield* fs.writeFileString(
           document,
           stripFrontmatterKeys(yield* fs.readFileString(document), source.stripFrontmatter),
@@ -244,21 +269,30 @@ const materializeSource = Effect.fn("materializeCatalogSource")(function* (
   for (const skill of selected) {
     const observation = yield* observePath(path.join(root, "skills", skill));
     const approvedDigest = source.digests?.[skill];
-    if (approvedDigest !== undefined &&
-      (observation.kind !== "directory" || observation.digest !== approvedDigest)) {
+
+    if (
+      approvedDigest !== undefined &&
+      (observation.kind !== "directory" || observation.digest !== approvedDigest)
+    ) {
       return yield* new CatalogError({
         message: `cached skill ${skill} does not match the approved catalog; remove ${root} and retry`,
       });
     }
   }
-  return new Map(selected.map((skill) => [skill, {
-    path: path.join(root, "skills", skill),
-    catalog: {
-      source: source.id,
-      repository: source.repository,
-      resolved: source.resolved,
-    },
-  } satisfies ResolvedSkillSource]));
+
+  return new Map(
+    selected.map((skill) => [
+      skill,
+      {
+        path: path.join(root, "skills", skill),
+        catalog: {
+          source: source.id,
+          repository: source.repository,
+          resolved: source.resolved,
+        },
+      } satisfies ResolvedSkillSource,
+    ]),
+  );
 });
 
 export const resolveSkillSources = Effect.fn("resolveSkillSources")(function* (
@@ -270,6 +304,7 @@ export const resolveSkillSources = Effect.fn("resolveSkillSources")(function* (
 ) {
   const path = yield* Path.Path;
   const sources = new Map<string, ResolvedSkillSource>();
+
   for (const skill of catalog.skills.filter((skill) => skill.bundled)) {
     if (selected.includes(skill.selector)) {
       sources.set(skill.selector, { path: path.join(packageRoot, "skills", skill.name) });
@@ -277,6 +312,7 @@ export const resolveSkillSources = Effect.fn("resolveSkillSources")(function* (
   }
   for (const source of catalog.lock?.sources ?? []) {
     const wanted = source.skills.filter((skill) => selected.includes(skill));
+
     if (wanted.length === 0) continue;
     for (const [name, sourcePath] of yield* materializeSource(projectDir, source, wanted, cache)) {
       sources.set(name, sourcePath);
@@ -285,6 +321,7 @@ export const resolveSkillSources = Effect.fn("resolveSkillSources")(function* (
   for (const selector of selected.filter((value) => value.includes("#"))) {
     const resolved = yield* resolvePackageSkillSelector(projectDir, selector);
     const observation = yield* observePath(resolved.path);
+
     if (observation.kind !== "directory") {
       return yield* new CatalogError({ message: `package skill is missing: ${selector}` });
     }
@@ -299,5 +336,6 @@ export const resolveSkillSources = Effect.fn("resolveSkillSources")(function* (
       },
     });
   }
+
   return sources;
 });

package/src/cli-ui.ts

@@ -26,6 +26,7 @@ const terminalCapabilities = Effect.fn("terminalCapabilities")(function* () {
   const term = yield* Config.string("TERM").pipe(Config.withDefault(""), Effect.orDie);
   const ci = yield* Config.string("CI").pipe(Config.withDefault(""), Effect.orDie);
   const interactive = columns > 0 && term !== "dumb" && ci !== "true" && ci !== "1";
+
   return {
     color: interactive && Option.isNone(noColor),
     interactive,
@@ -41,8 +42,8 @@ const formatDetail = (detail: string | undefined, color: boolean): string =>
   detail === undefined || detail.length === 0
     ? ""
     : color
-    ? ` ${ANSI.dim}${detail}${ANSI.reset}`
-    : ` ${detail}`;
+      ? ` ${ANSI.dim}${detail}${ANSI.reset}`
+      : ` ${detail}`;
 
 export const printStatus = Effect.fn("printCliStatus")(function* (
   kind: StatusKind,
@@ -52,22 +53,23 @@ export const printStatus = Effect.fn("printCliStatus")(function* (
   const capabilities = yield* terminalCapabilities();
   const [symbol, color] = statusAppearance[kind];
   const prefix = capabilities.color ? `${color}${symbol}${ANSI.reset}` : symbol;
-  yield* capabilities.terminal.display(
-    `${prefix} ${label}${formatDetail(detail, capabilities.color)}\n`,
-  ).pipe(Effect.orDie);
+
+  yield* capabilities.terminal
+    .display(`${prefix} ${label}${formatDetail(detail, capabilities.color)}\n`)
+    .pipe(Effect.orDie);
 });
 
 export const printDetail = Effect.fn("printCliDetail")(function* (text: string) {
   const capabilities = yield* terminalCapabilities();
-  yield* capabilities.terminal.display(
-    capabilities.color
-      ? `  ${ANSI.dim}${text}${ANSI.reset}\n`
-      : `  ${text}\n`,
-  ).pipe(Effect.orDie);
+
+  yield* capabilities.terminal
+    .display(capabilities.color ? `  ${ANSI.dim}${text}${ANSI.reset}\n` : `  ${text}\n`)
+    .pipe(Effect.orDie);
 });
 
 export const printLine = Effect.fn("printCliLine")(function* (text = "") {
   const capabilities = yield* terminalCapabilities();
+
   yield* capabilities.terminal.display(`${text}\n`).pipe(Effect.orDie);
 });
 
@@ -77,6 +79,7 @@ export const withSpinner = <A, E, R>(
 ): Effect.Effect<A, E, R | Terminal.Terminal> =>
   Effect.gen(function* () {
     const capabilities = yield* terminalCapabilities();
+
     if (!capabilities.interactive) return yield* effect;
 
     const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
@@ -84,15 +87,15 @@ export const withSpinner = <A, E, R>(
     const animate = Effect.forever(
       Effect.suspend(() => {
         const frame = frames[index++ % frames.length];
-        const symbol = capabilities.color
-          ? `${ANSI.cyan}${frame}${ANSI.reset}`
-          : frame;
-        return capabilities.terminal.display(
-          `${ANSI.clearLine}${symbol} ${label}`,
-        ).pipe(Effect.orDie, Effect.andThen(Effect.sleep("80 millis")));
+        const symbol = capabilities.color ? `${ANSI.cyan}${frame}${ANSI.reset}` : frame;
+
+        return capabilities.terminal
+          .display(`${ANSI.clearLine}${symbol} ${label}`)
+          .pipe(Effect.orDie, Effect.andThen(Effect.sleep("80 millis")));
       }),
     );
     const fiber = yield* Effect.forkChild(animate);
+
     return yield* effect.pipe(
       Effect.ensuring(
         Effect.sync(() => fiber.interruptUnsafe()).pipe(
@@ -106,5 +109,6 @@ export const printError = Effect.fn("printCliError")(function* (message: string)
   const capabilities = yield* terminalCapabilities();
   const [symbol, color] = statusAppearance.error;
   const prefix = capabilities.color ? `${color}${symbol}${ANSI.reset}` : symbol;
+
   yield* Console.error(`${prefix} ${message}`);
 });