@amsterdamdatalabs/adl-agent-control-darwin-arm64 0.1.4

package/packages/agent-skills/dist/profile.d.ts

@@ -0,0 +1,41 @@
+export interface SkillSurface {
+    readonly name: string;
+    readonly folder: string;
+}
+export interface DeployProfile {
+    readonly surfaces: readonly SkillSurface[];
+    /**
+     * Repo-relative skill folders no surface reads any more (e.g. old
+     * per-surface copies retired once that surface was confirmed to read a
+     * shared folder instead). deploy.ts removes a skill folder here only when
+     * its name is a skill under assets/; doctor.ts fails while one is still
+     * present. Optional — absent or `[]` means nothing is retired.
+     */
+    readonly retired?: readonly string[];
+    /**
+     * Repo-relative path to the OLD repo-controls engine's per-repo lock
+     * (lockVersion 2), used for a one-time takeover of skill folders it
+     * wrote before this package's own manifest existed — see legacy-lock.ts.
+     * Optional — absent means no legacy lock is considered (a repo the old
+     * engine never set up, or a deploy profile with nothing to take over).
+     */
+    readonly legacyLock?: string;
+}
+/** `profile.retired`, defaulted to `[]` — the one place callers should read it from. */
+export declare function retiredFolders(profile: DeployProfile): readonly string[];
+export declare const DEFAULT_PROFILE_PATH: string;
+export declare const DEFAULT_PROFILE_SCHEMA_PATH: string;
+export interface ProfileIssue {
+    readonly path: string;
+    readonly message: string;
+}
+/**
+ * Validates a parsed deploy-profile document: JSON Schema shape, plus a
+ * semantic check the schema itself cannot express — every surface `name`
+ * and every surface `folder` must be unique. Pure: never throws, never
+ * touches disk beyond reading `schemaPath` once.
+ */
+export declare function validateProfileDocument(doc: unknown, schemaPath?: string): readonly ProfileIssue[];
+/** Reads and validates a deploy profile from disk. Throws (fails loud) when the JSON is malformed or the document is invalid — deploy.ts has no way to proceed without a valid profile. */
+export declare function loadProfile(path?: string, schemaPath?: string): DeployProfile;
+//# sourceMappingURL=profile.d.ts.map

package/packages/agent-skills/dist/profile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../src/profile.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,SAAS,MAAM,EAAE,CAExE;AAED,eAAO,MAAM,oBAAoB,QAAoE,CAAC;AACtG,eAAO,MAAM,2BAA2B,QAA2E,CAAC;AAEpH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAcD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,GAAE,MAAoC,GAC/C,SAAS,YAAY,EAAE,CA4BzB;AAED,2LAA2L;AAC3L,wBAAgB,WAAW,CACzB,IAAI,GAAE,MAA6B,EACnC,UAAU,GAAE,MAAoC,GAC/C,aAAa,CAcf"}

package/packages/agent-skills/dist/profile.js

@@ -0,0 +1,86 @@
+/**
+ * The deploy profile: which on-disk folder each agent surface reads its
+ * skills from (packages/agent-skills/deploy-profile.json, shaped by
+ * ./deploy-profile.schema.json — both at the package root, never under
+ * src/, since they are data, not code).
+ *
+ * `DEFAULT_PROFILE_PATH`/`DEFAULT_PROFILE_SCHEMA_PATH` resolve relative to
+ * THIS module's own on-disk location, which only means anything for
+ * uncompiled use (`bun run`/`bun test`, a real checkout on disk) — exactly
+ * the caveat apps/cli/src/commands/repo-controls.ts documents for its own
+ * package-root resolution. A caller embedded in a `bun build --compile`
+ * binary (apps/cli's `adl`) must resolve real paths itself and pass them in
+ * explicitly; every exported function here takes its paths as parameters
+ * rather than reaching for the defaults itself.
+ */
+import Ajv, {} from "ajv";
+import addFormats from "ajv-formats";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+/** `profile.retired`, defaulted to `[]` — the one place callers should read it from. */
+export function retiredFolders(profile) {
+    return profile.retired ?? [];
+}
+export const DEFAULT_PROFILE_PATH = fileURLToPath(new URL("../deploy-profile.json", import.meta.url));
+export const DEFAULT_PROFILE_SCHEMA_PATH = fileURLToPath(new URL("../deploy-profile.schema.json", import.meta.url));
+function compileValidator(schemaPath) {
+    const schema = JSON.parse(readFileSync(schemaPath, "utf8"));
+    const ajv = new Ajv({ allErrors: true, strict: true });
+    addFormats(ajv);
+    return ajv.compile(schema);
+}
+function formatAjvError(error) {
+    const path = error.instancePath.length > 0 ? error.instancePath : "/";
+    return { path, message: `${path} ${error.message ?? "is invalid"}`.trim() };
+}
+/**
+ * Validates a parsed deploy-profile document: JSON Schema shape, plus a
+ * semantic check the schema itself cannot express — every surface `name`
+ * and every surface `folder` must be unique. Pure: never throws, never
+ * touches disk beyond reading `schemaPath` once.
+ */
+export function validateProfileDocument(doc, schemaPath = DEFAULT_PROFILE_SCHEMA_PATH) {
+    const validate = compileValidator(schemaPath);
+    if (!validate(doc)) {
+        return (validate.errors ?? []).map(formatAjvError);
+    }
+    const { surfaces, retired } = doc;
+    const issues = [];
+    const names = new Set();
+    const folders = new Set();
+    for (const surface of surfaces) {
+        if (names.has(surface.name))
+            issues.push({ path: "/surfaces", message: `duplicate surface name: ${surface.name}` });
+        names.add(surface.name);
+        if (folders.has(surface.folder)) {
+            issues.push({ path: "/surfaces", message: `duplicate surface folder: ${surface.folder}` });
+        }
+        folders.add(surface.folder);
+    }
+    const retiredFolderSet = new Set();
+    for (const folder of retired ?? []) {
+        if (retiredFolderSet.has(folder))
+            issues.push({ path: "/retired", message: `duplicate retired folder: ${folder}` });
+        retiredFolderSet.add(folder);
+        if (folders.has(folder)) {
+            issues.push({ path: "/retired", message: `retired folder is also an active surface folder: ${folder}` });
+        }
+    }
+    return issues;
+}
+/** Reads and validates a deploy profile from disk. Throws (fails loud) when the JSON is malformed or the document is invalid — deploy.ts has no way to proceed without a valid profile. */
+export function loadProfile(path = DEFAULT_PROFILE_PATH, schemaPath = DEFAULT_PROFILE_SCHEMA_PATH) {
+    let doc;
+    try {
+        doc = JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch (cause) {
+        throw new Error(`deploy profile is not valid JSON: ${path} (${cause.message})`);
+    }
+    const issues = validateProfileDocument(doc, schemaPath);
+    if (issues.length > 0) {
+        throw new Error(`deploy profile is invalid: ${path}\n${issues.map((issue) => `  - ${issue.path}: ${issue.message}`).join("\n")}`);
+    }
+    return doc;
+}
+//# sourceMappingURL=profile.js.map

package/packages/agent-skills/dist/profile.js.map

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

package/packages/agent-skills/dist/skill-config.d.ts

@@ -0,0 +1,24 @@
+export declare const ADL_CONFIG_FILE = "adl-config.toml";
+export type SkillSubsetResult = {
+    readonly ok: true;
+    readonly skills: readonly string[] | null;
+} | {
+    readonly ok: false;
+    readonly error: string;
+};
+export declare function readSkillSubset(targetRepo: string): SkillSubsetResult;
+export type SkillSelectionResult = {
+    readonly ok: true;
+    readonly skills: readonly string[];
+} | {
+    readonly ok: false;
+    readonly error: string;
+};
+/**
+ * Resolves `readSkillSubset` against the skills actually available under
+ * assets/. An unknown skill name in the subset is a hard error — never a
+ * silent skip — so a typo in `adl-config.toml` cannot quietly deploy less
+ * than the repo owner asked for.
+ */
+export declare function resolveSkillSelection(targetRepo: string, availableSkills: readonly string[]): SkillSelectionResult;
+//# sourceMappingURL=skill-config.d.ts.map

package/packages/agent-skills/dist/skill-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-config.d.ts","sourceRoot":"","sources":["../src/skill-config.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,eAAe,oBAAoB,CAAC;AAEjD,MAAM,MAAM,iBAAiB,GACzB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,GAChE;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAwBrE;AAED,MAAM,MAAM,oBAAoB,GAC5B;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GACzD;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,GAAG,oBAAoB,CAclH"}

package/packages/agent-skills/dist/skill-config.js

@@ -0,0 +1,68 @@
+/**
+ * Resolves which skills a deploy should write, per the target repo's own
+ * `adl-config.toml`. Absent file, absent `[assets]` table, or absent
+ * `assets.skills` key all mean "deploy everything under assets/" — the
+ * default is always the full set.
+ *
+ * The key is `[assets] skills = [...]`, not a new `[skills]` table:
+ * apps/cli/src/adl-config.ts already declares this exact field
+ * (`AdlConfig.assets.skills`, part of `ADL_CONFIG_SCHEMA`) and that
+ * schema's top level is `additionalProperties: false` against
+ * `{version, repo, assets, controls}` — a competing `[skills]` table would
+ * be an unknown key and rejected by `adl config check`. Reusing the
+ * existing field avoids inventing a second, conflicting mechanism.
+ */
+import TOML from "@iarna/toml";
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+export const ADL_CONFIG_FILE = "adl-config.toml";
+export function readSkillSubset(targetRepo) {
+    const path = join(targetRepo, ADL_CONFIG_FILE);
+    if (!existsSync(path))
+        return { ok: true, skills: null };
+    let doc;
+    try {
+        doc = TOML.parse(readFileSync(path, "utf8"));
+    }
+    catch (cause) {
+        return { ok: false, error: `${ADL_CONFIG_FILE} is not valid TOML: ${cause.message}` };
+    }
+    if (typeof doc !== "object" || doc === null)
+        return { ok: true, skills: null };
+    const assets = doc.assets;
+    if (assets === undefined)
+        return { ok: true, skills: null };
+    if (typeof assets !== "object" || assets === null || Array.isArray(assets)) {
+        return { ok: false, error: `${ADL_CONFIG_FILE}: [assets] must be a table` };
+    }
+    const skills = assets.skills;
+    if (skills === undefined)
+        return { ok: true, skills: null };
+    if (!Array.isArray(skills) || !skills.every((entry) => typeof entry === "string")) {
+        return { ok: false, error: `${ADL_CONFIG_FILE}: assets.skills must be an array of strings` };
+    }
+    return { ok: true, skills };
+}
+/**
+ * Resolves `readSkillSubset` against the skills actually available under
+ * assets/. An unknown skill name in the subset is a hard error — never a
+ * silent skip — so a typo in `adl-config.toml` cannot quietly deploy less
+ * than the repo owner asked for.
+ */
+export function resolveSkillSelection(targetRepo, availableSkills) {
+    const subset = readSkillSubset(targetRepo);
+    if (!subset.ok)
+        return { ok: false, error: subset.error };
+    if (subset.skills === null)
+        return { ok: true, skills: availableSkills };
+    const available = new Set(availableSkills);
+    const unknown = subset.skills.filter((name) => !available.has(name));
+    if (unknown.length > 0) {
+        return {
+            ok: false,
+            error: `${ADL_CONFIG_FILE}: assets.skills names skill(s) not present under agent-skills/assets: ${unknown.join(", ")}`,
+        };
+    }
+    return { ok: true, skills: [...new Set(subset.skills)] };
+}
+//# sourceMappingURL=skill-config.js.map

package/packages/agent-skills/dist/skill-config.js.map

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

package/packages/agent-skills/dist/skill-meta.d.ts

@@ -0,0 +1,17 @@
+export interface SkillFrontMatter {
+    readonly name: string;
+    readonly description: string;
+}
+export interface SkillMetaIssue {
+    readonly skill: string;
+    readonly path: string;
+    readonly message: string;
+}
+/** Directory names directly under `assetsDir`, sorted — the available skill names. */
+export declare function listSourceSkillNames(assetsDir: string): readonly string[];
+export declare function parseSkillFrontMatter(skillMdText: string): SkillFrontMatter | {
+    readonly error: string;
+};
+/** Validates one skill folder (source under assets/, or a deployed copy): SKILL.md exists, front matter parses, and its `name` matches the folder name. `[]` when valid. */
+export declare function validateSkillFolder(skillDir: string, skillName: string): readonly SkillMetaIssue[];
+//# sourceMappingURL=skill-meta.d.ts.map

package/packages/agent-skills/dist/skill-meta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-meta.d.ts","sourceRoot":"","sources":["../src/skill-meta.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,sFAAsF;AACtF,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAKzE;AAUD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAoBxG;AAED,4KAA4K;AAC5K,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,cAAc,EAAE,CAkBlG"}

package/packages/agent-skills/dist/skill-meta.js

@@ -0,0 +1,67 @@
+/**
+ * Skill well-formedness: a skill folder is valid when it has a `SKILL.md`
+ * whose YAML front matter declares a non-empty `name` (matching the folder
+ * name) and a non-empty `description`.
+ */
+import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+import YAML from "yaml";
+/** Directory names directly under `assetsDir`, sorted — the available skill names. */
+export function listSourceSkillNames(assetsDir) {
+    return readdirSync(assetsDir, { withFileTypes: true })
+        .filter((entry) => entry.isDirectory())
+        .map((entry) => entry.name)
+        .sort();
+}
+function splitFrontMatter(text) {
+    const lines = text.split("\n");
+    if (lines[0]?.trim() !== "---")
+        return null;
+    const end = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
+    if (end === -1)
+        return null;
+    return lines.slice(1, end).join("\n");
+}
+export function parseSkillFrontMatter(skillMdText) {
+    const raw = splitFrontMatter(skillMdText);
+    if (raw === null)
+        return { error: "SKILL.md has no --- front matter block" };
+    let parsed;
+    try {
+        parsed = YAML.parse(raw);
+    }
+    catch (cause) {
+        return { error: `SKILL.md front matter is not valid YAML: ${cause.message}` };
+    }
+    if (typeof parsed !== "object" || parsed === null)
+        return { error: "SKILL.md front matter must be a YAML mapping" };
+    const { name, description } = parsed;
+    if (typeof name !== "string" || name.length === 0) {
+        return { error: 'SKILL.md front matter is missing a non-empty "name"' };
+    }
+    if (typeof description !== "string" || description.length === 0) {
+        return { error: 'SKILL.md front matter is missing a non-empty "description"' };
+    }
+    return { name, description };
+}
+/** Validates one skill folder (source under assets/, or a deployed copy): SKILL.md exists, front matter parses, and its `name` matches the folder name. `[]` when valid. */
+export function validateSkillFolder(skillDir, skillName) {
+    const skillMdPath = join(skillDir, "SKILL.md");
+    if (!existsSync(skillMdPath) || !statSync(skillMdPath).isFile()) {
+        return [{ skill: skillName, path: skillMdPath, message: "SKILL.md is missing" }];
+    }
+    const result = parseSkillFrontMatter(readFileSync(skillMdPath, "utf8"));
+    if ("error" in result)
+        return [{ skill: skillName, path: skillMdPath, message: result.error }];
+    if (result.name !== skillName) {
+        return [
+            {
+                skill: skillName,
+                path: skillMdPath,
+                message: `front matter name "${result.name}" does not match folder name "${skillName}"`,
+            },
+        ];
+    }
+    return [];
+}
+//# sourceMappingURL=skill-meta.js.map

package/packages/agent-skills/dist/skill-meta.js.map

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

package/packages/agent-skills/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "@adl/agent-skills",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "description": "Deploys the skills under assets/ into a target repository's shared skill folders (.agents/skills, .claude/skills), retiring old per-surface copies (.cursor/skills, .kimi-code/skills, .opencode/skills), tracks what it wrote so a later deploy only ever touches its own files, and lists/doctors that deployed state.",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "build": "rm -rf dist && tsc -p tsconfig.build.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "bun run typecheck && bun test"
+  },
+  "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
+    "yaml": "^2.9.0"
+  },
+  "devDependencies": {
+    "@types/bun": "latest",
+    "@types/node": "26.6.3",
+    "typescript": "5.9.3"
+  }
+}

package/packages/agent-skills/src/deploy.ts

@@ -0,0 +1,222 @@
+/**
+ * Writes every skill under assets/ into a target repository's skill
+ * folders, per the deploy profile (profile.ts) and the repo's own subset
+ * (skill-config.ts). Never touches a file it did not itself write, per the
+ * manifest (manifest.ts): a same-name skill the target repo already owns
+ * is left untouched and reported as a conflict, and a skill dropped from
+ * assets/ or the subset is removed only when the manifest shows this
+ * deploy wrote it.
+ *
+ * Also cleans up `profile.retired` folders — old per-surface copies no
+ * surface reads any more. There, a skill folder is removed only when its
+ * NAME is a skill under assets/ (regardless of the repo's own subset —
+ * this is retirement cleanup, not a deploy target); every other entry is
+ * left byte-for-byte, since it was never this package's to manage. A
+ * retired folder itself is removed once cleanup empties it.
+ *
+ * When `profile.legacyLock` names a lock the OLD repo-controls engine
+ * left behind, a same-name folder it fully wrote (per legacy-lock.ts) is
+ * taken over on sight rather than reported as a conflict — see
+ * legacy-lock.ts for the exact ownership rule and lock rewrite.
+ *
+ * Fails loud: assets/target validation, an invalid deploy profile, an
+ * invalid adl-config.toml subset, or an unwritable target all throw. There
+ * is no partial-success return value — either this returns a result, or it
+ * threw and nothing should be read as success.
+ */
+import { existsSync, mkdirSync, readdirSync, readFileSync, rmdirSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { directoryNames, removeDirRecursive, walkFiles } from "./fs-utils.js";
+import { checkLegacyOwnership, readLegacyLock, stripTakenOverEntries } from "./legacy-lock.js";
+import { manifestPathFor, readManifest, writeManifest } from "./manifest.js";
+import { type DeployProfile, loadProfile, retiredFolders } from "./profile.js";
+import { resolveSkillSelection } from "./skill-config.js";
+import { listSourceSkillNames } from "./skill-meta.js";
+
+export interface DeploySkillsOptions {
+  readonly assetsDir: string;
+  readonly targetRepo: string;
+  /** Defaults to loadProfile() (the package's own deploy-profile.json) — pass explicitly when the caller has already resolved real on-disk paths (see profile.ts's header). */
+  readonly profile?: DeployProfile;
+}
+
+export interface SkillConflict {
+  readonly folder: string;
+  readonly skill: string;
+  readonly reason: string;
+}
+
+export interface DeploySkillsResult {
+  readonly written: readonly string[];
+  readonly unchanged: readonly string[];
+  readonly removed: readonly string[];
+  readonly conflicts: readonly SkillConflict[];
+  readonly manifestPath: string;
+  /**
+   * Every path removed from a `profile.retired` folder this run: one entry
+   * per managed-name skill folder removed, plus the retired folder itself
+   * when cleanup left it empty. `[]` when nothing needed cleaning up.
+   */
+  readonly retiredRemovals: readonly string[];
+}
+
+function removeEmptyParents(root: string, dir: string): void {
+  let current = dir;
+  while (current !== root && current.startsWith(root)) {
+    if (!existsSync(current)) {
+      current = dirname(current);
+      continue;
+    }
+    if (readdirSync(current).length > 0) return;
+    rmdirSync(current);
+    current = dirname(current);
+  }
+}
+
+export function deploySkills(options: DeploySkillsOptions): DeploySkillsResult {
+  const { assetsDir, targetRepo } = options;
+
+  if (!existsSync(assetsDir) || !statSync(assetsDir).isDirectory()) {
+    throw new Error(`agent-skills assets directory not found: ${assetsDir}`);
+  }
+  if (!existsSync(targetRepo) || !statSync(targetRepo).isDirectory()) {
+    throw new Error(`deploy target is not a directory: ${targetRepo}`);
+  }
+
+  const profile = options.profile ?? loadProfile();
+  const availableSkills = listSourceSkillNames(assetsDir);
+  if (availableSkills.length === 0) throw new Error(`agent-skills assets directory has no skills: ${assetsDir}`);
+
+  const selection = resolveSkillSelection(targetRepo, availableSkills);
+  if (!selection.ok) throw new Error(selection.error);
+  const selectedSkills = [...new Set(selection.skills)].sort();
+
+  const manifest = readManifest(targetRepo);
+  const legacyLock = readLegacyLock(targetRepo, profile.legacyLock);
+
+  // One-time takeover: a skill folder the OLD engine wrote (per legacyLock,
+  // every on-disk file listed with a matching hash, no unlisted extra
+  // file) is folded into this run's effective manifest before the deploy
+  // proper runs, so it is treated exactly like a folder we already own —
+  // updated if it differs from assets/, removed if it drops out of the
+  // current asset set/subset. A folder legacyLock knows about but that
+  // fails the check (hand-modified, or an unlisted extra file) stays a
+  // conflict, with a reason naming what disqualified it.
+  const takeoverFiles = new Set<string>();
+  const takeoverConflictReasons = new Map<string, string>();
+  if (legacyLock !== null) {
+    for (const surface of profile.surfaces) {
+      for (const skill of selectedSkills) {
+        const skillDirRel = `${surface.folder}/${skill}`;
+        const skillDirAbs = join(targetRepo, skillDirRel);
+        if (!existsSync(skillDirAbs)) continue;
+        if (manifest.files.some((file) => file.startsWith(`${skillDirRel}/`))) continue; // already ours
+
+        const check = checkLegacyOwnership(legacyLock, targetRepo, skillDirRel, skillDirAbs);
+        if (check.owned) {
+          for (const relFile of walkFiles(skillDirAbs)) takeoverFiles.add(`${skillDirRel}/${relFile}`);
+        } else {
+          takeoverConflictReasons.set(skillDirRel, check.reason!);
+        }
+      }
+    }
+  }
+
+  const manifestFiles = new Set([...manifest.files, ...takeoverFiles]);
+
+  const sourceFilesBySkill = new Map<string, readonly string[]>();
+  for (const skill of selectedSkills) sourceFilesBySkill.set(skill, walkFiles(join(assetsDir, skill)));
+
+  const written: string[] = [];
+  const unchanged: string[] = [];
+  const conflicts: SkillConflict[] = [];
+  const keptPaths = new Set<string>();
+
+  for (const surface of profile.surfaces) {
+    for (const skill of selectedSkills) {
+      const skillDirRel = `${surface.folder}/${skill}`;
+      const skillDirAbs = join(targetRepo, skillDirRel);
+      const skillDirExists = existsSync(skillDirAbs);
+      const managedByUs = [...manifestFiles].some((file) => file.startsWith(`${skillDirRel}/`));
+
+      if (skillDirExists && !managedByUs) {
+        conflicts.push({
+          folder: surface.folder,
+          skill,
+          reason:
+            takeoverConflictReasons.get(skillDirRel) ??
+            "a user-owned skill folder already exists with this name; deploy left it untouched",
+        });
+        continue; // never write into it, never claim its files in the manifest
+      }
+
+      for (const relFile of sourceFilesBySkill.get(skill) ?? []) {
+        const targetRel = `${skillDirRel}/${relFile}`;
+        keptPaths.add(targetRel);
+        const targetAbs = join(targetRepo, targetRel);
+        const content = readFileSync(join(assetsDir, skill, relFile));
+        if (existsSync(targetAbs) && statSync(targetAbs).isFile() && Buffer.compare(readFileSync(targetAbs), content) === 0) {
+          unchanged.push(targetRel);
+          continue;
+        }
+        mkdirSync(dirname(targetAbs), { recursive: true });
+        writeFileSync(targetAbs, content);
+        written.push(targetRel);
+      }
+    }
+  }
+
+  const removed: string[] = [];
+  for (const relPath of manifestFiles) {
+    if (keptPaths.has(relPath)) continue;
+    // Defense in depth: only ever remove a path inside a folder this
+    // profile actually manages, even though every manifest entry should
+    // already satisfy that by construction.
+    if (!profile.surfaces.some((surface) => relPath.startsWith(`${surface.folder}/`))) continue;
+    const absolute = join(targetRepo, relPath);
+    if (existsSync(absolute)) {
+      unlinkSync(absolute);
+      removeEmptyParents(targetRepo, dirname(absolute));
+    }
+    removed.push(relPath);
+  }
+
+  writeManifest(targetRepo, [...keptPaths]);
+
+  // legacyLock's own record of what it wrote under a skills folder stops
+  // being meaningful the moment this deploy has assessed it — taken over,
+  // or confirmed a conflict either way — so its entries are stripped
+  // regardless of this run's outcome, deleting the lock outright once
+  // nothing (including sibling packages' own sections) is left in it.
+  if (legacyLock !== null) {
+    const legacySkillFolders = [...profile.surfaces.map((surface) => surface.folder), ...retiredFolders(profile)];
+    stripTakenOverEntries(legacyLock, legacySkillFolders);
+  }
+
+  const retiredRemovals: string[] = [];
+  const availableSkillSet = new Set(availableSkills);
+  for (const folder of retiredFolders(profile)) {
+    const folderAbs = join(targetRepo, folder);
+    if (!existsSync(folderAbs)) continue;
+
+    for (const name of directoryNames(folderAbs)) {
+      if (!availableSkillSet.has(name)) continue; // not ours to manage — left byte-for-byte
+      removeDirRecursive(join(folderAbs, name));
+      retiredRemovals.push(`${folder}/${name}`);
+    }
+
+    if (existsSync(folderAbs) && readdirSync(folderAbs).length === 0) {
+      rmdirSync(folderAbs);
+      retiredRemovals.push(folder);
+    }
+  }
+
+  return {
+    written: written.sort(),
+    unchanged: unchanged.sort(),
+    removed: removed.sort(),
+    conflicts: conflicts.sort((a, b) => `${a.folder}/${a.skill}`.localeCompare(`${b.folder}/${b.skill}`)),
+    manifestPath: manifestPathFor(targetRepo),
+    retiredRemovals: retiredRemovals.sort(),
+  };
+}