@contentful/experience-design-system-cli 2.37.1-dev-build-f0533497.0 → 2.37.1-dev-build-1c5cd11a.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-f0533497.0",
+  "version": "2.37.1-dev-build-1c5cd11a.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,6 @@
   },
   "dependencies": {
     "@contentful/experience-design-system-backend-pipeline": "workspace:*",
-    "@contentful/experience-design-system-generation": "workspace:*",
     "@contentful/experience-design-system-types": "workspace:*",
     "@inkjs/ui": "^2.0.0",
     "@segment/analytics-node": "^3.0.0",

package/dist/src/tui/import/steps/07-scope-gate/cache-check.d.ts

@@ -7,23 +7,11 @@ export interface CacheCheckInput {
     existingEntitiesPath: string | null;
     noCache: boolean;
 }
-interface CacheCheckProcess {
-    exitCode: number;
-    stdout: string;
-    stderr: string;
-}
-/** Runs the legacy CLI with these arguments and waits for it to exit. */
-export type RunLegacyCli = (args: string[]) => Promise<CacheCheckProcess>;
-/**
- * The arguments of `generate components --cache-status --restore-cache`, in the order the wizard built them: the
- * generate arguments first, then the two cache flags. Arguments are not shell-quoted; they go straight to `node`.
- */
-export declare function buildCacheCheckArgs(input: CacheCheckInput): string[];
-/** The names on the `cache-components=["A","B"]` line. Anything missing or unreadable is an empty list. */
-export declare function parseCacheComponents(stdout: string): string[];
 /**
- * Never throws: any failure (spawn error, non-zero exit, no output line, bad JSON) resolves to an empty list. With the
- * cache off there is nothing to restore, so the command is not run at all.
+ * Runs the generation cache check in-process while the scope gate is open.
+ * Restores cached CDF entries into the pipeline database as a side-effect so
+ * the generate run that follows can skip them. A failed check is
+ * indistinguishable from "nothing cached", as in legacy. INTEG-5050 tracks
+ * surfacing it.
  */
-export declare function checkGenerationCache(input: CacheCheckInput, run?: RunLegacyCli): Promise<string[]>;
-export {};
+export declare function checkGenerationCache(input: CacheCheckInput): Promise<string[]>;

package/dist/src/tui/import/steps/08-generation/logic.d.ts

@@ -1,22 +1,5 @@
 import type { GenerationProgress } from './types.js';
 export declare function initialProgress(): GenerationProgress;
-/**
- * Folds a chunk of `__generate components` stderr into the progress. Two line shapes carry it:
- *  1. `progress=generate:<done>/<total>:<name>`, emitted when a component finishes. `done` is the count of finished
- *     components and never goes down.
- *  2. `[<index>/<total>] <name>`, emitted when a component starts (and again on a retry). With more than one worker its
- *     index is the worker's starting position, not a count of completions, so it must only change `current`.
- */
-export declare function applyGenerateStderr(chunk: string, previous: GenerationProgress['components']): GenerationProgress['components'];
-/** The session, the component count and the renamed-slot count from the command's output. */
-export declare function parseGenerateResult(output: {
-    stdout: string;
-    stderr: string;
-}, fallbackCount: number): {
-    generateSessionId: string | null;
-    generatedCount: number;
-    renamedSlotsCount: number;
-};
 /** Token mapping runs only when there is something to map and tokens to map it from. */
 export declare function shouldRunMapTokens(counts: {
     mappablePropCount: number;

package/dist/src/tui/import/steps/08-generation/run.d.ts

@@ -1,24 +1,20 @@
-import { checkAgentAuth } from '@contentful/experience-design-system-generation';
-import { type CacheCheckInput } from '../07-scope-gate/cache-check.js';
+import { checkAgentAuth, runGenerateComponentsSession, runMapTokens } from '@contentful/experience-design-system-backend-pipeline';
 import { prepareMapTokens } from './map-tokens.js';
-import { runMapTokens, spawnGenerate } from './processes.js';
 import { saveDecisions } from './save-decisions.js';
 import type { GenerationInput, GenerationProgress, GenerationResult } from './types.js';
-/** The outside world the stage talks to, so the order of events can be tested without a database, an agent or a CLI. */
 export interface GenerationDeps {
     checkAgentAuth: typeof checkAgentAuth;
     saveDecisions: typeof saveDecisions;
-    checkCache: (input: CacheCheckInput) => Promise<string[]>;
-    spawnGenerate: typeof spawnGenerate;
-    prepareMapTokens: typeof prepareMapTokens;
+    runGenerate: typeof runGenerateComponentsSession;
     runMapTokens: typeof runMapTokens;
+    prepareMapTokens: typeof prepareMapTokens;
 }
 /**
  * The whole stage, in the order the wizard ran it:
  *  1. Wait for the cache check that ran while the scope gate was open, then save the decisions. Both write to the
- *     pipeline database and the cache has to be restored first. With nothing accepted the stage ends here, as the wizard's did.
- *  2. If every accepted component is in the cache, take them all from it. Otherwise look at the cache again, because the
- *     earlier answer was read before the decisions were saved, and generate only what is still missing.
+ *     pipeline database and the cache has to be restored first. With nothing accepted the stage ends here.
+ *  2. Generate the accepted components in-process. The orchestrator handles per-component cache lookup, so the names
+ *     from the cache check are forwarded as `precomputedCachedNames` to skip a redundant lookup.
  *  3. Map tokens onto the generated session. Skipped when there is nothing to map.
  * A failed token mapping after a successful generation is an error to show. It neither retries nor throws away what was
  * generated.

package/legacy/dist/src/index.js

@@ -24413,6 +24413,107 @@ var init_run_generate_tokens_session = __esm({
   }
 });
 
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-empty-session-response.js
+var init_build_empty_session_response = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-empty-session-response.js"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/collect-duplicate-names.js
+var init_collect_duplicate_names = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/collect-duplicate-names.js"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/filter-dropped-allowed-components.js
+var init_filter_dropped_allowed_components = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/filter-dropped-allowed-components.js"() {
+    "use strict";
+    init_db2();
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/read-existing-entities.js
+var init_read_existing_entities = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/read-existing-entities.js"() {
+    "use strict";
+    init_read_from_session();
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/resolve-generate-prompt.js
+var init_resolve_generate_prompt = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/resolve-generate-prompt.js"() {
+    "use strict";
+    init_parse_prompt_overrides();
+    init_resolve_prompt_override();
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-one-generate-component.js
+var DEFAULT_TIMEOUT_MS6, RETRY_BACKOFF_MS2;
+var init_run_one_generate_component = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-one-generate-component.js"() {
+    "use strict";
+    init_build_prompt2();
+    init_describe_agent_failure2();
+    init_invoke_agent_with_output();
+    init_parse_tool_calls();
+    init_db2();
+    init_normalize_component_for_cache();
+    init_resolve_component_cache();
+    init_summarize_for_generate();
+    DEFAULT_TIMEOUT_MS6 = Number(process.env["EDS_AGENT_TIMEOUT_MS"] ?? 5 * 60 * 1e3);
+    RETRY_BACKOFF_MS2 = Number(process.env["EDS_RETRY_BACKOFF_MS"] ?? 5e3);
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-with-pool.js
+var init_run_with_pool = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-with-pool.js"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js
+var init_check_generate_components_cache = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js"() {
+    "use strict";
+    init_summarize_for_map_tokens();
+    init_resolve_component_cache();
+    init_normalize_component_for_cache();
+    init_db2();
+    init_cache_keys2();
+    init_src3();
+    init_read_existing_entities();
+    init_resolve_generate_prompt();
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/run-generate-components-session.js
+var DEFAULT_COMPONENT_CONCURRENCY2;
+var init_run_generate_components_session = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/run-generate-components-session.js"() {
+    "use strict";
+    init_create_local_cli_agent_invoker();
+    init_db2();
+    init_cache_keys2();
+    init_src3();
+    init_summarize_for_map_tokens();
+    init_build_empty_session_response();
+    init_collect_duplicate_names();
+    init_filter_dropped_allowed_components();
+    init_read_existing_entities();
+    init_resolve_generate_prompt();
+    init_run_one_generate_component();
+    init_run_with_pool();
+    init_check_generate_components_cache();
+    DEFAULT_COMPONENT_CONCURRENCY2 = Number(process.env["EDS_GENERATE_CONCURRENCY"] ?? 10);
+  }
+});
+
 // packages/experience-design-system-backend-pipeline/dist/src/index.js
 var init_src5 = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/index.js"() {
@@ -24528,6 +24629,7 @@ var init_src5 = __esm({
     init_component();
     init_run_extract_and_compose_session();
     init_run_generate_tokens_session();
+    init_run_generate_components_session();
   }
 });
 

package/legacy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-f0533497.0",
+  "version": "2.37.1-dev-build-1c5cd11a.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,6 @@
   },
   "dependencies": {
     "@contentful/experience-design-system-backend-pipeline": "workspace:*",
-    "@contentful/experience-design-system-generation": "workspace:*",
     "@contentful/experience-design-system-types": "workspace:*",
     "@inkjs/ui": "^2.0.0",
     "@segment/analytics-node": "^3.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-f0533497.0",
+  "version": "2.37.1-dev-build-1c5cd11a.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,9 +45,8 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-f0533497.0",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-f0533497.0",
-    "@contentful/experience-design-system-generation": "2.37.1-dev-build-f0533497.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-1c5cd11a.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-1c5cd11a.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",

package/dist/src/tui/import/steps/08-generation/processes.d.ts

@@ -1,42 +0,0 @@
-export interface GenerateCommand {
-    sessionId: string;
-    tokensPath: string;
-    agent: string;
-    agentModel?: string;
-    promptOverrides: string[];
-    generatePromptPath?: string;
-    noCache: boolean;
-    existingEntitiesPath: string | null;
-    /** Accepted components the cache already holds, so the command skips them. */
-    cachedComponents: string[];
-}
-export interface MapTokensCommand {
-    sessionId: string;
-    agent: string;
-    agentModel?: string;
-    promptOverrides: string[];
-    noCache: boolean;
-    existingEntitiesPath: string | null;
-}
-export interface SpawnedResult {
-    exitCode: number;
-    stdout: string;
-    stderr: string;
-}
-/**
- * `__generate components …`, in the order the wizard builds the arguments. The cache was already restored by the check
- * that ran while the scope gate was open, so `--restore-cache` is not passed here; what the cache holds goes in
- * `--cached-components` instead.
- */
-export declare function buildGenerateArgs(cliPath: string, command: GenerateCommand): string[];
-/** `map tokens …`, in the order the wizard builds the arguments. */
-export declare function buildMapTokensArgs(command: MapTokensCommand): string[];
-/**
- * Runs `__generate components`, delivering stderr as it arrives. Resolves on close, not exit, so the child's stdio and
- * any file handles it inherited (the pipeline database's WAL and SHM files) are released before anything else touches
- * the database.
- */
-export declare function spawnGenerate(command: GenerateCommand, handlers: {
-    onStderr: (chunk: string) => void;
-}): Promise<SpawnedResult>;
-export declare function runMapTokens(command: MapTokensCommand): Promise<SpawnedResult>;