@lesliechan721/aw 0.1.0-beta.8 → 0.1.0-beta.9

package/dist/src/utils/catalog-digests.d.ts

@@ -2,6 +2,13 @@ import type { CatalogManifestEntry, PluginManifestSource } from '../types.js';
 export declare function calculateCatalogEntryManifestDigest(manifest: PluginManifestSource | CatalogManifestEntry): string;
 export declare function calculateCatalogEntryArtifactDigest(pluginRoot: string): Promise<string>;
 export declare function calculateCatalogEntryContentDigest(pluginRoot: string): Promise<string>;
+/**
+ * Digest for the Codex native cache payload. Codex/AW can add or remove the
+ * manifest `skills` projection during native installation, so that one field
+ * is canonicalized while all other manifest fields and non-manifest payload
+ * bytes remain covered.
+ */
+export declare function calculateCodexSharedNativePayloadDigest(pluginRoot: string): Promise<string>;
 export declare function calculateCatalogEntryDigestsFromRoot(pluginRoot: string): Promise<{
     manifestDigest: string;
     artifactDigest: string;

package/dist/src/utils/catalog-digests.js

@@ -109,6 +109,33 @@ export async function calculateCatalogEntryContentDigest(pluginRoot) {
     }));
     return createSha256Digest(stableStringify(fileEntries));
 }
+/**
+ * Digest for the Codex native cache payload. Codex/AW can add or remove the
+ * manifest `skills` projection during native installation, so that one field
+ * is canonicalized while all other manifest fields and non-manifest payload
+ * bytes remain covered.
+ */
+export async function calculateCodexSharedNativePayloadDigest(pluginRoot) {
+    const files = (await listFilesRecursively(pluginRoot)).filter((relativePath) => path.posix.basename(relativePath) !== '.agent-workflows-owner.json');
+    const fileEntries = await Promise.all(files.map(async (relativePath) => {
+        const filePath = path.join(pluginRoot, relativePath);
+        const node = await resolveCatalogDigestNode(filePath);
+        let digest;
+        if (relativePath === '.codex-plugin/plugin.json' && node.kind === 'file') {
+            const manifest = await fs.readJson(filePath);
+            digest = createSha256Digest(stableStringify({
+                ...manifest,
+                version: '<plugin-version>',
+                skills: '<native-managed>',
+            }));
+        }
+        else {
+            digest = await calculateContentPathDigest(pluginRoot, relativePath, node);
+        }
+        return { path: relativePath, kind: node.kind, mode: node.mode, digest };
+    }));
+    return createSha256Digest(stableStringify(fileEntries));
+}
 export async function calculateCatalogEntryDigestsFromRoot(pluginRoot) {
     const plugin = await readPluginManifest(pluginRoot, { mode: 'bundle' });
     return {

package/dist/src/utils/catalog-digests.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog-digests.js","sourceRoot":"","sources":["../../../src/utils/catalog-digests.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,MAAM,UAAU,CAAC;AAG1B,OAAO,EACL,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACvE,CAAC;IACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,KAAgC,CAAC;QAChD,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;aAC3B,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;aACtE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,UAAU,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;AAC7E,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,OAAe;IACjD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAC1D,KAAK,CAAC,IAAI,CACR,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAChG,CAAC;YACF,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AASD,KAAK,UAAU,wBAAwB,CAAC,QAAgB;IAItD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC7C,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,0DAA0D,QAAQ,GAAG,CAAC,CAAC;IACzF,CAAC;IACD,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;KACtD,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,QAAgB,EAChB,IAA0D;IAE1D,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,kBAAkB,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,+BAA+B,GAAG,IAAI,GAAG,CAAC;IAC9C,4BAA4B;IAC5B,4BAA4B;IAC5B,2BAA2B;CAC5B,CAAC,CAAC;AACH,MAAM,uCAAuC,GAAG,6BAA6B,CAAC;AAE9E,KAAK,UAAU,0BAA0B,CACvC,UAAkB,EAClB,YAAoB,EACpB,IAA0D;IAE1D,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,YAAY,CAAC;WACjD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,uCAAuC,EAAE,CAAC;QACnF,OAAO,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;IAChF,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACrD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,kBAAkB,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAA4B,CAAC;IACxE,IAAI,+BAA+B,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QACtD,OAAO,kBAAkB,CAAC,eAAe,CAAC,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAC3F,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QACtG,CAAC,CAAC,QAAQ,CAAC,MAAiC;QAC5C,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,kBAAkB,CAAC,eAAe,CAAC;QACxC,GAAG,QAAQ;QACX,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE;KACnD,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,mCAAmC,CACjD,QAAqD;IAErD,OAAO,kBAAkB,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mCAAmC,CACvD,UAAkB;IAElB,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,EAAoC,EAAE;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QACtD,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,MAAM,2BAA2B,CAAC,QAAQ,EAAE,IAAI,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,kBAAkB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,UAAkB;IAElB,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,EAAoC,EAAE;QACjE,MAAM,IAAI,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;QACjF,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,MAAM,0BAA0B,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC;SACzE,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,kBAAkB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oCAAoC,CACxD,UAAkB;IAElB,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAExE,OAAO;QACL,cAAc,EAAE,mCAAmC,CAAC,MAAM,CAAC,QAAQ,CAAC;QACpE,cAAc,EAAE,MAAM,mCAAmC,CAAC,UAAU,CAAC;KACtE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"catalog-digests.js","sourceRoot":"","sources":["../../../src/utils/catalog-digests.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/catalog-generation-control-snapshot.d.ts

@@ -0,0 +1,11 @@
+import type { CatalogGenerationStateFileV1, CatalogSourceId, SourceIdentity } from '../types.js';
+import { type CatalogSourcesConfigSnapshot } from './catalog-sources.js';
+export interface CatalogGenerationControlSnapshot {
+    configSnapshot: CatalogSourcesConfigSnapshot;
+    generationState: CatalogGenerationStateFileV1;
+    sourceIdentities: Record<CatalogSourceId, SourceIdentity>;
+}
+export declare function readCatalogGenerationControlSnapshot(options?: {
+    env?: NodeJS.ProcessEnv;
+    configSnapshot?: CatalogSourcesConfigSnapshot;
+}): Promise<CatalogGenerationControlSnapshot>;

package/dist/src/utils/catalog-generation-control-snapshot.js

@@ -0,0 +1,45 @@
+import { CatalogGenerationError } from './catalog-generation-error.js';
+import { readCatalogGenerationState } from './catalog-generation-state.js';
+import { calculateCatalogSourceIdentity } from './catalog-source-identity.js';
+import { readCatalogSourcesConfigSnapshot, } from './catalog-sources.js';
+const MAX_CONTROL_SNAPSHOT_RETRIES = 3;
+function identityMismatch() {
+    return new CatalogGenerationError({
+        code: 'catalogGenerationIdentityMismatch',
+        message: 'Catalog source configuration changed while generation state was being read. Retry the operation.',
+    });
+}
+async function sourceIdentities(snapshot) {
+    return Object.fromEntries(await Promise.all(snapshot.config.sources.map(async (source) => [
+        source.id,
+        await calculateCatalogSourceIdentity(source),
+    ])));
+}
+export async function readCatalogGenerationControlSnapshot(options = {}) {
+    const env = options.env ?? process.env;
+    if (options.configSnapshot) {
+        const generationState = await readCatalogGenerationState(env);
+        const currentConfig = await readCatalogSourcesConfigSnapshot(env);
+        if (currentConfig.digest !== options.configSnapshot.digest)
+            throw identityMismatch();
+        return {
+            configSnapshot: options.configSnapshot,
+            generationState,
+            sourceIdentities: await sourceIdentities(options.configSnapshot),
+        };
+    }
+    for (let attempt = 0; attempt <= MAX_CONTROL_SNAPSHOT_RETRIES; attempt += 1) {
+        const configSnapshot = await readCatalogSourcesConfigSnapshot(env);
+        const generationState = await readCatalogGenerationState(env);
+        const currentConfig = await readCatalogSourcesConfigSnapshot(env);
+        if (currentConfig.digest === configSnapshot.digest) {
+            return {
+                configSnapshot,
+                generationState,
+                sourceIdentities: await sourceIdentities(configSnapshot),
+            };
+        }
+    }
+    throw identityMismatch();
+}
+//# sourceMappingURL=catalog-generation-control-snapshot.js.map

package/dist/src/utils/catalog-generation-control-snapshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-generation-control-snapshot.js","sourceRoot":"","sources":["../../../src/utils/catalog-generation-control-snapshot.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EACL,gCAAgC,GAEjC,MAAM,sBAAsB,CAAC;AAE9B,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAQvC,SAAS,gBAAgB;IACvB,OAAO,IAAI,sBAAsB,CAAC;QAChC,IAAI,EAAE,mCAAmC;QACzC,OAAO,EAAE,kGAAkG;KAC5G,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,QAAsC;IAEtC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;QACxF,MAAM,CAAC,EAAE;QACT,MAAM,8BAA8B,CAAC,MAAM,CAAC;KAC7C,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oCAAoC,CAAC,UAGvD,EAAE;IACJ,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,MAAM,eAAe,GAAG,MAAM,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,MAAM,gCAAgC,CAAC,GAAG,CAAC,CAAC;QAClE,IAAI,aAAa,CAAC,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,MAAM;YAAE,MAAM,gBAAgB,EAAE,CAAC;QACrF,OAAO;YACL,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,eAAe;YACf,gBAAgB,EAAE,MAAM,gBAAgB,CAAC,OAAO,CAAC,cAAc,CAAC;SACjE,CAAC;IACJ,CAAC;IAED,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,4BAA4B,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAC5E,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAAC,GAAG,CAAC,CAAC;QACnE,MAAM,eAAe,GAAG,MAAM,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,MAAM,gCAAgC,CAAC,GAAG,CAAC,CAAC;QAClE,IAAI,aAAa,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC;YACnD,OAAO;gBACL,cAAc;gBACd,eAAe;gBACf,gBAAgB,EAAE,MAAM,gBAAgB,CAAC,cAAc,CAAC;aACzD,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,gBAAgB,EAAE,CAAC;AAC3B,CAAC"}

package/dist/src/utils/catalog-generation-error.d.ts

@@ -1,4 +1,4 @@
-export type CatalogGenerationErrorCode = 'catalogGenerationStateInvalid' | 'catalogGenerationMetadataInvalid' | 'catalogGenerationUnavailable' | 'catalogGenerationCandidateUnavailable' | 'catalogGenerationCandidateChanged' | 'catalogGenerationSourceMissing' | 'catalogGenerationIdentityMismatch' | 'catalogGenerationRefreshFailed' | 'catalogGenerationRefreshPolicyInvalid' | 'catalogGenerationPublishFailed' | 'catalogImmutableVersionViolation';
+export type CatalogGenerationErrorCode = 'catalogSourcesConfigInvalid' | 'catalogGenerationStateInvalid' | 'catalogGenerationMetadataInvalid' | 'catalogGenerationUnavailable' | 'catalogGenerationSourceMissing' | 'catalogGenerationIdentityMismatch' | 'catalogGenerationRefreshFailed' | 'catalogGenerationPublishFailed';
 export declare class CatalogGenerationError extends Error {
     readonly code: CatalogGenerationErrorCode;
     readonly sourceId?: string;
@@ -10,3 +10,4 @@ export declare class CatalogGenerationError extends Error {
     });
 }
 export declare function catalogGenerationErrorCode(error: unknown): string;
+export declare function isOfflineCleanupCatalogGenerationError(error: unknown): boolean;

package/dist/src/utils/catalog-generation-error.js

@@ -13,4 +13,16 @@ export function catalogGenerationErrorCode(error) {
         ? error.code
         : 'catalogGenerationFailed';
 }
+const OFFLINE_CLEANUP_ERROR_CODES = new Set([
+    'catalogSourcesConfigInvalid',
+    'catalogGenerationStateInvalid',
+    'catalogGenerationMetadataInvalid',
+    'catalogGenerationUnavailable',
+    'catalogGenerationSourceMissing',
+    'catalogGenerationIdentityMismatch',
+]);
+export function isOfflineCleanupCatalogGenerationError(error) {
+    return error instanceof CatalogGenerationError
+        && OFFLINE_CLEANUP_ERROR_CODES.has(error.code);
+}
 //# sourceMappingURL=catalog-generation-error.js.map

package/dist/src/utils/catalog-generation-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog-generation-error.js","sourceRoot":"","sources":["../../../src/utils/catalog-generation-error.ts"],"names":[],"mappings":"AAaA,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IACtC,IAAI,CAA6B;IACjC,QAAQ,CAAU;IAE3B,YAAY,OAKX;QACC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;CACF;AAED,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACvD,OAAO,KAAK,YAAY,sBAAsB;QAC5C,CAAC,CAAC,KAAK,CAAC,IAAI;QACZ,CAAC,CAAC,yBAAyB,CAAC;AAChC,CAAC"}
+{"version":3,"file":"catalog-generation-error.js","sourceRoot":"","sources":["../../../src/utils/catalog-generation-error.ts"],"names":[],"mappings":"AAUA,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IACtC,IAAI,CAA6B;IACjC,QAAQ,CAAU;IAE3B,YAAY,OAKX;QACC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;CACF;AAED,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACvD,OAAO,KAAK,YAAY,sBAAsB;QAC5C,CAAC,CAAC,KAAK,CAAC,IAAI;QACZ,CAAC,CAAC,yBAAyB,CAAC;AAChC,CAAC;AAED,MAAM,2BAA2B,GAA4C,IAAI,GAAG,CAAC;IACnF,6BAA6B;IAC7B,+BAA+B;IAC/B,kCAAkC;IAClC,8BAA8B;IAC9B,gCAAgC;IAChC,mCAAmC;CACpC,CAAC,CAAC;AAEH,MAAM,UAAU,sCAAsC,CAAC,KAAc;IACnE,OAAO,KAAK,YAAY,sBAAsB;WACzC,2BAA2B,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC"}

package/dist/src/utils/catalog-generation-resolver.d.ts

@@ -1,13 +1,20 @@
-import type { CatalogGenerationPointerV1, CatalogGenerationSet, CatalogGenerationSetSource } from '../types.js';
+import type { CatalogGenerationActiveV1, CatalogGenerationSet, CatalogGenerationSetSource } from '../types.js';
+import { type CatalogGenerationControlSnapshot } from './catalog-generation-control-snapshot.js';
+import { type CatalogStoreEntry } from './catalog-generation-store.js';
 export interface ResolvedActiveCatalogGeneration extends CatalogGenerationSetSource {
-    pointer: CatalogGenerationPointerV1;
+    active: CatalogGenerationActiveV1;
 }
 export declare function resolveActiveCatalogGeneration(options: {
     sourceId: string;
     env?: NodeJS.ProcessEnv;
+    validatedStoreEntries?: Map<string, CatalogStoreEntry>;
+    validatingStoreEntries?: Map<string, Promise<CatalogStoreEntry>>;
 }): Promise<ResolvedActiveCatalogGeneration>;
-export declare function calculateCatalogGenerationSetDigest(primarySourceId: string, sources: CatalogGenerationSetSource[]): string;
+export declare function calculateCatalogGenerationSetDigest(configDigest: string, primarySourceId: string, sources: CatalogGenerationSetSource[]): string;
 export declare function resolveCatalogGenerationSet(options?: {
     sourceIds?: string[];
     env?: NodeJS.ProcessEnv;
+    controlSnapshot?: CatalogGenerationControlSnapshot;
+    validatedStoreEntries?: Map<string, CatalogStoreEntry>;
+    validatingStoreEntries?: Map<string, Promise<CatalogStoreEntry>>;
 }): Promise<CatalogGenerationSet>;

package/dist/src/utils/catalog-generation-resolver.js

@@ -1,129 +1,143 @@
 import crypto from 'node:crypto';
 import { IMPLEMENTED_AW_CAPABILITIES } from '../commands/aw-capabilities.js';
 import { CatalogGenerationError } from './catalog-generation-error.js';
+import { readCatalogGenerationControlSnapshot, } from './catalog-generation-control-snapshot.js';
 import { CatalogProviderCompatibilityError } from './catalog-public-error.js';
-import { readCatalogGenerationState } from './catalog-generation-state.js';
-import { readCatalogGeneration } from './catalog-generation-store.js';
+import { createCatalogStoreKey, readCatalogStoreEntry, } from './catalog-generation-store.js';
 import { calculateCatalogSourceConfigFingerprint } from './catalog-source-identity.js';
-import { readCatalogSourcesConfigSnapshot } from './catalog-sources.js';
 import { checkAwCapabilitySupport } from './manifest.js';
 async function resolveFromState(options) {
-    const selected = options.state.sources[options.source.id];
-    if (!selected?.active) {
+    if (!options.active) {
         throw new CatalogGenerationError({
             code: 'catalogGenerationUnavailable',
             sourceId: options.source.id,
-            message: `Catalog source "${options.source.id}" has no Active generation. Run aw catalog source refresh ${options.source.id}.`,
+            message: `Catalog source "${options.source.id}" has no Active snapshot. Run aw catalog source sync ${options.source.id}.`,
         });
     }
-    if (selected.active.sourceConfigFingerprint
-        !== calculateCatalogSourceConfigFingerprint(options.source)) {
+    const fingerprint = calculateCatalogSourceConfigFingerprint(options.source);
+    if (options.active.sourceIdentity !== options.sourceIdentity
+        || options.active.sourceConfigFingerprint !== fingerprint)
         throw new CatalogGenerationError({
             code: 'catalogGenerationIdentityMismatch',
             sourceId: options.source.id,
-            message: `Active Catalog generation for source "${options.source.id}" does not match the current source configuration. Run aw catalog source refresh ${options.source.id}, activate the Candidate with aw catalog source activate-candidate ${options.source.id}, then reload and retry.`,
+            message: `Active Catalog snapshot for source "${options.source.id}" does not match the current source configuration. Run aw catalog source sync ${options.source.id}.`,
         });
+    const storeKey = createCatalogStoreKey(options.active.logicalIdentity, options.active.snapshotDigest);
+    let entry = options.validatedStoreEntries?.get(storeKey);
+    if (!entry) {
+        let pending = options.validatingStoreEntries?.get(storeKey);
+        if (!pending) {
+            pending = readCatalogStoreEntry({
+                logicalIdentity: options.active.logicalIdentity,
+                snapshotDigest: options.active.snapshotDigest,
+                env: options.env,
+            });
+            options.validatingStoreEntries?.set(storeKey, pending);
+        }
+        try {
+            entry = await pending;
+            options.validatedStoreEntries?.set(storeKey, entry);
+        }
+        finally {
+            if (options.validatingStoreEntries?.get(storeKey) === pending) {
+                options.validatingStoreEntries.delete(storeKey);
+            }
+        }
     }
-    const generation = await readCatalogGeneration({
-        logicalIdentity: selected.logicalIdentity,
-        snapshotDigest: selected.active.snapshotDigest,
-        env: options.env,
-    });
-    const requiredCapabilities = generation.metadata.requiredAwCapabilities;
-    const support = checkAwCapabilitySupport(requiredCapabilities, IMPLEMENTED_AW_CAPABILITIES);
+    if (entry.metadata.manifestDigest !== options.active.manifestDigest) {
+        throw new CatalogGenerationError({
+            code: 'catalogGenerationIdentityMismatch',
+            sourceId: options.source.id,
+            message: `Active Catalog snapshot for source "${options.source.id}" does not match store metadata. Run aw catalog source sync ${options.source.id}.`,
+        });
+    }
+    const support = checkAwCapabilitySupport(entry.metadata.requiredAwCapabilities, IMPLEMENTED_AW_CAPABILITIES);
     if (!support.supported) {
         throw new CatalogProviderCompatibilityError({
             sourceId: options.source.id,
-            requiredCapabilities,
+            requiredCapabilities: entry.metadata.requiredAwCapabilities,
             missingCapabilities: support.missing,
             availableCapabilities: IMPLEMENTED_AW_CAPABILITIES,
         });
     }
-    if (generation.metadata.logicalIdentity !== selected.logicalIdentity
-        || generation.metadata.catalogVersion !== selected.active.catalogVersion
-        || generation.metadata.channel !== selected.active.channel
-        || generation.metadata.manifestDigest !== selected.active.manifestDigest
-        || generation.metadata.snapshotDigest !== selected.active.snapshotDigest
-        || generation.metadata.generationKey !== selected.active.generationKey) {
-        throw new CatalogGenerationError({
-            code: 'catalogGenerationIdentityMismatch',
-            sourceId: options.source.id,
-            message: `Active Catalog generation for source "${options.source.id}" does not match its immutable metadata. Refresh the source after repairing catalog-generations.json.`,
-        });
-    }
     return {
         sourceId: options.source.id,
-        sourceConfigFingerprint: selected.active.sourceConfigFingerprint,
-        logicalIdentity: selected.logicalIdentity,
-        catalogVersion: selected.active.catalogVersion,
-        resolvedCommit: selected.active.resolvedCommit,
-        manifestDigest: selected.active.manifestDigest,
-        snapshotDigest: selected.active.snapshotDigest,
-        generationKey: selected.active.generationKey,
-        snapshotPath: generation.snapshotRoot,
-        pointer: selected.active,
+        sourceConfigFingerprint: options.active.sourceConfigFingerprint,
+        sourceIdentity: options.active.sourceIdentity,
+        logicalIdentity: options.active.logicalIdentity,
+        catalogVersion: entry.metadata.catalogVersion,
+        resolvedCommit: options.active.resolvedCommit,
+        manifestDigest: options.active.manifestDigest,
+        snapshotDigest: options.active.snapshotDigest,
+        storeKey,
+        snapshotPath: entry.snapshotRoot,
+        manifest: entry.manifest,
+        active: options.active,
     };
 }
 export async function resolveActiveCatalogGeneration(options) {
     const env = options.env ?? process.env;
-    const [config, state] = await Promise.all([
-        readCatalogSourcesConfigSnapshot(env),
-        readCatalogGenerationState(env),
-    ]);
-    const source = config.config.sources.find((entry) => entry.id === options.sourceId);
-    if (!source) {
+    const control = await readCatalogGenerationControlSnapshot({ env });
+    const source = control.configSnapshot.config.sources.find((entry) => entry.id === options.sourceId);
+    if (!source)
         throw new CatalogGenerationError({
             code: 'catalogGenerationSourceMissing',
             sourceId: options.sourceId,
             message: `Catalog source "${options.sourceId}" is not configured.`,
         });
-    }
-    return resolveFromState({ source, state, env });
+    return resolveFromState({
+        source,
+        sourceIdentity: control.sourceIdentities[source.id],
+        active: control.generationState.sources[source.id]?.active,
+        env,
+        validatedStoreEntries: options.validatedStoreEntries,
+        validatingStoreEntries: options.validatingStoreEntries,
+    });
 }
-export function calculateCatalogGenerationSetDigest(primarySourceId, sources) {
-    const input = {
+export function calculateCatalogGenerationSetDigest(configDigest, primarySourceId, sources) {
+    const identity = sources.map((source) => ({
+        sourceId: source.sourceId,
+        sourceConfigFingerprint: source.sourceConfigFingerprint,
+        logicalIdentity: source.logicalIdentity,
+        snapshotDigest: source.snapshotDigest,
+        storeKey: source.storeKey,
+    }));
+    return `sha256:${crypto.createHash('sha256').update(JSON.stringify({
+        configDigest,
         primarySourceId,
-        sources: sources.map((source) => ({
-            sourceId: source.sourceId,
-            sourceConfigFingerprint: source.sourceConfigFingerprint,
-            logicalIdentity: source.logicalIdentity,
-            catalogVersion: source.catalogVersion,
-            resolvedCommit: source.resolvedCommit,
-            manifestDigest: source.manifestDigest,
-            snapshotDigest: source.snapshotDigest,
-            generationKey: source.generationKey,
-        })),
-    };
-    return `sha256:${crypto.createHash('sha256').update(JSON.stringify(input)).digest('hex')}`;
+        sources: identity,
+    })).digest('hex')}`;
 }
 export async function resolveCatalogGenerationSet(options = {}) {
     const env = options.env ?? process.env;
-    const [config, state] = await Promise.all([
-        readCatalogSourcesConfigSnapshot(env),
-        readCatalogGenerationState(env),
-    ]);
-    const requested = options.sourceIds ? new Set(options.sourceIds) : null;
+    const control = options.controlSnapshot ?? await readCatalogGenerationControlSnapshot({ env });
+    const requested = options.sourceIds ? new Set(options.sourceIds) : undefined;
     if (requested) {
-        const configured = new Set(config.config.sources.map((source) => source.id));
-        const missing = [...requested].find((sourceId) => !configured.has(sourceId));
-        if (missing) {
+        const configured = new Set(control.configSnapshot.config.sources.map((source) => source.id));
+        const missing = options.sourceIds.find((sourceId) => !configured.has(sourceId));
+        if (missing)
             throw new CatalogGenerationError({
                 code: 'catalogGenerationSourceMissing',
                 sourceId: missing,
                 message: `Catalog source "${missing}" is not configured.`,
             });
-        }
     }
-    const configuredSources = config.config.sources
-        .filter((source) => !requested || requested.has(source.id))
-        .sort((left, right) => left.id < right.id ? -1 : left.id > right.id ? 1 : 0);
-    const resolved = await Promise.all(configuredSources.map((source) => resolveFromState({ source, state, env })));
-    const sources = resolved.map(({ pointer: _pointer, ...source }) => source);
-    const primarySourceId = config.config.sources.find((source) => source.primary).id;
+    const selected = control.configSnapshot.config.sources.filter((source) => !requested || requested.has(source.id));
+    const resolved = await Promise.all(selected.map((source) => resolveFromState({
+        source,
+        sourceIdentity: control.sourceIdentities[source.id],
+        active: control.generationState.sources[source.id]?.active,
+        env,
+        validatedStoreEntries: options.validatedStoreEntries,
+        validatingStoreEntries: options.validatingStoreEntries,
+    })));
+    const sources = resolved.map(({ active: _active, ...source }) => source);
+    const primarySourceId = control.configSnapshot.config.sources.find((source) => source.primary).id;
     return {
-        generationSetDigest: calculateCatalogGenerationSetDigest(primarySourceId, sources),
+        configDigest: control.configSnapshot.digest,
         primarySourceId,
         sources,
+        generationSetDigest: calculateCatalogGenerationSetDigest(control.configSnapshot.digest, primarySourceId, sources),
     };
 }
 //# sourceMappingURL=catalog-generation-resolver.js.map

package/dist/src/utils/catalog-generation-resolver.js.map

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

package/dist/src/utils/catalog-generation-service.d.ts

@@ -1,51 +1,42 @@
-import type { CatalogGenerationActivationResult, CatalogGenerationCandidateV1, CatalogGenerationLastCheckV1, CatalogGenerationPointerV1, CatalogGenerationRefreshResult, CatalogSource } from '../types.js';
-import { type AwHomeMutationToken } from './aw-home-mutation-lock.js';
-import type { CatalogSourceProviderSet } from './multi-source-catalog.js';
+import type { CatalogGenerationActiveV1, CatalogGenerationLastSyncV1, CatalogGenerationSyncResult } from '../types.js';
+import { type CatalogStoreEntry } from './catalog-generation-store.js';
+export { removeCatalogSourceGenerationState } from './catalog-generation-state.js';
+import { catalogGitProviderInternal } from './git-catalog-provider.js';
+import { catalogPathProviderInternal } from './path-catalog-provider.js';
+export interface CatalogGenerationProviderSet {
+    git: typeof catalogGitProviderInternal.resolve;
+    path: typeof catalogPathProviderInternal.resolve;
+}
 export interface CatalogGenerationServiceRuntime {
-    providers?: CatalogSourceProviderSet;
+    providers?: CatalogGenerationProviderSet;
     now?: () => Date;
-    onProgress?: (event: {
-        sourceId: string;
-        state: 'checking' | 'validating';
-    }) => void | Promise<void>;
+    validatedStoreEntries?: Map<string, CatalogStoreEntry>;
+    validatingStoreEntries?: Map<string, Promise<CatalogStoreEntry>>;
 }
 export interface CatalogGenerationStatusEntry {
     sourceId: string;
-    sourceType: CatalogSource['type'];
-    logicalIdentity?: string;
-    refreshPolicy: 'startup' | 'manual';
-    active?: CatalogGenerationPointerV1;
-    candidate?: CatalogGenerationCandidateV1;
-    lastCheck?: CatalogGenerationLastCheckV1;
+    configuredSourceIdentity: string;
+    active?: CatalogGenerationActiveV1;
+    activeReady: boolean;
+    configMatchesActive: boolean;
+    catalogVersion?: string;
+    channel?: 'latest' | 'beta';
+    storeKey?: string;
+    lastSync?: CatalogGenerationLastSyncV1;
+    errorCode?: string;
 }
 export interface CatalogGenerationStatusPayload {
     catalogGenerationStatusSchemaVersion: 1;
     sources: CatalogGenerationStatusEntry[];
 }
-export declare function refreshCatalogSourceGeneration(options: {
+export declare function syncCatalogSourceGeneration(options: {
     sourceId: string;
     cliVersion: string;
+    check?: boolean;
     env?: NodeJS.ProcessEnv;
     signal?: AbortSignal;
     runtime?: CatalogGenerationServiceRuntime;
-    awHomeMutationToken?: AwHomeMutationToken;
-}): Promise<CatalogGenerationRefreshResult>;
-export declare function activateCatalogSourceCandidate(options: {
-    sourceId: string;
-    expectedCandidateGenerationKey?: string;
-    env?: NodeJS.ProcessEnv;
-    awHomeMutationToken?: AwHomeMutationToken;
-    runtime?: Pick<CatalogGenerationServiceRuntime, 'now'>;
-}): Promise<CatalogGenerationActivationResult>;
-export declare function setCatalogSourceRefreshPolicy(options: {
-    sourceId: string;
-    refreshPolicy: 'startup' | 'manual';
-    env?: NodeJS.ProcessEnv;
-}): Promise<CatalogGenerationStatusEntry>;
-export declare function removeCatalogSourceGenerationState(options: {
-    sourceId: string;
-    env?: NodeJS.ProcessEnv;
-}): Promise<boolean>;
+}): Promise<CatalogGenerationSyncResult>;
 export declare function readCatalogGenerationStatus(options?: {
     sourceId?: string;
     env?: NodeJS.ProcessEnv;