@contentful/experience-design-system-cli 2.25.2-dev-build-7edb0e3.0 → 2.25.2

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.25.2-dev-build-7edb0e3.0",
+  "version": "2.25.2",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/analytics/client.js

@@ -3,10 +3,7 @@ import { Analytics } from '@segment/analytics-node';
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
 // Anonymous usage telemetry for the CLI. Disabled when DISABLE_ANALYTICS is set
-// or when the setup preference opts out. Never blocks command execution.
-// Public write key scoped to data source. Grants write-only event ingest; a
-// distributed CLI cannot hold a secret, so this ships in source by design.
-const DEFAULT_WRITE_KEY = '6DmxiEPN3SV1vbRTTMcNqDzCvkfwT06N';
+// or when no write key is configured. Never blocks command execution.
 let analyticsClient = null;
 let persistedDisabled = false;
 export function cliVersion() {
@@ -19,13 +16,11 @@ export function setPersistedAnalyticsDisabled(disabled) {
     persistedDisabled = disabled;
 }
 export function analyticsEnabled() {
-    return !persistedDisabled && !process.env.DISABLE_ANALYTICS;
+    return !persistedDisabled && !process.env.DISABLE_ANALYTICS && Boolean(resolveWriteKey());
 }
-// SEGMENT_WRITE_KEY overrides the default so engineers can point a local run at
-// their own staging connection.
 function resolveWriteKey() {
     const key = (process.env.SEGMENT_WRITE_KEY ?? '').trim();
-    return key.length > 0 ? key : DEFAULT_WRITE_KEY;
+    return key.length > 0 ? key : undefined;
 }
 function getClient() {
     if (!analyticsEnabled())

package/dist/src/analyze/select-agent/command.js

@@ -204,7 +204,7 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
     let cliVersion = '';
     if (!cacheConfig.noCache) {
         try {
-            promptHash = await hashPromptForSkill('select', skillPathOverride);
+            promptHash = await hashPromptForSkill('select', agent, model, skillPathOverride);
             cliVersion = await getCliCacheVersion();
             const db = openPipelineDb(cacheConfig.dbPath);
             try {

package/dist/src/generate/command.js

@@ -415,7 +415,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
         const db = openPipelineDb();
         let componentResults;
         try {
-            const promptHash = await hashPromptForSkill('components', generatePromptPath);
+            const promptHash = await hashPromptForSkill('components', agent, model, generatePromptPath);
             componentResults = await runAllComponents(agent, model, db, sessionId, allComponents, tokensInline, tokenMapInline, verbose, opts.cache === false || process.env.EDS_NO_CACHE === '1', generatePromptPath, promptHash);
         }
         finally {
@@ -477,7 +477,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
             }
             sessionId = resolvedSessionId;
             await bindAnalyticsSessionId(resolvedSessionId);
-            const tokenPromptHash = await hashPromptForSkill('tokens');
+            const tokenPromptHash = await hashPromptForSkill('tokens', agent, model);
             // Check cache before invoking agent
             if (!noCache) {
                 const tokenCached = lookupCache(db, tokenInputHash, 'token_set', '__tokens__', tokenPromptHash);

package/dist/src/session/cache-keys.d.ts

@@ -9,7 +9,14 @@ export declare function hashFile(filePath: string): Promise<string>;
  * generation_cache so cache entries invalidate when the prompt itself changes
  * (including bundled-skill updates across CLI versions).
  *
+ * Also folds in the resolved agent and model: a cache hit must not stand in
+ * for an agent run that was never made with the currently requested
+ * agent/model, or `--agent`/`--model` overrides would appear to be ignored
+ * whenever a prior cache entry already exists for the same input/prompt.
+ *
  * @param skill — which skill (matches resolveSkillPath in prompt-builder)
+ * @param agent — resolved agent name for this run
+ * @param model — resolved model for this run (undefined resolves to the agent's default)
  * @param skillPathOverride — optional absolute/relative path to a custom prompt
  */
-export declare function hashPromptForSkill(skill: Skill, skillPathOverride?: string): Promise<string>;
+export declare function hashPromptForSkill(skill: Skill, agent: string, model: string | undefined, skillPathOverride?: string): Promise<string>;

package/dist/src/session/cache-keys.js

@@ -26,13 +26,19 @@ export async function hashFile(filePath) {
  * generation_cache so cache entries invalidate when the prompt itself changes
  * (including bundled-skill updates across CLI versions).
  *
+ * Also folds in the resolved agent and model: a cache hit must not stand in
+ * for an agent run that was never made with the currently requested
+ * agent/model, or `--agent`/`--model` overrides would appear to be ignored
+ * whenever a prior cache entry already exists for the same input/prompt.
+ *
  * @param skill — which skill (matches resolveSkillPath in prompt-builder)
+ * @param agent — resolved agent name for this run
+ * @param model — resolved model for this run (undefined resolves to the agent's default)
  * @param skillPathOverride — optional absolute/relative path to a custom prompt
  */
-export async function hashPromptForSkill(skill, skillPathOverride) {
-    if (skillPathOverride) {
-        return hashFile(resolve(skillPathOverride));
-    }
-    const bundled = resolveSkillPath(skill);
-    return hashFile(bundled);
+export async function hashPromptForSkill(skill, agent, model, skillPathOverride) {
+    const promptHash = skillPathOverride
+        ? await hashFile(resolve(skillPathOverride))
+        : await hashFile(resolveSkillPath(skill));
+    return hashContent(`${promptHash}|${agent}|${model ?? ''}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.25.2-dev-build-7edb0e3.0",
+  "version": "2.25.2",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -34,10 +34,10 @@
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",
     "react-dom": "^18.3.1",
-    "@contentful/experience-design-system-extraction": "2.25.2-dev-build-7edb0e3.0",
-    "@contentful/experience-design-system-client": "2.25.2-dev-build-7edb0e3.0",
-    "@contentful/experience-design-system-generation": "2.25.2-dev-build-7edb0e3.0",
-    "@contentful/experience-design-system-types": "2.25.2-dev-build-7edb0e3.0"
+    "@contentful/experience-design-system-client": "2.25.2",
+    "@contentful/experience-design-system-generation": "2.25.2",
+    "@contentful/experience-design-system-extraction": "2.25.2",
+    "@contentful/experience-design-system-types": "2.25.2"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",