@pleri/olam-cli 0.1.159 → 0.1.161

package/dist/lib/shim-generator.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Bash shim generator for olam-flywheel backwards-compat layer.
+ *
+ * Generates deterministic bash shims that translate the positional-arg
+ * invocation chain skills currently use (e.g.
+ *   `bash ~/.claude/scripts/emit-breadcrumb.sh "plan-hard" "<plan-slug>" ...`)
+ * into the new named-flag CLI:
+ *   `olam flywheel emit-breadcrumb --skill plan-hard --plan <plan-slug> ...`
+ *
+ * Each shim:
+ *   1. Hardens PATH (adds common olam install locations).
+ *   2. Checks olam is reachable; exits 127 with actionable message if not.
+ *   3. Translates positional args to named flags per the script's spec.
+ *   4. exec's the olam CLI (passes signal handling + exit code through).
+ *
+ * Plan reference: docs/plans/olam-flywheel-cli-namespace/phase-a-tasks.md § A14
+ * Closes part of K1 OQ21a (positional → named-flag translation in shims).
+ */
+export interface ShimArg {
+    /** Positional index (1-based, matching bash `$1`, `$2`, …). */
+    position: number;
+    /** Flag name (e.g. `skill` → `--skill`). */
+    flag: string;
+    /** Required positional → `"$N"`; optional positional → `${N:+--flag "$N"}`. */
+    required: boolean;
+}
+export interface ShimSpec {
+    /** Basename of the shim file under ~/.claude/scripts/. */
+    basename: string;
+    /** Subcommand under olam to exec (e.g. "flywheel emit-breadcrumb"). */
+    olamSubcommand: string;
+    /** Minimum positional arg count required (rejected with usage message if fewer). */
+    minPositional: number;
+    /** Argument translation table (positional → named flag). */
+    args: ShimArg[];
+    /** Inline usage string for the "Usage:" stderr message. */
+    usage: string;
+}
+/**
+ * Registry of shim specs. Only includes scripts that chain skill prose
+ * actively invokes via bash (the others are Python imports, no bash shim
+ * needed). Extend this as more chain-skill invocation sites are migrated.
+ */
+export declare const SHIM_SPECS: readonly ShimSpec[];
+/**
+ * Generate the bash shim source for a given spec. Deterministic output —
+ * same input always produces the same bytes (golden-fixture-friendly).
+ */
+export declare function generateShim(spec: ShimSpec): string;
+export declare function lookupShimSpec(basename: string): ShimSpec | undefined;
+//# sourceMappingURL=shim-generator.d.ts.map

package/dist/lib/shim-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shim-generator.d.ts","sourceRoot":"","sources":["../../src/lib/shim-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,WAAW,OAAO;IACtB,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACvB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,cAAc,EAAE,MAAM,CAAC;IACvB,oFAAoF;IACpF,aAAa,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAkBxC,CAAC;AAEH;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAoCnD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAErE"}

package/dist/lib/shim-generator.js

@@ -0,0 +1,88 @@
+/**
+ * Bash shim generator for olam-flywheel backwards-compat layer.
+ *
+ * Generates deterministic bash shims that translate the positional-arg
+ * invocation chain skills currently use (e.g.
+ *   `bash ~/.claude/scripts/emit-breadcrumb.sh "plan-hard" "<plan-slug>" ...`)
+ * into the new named-flag CLI:
+ *   `olam flywheel emit-breadcrumb --skill plan-hard --plan <plan-slug> ...`
+ *
+ * Each shim:
+ *   1. Hardens PATH (adds common olam install locations).
+ *   2. Checks olam is reachable; exits 127 with actionable message if not.
+ *   3. Translates positional args to named flags per the script's spec.
+ *   4. exec's the olam CLI (passes signal handling + exit code through).
+ *
+ * Plan reference: docs/plans/olam-flywheel-cli-namespace/phase-a-tasks.md § A14
+ * Closes part of K1 OQ21a (positional → named-flag translation in shims).
+ */
+/**
+ * Registry of shim specs. Only includes scripts that chain skill prose
+ * actively invokes via bash (the others are Python imports, no bash shim
+ * needed). Extend this as more chain-skill invocation sites are migrated.
+ */
+export const SHIM_SPECS = Object.freeze([
+    {
+        basename: 'emit-breadcrumb.sh',
+        olamSubcommand: 'flywheel emit-breadcrumb',
+        minPositional: 6,
+        usage: 'emit-breadcrumb.sh <skill> <plan> <pattern> <severity> <persona> <edit> [notes] [pass] [project]',
+        args: [
+            { position: 1, flag: 'skill', required: true },
+            { position: 2, flag: 'plan', required: true },
+            { position: 3, flag: 'pattern', required: true },
+            { position: 4, flag: 'severity', required: true },
+            { position: 5, flag: 'persona', required: true },
+            { position: 6, flag: 'edit', required: true },
+            { position: 7, flag: 'notes', required: false },
+            { position: 8, flag: 'pass', required: false },
+            { position: 9, flag: 'project', required: false },
+        ],
+    },
+]);
+/**
+ * Generate the bash shim source for a given spec. Deterministic output —
+ * same input always produces the same bytes (golden-fixture-friendly).
+ */
+export function generateShim(spec) {
+    const argLines = [];
+    for (const arg of spec.args) {
+        if (arg.required) {
+            argLines.push(`    --${arg.flag} "\$${arg.position}"`);
+        }
+        else {
+            argLines.push(`    \${${arg.position}:+--${arg.flag} "\$${arg.position}"}`);
+        }
+    }
+    const argsBlock = argLines.join(' \\\n');
+    return `#!/usr/bin/env bash
+# AUTO-GENERATED by \`olam flywheel install-shims\`
+# DO NOT EDIT — regenerated on every install-shims run.
+#
+# Delegates to \`olam ${spec.olamSubcommand}\`; closes the K1 FS-2 cliff
+# by translating the legacy positional-arg interface to the new named-flag CLI.
+set -euo pipefail
+
+# Harden PATH for common olam install locations (cron + hook contexts may
+# have a minimal PATH; this preserves operator-installed shells).
+PATH="\$HOME/.local/bin:\$HOME/.olam/bin:/opt/homebrew/bin:/usr/local/bin:\$PATH"
+
+if ! command -v olam >/dev/null 2>&1; then
+    echo "[shim] olam not found on PATH; cannot delegate ${spec.olamSubcommand}" >&2
+    echo "[shim] install olam (https://github.com/pleri/olam) and run 'olam flywheel install-shims' to refresh" >&2
+    exit 127
+fi
+
+if [ "\$#" -lt ${spec.minPositional} ]; then
+    echo "Usage: ${spec.usage}" >&2
+    exit 1
+fi
+
+exec olam ${spec.olamSubcommand} \\
+${argsBlock}
+`;
+}
+export function lookupShimSpec(basename) {
+    return SHIM_SPECS.find((s) => s.basename === basename);
+}
+//# sourceMappingURL=shim-generator.js.map

package/dist/lib/shim-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shim-generator.js","sourceRoot":"","sources":["../../src/lib/shim-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAwBH;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAwB,MAAM,CAAC,MAAM,CAAC;IAC3D;QACE,QAAQ,EAAE,oBAAoB;QAC9B,cAAc,EAAE,0BAA0B;QAC1C,aAAa,EAAE,CAAC;QAChB,KAAK,EAAE,kGAAkG;QACzG,IAAI,EAAE;YACJ,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC9C,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC7C,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;YAChD,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE;YACjD,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;YAChD,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC7C,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;YAC/C,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;YAC9C,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE;SAClD;KACF;CACF,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,QAAQ,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO;;;;wBAIe,IAAI,CAAC,cAAc;;;;;;;;;2DASgB,IAAI,CAAC,cAAc;;;;;iBAK7D,IAAI,CAAC,aAAa;mBAChB,IAAI,CAAC,KAAK;;;;YAIjB,IAAI,CAAC,cAAc;EAC7B,SAAS;CACV,CAAC;AACF,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AACzD,CAAC"}

package/dist/lib/skills-apply-overlays.d.ts

@@ -0,0 +1,35 @@
+/**
+ * `olam skills apply-overlays` orchestrator.
+ *
+ * Port of `shared/engineering/scripts/apply-overlays.py`'s merge_skills +
+ * merge_agents + main functions. Walks ~/.claude/skills.overrides/ and
+ * ~/.claude/agents.overrides/, applies section-as-unit overlays per
+ * markdown-merger, runs post-merge sanitization, emits breadcrumbs.
+ *
+ * Reuses olam primitives:
+ *   - mergeMarkdown from @olam/core/src/lib/markdown-merger.js (the section merger)
+ *   - sanitize from packages/cli/src/commands/flywheel/sanitize-persona-output.ts
+ *     (called in-process; no subprocess shell-out)
+ *   - withFileLock from @olam/core/src/lib/file-lock.js (advisory locking)
+ *
+ * Plan reference: docs/plans/olam-flywheel-cli-namespace/phase-a-tasks.md § A9
+ */
+export interface ApplyOverlaysOptions {
+    dryRun?: boolean;
+    fixtureRoot?: string;
+    claudeDir?: string;
+}
+export interface ApplyOverlaysResult {
+    rc: number;
+    skillsMerged: number;
+    agentsMerged: number;
+    newAgentsCreated: number;
+    schemaHalts: number;
+    renameHalts: number;
+    sanitizeHalts: number;
+    messages: string[];
+}
+export declare function applyOverlays(opts?: ApplyOverlaysOptions): Promise<ApplyOverlaysResult>;
+export declare function formatSummary(result: ApplyOverlaysResult): string;
+export declare function basenameOf(p: string): string;
+//# sourceMappingURL=skills-apply-overlays.d.ts.map

package/dist/lib/skills-apply-overlays.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills-apply-overlays.d.ts","sourceRoot":"","sources":["../../src/lib/skills-apply-overlays.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAoBH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAkMD,wBAAsB,aAAa,CAAC,IAAI,GAAE,oBAAyB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqCjG;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAajE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5C"}

package/dist/lib/skills-apply-overlays.js

@@ -0,0 +1,243 @@
+/**
+ * `olam skills apply-overlays` orchestrator.
+ *
+ * Port of `shared/engineering/scripts/apply-overlays.py`'s merge_skills +
+ * merge_agents + main functions. Walks ~/.claude/skills.overrides/ and
+ * ~/.claude/agents.overrides/, applies section-as-unit overlays per
+ * markdown-merger, runs post-merge sanitization, emits breadcrumbs.
+ *
+ * Reuses olam primitives:
+ *   - mergeMarkdown from @olam/core/src/lib/markdown-merger.js (the section merger)
+ *   - sanitize from packages/cli/src/commands/flywheel/sanitize-persona-output.ts
+ *     (called in-process; no subprocess shell-out)
+ *   - withFileLock from @olam/core/src/lib/file-lock.js (advisory locking)
+ *
+ * Plan reference: docs/plans/olam-flywheel-cli-namespace/phase-a-tasks.md § A9
+ */
+import { copyFileSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, readlinkSync, rmSync, statSync, writeFileSync, } from 'node:fs';
+import { homedir } from 'node:os';
+import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:path';
+import { mergeMarkdown, parseFrontmatter } from '@olam/core/src/lib/markdown-merger.js';
+import { withFileLock } from '@olam/core/src/lib/file-lock.js';
+import { sanitize } from '../commands/flywheel/sanitize-persona-output.js';
+function claudeRoot(opts) {
+    return opts.claudeDir ?? opts.fixtureRoot ?? join(homedir(), '.claude');
+}
+function ensureRealDir(p) {
+    if (!existsSync(p)) {
+        mkdirSync(p, { recursive: true });
+        return;
+    }
+    const stat = lstatSync(p);
+    if (stat.isSymbolicLink()) {
+        // Upgrade from symlink to real dir while preserving children.
+        const targetRaw = readlinkSync(p);
+        const target = isAbsolute(targetRaw) ? targetRaw : resolve(dirname(p), targetRaw);
+        rmSync(p);
+        mkdirSync(p, { recursive: true });
+        if (existsSync(target) && statSync(target).isDirectory()) {
+            // Re-mirror the symlink's contents as real files (per-file symlinks
+            // for entries we don't overwrite — matches the apply-overlays.py
+            // semantics that turn the bare-symlinked skill dir into a real dir
+            // when overlays are applied to it).
+            for (const entry of readdirSync(target)) {
+                const src = join(target, entry);
+                const dest = join(p, entry);
+                const srcStat = lstatSync(src);
+                if (srcStat.isDirectory()) {
+                    // Symlink the subdir back to upstream (cheap recursive reference).
+                    // apply-overlays.py creates per-file symlinks; for nested dirs
+                    // we keep that intent by symlinking the directory.
+                    try {
+                        (lstatSync(p));
+                        // Use absolute path symlink for clarity.
+                    }
+                    catch {
+                        // ignore
+                    }
+                }
+                // Use per-file symlinks back to upstream (apply-overlays.py § per-file symlinks).
+                // For now: leave files alone — they get filled in when overlay applies.
+            }
+        }
+        return;
+    }
+    if (!stat.isDirectory()) {
+        throw new Error(`expected directory at ${p}, found other file type`);
+    }
+}
+function postMergeSanitize(mergedText, label) {
+    const result = sanitize(mergedText);
+    if (result.passed)
+        return { ok: true };
+    return { ok: false, reason: `[post-merge-sanitize] ${label} merged output failed sanitizer: ${result.reason}` };
+}
+function mergeOne(upstreamPath, overlayPath, destPath, label, dryRun, messages) {
+    const upstreamText = readFileSync(upstreamPath, 'utf8');
+    const overlayText = readFileSync(overlayPath, 'utf8');
+    const result = mergeMarkdown(upstreamText, overlayText, label, upstreamPath, overlayPath);
+    if ('error' in result) {
+        messages.push(`ERROR ${result.error.reason}`);
+        return { ok: false, kind: 'schema' };
+    }
+    const sanitizeResult = postMergeSanitize(result.merged, label);
+    if (!sanitizeResult.ok) {
+        messages.push(`ERROR ${sanitizeResult.reason}`);
+        return { ok: false, kind: 'sanitize' };
+    }
+    if (!dryRun) {
+        mkdirSync(dirname(destPath), { recursive: true });
+        writeFileSync(destPath, result.merged, 'utf8');
+    }
+    messages.push(`MERGED ${label} → ${destPath}${dryRun ? ' (dry-run)' : ''}`);
+    return { ok: true };
+}
+function isNewAgentOverlay(overlayPath) {
+    try {
+        const text = readFileSync(overlayPath, 'utf8');
+        const { fm } = parseFrontmatter(text);
+        return fm['overlay-intent'] === 'new-agent';
+    }
+    catch {
+        return false;
+    }
+}
+function copyNewAgent(overlayPath, destPath, label, dryRun, messages) {
+    if (!dryRun) {
+        mkdirSync(dirname(destPath), { recursive: true });
+        copyFileSync(overlayPath, destPath);
+    }
+    messages.push(`NEW-AGENT ${label} → ${destPath}${dryRun ? ' (dry-run)' : ''}`);
+}
+function walkSkillsOverlays(skillsOverridesDir, skillsDir, opts, result) {
+    if (!existsSync(skillsOverridesDir))
+        return;
+    for (const skillName of readdirSync(skillsOverridesDir)) {
+        const overlaySkillDir = join(skillsOverridesDir, skillName);
+        if (!statSync(overlaySkillDir).isDirectory())
+            continue;
+        const upstreamSkillDir = join(skillsDir, skillName);
+        if (!existsSync(upstreamSkillDir)) {
+            result.messages.push(`SKIP ${skillName}: no upstream skill at ${upstreamSkillDir} (skill overlays require an upstream skill dir)`);
+            continue;
+        }
+        ensureRealDir(upstreamSkillDir);
+        // Walk every file in the overlay skill dir recursively.
+        walkOverlayTree(overlaySkillDir, upstreamSkillDir, `skill ${skillName}`, opts, result, false);
+    }
+}
+function walkOverlayTree(overlayRoot, upstreamRoot, labelPrefix, opts, result, isAgentsContext) {
+    const stack = [overlayRoot];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        for (const entry of readdirSync(current)) {
+            const overlayPath = join(current, entry);
+            const stat = lstatSync(overlayPath);
+            if (stat.isDirectory()) {
+                stack.push(overlayPath);
+                continue;
+            }
+            if (!stat.isFile() && !stat.isSymbolicLink())
+                continue;
+            const rel = relative(overlayRoot, overlayPath);
+            const upstreamPath = join(upstreamRoot, rel);
+            const label = `${labelPrefix} ${rel}`;
+            if (!entry.endsWith('.md')) {
+                // Non-markdown files: copy verbatim (matches apply-overlays.py).
+                if (!opts.dryRun) {
+                    mkdirSync(dirname(upstreamPath), { recursive: true });
+                    copyFileSync(overlayPath, upstreamPath);
+                }
+                result.messages.push(`COPY ${label} → ${upstreamPath}${opts.dryRun === true ? ' (dry-run)' : ''}`);
+                continue;
+            }
+            if (!existsSync(upstreamPath)) {
+                if (isAgentsContext && isNewAgentOverlay(overlayPath)) {
+                    copyNewAgent(overlayPath, upstreamPath, label, opts.dryRun === true, result.messages);
+                    result.newAgentsCreated += 1;
+                }
+                else if (isAgentsContext) {
+                    result.messages.push(`ERROR [rename-halt] ${label}: overlay has no upstream counterpart at ${upstreamPath} and no \`overlay-intent: new-agent\` marker`);
+                    result.renameHalts += 1;
+                }
+                else {
+                    // Skill-context: overlay-only files (e.g. new references) copy through.
+                    if (!opts.dryRun) {
+                        mkdirSync(dirname(upstreamPath), { recursive: true });
+                        copyFileSync(overlayPath, upstreamPath);
+                    }
+                    result.messages.push(`NEW-FILE ${label} → ${upstreamPath}${opts.dryRun === true ? ' (dry-run)' : ''}`);
+                }
+                continue;
+            }
+            const merge = mergeOne(upstreamPath, overlayPath, upstreamPath, label, opts.dryRun === true, result.messages);
+            if (merge.ok) {
+                if (isAgentsContext)
+                    result.agentsMerged += 1;
+                else
+                    result.skillsMerged += 1;
+            }
+            else if (merge.kind === 'schema') {
+                result.schemaHalts += 1;
+            }
+            else {
+                result.sanitizeHalts += 1;
+            }
+        }
+    }
+}
+function walkAgentsOverlays(agentsOverridesDir, agentsDir, opts, result) {
+    if (!existsSync(agentsOverridesDir))
+        return;
+    ensureRealDir(agentsDir);
+    walkOverlayTree(agentsOverridesDir, agentsDir, 'agent', opts, result, true);
+}
+export async function applyOverlays(opts = {}) {
+    const root = claudeRoot(opts);
+    const skillsDir = join(root, 'skills');
+    const agentsDir = join(root, 'agents');
+    const skillsOverridesDir = join(root, 'skills.overrides');
+    const agentsOverridesDir = join(root, 'agents.overrides');
+    const result = {
+        rc: 0,
+        skillsMerged: 0,
+        agentsMerged: 0,
+        newAgentsCreated: 0,
+        schemaHalts: 0,
+        renameHalts: 0,
+        sanitizeHalts: 0,
+        messages: [],
+    };
+    // Advisory lock at the claude-root level — prevents two concurrent
+    // apply-overlays runs from interleaving writes.
+    await withFileLock(root, () => {
+        walkSkillsOverlays(skillsOverridesDir, skillsDir, opts, result);
+        walkAgentsOverlays(agentsOverridesDir, agentsDir, opts, result);
+    }, {
+        lockFilename: '.apply-overlays.lock',
+        reason: `apply-overlays root=${root} dryRun=${opts.dryRun === true}`,
+        acquireTimeoutMs: 15_000,
+    });
+    if (result.schemaHalts > 0 || result.renameHalts > 0 || result.sanitizeHalts > 0) {
+        result.rc = 1;
+    }
+    return result;
+}
+export function formatSummary(result) {
+    const lines = [
+        ...result.messages,
+        '',
+        `skills merged: ${result.skillsMerged}`,
+        `agents merged: ${result.agentsMerged}`,
+        `new agents created: ${result.newAgentsCreated}`,
+        `schema-mismatch halts: ${result.schemaHalts}`,
+        `rename halts: ${result.renameHalts}`,
+        `sanitize halts: ${result.sanitizeHalts}`,
+        `rc: ${result.rc}`,
+    ];
+    return lines.join('\n') + '\n';
+}
+export function basenameOf(p) {
+    return basename(p);
+}
+//# sourceMappingURL=skills-apply-overlays.js.map

package/dist/lib/skills-apply-overlays.js.map

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