@contentful/experience-design-system-cli 2.32.1-dev-build-661f431.0 → 2.32.1-dev-build-26a2030.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-661f431.0",
+  "version": "2.32.1-dev-build-26a2030.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/index.js

@@ -8942,6 +8942,76 @@ var init_session_resolver = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/session/core/tokens/build-dtcg-groups.ts
+function buildDtcgGroups(groupRows, tokenRows) {
+  return groupRows.map((r) => {
+    const prefix = `${r.path}.`;
+    const tokenIds = tokenRows.filter((t) => t.path.startsWith(prefix) && !t.path.slice(prefix.length).includes(".")).map((t) => t.path);
+    const g = { path: r.path, tokenIds };
+    if (r.description !== null) g.$description = r.description;
+    return g;
+  });
+}
+var init_build_dtcg_groups = __esm({
+  "packages/experience-design-system-cli/src/session/core/tokens/build-dtcg-groups.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/tokens/build-dtcg-tokens.ts
+function buildDtcgTokens(tokenRows) {
+  return tokenRows.map((r) => {
+    const t = {
+      path: r.path,
+      $type: r.type,
+      $value: JSON.parse(r.value)
+    };
+    if (r.description !== null) t.$description = r.description;
+    return t;
+  });
+}
+var init_build_dtcg_tokens = __esm({
+  "packages/experience-design-system-cli/src/session/core/tokens/build-dtcg-tokens.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/tokens/read.ts
+function getDtcgTokensForSession(db, sessionId2) {
+  const groupRows = db.prepare("SELECT path, description FROM raw_token_groups WHERE session_id = ? ORDER BY path").all(sessionId2).map((row) => ({
+    path: String(row.path),
+    description: row.description === null ? null : String(row.description)
+  }));
+  const tokenRows = db.prepare("SELECT path, type, value, description FROM raw_tokens WHERE session_id = ? ORDER BY path").all(sessionId2).map((row) => ({
+    path: String(row.path),
+    type: String(row.type),
+    value: String(row.value),
+    description: row.description === null ? null : String(row.description)
+  }));
+  return {
+    groups: buildDtcgGroups(groupRows, tokenRows),
+    tokens: buildDtcgTokens(tokenRows)
+  };
+}
+function getRawTokenNamePaths(db, sessionId2) {
+  const rows = db.prepare("SELECT raw_name, path FROM raw_token_name_paths WHERE session_id = ? ORDER BY raw_name").all(sessionId2);
+  return Object.fromEntries(rows.map((row) => [String(row.raw_name), String(row.path)]));
+}
+function getRawTokenNamePathRows(db, sessionId2) {
+  return db.prepare("SELECT raw_name, path, source FROM raw_token_name_paths WHERE session_id = ? ORDER BY raw_name").all(sessionId2).map((row) => ({
+    rawName: String(row.raw_name),
+    path: String(row.path),
+    source: String(row.source)
+  }));
+}
+var init_read3 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/tokens/read.ts"() {
+    "use strict";
+    init_build_dtcg_groups();
+    init_build_dtcg_tokens();
+  }
+});
+
 // packages/experience-design-system-cli/src/session/core/components/hash-component-shape.ts
 import { createHash as createHash2 } from "node:crypto";
 function hashComponentShape(component) {
@@ -8978,6 +9048,169 @@ var init_hash_token_content = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/session/repositories/tokens/write.ts
+function deleteRawTokensForSession(db, sessionId2) {
+  db.prepare("DELETE FROM raw_token_groups WHERE session_id = ?").run(sessionId2);
+  db.prepare("DELETE FROM raw_tokens WHERE session_id = ?").run(sessionId2);
+}
+function createRawTokenGroups(db, sessionId2, groups) {
+  const insertGroup = db.prepare(`INSERT INTO raw_token_groups (session_id, path, description) VALUES (?, ?, ?)`);
+  for (const group of groups) {
+    insertGroup.run(sessionId2, group.path, group.$description ?? null);
+  }
+}
+function createRawTokens(db, sessionId2, tokens) {
+  const insertToken = db.prepare(
+    `INSERT INTO raw_tokens (session_id, path, type, value, description) VALUES (?, ?, ?, ?, ?)`
+  );
+  for (const token of tokens) {
+    insertToken.run(sessionId2, token.path, token.$type, JSON.stringify(token.$value), token.$description ?? null);
+  }
+}
+function upsertRawToken(db, sessionId2, call) {
+  db.prepare(
+    `INSERT INTO raw_tokens (session_id, path, type, value, description) VALUES (?, ?, ?, ?, ?)
+     ON CONFLICT(session_id, path) DO UPDATE SET type = excluded.type, value = excluded.value, description = excluded.description`
+  ).run(sessionId2, call.path, call.type, JSON.stringify(call.value), call.description ?? null);
+}
+function upsertRawTokenGroup(db, sessionId2, call) {
+  db.prepare(
+    `INSERT INTO raw_token_groups (session_id, path, description) VALUES (?, ?, ?)
+     ON CONFLICT(session_id, path) DO UPDATE SET description = excluded.description`
+  ).run(sessionId2, call.path, call.description ?? null);
+}
+function updateRawTokenNamePaths(db, sessionId2, tokenNamePaths, source) {
+  const entries = Object.entries(tokenNamePaths);
+  const deletePaths = db.prepare("DELETE FROM raw_token_name_paths WHERE session_id = ? AND source = ?");
+  const insertPath = db.prepare(
+    "INSERT OR IGNORE INTO raw_token_name_paths (session_id, raw_name, path, source) VALUES (?, ?, ?, ?)"
+  );
+  const deleteAutomaticByName = db.prepare(
+    "DELETE FROM raw_token_name_paths WHERE session_id = ? AND raw_name = ? AND source = 'automatic'"
+  );
+  deletePaths.run(sessionId2, source);
+  for (const [rawName, path] of entries) {
+    if (source === "manual") deleteAutomaticByName.run(sessionId2, rawName);
+    insertPath.run(sessionId2, rawName, path, source);
+  }
+}
+function updateRawPropTokenPaths(db, sessionId2, componentId, propName, paths, source) {
+  db.prepare(
+    `DELETE FROM raw_prop_token_paths
+     WHERE session_id = ? AND component_id = ? AND prop_name = ?`
+  ).run(sessionId2, componentId, propName);
+  const insertPath = db.prepare(
+    `INSERT INTO raw_prop_token_paths (session_id, component_id, prop_name, source, position, path)
+     VALUES (?, ?, ?, ?, ?, ?)`
+  );
+  paths.forEach((path, position) => {
+    insertPath.run(sessionId2, componentId, propName, source, position, path);
+  });
+}
+var init_write3 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/tokens/write.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/shared/with-transaction.ts
+function withTransaction(db, fn) {
+  db.exec("BEGIN");
+  try {
+    const result = fn();
+    db.exec("COMMIT");
+    return result;
+  } catch (e) {
+    db.exec("ROLLBACK");
+    throw e;
+  }
+}
+var init_with_transaction = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/shared/with-transaction.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/services/tokens/store-dtcg-tokens.ts
+function storeDtcgTokens(db, sessionId2, groups, tokens) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  withTransaction(db, () => {
+    deleteRawTokensForSession(db, sessionId2);
+    createRawTokenGroups(db, sessionId2, groups);
+    createRawTokens(db, sessionId2, tokens);
+    updateSessionTimestamp(db, sessionId2, now);
+  });
+}
+var init_store_dtcg_tokens = __esm({
+  "packages/experience-design-system-cli/src/session/services/tokens/store-dtcg-tokens.ts"() {
+    "use strict";
+    init_write();
+    init_write3();
+    init_with_transaction();
+  }
+});
+
+// packages/experience-design-system-cli/src/session/services/tokens/apply-tool-calls.ts
+function applyTokenToolCalls(db, sessionId2, calls, incomingWarnings) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  const warnings = [...incomingWarnings];
+  let tokens = 0;
+  let groups = 0;
+  withTransaction(db, () => {
+    for (const call of calls) {
+      if (call.tool === "set_token") {
+        upsertRawToken(db, sessionId2, call);
+        tokens++;
+      } else if (call.tool === "set_group") {
+        upsertRawTokenGroup(db, sessionId2, call);
+        groups++;
+      }
+    }
+    updateSessionTimestamp(db, sessionId2, now);
+  });
+  return { tokens, groups, warnings };
+}
+var init_apply_tool_calls = __esm({
+  "packages/experience-design-system-cli/src/session/services/tokens/apply-tool-calls.ts"() {
+    "use strict";
+    init_write();
+    init_write3();
+    init_with_transaction();
+  }
+});
+
+// packages/experience-design-system-cli/src/session/services/tokens/replace-raw-token-name-paths.ts
+function replaceRawTokenNamePaths(db, sessionId2, tokenNamePaths, source = "automatic") {
+  withTransaction(db, () => {
+    updateRawTokenNamePaths(db, sessionId2, tokenNamePaths, source);
+    updateSessionTimestamp(db, sessionId2, (/* @__PURE__ */ new Date()).toISOString());
+  });
+}
+var init_replace_raw_token_name_paths = __esm({
+  "packages/experience-design-system-cli/src/session/services/tokens/replace-raw-token-name-paths.ts"() {
+    "use strict";
+    init_write3();
+    init_write();
+    init_with_transaction();
+  }
+});
+
+// packages/experience-design-system-cli/src/session/services/tokens/replace-raw-prop-token-paths.ts
+function replaceRawPropTokenPaths(db, sessionId2, componentId, propName, paths, source) {
+  withTransaction(db, () => {
+    updateRawPropTokenPaths(db, sessionId2, componentId, propName, paths, source);
+    updateSessionTimestamp(db, sessionId2, (/* @__PURE__ */ new Date()).toISOString());
+  });
+}
+var init_replace_raw_prop_token_paths = __esm({
+  "packages/experience-design-system-cli/src/session/services/tokens/replace-raw-prop-token-paths.ts"() {
+    "use strict";
+    init_write3();
+    init_write();
+    init_with_transaction();
+  }
+});
+
 // packages/experience-design-system-cli/src/session/cache-keys.ts
 var cache_keys_exports = {};
 __export(cache_keys_exports, {
@@ -9278,57 +9511,6 @@ function applyDbMigrations(db) {
     `);
   }
 }
-function replaceRawTokenNamePaths(db, sessionId2, tokenNamePaths, source = "automatic") {
-  const entries = Object.entries(tokenNamePaths);
-  const deletePaths = db.prepare("DELETE FROM raw_token_name_paths WHERE session_id = ? AND source = ?");
-  const insertPath = db.prepare(
-    "INSERT OR IGNORE INTO raw_token_name_paths (session_id, raw_name, path, source) VALUES (?, ?, ?, ?)"
-  );
-  const deleteAutomaticByName = db.prepare(
-    "DELETE FROM raw_token_name_paths WHERE session_id = ? AND raw_name = ? AND source = 'automatic'"
-  );
-  db.exec("BEGIN");
-  try {
-    deletePaths.run(sessionId2, source);
-    for (const [rawName, path] of entries) {
-      if (source === "manual") deleteAutomaticByName.run(sessionId2, rawName);
-      insertPath.run(sessionId2, rawName, path, source);
-    }
-    db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run((/* @__PURE__ */ new Date()).toISOString(), sessionId2);
-    db.exec("COMMIT");
-  } catch (e) {
-    db.exec("ROLLBACK");
-    throw e;
-  }
-}
-function loadRawTokenNamePaths(db, sessionId2) {
-  const rows = db.prepare("SELECT raw_name, path FROM raw_token_name_paths WHERE session_id = ? ORDER BY raw_name").all(sessionId2);
-  return Object.fromEntries(rows.map((row) => [row.raw_name, row.path]));
-}
-function loadRawTokenNamePathRows(db, sessionId2) {
-  return db.prepare("SELECT raw_name, path, source FROM raw_token_name_paths WHERE session_id = ? ORDER BY raw_name").all(sessionId2).map((row) => ({ rawName: row.raw_name, path: row.path, source: row.source }));
-}
-function replaceRawPropTokenPaths(db, sessionId2, componentId, propName, paths, source) {
-  const deletePaths = db.prepare(
-    `DELETE FROM raw_prop_token_paths
-     WHERE session_id = ? AND component_id = ? AND prop_name = ?`
-  );
-  const insertPath = db.prepare(
-    `INSERT INTO raw_prop_token_paths (session_id, component_id, prop_name, source, position, path)
-     VALUES (?, ?, ?, ?, ?, ?)`
-  );
-  db.exec("BEGIN");
-  try {
-    deletePaths.run(sessionId2, componentId, propName);
-    paths.forEach((path, position) => {
-      insertPath.run(sessionId2, componentId, propName, source, position, path);
-    });
-    db.exec("COMMIT");
-  } catch (e) {
-    db.exec("ROLLBACK");
-    throw e;
-  }
-}
 function loadComponentReviewMetadata(db, sessionId2, componentName) {
   const compRow = db.prepare(`SELECT component_id, source, source_path FROM raw_components WHERE session_id = ? AND name = ?`).get(sessionId2, componentName);
   if (!compRow) return null;
@@ -10163,7 +10345,7 @@ function loadCDFComponents(db, sessionId2) {
     `SELECT component_id, prop_name, position, path
        FROM raw_prop_token_paths WHERE session_id = ? ORDER BY component_id, prop_name, position`
   ).all(sessionId2);
-  const resolvedDefaultPaths = loadRawTokenNamePaths(db, sessionId2);
+  const resolvedDefaultPaths = getRawTokenNamePaths(db, sessionId2);
   const tokenTypeByPath = new Map(
     db.prepare("SELECT path, type FROM raw_tokens WHERE session_id = ?").all(sessionId2).map((token) => [token.path, token.type])
   );
@@ -10275,82 +10457,6 @@ function applyScopeDecisions(db, sessionId2, decisions) {
   }
   db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
 }
-function storeDTCGTokens(db, sessionId2, groups, tokens) {
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  db.exec("BEGIN");
-  try {
-    db.prepare("DELETE FROM raw_token_groups WHERE session_id = ?").run(sessionId2);
-    db.prepare("DELETE FROM raw_tokens WHERE session_id = ?").run(sessionId2);
-    const insertGroup = db.prepare(`INSERT INTO raw_token_groups (session_id, path, description) VALUES (?, ?, ?)`);
-    for (const group of groups) {
-      insertGroup.run(sessionId2, group.path, group.$description ?? null);
-    }
-    const insertToken = db.prepare(
-      `INSERT INTO raw_tokens (session_id, path, type, value, description) VALUES (?, ?, ?, ?, ?)`
-    );
-    for (const token of tokens) {
-      insertToken.run(sessionId2, token.path, token.$type, JSON.stringify(token.$value), token.$description ?? null);
-    }
-    db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
-    db.exec("COMMIT");
-  } catch (e) {
-    db.exec("ROLLBACK");
-    throw e;
-  }
-}
-function applyTokenToolCalls(db, sessionId2, calls, incomingWarnings) {
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  const warnings = [...incomingWarnings];
-  let tokens = 0;
-  let groups = 0;
-  const upsertToken = db.prepare(
-    `INSERT INTO raw_tokens (session_id, path, type, value, description) VALUES (?, ?, ?, ?, ?)
-     ON CONFLICT(session_id, path) DO UPDATE SET type = excluded.type, value = excluded.value, description = excluded.description`
-  );
-  const upsertGroup = db.prepare(
-    `INSERT INTO raw_token_groups (session_id, path, description) VALUES (?, ?, ?)
-     ON CONFLICT(session_id, path) DO UPDATE SET description = excluded.description`
-  );
-  db.exec("BEGIN");
-  try {
-    for (const call of calls) {
-      if (call.tool === "set_token") {
-        upsertToken.run(sessionId2, call.path, call.type, JSON.stringify(call.value), call.description ?? null);
-        tokens++;
-      } else if (call.tool === "set_group") {
-        upsertGroup.run(sessionId2, call.path, call.description ?? null);
-        groups++;
-      }
-    }
-    db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
-    db.exec("COMMIT");
-  } catch (e) {
-    db.exec("ROLLBACK");
-    throw e;
-  }
-  return { tokens, groups, warnings };
-}
-function loadDTCGTokens(db, sessionId2) {
-  const groupRows = db.prepare("SELECT path, description FROM raw_token_groups WHERE session_id = ? ORDER BY path").all(sessionId2);
-  const tokenRows = db.prepare("SELECT path, type, value, description FROM raw_tokens WHERE session_id = ? ORDER BY path").all(sessionId2);
-  const groups = groupRows.map((r) => {
-    const prefix = `${r.path}.`;
-    const tokenIds = tokenRows.filter((t) => t.path.startsWith(prefix) && !t.path.slice(prefix.length).includes(".")).map((t) => t.path);
-    const g = { path: r.path, tokenIds };
-    if (r.description !== null) g.$description = r.description;
-    return g;
-  });
-  const tokens = tokenRows.map((r) => {
-    const t = {
-      path: r.path,
-      $type: r.type,
-      $value: JSON.parse(r.value)
-    };
-    if (r.description !== null) t.$description = r.description;
-    return t;
-  });
-  return { groups, tokens };
-}
 function findLatestSessionForCommand(db, command) {
   return getLatestCompletedSessionForCommand(db, command);
 }
@@ -10771,10 +10877,16 @@ var init_db = __esm({
     init_read2();
     init_write2();
     init_session_resolver();
+    init_read3();
     init_derive_component_id();
     init_hash_component_shape();
     init_hash_token_content();
     init_cdf_mappers();
+    init_read3();
+    init_store_dtcg_tokens();
+    init_apply_tool_calls();
+    init_replace_raw_token_name_paths();
+    init_replace_raw_prop_token_paths();
     SCHEMA = `
 PRAGMA journal_mode = WAL;
 PRAGMA foreign_keys = ON;
@@ -24980,7 +25092,7 @@ function GenerateReviewStep({
     try {
       cdfComponents = loadCDFComponents(db, extractSessionId);
       cycles = loadSlotCycles(db, extractSessionId);
-      tokens = loadDTCGTokens(db, tokenSessionId ?? extractSessionId).tokens.map((token) => ({
+      tokens = getDtcgTokensForSession(db, tokenSessionId ?? extractSessionId).tokens.map((token) => ({
         path: token.path,
         kind: token.$type
       }));
@@ -26868,7 +26980,7 @@ function AtomicGenerateReviewStep({
     let tokens = [];
     try {
       cdfComponents = loadCDFComponents(db, extractSessionId);
-      tokens = loadDTCGTokens(db, tokenSessionId ?? extractSessionId).tokens.map((token) => ({
+      tokens = getDtcgTokensForSession(db, tokenSessionId ?? extractSessionId).tokens.map((token) => ({
         path: token.path,
         kind: token.$type
       }));
@@ -28217,7 +28329,7 @@ If you are using AWS Bedrock, run:
           copyTokensFromCache(db, state.tokenSessionId, sessionId2);
         } else if (!state.tokenSessionId && state.tokensPath) {
           const tokens = await readTokensFromPath("tokens", state.tokensPath);
-          storeDTCGTokens(db, sessionId2, [], tokens);
+          storeDtcgTokens(db, sessionId2, [], tokens);
         }
         const cdfEntries = loadCDFComponents(db, sessionId2);
         mappablePropCount = cdfEntries.reduce(
@@ -28226,7 +28338,7 @@ If you are using AWS Bedrock, run:
           ).length,
           0
         );
-        rawTokenCount = loadDTCGTokens(db, sessionId2).tokens.length;
+        rawTokenCount = getDtcgTokensForSession(db, sessionId2).tokens.length;
       } finally {
         db.close();
       }
@@ -34314,7 +34426,7 @@ function registerPrintCommand(program) {
     const db = openPipelineDb();
     let result;
     try {
-      result = loadDTCGTokens(db, sessionId2);
+      result = getDtcgTokensForSession(db, sessionId2);
     } finally {
       db.close();
     }
@@ -34664,7 +34776,7 @@ async function runMapTokens(opts) {
       tokenLeaves
     );
     const manualMappings = new Map(
-      loadRawTokenNamePathRows(db, sessionId2).filter((row) => row.source === "manual").map((row) => [row.rawName, row.path])
+      getRawTokenNamePathRows(db, sessionId2).filter((row) => row.source === "manual").map((row) => [row.rawName, row.path])
     );
     const automaticMappings = {};
     const defaultDiagnostics = [
@@ -34699,7 +34811,7 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
       (count, { entry }) => count + Object.values(entry.$properties ?? {}).filter((prop) => prop.$type === "token" && prop.$category === "design").length,
       0
     );
-    const { groups, tokens } = loadDTCGTokens(db, sessionId2);
+    const { groups, tokens } = getDtcgTokensForSession(db, sessionId2);
     const tokenCount = tokens.length;
     if (mappablePropCount === 0 || tokenCount === 0) {
       process.stdout.write(
@@ -35184,7 +35296,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
   }
   if (extractSessionId && opts.tokens) {
     const tokens = await readTokensFromPath("--tokens", opts.tokens);
-    storeDTCGTokens(db, extractSessionId, [], tokens);
+    storeDtcgTokens(db, extractSessionId, [], tokens);
   }
   const mapTokensLabel = stepLabel("Mapping design tokens");
   const hasGeneratedComponents = extractSessionId !== null && loadCDFComponents(db, extractSessionId).length > 0;

package/dist/src/session/core/tokens/build-dtcg-groups.d.ts

@@ -0,0 +1,12 @@
+import type { DTCGTokenGroup } from '@contentful/experience-design-system-types';
+export interface GroupRow {
+    path: string;
+    description: string | null;
+}
+export interface TokenRow {
+    path: string;
+    type: string;
+    value: string;
+    description: string | null;
+}
+export declare function buildDtcgGroups(groupRows: GroupRow[], tokenRows: TokenRow[]): DTCGTokenGroup[];

package/dist/src/session/core/tokens/build-dtcg-tokens.d.ts

@@ -0,0 +1,3 @@
+import type { DTCGTokenEntry } from '@contentful/experience-design-system-types';
+import type { TokenRow } from './build-dtcg-groups.js';
+export declare function buildDtcgTokens(tokenRows: TokenRow[]): DTCGTokenEntry[];

package/dist/src/session/db.d.ts

@@ -1,7 +1,7 @@
 import { DatabaseSync } from 'node:sqlite';
 import type { RawComponentDefinition } from '../types.js';
-import type { CDFComponentEntry, DTCGTokenEntry, DTCGTokenGroup } from '@contentful/experience-design-system-types';
-import type { ToolCall, TokenToolCall, ComponentSourceRef } from '@contentful/experience-design-system-generation';
+import type { CDFComponentEntry } from '@contentful/experience-design-system-types';
+import type { ToolCall, ComponentSourceRef } from '@contentful/experience-design-system-generation';
 import type { ComponentTypeSummary } from '@contentful/experience-design-system-types';
 import type { SlotCycle, SlotEdge } from '../analyze/cycle-detection.js';
 import { type MatchHints as SessionMatchHints } from './repositories/sessions/read.js';
@@ -10,6 +10,12 @@ export { deriveComponentId } from './core/components/derive-component-id.js';
 export { hashComponentShape as computeComponentInputHash } from './core/components/hash-component-shape.js';
 export { hashTokenContent as computeTokenInputHash } from './core/tokens/hash-token-content.js';
 export { mapContentfulTypeToCdfType, resolveCdfCategory } from './core/cdf/cdf-mappers.js';
+export { getDtcgTokensForSession as loadDTCGTokens, getRawTokenNamePaths as loadRawTokenNamePaths, getRawTokenNamePathRows as loadRawTokenNamePathRows, type RawTokenNamePaths, type RawTokenNamePathSource, type RawTokenNamePath, } from './repositories/tokens/read.js';
+export { type RawPropTokenPathSource } from './repositories/tokens/write.js';
+export { storeDtcgTokens as storeDTCGTokens } from './services/tokens/store-dtcg-tokens.js';
+export { applyTokenToolCalls, type ApplyTokenToolCallsResult } from './services/tokens/apply-tool-calls.js';
+export { replaceRawTokenNamePaths } from './services/tokens/replace-raw-token-name-paths.js';
+export { replaceRawPropTokenPaths } from './services/tokens/replace-raw-prop-token-paths.js';
 export type StepStatus = 'pending' | 'complete' | 'failed' | 'interrupted';
 export type CommandName = 'analyze extract' | 'analyze select' | 'generate components' | 'generate tokens' | 'generate edit' | 'apply preview' | 'apply select' | 'apply push' | 'print components' | 'print tokens' | 'map tokens' | 'fetch existing entities' | 'import';
 export interface SessionRow {
@@ -32,30 +38,6 @@ export interface StepRow {
 }
 export declare function getPipelineDbPath(): string;
 export declare function openPipelineDb(dbPath?: string): DatabaseSync;
-/** An exact source token reference paired with its canonical DTCG path. */
-export type RawTokenNamePaths = Record<string, string>;
-export type RawTokenNamePathSource = 'automatic' | 'manual';
-export interface RawTokenNamePath {
-    rawName: string;
-    path: string;
-    source: RawTokenNamePathSource;
-}
-/**
- * Replaces the session's exact source-reference-to-DTCG-path sidecar.
- * Source references are retained verbatim; normalisation belongs to the
- * deterministic resolver, not to persistence or CDF emission.
- */
-export declare function replaceRawTokenNamePaths(db: DatabaseSync, sessionId: string, tokenNamePaths: RawTokenNamePaths, source?: RawTokenNamePathSource): void;
-/** Loads the exact source-reference-to-DTCG-path sidecar for a session. */
-export declare function loadRawTokenNamePaths(db: DatabaseSync, sessionId: string): RawTokenNamePaths;
-export declare function loadRawTokenNamePathRows(db: DatabaseSync, sessionId: string): RawTokenNamePath[];
-/**
- * Where a prop's token-path list came from. 'agent' is a map-tokens suggestion,
- * which a later run of that step may revise. 'review' is a person's decision in
- * the review editor, which a re-run must leave alone.
- */
-export type RawPropTokenPathSource = 'agent' | 'review';
-export declare function replaceRawPropTokenPaths(db: DatabaseSync, sessionId: string, componentId: string, propName: string, paths: string[], source: RawPropTokenPathSource): void;
 export interface ApplyToolCallsResult {
     classified: number;
     excluded: number;
@@ -138,17 +120,6 @@ export declare function applyScopeDecisions(db: DatabaseSync, sessionId: string,
     accepted: string[];
     rejected: string[];
 }): void;
-export declare function storeDTCGTokens(db: DatabaseSync, sessionId: string, groups: DTCGTokenGroup[], tokens: DTCGTokenEntry[]): void;
-export interface ApplyTokenToolCallsResult {
-    tokens: number;
-    groups: number;
-    warnings: string[];
-}
-export declare function applyTokenToolCalls(db: DatabaseSync, sessionId: string, calls: TokenToolCall[], incomingWarnings: string[]): ApplyTokenToolCallsResult;
-export declare function loadDTCGTokens(db: DatabaseSync, sessionId: string): {
-    groups: DTCGTokenGroup[];
-    tokens: DTCGTokenEntry[];
-};
 export declare function findLatestSessionForCommand(db: DatabaseSync, command: CommandName): string | null;
 export declare function seedCDFFromPriorSession(db: DatabaseSync, targetSessionId: string): number;
 export declare function seedCDFFromPreviewResponse(db: DatabaseSync, sessionId: string, removedItems: ComponentTypeSummary[]): number;

package/dist/src/session/repositories/shared/with-transaction.d.ts

@@ -0,0 +1,2 @@
+import type { DatabaseSync } from 'node:sqlite';
+export declare function withTransaction<T>(db: DatabaseSync, fn: () => T): T;

package/dist/src/session/repositories/tokens/read.d.ts

@@ -0,0 +1,15 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { DTCGTokenEntry, DTCGTokenGroup } from '@contentful/experience-design-system-types';
+export type RawTokenNamePaths = Record<string, string>;
+export type RawTokenNamePathSource = 'automatic' | 'manual';
+export interface RawTokenNamePath {
+    rawName: string;
+    path: string;
+    source: RawTokenNamePathSource;
+}
+export declare function getDtcgTokensForSession(db: DatabaseSync, sessionId: string): {
+    groups: DTCGTokenGroup[];
+    tokens: DTCGTokenEntry[];
+};
+export declare function getRawTokenNamePaths(db: DatabaseSync, sessionId: string): RawTokenNamePaths;
+export declare function getRawTokenNamePathRows(db: DatabaseSync, sessionId: string): RawTokenNamePath[];

package/dist/src/session/repositories/tokens/write.d.ts

@@ -0,0 +1,16 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { DTCGTokenEntry, DTCGTokenGroup } from '@contentful/experience-design-system-types';
+import type { TokenToolCall } from '@contentful/experience-design-system-generation';
+import type { RawTokenNamePaths, RawTokenNamePathSource } from './read.js';
+export type RawPropTokenPathSource = 'agent' | 'review';
+export declare function deleteRawTokensForSession(db: DatabaseSync, sessionId: string): void;
+export declare function createRawTokenGroups(db: DatabaseSync, sessionId: string, groups: DTCGTokenGroup[]): void;
+export declare function createRawTokens(db: DatabaseSync, sessionId: string, tokens: DTCGTokenEntry[]): void;
+export declare function upsertRawToken(db: DatabaseSync, sessionId: string, call: Extract<TokenToolCall, {
+    tool: 'set_token';
+}>): void;
+export declare function upsertRawTokenGroup(db: DatabaseSync, sessionId: string, call: Extract<TokenToolCall, {
+    tool: 'set_group';
+}>): void;
+export declare function updateRawTokenNamePaths(db: DatabaseSync, sessionId: string, tokenNamePaths: RawTokenNamePaths, source: RawTokenNamePathSource): void;
+export declare function updateRawPropTokenPaths(db: DatabaseSync, sessionId: string, componentId: string, propName: string, paths: string[], source: RawPropTokenPathSource): void;

package/dist/src/session/services/tokens/apply-tool-calls.d.ts

@@ -0,0 +1,8 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { TokenToolCall } from '@contentful/experience-design-system-generation';
+export interface ApplyTokenToolCallsResult {
+    tokens: number;
+    groups: number;
+    warnings: string[];
+}
+export declare function applyTokenToolCalls(db: DatabaseSync, sessionId: string, calls: TokenToolCall[], incomingWarnings: string[]): ApplyTokenToolCallsResult;

package/dist/src/session/services/tokens/replace-raw-prop-token-paths.d.ts

@@ -0,0 +1,3 @@
+import type { DatabaseSync } from 'node:sqlite';
+import { type RawPropTokenPathSource } from '../../repositories/tokens/write.js';
+export declare function replaceRawPropTokenPaths(db: DatabaseSync, sessionId: string, componentId: string, propName: string, paths: string[], source: RawPropTokenPathSource): void;

package/dist/src/session/services/tokens/replace-raw-token-name-paths.d.ts

@@ -0,0 +1,3 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { RawTokenNamePaths, RawTokenNamePathSource } from '../../repositories/tokens/read.js';
+export declare function replaceRawTokenNamePaths(db: DatabaseSync, sessionId: string, tokenNamePaths: RawTokenNamePaths, source?: RawTokenNamePathSource): void;

package/dist/src/session/services/tokens/store-dtcg-tokens.d.ts

@@ -0,0 +1,3 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { DTCGTokenEntry, DTCGTokenGroup } from '@contentful/experience-design-system-types';
+export declare function storeDtcgTokens(db: DatabaseSync, sessionId: string, groups: DTCGTokenGroup[], tokens: DTCGTokenEntry[]): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-661f431.0",
+  "version": "2.32.1-dev-build-26a2030.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -40,8 +40,8 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.32.1-dev-build-661f431.0",
-    "@contentful/experience-design-system-cli-v2": "2.32.1-dev-build-661f431.0"
+    "@contentful/experience-design-system-types": "2.32.1-dev-build-26a2030.0",
+    "@contentful/experience-design-system-cli-v2": "2.32.1-dev-build-26a2030.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -53,9 +53,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-generation": "2.32.1-dev-build-661f431.0",
-    "@contentful/experience-design-system-client": "2.32.1-dev-build-661f431.0",
-    "@contentful/experience-design-system-extraction": "2.32.1-dev-build-661f431.0"
+    "@contentful/experience-design-system-client": "2.32.1-dev-build-26a2030.0",
+    "@contentful/experience-design-system-extraction": "2.32.1-dev-build-26a2030.0",
+    "@contentful/experience-design-system-generation": "2.32.1-dev-build-26a2030.0"
   },
   "repository": {
     "type": "git",