@lesliechan721/aw 0.1.0-beta.3 → 0.1.0-beta.30

package/dist/src/types.d.ts

@@ -1,5 +1,5 @@
 export type * from '@lesliechan721/aw-plugin-core/manifest';
-import type { ArtifactState, ArtifactTarget, CatalogChannel, CatalogManifestV4, CatalogSourceId, CliVersion, DistributionName, DynamicArtifactKind, ManagedArtifactId, PlatformName, PluginId, PluginLifecycleEvent, PluginVersion, Scope, SourceIdentity, TrackedHookGroupIdentity } from '@lesliechan721/aw-plugin-core/manifest';
+import type { ArtifactState, ArtifactTarget, CatalogChannel, CatalogManifestV7, CatalogSourceId, CliVersion, DistributionName, DynamicArtifactKind, ManagedArtifactId, PlatformName, PluginId, PluginVersion, Scope, SourceIdentity, TrackedHookGroupIdentity } from '@lesliechan721/aw-plugin-core/manifest';
 export type ArtifactSurface = {
     kind: 'platform';
     name: PlatformName;
@@ -8,9 +8,9 @@ export type ArtifactSurface = {
     name: DistributionName;
 };
 export type PlatformSelection = PlatformName | 'both';
-export type CommandAction = 'install' | 'uninstall' | 'upgrade' | 'upgradeAll' | 'reinstall' | 'cleanup' | 'config' | 'status';
-export type RebuildCommand = 'install' | 'upgrade' | 'cleanup' | 'reinstall' | 'uninstall';
-export type RebuildActionName = 'preflight.inspect' | 'stale.cleanup' | 'native.write' | 'artifacts.write' | 'active.prepare' | 'active.discard' | `lifecycle.${PluginLifecycleEvent}` | 'active.promote' | 'postcheck.inspect' | 'marketplace.commit' | 'marketplace.rollback' | 'recovery.cleanup' | 'cleanup.owned' | 'active.read' | 'active.remove' | 'active.release' | 'operation.lock' | 'operation.release';
+export type CommandAction = 'install' | 'uninstall' | 'reinstall' | 'cleanup' | 'config' | 'status';
+export type RebuildCommand = 'install' | 'sync' | 'cleanup' | 'reinstall' | 'uninstall';
+export type RebuildActionName = 'preflight.inspect' | 'stale.cleanup' | 'native.write' | 'artifacts.write' | 'preApply' | 'postcheck.inspect' | 'recovery.cleanup' | 'cleanup.owned';
 export type RebuildActionEventData = {
     name: RebuildActionName;
     phase: 'start';
@@ -43,7 +43,9 @@ export type ConfigValueState = 'default' | 'configured' | 'invalid';
 export type NextStepKind = 'uiAction' | 'cliCommand' | 'manual';
 export type ManualNextStepKind = 'guidance' | 'blocker' | 'documentation';
 export type TargetWriteState = 'completed' | 'failed';
+export type ConfigApplyTargetState = TargetWriteState | 'skipped';
 export type ReceiptOverallState = 'succeeded' | 'failed';
+export type RebuildReceiptOverallState = ReceiptOverallState | 'partial';
 export type CatalogGitRefPolicy = {
     type: 'explicit';
     ref: string;
@@ -53,6 +55,7 @@ export type CatalogGitRefPolicy = {
 interface CatalogSourceBase {
     id: CatalogSourceId;
     primary: boolean;
+    autoCheck?: boolean;
 }
 export interface GitCatalogSource extends CatalogSourceBase {
     type: 'git';
@@ -63,29 +66,163 @@ export interface GitCatalogSource extends CatalogSourceBase {
 export interface PathCatalogSource extends CatalogSourceBase {
     type: 'path';
     path: string;
+    managedBy?: {
+        kind: 'catalog-workspace';
+        workspaceIdentity: string;
+    };
 }
 export type CatalogSource = GitCatalogSource | PathCatalogSource;
 export interface CatalogSourcesConfig {
-    schemaVersion: 1;
+    schemaVersion: 2;
     sources: CatalogSource[];
 }
 export interface CatalogSourceResolution {
     sourceId: CatalogSourceId;
     sourceIdentity: SourceIdentity;
+    logicalIdentity: string;
     requestedRef: string;
     resolvedCommit: string;
     rootDir: string;
-    manifest: CatalogManifestV4;
+    manifest: CatalogManifestV7;
+    manifestDigest: string;
+    snapshotDigest: string;
+    transport: 'git' | 'path';
+    cleanup(): Promise<void>;
+}
+export interface CatalogGenerationActiveV1 {
+    sourceConfigFingerprint: string;
+    sourceIdentity: SourceIdentity;
+    requestedRef: string;
+    resolvedCommit: string;
+    logicalIdentity: string;
+    manifestDigest: string;
+    snapshotDigest: string;
+    activatedAt: string;
+}
+export interface CatalogGenerationLastSyncV1 {
+    syncedAt: string;
+    mode: 'check' | 'sync';
+    state: 'succeeded' | 'failed';
+    resolvedCommit?: string;
+    errorCode?: string;
+}
+export interface CatalogSourceGenerationStateV1 {
+    active?: CatalogGenerationActiveV1;
+    lastSync?: CatalogGenerationLastSyncV1;
+}
+export interface CatalogGenerationStateFileV1 {
+    schemaVersion: 1;
+    sources: Record<string, CatalogSourceGenerationStateV1>;
+}
+export interface CatalogGenerationMetadataV1 {
+    schemaVersion: 1;
+    logicalIdentity: string;
+    catalogVersion: string;
+    channel: CatalogChannel;
+    manifestDigest: string;
+    snapshotDigest: string;
+    requiredAwCapabilities: string[];
+}
+export interface CatalogGenerationSyncEvidence {
+    sourceIdentity: SourceIdentity;
+    logicalIdentity: string;
+    catalogVersion: string;
+    channel: CatalogChannel;
+    requestedRef: string;
+    resolvedCommit: string;
+    manifestDigest: string;
+    snapshotDigest: string;
+}
+export interface CatalogGenerationCandidateEvidence extends CatalogGenerationSyncEvidence {
+    sourceConfigFingerprint: string;
+}
+export interface CatalogGenerationCandidateComparison {
+    matches: boolean;
+    changedFields: Array<keyof CatalogGenerationCandidateEvidence>;
+}
+export type CatalogActivationMode = 'normal' | 'explicitSourceChange' | 'exactRepair' | 'replaceDamaged';
+export type CatalogSourceImpactCategory = 'installation' | 'config' | 'lifecycle' | 'marketplace';
+export interface CatalogSourceImpactReference {
+    category: CatalogSourceImpactCategory;
+    sourceId: string;
+    pluginId?: string;
+    platform?: PlatformName;
+    scope?: Scope;
+    projectRecord?: 'current' | 'historical' | 'unknown';
+    marketplaceName?: string;
+}
+export interface CatalogSourcePluginChanges {
+    added: string[];
+    removed: string[];
+    changed: string[];
+    newlyIncompatible: string[];
+    dependencyChanged: string[];
+    platformSupportChanged: CatalogSourcePlatformSupportChange[];
+}
+export interface CatalogSourcePlatformSupportChange {
+    pluginId: string;
+    removedPlatforms: PlatformName[];
+    addedPlatforms: PlatformName[];
+}
+export interface CatalogSourceImpactError {
+    code: 'stateInventoryFailed' | 'catalogManifestUnavailable';
+    kind: string;
+    relevance?: {
+        global: true;
+    } | {
+        global: false;
+        sourceId?: string;
+        pluginName?: string;
+        platform?: PlatformName;
+        scope?: Scope;
+    };
+}
+export interface CatalogSourcePrimaryChange {
+    fromSourceId: string;
+    toSourceId: string;
+}
+export interface CatalogSourceImpact {
+    impactSchemaVersion: 3;
+    sourceId: string;
+    primaryChange: CatalogSourcePrimaryChange | null;
+    inventoryComplete: boolean;
+    references: CatalogSourceImpactReference[];
+    affectedReferences: CatalogSourceImpactReference[];
+    changes: CatalogSourcePluginChanges;
+    errors: CatalogSourceImpactError[];
+}
+export interface CatalogGenerationSyncResult {
+    catalogGenerationSchemaVersion: 1;
+    sourceId: CatalogSourceId;
+    mode: 'check' | 'sync';
+    outcome: 'checked' | 'activated' | 'unchanged';
+    activeChanged: boolean;
+    resolution: CatalogGenerationSyncEvidence;
+    active?: CatalogGenerationActiveV1;
+    lastSync: CatalogGenerationLastSyncV1;
+    impact?: CatalogSourceImpact;
+}
+export interface CatalogGenerationSetSource {
+    sourceId: CatalogSourceId;
+    sourceConfigFingerprint: string;
+    sourceIdentity: SourceIdentity;
+    logicalIdentity: string;
+    catalogVersion: string;
+    resolvedCommit: string;
     manifestDigest: string;
     snapshotDigest: string;
-    cacheEntryKey: string;
-    source: 'remote' | 'cache' | 'path';
-    cacheFallback: boolean;
-    remoteFailure?: string;
+    storeKey: string;
+    snapshotPath: string;
+    manifest: CatalogManifestV7;
+}
+export interface CatalogGenerationSet {
+    generationSetDigest: string;
+    configDigest: string;
+    primarySourceId: CatalogSourceId;
+    sources: CatalogGenerationSetSource[];
 }
 export interface CatalogProviderRuntimeOptions {
     cliVersion: CliVersion;
-    freshnessPolicy: CatalogFreshnessPolicy;
     env?: NodeJS.ProcessEnv;
     signal?: AbortSignal;
 }
@@ -118,18 +255,80 @@ export interface ReceiptTargetResult {
     state: TargetWriteState;
     message?: string;
     errorCode?: string;
+    relation?: 'requested' | 'dependency';
+    requiredBy?: string[];
+    recoveryActions?: string[];
 }
+export interface ConfigApplyTargetIdentity {
+    pluginName: string;
+    pluginId?: PluginId;
+    platform: PlatformName;
+    scope: Scope;
+}
+export interface ConfigApplyTargetResult {
+    target: ConfigApplyTargetIdentity;
+    action: string;
+    state: ConfigApplyTargetState;
+    message?: string;
+    errorCode?: string;
+    relation?: 'requested' | 'dependency';
+    requiredBy?: string[];
+}
+export interface ConfigApplyError {
+    stage: 'schema' | 'source' | 'effectiveConfig' | 'targetDiscovery' | 'targetValidation' | 'apply';
+    code: string;
+    message: string;
+}
+export type ConfigApplyResult = {
+    state: 'skipped';
+    reason: 'notRequested' | 'noConfigChange' | 'noEffectiveConfigChange' | 'noVisibleTarget';
+    targetResults: [];
+} | {
+    state: 'unavailable';
+    reason: 'invalidConfig' | 'schemaUnavailable' | 'sourceUnavailable' | 'effectiveConfigUnavailable' | 'targetDiscoveryFailed';
+    targetResults: ConfigApplyTargetResult[];
+    error?: ConfigApplyError;
+} | {
+    state: 'succeeded';
+    targetResults: ConfigApplyTargetResult[];
+} | {
+    state: 'partial';
+    targetResults: ConfigApplyTargetResult[];
+    errors?: ConfigApplyError[];
+};
 export interface ConfigFieldEntry {
     key: string;
     title: string;
     kind: ConfigFieldKind;
     reserved: boolean;
     writable: boolean;
+    canSet: boolean;
+    canUnset: boolean;
     valueState: ConfigValueState;
     effectiveValue: unknown | null;
-    sourceLayer: 'default' | 'user' | 'project' | 'local' | null;
+    sourceLayer: 'default' | 'user' | 'project' | null;
     storedValue?: unknown;
-    storedSourceLayer?: 'user' | 'project' | 'local';
+    storedSourceLayer?: 'user' | 'project';
+    invalidOverride?: {
+        sourceLayer: 'default' | 'user' | 'project';
+        issues: unknown[];
+    };
+    fallback?: {
+        state: 'valid';
+        effectiveValue: unknown;
+        sourceLayer: 'default' | 'user' | 'project';
+    } | {
+        state: 'invalid';
+        sourceLayer: 'default' | 'user' | 'project';
+        issues: unknown[];
+    } | {
+        state: 'missing';
+    };
+    value: unknown | null;
+    source: 'default' | 'user' | 'project' | 'missing';
+    matchedPreset: string | null;
+    valid: boolean;
+    issues: unknown[];
 }
 export interface ConfigReceiptFieldEntry {
     key: string;
@@ -138,8 +337,17 @@ export interface ConfigReceiptFieldEntry {
     reserved: boolean;
     action: 'set' | 'unset' | 'reset';
     scope: Scope;
-    projectLayer?: 'shared' | 'local';
     valueState?: ConfigValueState;
+    stale?: true;
+}
+export declare const CONFIG_MUTATION_RECEIPT_SCHEMA_VERSION = 7;
+export type ConfigMutationCommand = 'config:set' | 'config:unset' | 'config:reset';
+export interface ConfigMutationReceiptBase<Command extends ConfigMutationCommand = ConfigMutationCommand> {
+    receiptSchemaVersion: typeof CONFIG_MUTATION_RECEIPT_SCHEMA_VERSION;
+    command: Command;
+    ok: boolean;
+    overallState: RebuildReceiptOverallState;
+    configWrite: 'notStarted' | 'failed' | 'succeeded';
 }
 export interface ConfigSchemaEvidence {
     source: 'currentCatalog';
@@ -242,6 +450,11 @@ export interface AgentVersionRequirement {
     displayName: string;
     minVersion: StrictSemVerString;
 }
+export interface CodexOperationRequirement {
+    scope: Scope;
+    minimumVersion: StrictSemVerString;
+    requiresProjectPluginContract: boolean;
+}
 export interface AgentVersionProbeResult {
     platform: PlatformName;
     command: string;
@@ -276,10 +489,21 @@ export interface CommandOptions {
     platform: PlatformSelection;
     cwd: string;
     scriptTimeoutMs?: number;
+    allowManagedCodexInstall?: boolean;
+    yes?: boolean;
+}
+export interface DependencyScopeOverride {
+    pluginId: string;
+    platform: PlatformName;
+    scope: Scope;
+}
+export interface DependencyScopeSelector {
+    pluginId: string;
+    platform?: PlatformName;
+    scope: Scope;
 }
-export type InstallCommandOptions = CommandOptions;
-export interface UpgradeCommandOptions extends CommandOptions {
-    all?: boolean;
+export interface InstallCommandOptions extends CommandOptions {
+    dependencyScopeOverrides?: DependencyScopeSelector[];
 }
 export interface StatusCommandOptions {
     cwd: string;
@@ -303,11 +527,9 @@ export declare class AgentVersionGateError extends Error {
     constructor(message: string, payload: AgentVersionGateErrorPayload);
 }
 export declare function isAgentVersionGateError(error: unknown): error is AgentVersionGateError;
-export type CatalogFreshnessPolicy = 'cacheFirst' | 'requireRemote' | 'forceRemote';
 export interface CatalogResolution {
     rootDir: string;
-    source: 'local' | 'embedded' | 'remote' | 'cache';
+    source: 'local' | 'embedded';
     channel?: CatalogChannel;
     catalogVersion?: CatalogVersion;
-    minAwVersion?: CliVersion;
 }

package/dist/src/types.js

@@ -1,3 +1,4 @@
+export const CONFIG_MUTATION_RECEIPT_SCHEMA_VERSION = 7;
 export class CommandWarningError extends Error {
     warnings;
     exitCode;

package/dist/src/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAuXA,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IACnC,QAAQ,CAAW;IACnB,QAAQ,CAAS;IAE1B,YACE,OAAe,EACf,UAGI,EAAE;QAEN,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;IACxC,CAAC;CACF;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,OAAO,CACL,KAAK,YAAY,KAAK;QACtB,KAAK,CAAC,IAAI,KAAK,qBAAqB;QACpC,KAAK,CAAC,OAAO,CAAE,KAA6B,CAAC,QAAQ,CAAC;QACtD,OAAQ,KAA6B,CAAC,QAAQ,KAAK,QAAQ,CAC5D,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IACrC,IAAI,GAAG,2BAA2B,CAAC;IACnC,OAAO,CAA+B;IAE/C,YACE,OAAe,EACf,OAAqC;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,OAAO,CACL,KAAK,YAAY,KAAK;QACtB,KAAK,CAAC,IAAI,KAAK,uBAAuB;QACtC,OAAQ,KAA+B,CAAC,IAAI,KAAK,QAAQ;QACzD,OAAQ,KAA+B,CAAC,OAAO,KAAK,QAAQ;QAC5D,KAAK,CAAC,OAAO,CAAE,KAA+B,CAAC,OAAO,CAAC,QAAQ,CAAC,CACjE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AA6aA,MAAM,CAAC,MAAM,sCAAsC,GAAG,CAAC,CAAC;AA6MxD,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IACnC,QAAQ,CAAW;IACnB,QAAQ,CAAS;IAE1B,YACE,OAAe,EACf,UAGI,EAAE;QAEN,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;IACxC,CAAC;CACF;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,OAAO,CACL,KAAK,YAAY,KAAK;QACtB,KAAK,CAAC,IAAI,KAAK,qBAAqB;QACpC,KAAK,CAAC,OAAO,CAAE,KAA6B,CAAC,QAAQ,CAAC;QACtD,OAAQ,KAA6B,CAAC,QAAQ,KAAK,QAAQ,CAC5D,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IACrC,IAAI,GAAG,2BAA2B,CAAC;IACnC,OAAO,CAA+B;IAE/C,YACE,OAAe,EACf,OAAqC;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,OAAO,CACL,KAAK,YAAY,KAAK;QACtB,KAAK,CAAC,IAAI,KAAK,uBAAuB;QACtC,OAAQ,KAA+B,CAAC,IAAI,KAAK,QAAQ;QACzD,OAAQ,KAA+B,CAAC,OAAO,KAAK,QAAQ;QAC5D,KAAK,CAAC,OAAO,CAAE,KAA+B,CAAC,OAAO,CAAC,QAAQ,CAAC,CACjE,CAAC;AACJ,CAAC"}

package/dist/src/utils/agent-version.d.ts

@@ -1,13 +1,19 @@
-import type { AgentVersionProbeResult, AgentVersionRequirement, PlatformName } from '../types.js';
+import type { AgentVersionProbeResult, AgentVersionRequirement, CodexOperationRequirement, PlatformName, Scope } from '../types.js';
 import { type NativeCliRunner } from './native-cli.js';
 export interface ProbeAgentVersionOptions {
+    argsPrefix?: string[];
+    cache?: boolean;
+    command?: string;
     cwd?: string;
     env?: NodeJS.ProcessEnv;
+    minimumVersion?: string;
     runner?: NativeCliRunner;
     timeoutMs?: number;
 }
 export declare function getMinimumAgentVersion(platform: PlatformName): string;
 export declare function getAgentVersionRequirement(platform: PlatformName): AgentVersionRequirement;
+export declare function getCodexOperationRequirement(scope: Scope): CodexOperationRequirement;
 export declare function extractStrictSemVerTokenFromVersionOutput(output: string): string | null;
 export declare function probeAgentVersion(platform: PlatformName, options?: ProbeAgentVersionOptions): Promise<AgentVersionProbeResult>;
+export declare function probeCodexOperationVersion(requirement: CodexOperationRequirement, options?: Omit<ProbeAgentVersionOptions, 'minimumVersion'>): Promise<AgentVersionProbeResult>;
 export declare function clearAgentVersionProbeCacheForTests(): void;

package/dist/src/utils/agent-version.js

@@ -1,6 +1,7 @@
 import crypto from 'node:crypto';
-import { AGENT_VERSION_DISPLAY_NAMES, AGENT_VERSION_PROBE_COMMANDS, DEFAULT_AGENT_VERSION_PROBE_TIMEOUT_MS, MINIMUM_AGENT_VERSIONS, } from '../constants.js';
+import { AGENT_VERSION_DISPLAY_NAMES, AGENT_VERSION_PROBE_COMMANDS, CODEX_PROJECT_PLUGIN_MIN_VERSION, DEFAULT_AGENT_VERSION_PROBE_TIMEOUT_MS, MINIMUM_AGENT_VERSIONS, } from '../constants.js';
 import { compareStrictSemVer, tryParseStrictSemVer } from './manifest.js';
+import { getCodexHome } from './state-paths.js';
 import { getDefaultNativeCliRunner, isNativeCliExecutableMissingError, runNativeCli, summarizeNativeCliFailure, } from './native-cli.js';
 const VERSION_ARGUMENTS = ['--version'];
 let probeCacheByRunner = new WeakMap();
@@ -15,6 +16,16 @@ export function getAgentVersionRequirement(platform) {
         minVersion: getMinimumAgentVersion(platform),
     };
 }
+export function getCodexOperationRequirement(scope) {
+    const requiresProjectPluginContract = scope === 'project';
+    return {
+        scope,
+        minimumVersion: requiresProjectPluginContract
+            ? CODEX_PROJECT_PLUGIN_MIN_VERSION
+            : MINIMUM_AGENT_VERSIONS.codex,
+        requiresProjectPluginContract,
+    };
+}
 export function extractStrictSemVerTokenFromVersionOutput(output) {
     for (const token of output.split(/\s+/u)) {
         if (token && tryParseStrictSemVer(token)) {
@@ -41,11 +52,11 @@ function buildProbeCacheKey(platform, requirement, options) {
     const env = options.env ?? process.env;
     return JSON.stringify({
         platform,
-        command: requirement.command,
-        args: VERSION_ARGUMENTS,
+        command: options.command ?? requirement.command,
+        args: [...(options.argsPrefix ?? []), ...VERSION_ARGUMENTS],
         cwd: options.cwd ?? process.cwd(),
         timeoutMs: options.timeoutMs ?? DEFAULT_AGENT_VERSION_PROBE_TIMEOUT_MS,
-        minVersion: requirement.minVersion,
+        minVersion: options.minimumVersion ?? requirement.minVersion,
         envFingerprint: createEnvFingerprint(env),
     });
 }
@@ -74,8 +85,20 @@ function createFailureProbeResult(requirement, status, options = {}) {
     };
 }
 export async function probeAgentVersion(platform, options = {}) {
-    const requirement = getAgentVersionRequirement(platform);
+    const baseRequirement = getAgentVersionRequirement(platform);
+    const requirement = options.minimumVersion === undefined
+        ? baseRequirement
+        : {
+            ...baseRequirement,
+            minVersion: options.minimumVersion,
+        };
+    if (!tryParseStrictSemVer(requirement.minVersion)) {
+        throw new Error(`Invalid agent version requirement: ${requirement.minVersion}.`);
+    }
     const runner = options.runner ?? getDefaultNativeCliRunner();
+    if (options.cache === false) {
+        return probeAgentVersionUncached(requirement, runner, options);
+    }
     const cacheKey = buildProbeCacheKey(platform, requirement, options);
     let runnerCache = probeCacheByRunner.get(runner);
     if (!runnerCache) {
@@ -94,13 +117,23 @@ export async function probeAgentVersion(platform, options = {}) {
     runnerCache.set(cacheKey, probe);
     return cloneProbeResult(await probe);
 }
+export function probeCodexOperationVersion(requirement, options = {}) {
+    return probeAgentVersion('codex', {
+        ...options,
+        minimumVersion: requirement.minimumVersion,
+    });
+}
 async function probeAgentVersionUncached(requirement, runner, options) {
     try {
+        const env = options.env ?? process.env;
         const result = await runNativeCli({
-            command: requirement.command,
-            args: VERSION_ARGUMENTS,
+            command: options.command ?? requirement.command,
+            args: [...(options.argsPrefix ?? []), ...VERSION_ARGUMENTS],
             cwd: options.cwd,
-            env: options.env,
+            env: requirement.platform === 'codex'
+                ? { ...env, CODEX_HOME: getCodexHome(env) }
+                : options.env,
+            agentKind: requirement.platform,
             timeoutMs: options.timeoutMs ?? DEFAULT_AGENT_VERSION_PROBE_TIMEOUT_MS,
         }, runner);
         const rawOutput = combineProbeOutput(result.stdout, result.stderr);

package/dist/src/utils/agent-version.js.map

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

package/dist/src/utils/artifact-plan.d.ts

@@ -1,4 +1,4 @@
-import type { ArtifactPlanArtifact, PlatformName, DistributionName, PluginArtifactTargetDefinition, PluginManifestSource, Scope } from '../types.js';
+import type { ArtifactPlanArtifact, PlatformName, DistributionName, NormalizedPluginManifest, PluginArtifactTargetDefinition, Scope } from '../types.js';
 import type { ResolvedArtifactRenderConfig } from './artifact-renderer.js';
 export type ValidatedArtifactPlanArtifact = ArtifactPlanArtifact & {
     declaration: PluginArtifactTargetDefinition;
@@ -11,16 +11,17 @@ export interface ValidatedArtifactPlan {
 }
 export declare function createArtifactConfigDigest(options: {
     artifact: Pick<ArtifactPlanArtifact, 'id' | 'platform' | 'distribution' | 'target' | 'refreshKeys'>;
-    configValues: Record<string, unknown>;
+    renderConfig: Pick<ResolvedArtifactRenderConfig, 'values' | 'sources' | 'issues'>;
     digestSalt: string;
 }): string;
 export declare function validateArtifactPlan(options: {
     pluginName?: string;
-    manifest: PluginManifestSource;
+    manifest: NormalizedPluginManifest;
     plan: unknown;
     platform: PlatformName | DistributionName;
     scope: Scope;
-    renderConfig: Pick<ResolvedArtifactRenderConfig, 'values'>;
+    requestedArtifactIds: readonly string[];
+    renderConfig: Pick<ResolvedArtifactRenderConfig, 'values' | 'sources' | 'issues'>;
     rendererDigest?: string;
     manifestDigest?: string;
 }): ValidatedArtifactPlan;

package/dist/src/utils/artifact-plan.js

@@ -2,6 +2,7 @@ import crypto from 'node:crypto';
 import path from 'node:path';
 import { assertPlatformFieldSupported } from './manifest.js';
 import { validatePortableSkillName } from './dynamic-skill-tree.js';
+import { resolveArtifactRequest } from './artifact-request.js';
 const SUPPORTED_ARTIFACT_TARGETS = new Set([
     'codex.developerInstructionsBlock',
     'codex.agentRole',
@@ -296,7 +297,7 @@ function normalizeArtifact(options) {
             logicalIdentity,
             configDigest: createArtifactConfigDigest({
                 artifact: normalized,
-                configValues: options.renderConfig.values,
+                renderConfig: options.renderConfig,
                 digestSalt: options.digestSalt,
             }),
         };
@@ -330,7 +331,7 @@ function normalizeArtifact(options) {
             logicalIdentity,
             configDigest: createArtifactConfigDigest({
                 artifact: normalized,
-                configValues: options.renderConfig.values,
+                renderConfig: options.renderConfig,
                 digestSalt: options.digestSalt,
             }),
         };
@@ -360,7 +361,7 @@ function normalizeArtifact(options) {
         logicalIdentity,
         configDigest: createArtifactConfigDigest({
             artifact: normalized,
-            configValues: options.renderConfig.values,
+            renderConfig: options.renderConfig,
             digestSalt: options.digestSalt,
         }),
     };
@@ -386,20 +387,30 @@ export function createArtifactConfigDigest(options) {
         distribution: options.artifact.distribution,
         target: options.artifact.target,
         id: options.artifact.id,
-        refreshValues: options.artifact.refreshKeys.map((key) => ({
+        refreshInputs: options.artifact.refreshKeys.map((key) => ({
             key,
-            present: Object.hasOwn(options.configValues, key),
-            value: options.configValues[key],
+            present: Object.hasOwn(options.renderConfig.values, key),
+            value: options.renderConfig.values[key],
+            source: options.renderConfig.sources[key],
+            issues: options.renderConfig.issues.filter((issue) => issue.key === key),
         })),
     });
 }
 export function validateArtifactPlan(options) {
     const pluginName = options.pluginName ?? options.manifest.name;
-    const declarationMap = getDeclaredTargets({
+    const allDeclarations = getDeclaredTargets({
         manifest: options.manifest,
         platform: options.platform,
         scope: options.scope,
     });
+    const request = resolveArtifactRequest({
+        manifest: options.manifest,
+        platform: options.platform,
+        scope: options.scope,
+        requestedArtifactIds: options.requestedArtifactIds,
+    });
+    const requestedIds = new Set(request.requestedArtifactIds);
+    const declarationMap = new Map([...allDeclarations].filter(([, declaration]) => requestedIds.has(declaration.id)));
     const parsedPlan = resolvePlanObject(options.plan);
     const digestSalt = resolveDigestSalt({
         manifest: options.manifest,