@open-agent-toolkit/cli 0.3.15 → 0.3.17

package/dist/engine/compute-plan.js

@@ -1,7 +1,7 @@
 import { access, lstat, readFile, readlink, stat } from 'node:fs/promises';
 import { basename, dirname, join, normalize, relative, resolve, } from 'node:path';
 import { CliError } from '../errors/index.js';
-import { computeContentHash, computeStringHash } from '../manifest/hash.js';
+import { computeContentHash, computeDirectoryDigests, computeStringHash, } from '../manifest/hash.js';
 import { findEntry } from '../manifest/manager.js';
 import { getSyncMappings } from '../providers/shared/adapter.utils.js';
 import { proveCollectionIdentity } from './collection-sync.js';
@@ -200,6 +200,23 @@ export async function classifyObsoleteMappingRetirement(manifestEntry, scopeRoot
             if (managedHash === manifestEntry.contentHash) {
                 return createRetirementEntry(manifestEntry, scopeRoot, 'remove', 'obsolete mapping has verified clean managed copy');
             }
+            // Pre-framing manifest bridge, mirroring `drift/detector.ts`: a manifest
+            // written before length framing records the legacy digest, so the framed
+            // comparison above cannot match it and a faithful obsolete copy would be
+            // detached and left behind as a stale unmanaged tree. Accept the legacy
+            // value only when it is the legacy digest of the canonical tree *and*
+            // the copy's framed managed digest equals that same capture's framed
+            // digest, so acceptance still rests entirely on the framed digests (a
+            // tampered body or a forged recorded hash still detaches). Any failure
+            // to read the canonical tree is "cannot verify" and detaches below.
+            if (managedHash !== null) {
+                const canonicalDigests = await computeDirectoryDigests(canonicalPath).catch(() => null);
+                if (canonicalDigests !== null &&
+                    manifestEntry.contentHash === canonicalDigests.legacy &&
+                    managedHash === canonicalDigests.framed) {
+                    return createRetirementEntry(manifestEntry, scopeRoot, 'remove', 'obsolete mapping has verified clean managed copy');
+                }
+            }
         }
     }
     return createRetirementEntry(manifestEntry, scopeRoot, 'detach', 'obsolete mapping provider path is changed or unverified; preserve and detach manifest ownership');
@@ -264,6 +281,7 @@ async function classifyOperation(canonicalEntry, providerPath, strategy, rendere
         return {
             operation: 'skip',
             reason: 'already in sync',
+            verifiedContentHash: canonicalHash,
         };
     }
     // A directory copy is decorated by the writer: `applyCopyMarker` adds the
@@ -283,6 +301,7 @@ async function classifyOperation(canonicalEntry, providerPath, strategy, rendere
             return {
                 operation: 'skip',
                 reason: 'already in sync',
+                verifiedContentHash: canonicalHash,
             };
         }
     }
@@ -291,6 +310,34 @@ async function classifyOperation(canonicalEntry, providerPath, strategy, rendere
         reason: 'copied content differs from canonical content',
     };
 }
+/**
+ * The marker file a copy-strategy directory needs and lacks, or `null`.
+ *
+ * `applyCopyMarker` prepends the banner to `SKILL.md` / `AGENT.md`, and the
+ * managed-copy digest requires that banner. A canonical skill or agent
+ * directory without its marker therefore produced a copy that never verified:
+ * `computeManagedDirectoryCopyHash` returned `null`, so every `oat sync`
+ * planned another `update_copy` while the manifest hash never moved.
+ */
+async function missingCopyMarker(canonicalEntry) {
+    if (canonicalEntry.isFile || canonicalEntry.type === 'rule') {
+        return null;
+    }
+    const markerFileName = canonicalEntry.type === 'agent' ? 'AGENT.md' : 'SKILL.md';
+    try {
+        const markerStat = await stat(join(canonicalEntry.canonicalPath, markerFileName));
+        return markerStat.isFile() ? null : markerFileName;
+    }
+    catch (error) {
+        if (typeof error === 'object' &&
+            error !== null &&
+            'code' in error &&
+            (error.code === 'ENOENT' || error.code === 'ENOTDIR')) {
+            return markerFileName;
+        }
+        throw error;
+    }
+}
 function resolveScopeRoot(canonical, explicitScopeRoot) {
     if (explicitScopeRoot) {
         return resolve(explicitScopeRoot);
@@ -572,6 +619,24 @@ export async function computeSyncPlan({ canonical, adapters, manifest, scope, co
                         manifestEntry?.strategy === 'copy'
                         ? manifestEntry.strategy
                         : mappingStrategy;
+                const missingMarker = entryStrategy === 'copy'
+                    ? await missingCopyMarker(canonicalEntry)
+                    : null;
+                if (missingMarker !== null) {
+                    const displayPath = relativeCanonicalPath.replaceAll('\\', '/');
+                    entries.push({
+                        canonical: canonicalEntry,
+                        provider: adapter.name,
+                        providerPath,
+                        operation: 'error',
+                        strategy: entryStrategy,
+                        reason: `canonical ${canonicalEntry.type} directory ${displayPath} has no ${missingMarker}; add ${missingMarker} or remove the directory, then re-run oat sync`,
+                    });
+                    // Seen, so an owned row is neither removed nor detached: the entry
+                    // still exists canonically and only its configuration is wrong.
+                    seenCanonicalKeys.add(`${normalize(relativeCanonicalPath)}::${adapter.name}`);
+                    continue;
+                }
                 const operation = deferredCollectionTransition
                     ? {
                         operation: entryStrategy === 'copy'
@@ -583,17 +648,37 @@ export async function computeSyncPlan({ canonical, adapters, manifest, scope, co
                         await assertSafeProviderMutationPath(entryScopeRoot, providerPath);
                         return classifyOperation(canonicalEntry, providerPath, entryStrategy, renderedContent);
                     })();
+                // A faithful copy whose owning manifest entry records a different
+                // digest (a pre-framing legacy value or a tampered one) is restamped on
+                // skip. Without this `ensureSkipEntryManaged` kept the stale value
+                // forever: `oat status` reported drift that no `oat sync` repaired.
+                // The row must track the path that was verified: a row keyed by
+                // `(canonicalPath, provider)` can still name an older provider path
+                // (after a `providerDir` change), and stamping it with the digest of a
+                // different tree would turn its `in_sync` into permanent drift.
+                const { verifiedContentHash } = operation;
+                const restampContentHash = operation.operation === 'skip' &&
+                    verifiedContentHash !== undefined &&
+                    manifestEntry?.strategy === 'copy' &&
+                    normalize(manifestEntry.providerPath).replaceAll('\\', '/') ===
+                        relativeManifestPath(entryScopeRoot, providerPath) &&
+                    manifestEntry.contentHash !== verifiedContentHash
+                    ? verifiedContentHash
+                    : undefined;
                 entries.push({
                     canonical: canonicalEntry,
                     provider: adapter.name,
                     providerPath,
                     operation: operation.operation,
                     strategy: entryStrategy,
-                    reason: operation.reason,
+                    reason: restampContentHash === undefined
+                        ? operation.reason
+                        : `${operation.reason}; restamp stale manifest content hash`,
                     renderedContent,
                     ...(deferredCollectionTransition
                         ? { deferredUntilCollectionDetached: true }
                         : {}),
+                    ...(restampContentHash === undefined ? {} : { restampContentHash }),
                 });
                 seenCanonicalKeys.add(`${normalize(relativeCanonicalPath)}::${adapter.name}`);
             }

package/dist/engine/engine.types.d.ts

@@ -48,7 +48,7 @@ export interface CollectionProjectionPlan {
     reason: string;
 }
 export type EngineScope = Exclude<Scope, 'all'>;
-export declare const SYNC_OPERATION_TYPES: readonly ['create_symlink', 'create_copy', 'update_symlink', 'update_copy', 'remove', 'detach', 'skip'];
+export declare const SYNC_OPERATION_TYPES: readonly ['create_symlink', 'create_copy', 'update_symlink', 'update_copy', 'remove', 'detach', 'skip', 'error'];
 export type SyncOperationType = (typeof SYNC_OPERATION_TYPES)[number];
 export interface SyncPlanEntry {
     canonical: CanonicalEntry;
@@ -59,6 +59,15 @@ export interface SyncPlanEntry {
     reason: string;
     renderedContent?: string;
     deferredUntilCollectionDetached?: boolean;
+    /**
+     * Set only on a copy-strategy `skip` whose provider content was verified
+     * against canonical while the manifest entry that already owns it, and that
+     * tracks this same provider path, records a different `contentHash` (a
+     * pre-framing legacy digest or a tampered value).
+     * The value is the framed digest the planner verified; `executeSyncPlan`
+     * writes exactly it, so the next plan carries no restamp.
+     */
+    restampContentHash?: string;
 }
 export type RemovalSyncPlanEntry = SyncPlanEntry & {
     operation: 'remove' | 'detach';

package/dist/engine/engine.types.d.ts.map

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

package/dist/engine/engine.types.js

@@ -6,4 +6,8 @@ export const SYNC_OPERATION_TYPES = [
     'remove',
     'detach',
     'skip',
+    // A configuration error found while planning (for example a copy-strategy
+    // skill or agent directory with no marker file). It mutates nothing and
+    // reports as a failed operation, so it cannot loop as a repeated copy.
+    'error',
 ];

package/dist/engine/execute-plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute-plan.d.ts","sourceRoot":"","sources":["../../src/engine/execute-plan.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAGb,gCAAgC,EAEhC,sBAAsB,EACtB,kCAAkC,EAGnC,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,YAAY,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EACV,QAAQ,EAGT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGL,uBAAuB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,wBAAwB,EAExB,QAAQ,EAER,UAAU,EACX,MAAM,gBAAgB,CAAC;AAIxB,UAAU,2BAA2B;IACnC,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,eAAe,CAAC;IACtC,aAAa,CAAC,EAAE,OAAO,aAAa,CAAC;IACrC,sBAAsB,CAAC,EAAE,OAAO,sBAAsB,CAAC;IACvD,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,kCAAkC,CAAC,EAAE,OAAO,kCAAkC,CAAC;IAC/E,uBAAuB,CAAC,EAAE,OAAO,uBAAuB,CAAC;CAC1D;AAID,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAC3C,SAAS,EAAE,wBAAwB,CAAC,WAAW,CAAC,CAAC;IACjD,MAAM,EACF,SAAS,GACT,SAAS,GACT,UAAU,GACV,UAAU,GACV,QAAQ,GACR,SAAS,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG;IAC9C,iBAAiB,EAAE,yBAAyB,EAAE,CAAC;CAChD,CAAC;AAiFF,wBAAgB,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAW5D;AAoqBD,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,2BAAoE,GACjF,OAAO,CAAC,oBAAoB,CAAC,CAkK/B"}
+{"version":3,"file":"execute-plan.d.ts","sourceRoot":"","sources":["../../src/engine/execute-plan.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAGb,gCAAgC,EAEhC,sBAAsB,EACtB,kCAAkC,EAGnC,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,YAAY,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EACV,QAAQ,EAGT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGL,uBAAuB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,wBAAwB,EAExB,QAAQ,EAER,UAAU,EACX,MAAM,gBAAgB,CAAC;AAIxB,UAAU,2BAA2B;IACnC,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,eAAe,CAAC;IACtC,aAAa,CAAC,EAAE,OAAO,aAAa,CAAC;IACrC,sBAAsB,CAAC,EAAE,OAAO,sBAAsB,CAAC;IACvD,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,kCAAkC,CAAC,EAAE,OAAO,kCAAkC,CAAC;IAC/E,uBAAuB,CAAC,EAAE,OAAO,uBAAuB,CAAC;CAC1D;AAID,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAC3C,SAAS,EAAE,wBAAwB,CAAC,WAAW,CAAC,CAAC;IACjD,MAAM,EACF,SAAS,GACT,SAAS,GACT,UAAU,GACV,UAAU,GACV,QAAQ,GACR,SAAS,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG;IAC9C,iBAAiB,EAAE,yBAAyB,EAAE,CAAC;CAChD,CAAC;AAqFF,wBAAgB,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAW5D;AAusBD,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,2BAAoE,GACjF,OAAO,CAAC,oBAAoB,CAAC,CAyK/B"}

package/dist/engine/execute-plan.js

@@ -1,5 +1,5 @@
 import { mkdir, rm, writeFile } from 'node:fs/promises';
-import { dirname, join, relative, resolve } from 'node:path';
+import { dirname, join, normalize, relative, resolve } from 'node:path';
 import { copyDirectory, copySingleFile, copySingleFileNoClobber, createCollectionSymlinkNoClobber, createSymlink, createSymlinkNoClobber, removeCollectionSymlinkIfUnchanged, writeFileNoClobber, } from '../fs/io.js';
 import { computeContentHash, computeStringHash } from '../manifest/hash.js';
 import { saveManifest as persistManifest } from '../manifest/manager.js';
@@ -8,7 +8,9 @@ import { insertMarker, writeDirectorySentinel } from './markers.js';
 import { assertSafeProviderMutationPath } from './provider-path-safety.js';
 const DEFAULT_EXECUTE_SYNC_PLAN_DEPENDENCIES = {};
 function mutatesProviderPath(entry) {
-    return entry.operation !== 'skip' && entry.operation !== 'detach';
+    return (entry.operation !== 'skip' &&
+        entry.operation !== 'detach' &&
+        entry.operation !== 'error');
 }
 function operationEvidence(scope, entry, status, failure) {
     return {
@@ -111,7 +113,9 @@ async function applyCopyMarker(entry) {
             error !== null &&
             'code' in error &&
             error.code === 'ENOENT') {
-            // Marker insertion is best-effort for non-standard directory layouts.
+            // Marker insertion stays best-effort here. The planner already reports a
+            // canonical directory without its marker as an `error` entry, so this
+            // path is reached only if the marker disappears between plan and apply.
             return;
         }
         throw error;
@@ -203,12 +207,40 @@ function removeManifestEntry(manifest, canonicalPath, provider) {
         ? manifest
         : { ...manifest, entries, lastUpdated: new Date().toISOString() };
 }
+/**
+ * Whether two scope-relative manifest paths name the same location. A stored
+ * row may spell its path differently (`./.claude/skills/x`) from the form
+ * `resolveManifestPaths` produces; the planner compares normalized paths, so
+ * the restamp guard must too, or a planned restamp is silently dropped. The
+ * stored spelling itself is left unchanged.
+ */
+function sameManifestPath(left, right) {
+    return (normalize(left).replaceAll('\\', '/') ===
+        normalize(right).replaceAll('\\', '/'));
+}
 async function ensureSkipEntryManaged(planEntry, manifest) {
-    const { canonicalPath } = resolveManifestPaths(planEntry);
+    const { canonicalPath, providerPath } = resolveManifestPaths(planEntry);
     const existing = manifest.entries.find((entry) => entry.canonicalPath === canonicalPath &&
         entry.provider === planEntry.provider);
     if (existing) {
-        return manifest;
+        // An owned entry is rewritten only when the planner verified the provider
+        // content and found the recorded digest stale; it then writes exactly the
+        // digest it verified. The row must track that same provider path, or the
+        // digest would describe a tree the row does not point at. Every other
+        // owned skip leaves the manifest as is, so a settled sync stays a no-op.
+        const restampContentHash = planEntry.restampContentHash;
+        if (restampContentHash === undefined ||
+            existing.strategy === 'collection' ||
+            !sameManifestPath(existing.providerPath, providerPath) ||
+            existing.contentHash === restampContentHash) {
+            return manifest;
+        }
+        return addManifestEntry(manifest, {
+            ...existing,
+            strategy: existing.strategy,
+            contentHash: restampContentHash,
+            lastSynced: new Date().toISOString(),
+        });
     }
     const manifestEntry = await toManifestEntry(planEntry, planEntry.strategy);
     return addManifestEntry(manifest, manifestEntry);
@@ -561,6 +593,11 @@ export async function executeSyncPlan(plan, manifest, manifestPath, dependencies
                 'Collection alias could not be safely cleared; resolve the reported collection conflict and retry.'));
             continue;
         }
+        if (operation.operation === 'error') {
+            // A planning-time configuration error: report it, change nothing.
+            operationResults.push(operationEvidence(plan.scope, operation, 'failed', operation.reason));
+            continue;
+        }
         if (operation.operation === 'skip') {
             nextManifest = await ensureSkipEntryManaged(operation, nextManifest);
             operationResults.push(operationEvidence(plan.scope, operation, 'current'));

package/dist/engine/managed-copy-hash.d.ts

@@ -42,9 +42,10 @@ import type { ManifestEntry } from '../manifest/manifest.types.js';
  *    skipped it. Combined with the unframed digest that let a view drop
  *    `SKILL.md`, fuse its bytes into a surviving file, and read `in_sync`. The
  *    requirement is unconditional, so a skill directory that genuinely has no
- *    `SKILL.md` (a layout `applyCopyMarker` tolerates as best-effort) is now
- *    permanently `drifted` / `update_copy` rather than `in_sync`: the safe
- *    direction, and the direction the review asked for.
+ *    `SKILL.md` reads `drifted` rather than `in_sync`: the safe direction, and
+ *    the direction the review asked for. The planner does not loop on it:
+ *    `computeSyncPlan` reports a canonical directory without its marker as a
+ *    configuration `error` entry instead of planning `update_copy`.
  *
  * These claims describe a quiescent tree. Every check here is path-based, so
  * none of them survives an adversary swapping an entry between the check and

package/dist/engine/managed-copy-hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"managed-copy-hash.d.ts","sourceRoot":"","sources":["../../src/engine/managed-copy-hash.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAI9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GACxC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyHxB"}
+{"version":3,"file":"managed-copy-hash.d.ts","sourceRoot":"","sources":["../../src/engine/managed-copy-hash.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAI9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkEG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GACxC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyHxB"}

package/dist/engine/managed-copy-hash.js

@@ -45,9 +45,10 @@ import { OAT_DIRECTORY_SENTINEL, OAT_MARKER_PREFIX } from './markers.js';
  *    skipped it. Combined with the unframed digest that let a view drop
  *    `SKILL.md`, fuse its bytes into a surviving file, and read `in_sync`. The
  *    requirement is unconditional, so a skill directory that genuinely has no
- *    `SKILL.md` (a layout `applyCopyMarker` tolerates as best-effort) is now
- *    permanently `drifted` / `update_copy` rather than `in_sync`: the safe
- *    direction, and the direction the review asked for.
+ *    `SKILL.md` reads `drifted` rather than `in_sync`: the safe direction, and
+ *    the direction the review asked for. The planner does not loop on it:
+ *    `computeSyncPlan` reports a canonical directory without its marker as a
+ *    configuration `error` entry instead of planning `update_copy`.
  *
  * These claims describe a quiescent tree. Every check here is path-based, so
  * none of them survives an adversary swapping an entry between the check and

package/dist/fs/assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/fs/assets.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,UAAU,CAAC;AA0CvD;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,YACtC,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,SAAS,EACT,MAAM,EACN,WAAW,EACX,QAAQ,CACA,CAAC;AAgFX;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,eAAe,SAAc,EAC7B,MAAM,GAAE,gBAA6B,GACpC,OAAO,CAAC,IAAI,CAAC,CAsCf;AAQD;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,MAAM,CAAC,CA8BjB"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/fs/assets.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,UAAU,CAAC;AA0CvD;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,YACtC,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,SAAS,EACT,MAAM,EACN,WAAW,EACX,QAAQ,CACA,CAAC;AAgFX;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,eAAe,SAAc,EAC7B,MAAM,GAAE,gBAA6B,GACpC,OAAO,CAAC,IAAI,CAAC,CAsCf;AAQD;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,MAAM,CAAC,CAwCjB"}

package/dist/fs/assets.js

@@ -179,7 +179,13 @@ export async function resolveAssetsRoot(env = process.env) {
         if (error instanceof CliError) {
             throw error;
         }
-        throw new CliError(`Assets directory not found: ${assetsRoot}. ${assetsRemedy(source, PACKAGED_ROOT_REMEDY)}`, 2);
+        // Only an absent root is "not found". EACCES, ELOOP, and EIO on a root
+        // that exists need a different response, so name the errno, as
+        // `validateBundleStructure` does for the directories inside it.
+        if (isMissingPathError(error)) {
+            throw new CliError(`Assets directory not found: ${assetsRoot}. ${assetsRemedy(source, PACKAGED_ROOT_REMEDY)}`, 2);
+        }
+        throw new CliError(`Assets directory could not be read (${errorCode(error)}): ${assetsRoot}. ${assetsRemedy(source, PACKAGED_ROOT_REMEDY)}`, 2);
     }
     await validateAssetsBundle(assetsRoot, OAT_VERSION, source);
     return assetsRoot;

package/dist/manifest/hash.d.ts

@@ -45,16 +45,14 @@ export declare function computeContentHash(contentPath: string, isFile: boolean)
  * framed digest equals a legacy digest under SHA-256 collision resistance —
  * the same assumption every other comparison here already rests on.
  *
- * `legacy` is retained for exactly one purpose: `drift/detector.ts` uses it to
- * recognize a manifest written before the framing change and re-decide with
- * `framed`. It is never an acceptance basis for provider content on its own.
- * The migration is needed because framing changes every recorded
- * `contentHash`, and `oat sync` plans `skip` for a faithful tree while
- * `ensureSkipEntryManaged` (`engine/execute-plan.ts`) does not restamp an entry
- * it already owns — so a legacy value is never rewritten by a no-op sync.
- * Measured on the built CLI: a directory-copy entry whose `contentHash` no
- * longer matches reports `drifted/modified` from `oat status`, `oat sync`
- * answers `skip` / "already in sync", and the manifest keeps the old value.
+ * `legacy` is retained for exactly one purpose: recognizing a manifest written
+ * before the framing change and re-deciding with `framed`, in
+ * `drift/detector.ts` and in the obsolete-mapping retirement classifier
+ * (`classifyObsoleteMappingRetirement` in `engine/compute-plan.ts`). It is
+ * never an acceptance basis for provider content on its own. The migration is
+ * needed because framing changes every recorded `contentHash`; `oat sync` now
+ * restamps a stale value when it plans `skip` for a faithful tree, so the
+ * bridge only covers installs that have not run such a sync yet.
  *
  * ## Bounds this digest still does not cover
  *

package/dist/manifest/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/manifest/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAMpD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAIzD;AAqBD,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBvE;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAIjB;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,IAAI,IAAI,CAIlD;AAED,gEAAgE;AAChE,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,MAAM,CAER;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,GACd,IAAI,CAMN;AAgFD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiB3E"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/manifest/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAMpD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAIzD;AAqBD,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBvE;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAIjB;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,IAAI,IAAI,CAIlD;AAED,gEAAgE;AAChE,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,MAAM,CAER;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,GACd,IAAI,CAMN;AAgFD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiB3E"}

package/dist/ui/output.js

@@ -90,7 +90,7 @@ function colorSyncOperation(operation) {
     if (operation === 'update_symlink' || operation === 'update_copy') {
         return chalk.yellow(operation);
     }
-    if (operation === 'remove') {
+    if (operation === 'remove' || operation === 'error') {
         return chalk.red(operation);
     }
     return chalk.gray(operation);

package/dist/validation/skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../src/validation/skills.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,uCAAuC;IACtD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sCAAsC;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,UAAU,6BAA6B;IACrC,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAu1CD,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,uCAAuC,EAChD,YAAY,GAAE,6BAAkC,GAC/C,OAAO,CAAC,sCAAsC,CAAC,CAsBjD;AAsGD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,wBAA6B,EACtC,YAAY,GAAE,6BAAkC,GAC/C,OAAO,CAAC,uBAAuB,CAAC,CAsJlC"}
+{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../src/validation/skills.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,uCAAuC;IACtD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sCAAsC;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,UAAU,6BAA6B;IACrC,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAqgDD,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,uCAAuC,EAChD,YAAY,GAAE,6BAAkC,GAC/C,OAAO,CAAC,sCAAsC,CAAC,CAsBjD;AAsGD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,wBAA6B,EACtC,YAAY,GAAE,6BAAkC,GAC/C,OAAO,CAAC,uBAAuB,CAAC,CAoKlC"}