@contentful/experience-design-system-cli 2.32.1-dev-build-23e5797.0 → 2.32.1-dev-build-4052dd5.0

package/dist/src/index.js

@@ -8472,6 +8472,230 @@ var init_terminal_capabilities = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/session/source-excerpt.ts
+function escapeForRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function identifierPattern(name) {
+  return new RegExp(`(?<![A-Za-z0-9_$])${escapeForRegExp(name)}(?![A-Za-z0-9_$])`);
+}
+function excerptAroundNames(text, names, maxChars, contextLines = 6) {
+  if (text.length <= maxChars) return { content: text, usesNotShown: [] };
+  const patterns = names.filter((name) => name.length > 0).map((name) => ({ name, pattern: identifierPattern(name) }));
+  const lines = text.split("\n");
+  const windows = [];
+  lines.forEach((line, index) => {
+    const mentioned = patterns.filter(({ pattern }) => pattern.test(line)).map(({ name }) => name);
+    if (mentioned.length === 0) return;
+    const start = Math.max(0, index - contextLines);
+    const end = Math.min(lines.length - 1, index + contextLines);
+    const last = windows[windows.length - 1];
+    if (last && start <= last.end + 1) {
+      last.end = Math.max(last.end, end);
+      for (const name of mentioned) last.names.add(name);
+    } else {
+      windows.push({ start, end, names: new Set(mentioned) });
+    }
+  });
+  if (windows.length === 0) {
+    return { content: `${text.slice(0, maxChars)}
+${TRUNCATED_MARKER}`, usesNotShown: [] };
+  }
+  const lastWindowFor = /* @__PURE__ */ new Map();
+  for (const window of windows) for (const name of window.names) lastWindowFor.set(name, window);
+  const kept = [];
+  const cut = /* @__PURE__ */ new Set();
+  let used = 0;
+  for (const window of [...windows].reverse()) {
+    const chunk = lines.slice(window.start, window.end + 1).join("\n");
+    const separator = kept.length > 0 ? `
+${ELLIPSIS_MARKER}
+` : "";
+    if (used + separator.length + chunk.length > maxChars) {
+      if (kept.length === 0) {
+        const head = chunk.slice(0, maxChars);
+        kept.push({ window, text: head });
+        used += head.length;
+        for (const name of window.names) {
+          if (lastWindowFor.get(name) === window && !identifierPattern(name).test(head)) cut.add(name);
+        }
+        continue;
+      }
+      for (const name of window.names) {
+        if (lastWindowFor.get(name) === window) cut.add(name);
+      }
+      continue;
+    }
+    kept.push({ window, text: chunk });
+    used += separator.length + chunk.length;
+  }
+  kept.sort((a, b) => a.window.start - b.window.start);
+  const parts = kept.map((entry, index) => (index > 0 ? `
+${ELLIPSIS_MARKER}
+` : "") + entry.text);
+  const usesNotShown = names.filter((name, index) => cut.has(name) && names.indexOf(name) === index);
+  return { content: `${parts.join("")}
+${TRUNCATED_MARKER}`, usesNotShown };
+}
+var ELLIPSIS_MARKER, TRUNCATED_MARKER;
+var init_source_excerpt = __esm({
+  "packages/experience-design-system-cli/src/session/source-excerpt.ts"() {
+    "use strict";
+    ELLIPSIS_MARKER = "/* \u2026 */";
+    TRUNCATED_MARKER = "/* truncated */";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/components/derive-component-id.ts
+import { createHash } from "node:crypto";
+function deriveComponentId(name, source) {
+  return createHash("sha256").update(`${name}:${source}`).digest("hex").slice(0, 12);
+}
+var init_derive_component_id = __esm({
+  "packages/experience-design-system-cli/src/session/core/components/derive-component-id.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/cdf/cdf-mappers.ts
+function mapContentfulTypeToCdfType(contentfulType) {
+  switch (contentfulType.toLowerCase()) {
+    case "string":
+    case "text":
+      return "string";
+    case "richtext":
+      return "richtext";
+    case "media":
+      return "media";
+    case "link":
+      return "link";
+    case "enum":
+    case "symbol":
+      return "enum";
+    case "token":
+      return "token";
+    case "boolean":
+      return "boolean";
+    default:
+      return "string";
+  }
+}
+function resolveCdfCategory(contentfulCategory, propName, contentProps, designProps) {
+  if (contentfulCategory && VALID_CATEGORIES2.includes(contentfulCategory)) {
+    return contentfulCategory;
+  }
+  if (contentProps.has(propName)) return "content";
+  if (designProps.has(propName)) return "design";
+  return "state";
+}
+var VALID_CATEGORIES2;
+var init_cdf_mappers = __esm({
+  "packages/experience-design-system-cli/src/session/core/cdf/cdf-mappers.ts"() {
+    "use strict";
+    VALID_CATEGORIES2 = ["content", "design", "state"];
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/shared/index-rows-by-key.ts
+function indexRowsByKey(items, key) {
+  const map = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const k = key(item);
+    let arr = map.get(k);
+    if (!arr) {
+      arr = [];
+      map.set(k, arr);
+    }
+    arr.push(item);
+  }
+  return map;
+}
+var init_index_rows_by_key = __esm({
+  "packages/experience-design-system-cli/src/session/core/shared/index-rows-by-key.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/sessions/read.ts
+function getSessionById(db, sessionId2) {
+  const row = db.prepare("SELECT id FROM sessions WHERE id = ?").get(sessionId2);
+  return row ?? null;
+}
+function getLatestCompletedSessionForCommand(db, command) {
+  const row = db.prepare(
+    `SELECT s.id FROM sessions s
+       JOIN steps st ON st.session_id = s.id
+       WHERE st.command = ? AND st.status = 'complete'
+       ORDER BY st.started_at DESC, st.id DESC
+       LIMIT 1`
+  ).get(command);
+  return row?.id ?? null;
+}
+var init_read = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/sessions/read.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/sessions/write.ts
+function createSession(db, id, name, timestamp) {
+  db.prepare("INSERT INTO sessions (id, name, created_at, updated_at) VALUES (?, ?, ?, ?)").run(
+    id,
+    name,
+    timestamp,
+    timestamp
+  );
+}
+function updateSessionTimestamp(db, sessionId2, timestamp) {
+  db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(timestamp, sessionId2);
+}
+var init_write = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/sessions/write.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/steps/read.ts
+function getSessionIdForStep(db, stepId) {
+  const row = db.prepare("SELECT session_id FROM steps WHERE id = ?").get(stepId);
+  return row?.session_id ?? null;
+}
+var init_read2 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/steps/read.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/steps/write.ts
+function updatePendingStepsToInterrupted(db, sessionId2, command, timestamp) {
+  db.prepare(
+    `UPDATE steps SET status = 'interrupted', completed_at = ?, updated_at = ?
+     WHERE session_id = ? AND command = ? AND status = 'pending'`
+  ).run(timestamp, timestamp, sessionId2, command);
+}
+function createPendingStep(db, sessionId2, command, inputs, timestamp) {
+  const result = db.prepare(
+    `INSERT INTO steps (session_id, command, status, started_at, inputs, outputs, updated_at)
+       VALUES (?, ?, 'pending', ?, ?, '{}', ?)`
+  ).run(sessionId2, command, timestamp, JSON.stringify(inputs), timestamp);
+  return Number(result.lastInsertRowid);
+}
+function updateStepStatus(db, stepId, status, outputs, error, timestamp) {
+  db.prepare(`UPDATE steps SET status = ?, completed_at = ?, outputs = ?, error = ?, updated_at = ? WHERE id = ?`).run(
+    status,
+    timestamp,
+    JSON.stringify(outputs),
+    error,
+    timestamp,
+    stepId
+  );
+}
+var init_write2 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/steps/write.ts"() {
+    "use strict";
+  }
+});
+
 // packages/experience-design-system-cli/src/session/session-id.ts
 var session_id_exports = {};
 __export(session_id_exports, {
@@ -8696,77 +8920,292 @@ var init_session_id = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/session/source-excerpt.ts
-function escapeForRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+// packages/experience-design-system-cli/src/session/services/session-resolver.ts
+function getOrCreateSessionForCommand(db, sessionFlag, sessionName, _hints) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  if (sessionFlag === "new" || sessionFlag === void 0) {
+    const id = generateSessionId();
+    createSession(db, id, sessionName ?? null, now);
+    return { sessionId: id, isNew: true, isResumed: false };
+  }
+  if (!getSessionById(db, sessionFlag)) {
+    throw new Error(`session '${sessionFlag}' not found. Run 'session list' to see active sessions.`);
+  }
+  return { sessionId: sessionFlag, isNew: false, isResumed: false };
 }
-function identifierPattern(name) {
-  return new RegExp(`(?<![A-Za-z0-9_$])${escapeForRegExp(name)}(?![A-Za-z0-9_$])`);
+var init_session_resolver = __esm({
+  "packages/experience-design-system-cli/src/session/services/session-resolver.ts"() {
+    "use strict";
+    init_session_id();
+    init_read();
+    init_write();
+  }
+});
+
+// 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;
+  });
 }
-function excerptAroundNames(text, names, maxChars, contextLines = 6) {
-  if (text.length <= maxChars) return { content: text, usesNotShown: [] };
-  const patterns = names.filter((name) => name.length > 0).map((name) => ({ name, pattern: identifierPattern(name) }));
-  const lines = text.split("\n");
-  const windows = [];
-  lines.forEach((line, index) => {
-    const mentioned = patterns.filter(({ pattern }) => pattern.test(line)).map(({ name }) => name);
-    if (mentioned.length === 0) return;
-    const start = Math.max(0, index - contextLines);
-    const end = Math.min(lines.length - 1, index + contextLines);
-    const last = windows[windows.length - 1];
-    if (last && start <= last.end + 1) {
-      last.end = Math.max(last.end, end);
-      for (const name of mentioned) last.names.add(name);
-    } else {
-      windows.push({ start, end, names: new Set(mentioned) });
-    }
+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) {
+  const payload = {
+    framework: component.framework,
+    name: component.name,
+    source: component.source,
+    props: component.props.map((p) => ({
+      name: p.name,
+      type: p.type
+    })),
+    slots: component.slots.map((s) => ({
+      name: s.name,
+      isDefault: s.isDefault,
+      allowedComponents: [...s.allowedComponents ?? []].sort()
+    }))
+  };
+  return createHash2("sha256").update(JSON.stringify(payload)).digest("hex");
+}
+var init_hash_component_shape = __esm({
+  "packages/experience-design-system-cli/src/session/core/components/hash-component-shape.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/tokens/hash-token-content.ts
+import { createHash as createHash3 } from "node:crypto";
+function hashTokenContent(rawTokenContent) {
+  return createHash3("sha256").update(rawTokenContent.trim()).digest("hex");
+}
+var init_hash_token_content = __esm({
+  "packages/experience-design-system-cli/src/session/core/tokens/hash-token-content.ts"() {
+    "use strict";
+  }
+});
+
+// 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);
   });
-  if (windows.length === 0) {
-    return { content: `${text.slice(0, maxChars)}
-${TRUNCATED_MARKER}`, usesNotShown: [] };
+}
+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();
   }
-  const lastWindowFor = /* @__PURE__ */ new Map();
-  for (const window of windows) for (const name of window.names) lastWindowFor.set(name, window);
-  const kept = [];
-  const cut = /* @__PURE__ */ new Set();
-  let used = 0;
-  for (const window of [...windows].reverse()) {
-    const chunk = lines.slice(window.start, window.end + 1).join("\n");
-    const separator = kept.length > 0 ? `
-${ELLIPSIS_MARKER}
-` : "";
-    if (used + separator.length + chunk.length > maxChars) {
-      if (kept.length === 0) {
-        const head = chunk.slice(0, maxChars);
-        kept.push({ window, text: head });
-        used += head.length;
-        for (const name of window.names) {
-          if (lastWindowFor.get(name) === window && !identifierPattern(name).test(head)) cut.add(name);
-        }
-        continue;
-      }
-      for (const name of window.names) {
-        if (lastWindowFor.get(name) === window) cut.add(name);
+});
+
+// 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++;
       }
-      continue;
     }
-    kept.push({ window, text: chunk });
-    used += separator.length + chunk.length;
+    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();
   }
-  kept.sort((a, b) => a.window.start - b.window.start);
-  const parts = kept.map((entry, index) => (index > 0 ? `
-${ELLIPSIS_MARKER}
-` : "") + entry.text);
-  const usesNotShown = names.filter((name, index) => cut.has(name) && names.indexOf(name) === index);
-  return { content: `${parts.join("")}
-${TRUNCATED_MARKER}`, usesNotShown };
+});
+
+// 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 ELLIPSIS_MARKER, TRUNCATED_MARKER;
-var init_source_excerpt = __esm({
-  "packages/experience-design-system-cli/src/session/source-excerpt.ts"() {
+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";
-    ELLIPSIS_MARKER = "/* \u2026 */";
-    TRUNCATED_MARKER = "/* truncated */";
+    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);
+  });
+}
+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_with_transaction();
   }
 });
 
@@ -8777,11 +9216,11 @@ __export(cache_keys_exports, {
   hashFile: () => hashFile,
   hashPromptForSkill: () => hashPromptForSkill
 });
-import { createHash } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 import { readFile as readFile6 } from "node:fs/promises";
 import { resolve as resolve6 } from "node:path";
 function hashContent(content) {
-  return createHash("sha256").update(content).digest("hex");
+  return createHash4("sha256").update(content).digest("hex");
 }
 async function hashFile(filePath) {
   const content = await readFile6(filePath, "utf8");
@@ -8803,7 +9242,7 @@ var init_cache_keys = __esm({
 import { DatabaseSync } from "node:sqlite";
 import { mkdirSync, readFileSync as readFileSync5 } from "node:fs";
 import { readFile as readFile7 } from "node:fs/promises";
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 import { homedir } from "node:os";
 import { dirname as dirname7, resolve as resolve7 } from "node:path";
 function getPipelineDbPath() {
@@ -9070,57 +9509,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;
@@ -9334,39 +9722,18 @@ function applyToolCalls(db, sessionId2, componentId, componentName, calls, incom
   }
   return { classified, excluded, slots, warnings };
 }
-function getOrCreateSession(db, sessionFlag, sessionName, _hints) {
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  if (sessionFlag === "new" || sessionFlag === void 0) {
-    const id = generateSessionId();
-    db.prepare("INSERT INTO sessions (id, name, created_at, updated_at) VALUES (?, ?, ?, ?)").run(
-      id,
-      sessionName ?? null,
-      now,
-      now
-    );
-    return { sessionId: id, isNew: true, isResumed: false };
-  }
-  const existing = db.prepare("SELECT id FROM sessions WHERE id = ?").get(sessionFlag);
-  if (!existing) {
-    throw new Error(`session '${sessionFlag}' not found. Run 'session list' to see active sessions.`);
-  }
-  return { sessionId: sessionFlag, isNew: false, isResumed: false };
+function getOrCreateSession(db, sessionFlag, sessionName, hints) {
+  return getOrCreateSessionForCommand(db, sessionFlag, sessionName, hints);
 }
 function createStep(db, sessionId2, command, inputs) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   db.exec("BEGIN");
   try {
-    db.prepare(
-      `UPDATE steps SET status = 'interrupted', completed_at = ?, updated_at = ?
-       WHERE session_id = ? AND command = ? AND status = 'pending'`
-    ).run(now, now, sessionId2, command);
-    const result = db.prepare(
-      `INSERT INTO steps (session_id, command, status, started_at, inputs, outputs, updated_at)
-         VALUES (?, ?, 'pending', ?, ?, '{}', ?)`
-    ).run(sessionId2, command, now, JSON.stringify(inputs), now);
-    db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
+    updatePendingStepsToInterrupted(db, sessionId2, command, now);
+    const stepId = createPendingStep(db, sessionId2, command, inputs, now);
+    updateSessionTimestamp(db, sessionId2, now);
     db.exec("COMMIT");
-    return Number(result.lastInsertRowid);
+    return stepId;
   } catch (e) {
     db.exec("ROLLBACK");
     throw e;
@@ -9376,12 +9743,10 @@ function updateStep(db, stepId, status, outputs, error) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   db.exec("BEGIN");
   try {
-    const step = db.prepare("SELECT session_id FROM steps WHERE id = ?").get(stepId);
-    db.prepare(
-      `UPDATE steps SET status = ?, completed_at = ?, outputs = ?, error = ?, updated_at = ? WHERE id = ?`
-    ).run(status, now, JSON.stringify(outputs), error ?? null, now, stepId);
-    if (step) {
-      db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, step.session_id);
+    const stepSessionId = getSessionIdForStep(db, stepId);
+    updateStepStatus(db, stepId, status, outputs, error ?? null, now);
+    if (stepSessionId) {
+      updateSessionTimestamp(db, stepSessionId, now);
     }
     db.exec("COMMIT");
   } catch (e) {
@@ -9579,10 +9944,10 @@ function loadRawComponents(db, sessionId2, allowedNames) {
     `SELECT component_id, slot_name, position, allowed_component
        FROM raw_slot_allowed_components WHERE session_id = ? ORDER BY component_id, slot_name, position`
   ).all(sessionId2);
-  const propsByComponent = groupBy(props, (p) => p.component_id);
-  const allowedValuesByProp = groupBy(allowedValues, (av) => `${av.component_id}::${av.prop_name}`);
-  const slotsByComponent = groupBy(slots, (s) => s.component_id);
-  const allowedComponentsBySlot = groupBy(allowedComponents, (ac) => `${ac.component_id}::${ac.slot_name}`);
+  const propsByComponent = indexRowsByKey(props, (p) => p.component_id);
+  const allowedValuesByProp = indexRowsByKey(allowedValues, (av) => `${av.component_id}::${av.prop_name}`);
+  const slotsByComponent = indexRowsByKey(slots, (s) => s.component_id);
+  const allowedComponentsBySlot = indexRowsByKey(allowedComponents, (ac) => `${ac.component_id}::${ac.slot_name}`);
   return components.map(
     (c2) => ({
       component_id: c2.component_id,
@@ -9808,22 +10173,6 @@ function parseReviewReasons(raw) {
     return [];
   }
 }
-function groupBy(items, key) {
-  const map = /* @__PURE__ */ new Map();
-  for (const item of items) {
-    const k = key(item);
-    let arr = map.get(k);
-    if (!arr) {
-      arr = [];
-      map.set(k, arr);
-    }
-    arr.push(item);
-  }
-  return map;
-}
-function deriveComponentId(name, source) {
-  return createHash2("sha256").update(`${name}:${source}`).digest("hex").slice(0, 12);
-}
 function storeCDFComponents(db, sessionId2, components) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const updateComp = db.prepare(
@@ -9916,7 +10265,7 @@ function storeCDFComponents(db, sessionId2, components) {
           }
         }
       } else {
-        const componentId = createHash2("sha256").update(`${key}:generated`).digest("hex").slice(0, 12);
+        const componentId = deriveComponentId(key, "generated");
         db.prepare(
           `INSERT INTO raw_components (session_id, component_id, name, source, framework, extracted_at, status, description)
            VALUES (?, ?, ?, '', 'react', ?, 'generated', ?)`
@@ -9994,15 +10343,15 @@ 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])
   );
-  const propsByComponent = groupBy(props, (p) => p.component_id);
-  const allowedValuesByProp = groupBy(allowedValues, (av) => `${av.component_id}::${av.prop_name}`);
-  const slotsByComponent = groupBy(slots, (s) => s.component_id);
-  const allowedComponentsBySlot = groupBy(allowedComponents, (ac) => `${ac.component_id}::${ac.slot_name}`);
-  const tokenPathsByProp = groupBy(tokenPaths, (t) => `${t.component_id}::${t.prop_name}`);
+  const propsByComponent = indexRowsByKey(props, (p) => p.component_id);
+  const allowedValuesByProp = indexRowsByKey(allowedValues, (av) => `${av.component_id}::${av.prop_name}`);
+  const slotsByComponent = indexRowsByKey(slots, (s) => s.component_id);
+  const allowedComponentsBySlot = indexRowsByKey(allowedComponents, (ac) => `${ac.component_id}::${ac.slot_name}`);
+  const tokenPathsByProp = indexRowsByKey(tokenPaths, (t) => `${t.component_id}::${t.prop_name}`);
   const toTokenPaths = (rows) => rows === void 0 ? void 0 : rows.map((r) => r.path);
   return components.map(({ component_id, name, description }) => {
     const compProps = propsByComponent.get(component_id) ?? [];
@@ -10067,8 +10416,8 @@ function loadScopeComponents(db, sessionId2) {
     `SELECT component_id, slot_name, position, allowed_component
        FROM raw_slot_allowed_components WHERE session_id = ? ORDER BY component_id, slot_name, position`
   ).all(sessionId2);
-  const slotsByComponent = groupBy(slotRows, (s) => s.component_id);
-  const allowedBySlot = groupBy(allowedRows, (a) => `${a.component_id}::${a.slot_name}`);
+  const slotsByComponent = indexRowsByKey(slotRows, (s) => s.component_id);
+  const allowedBySlot = indexRowsByKey(allowedRows, (a) => `${a.component_id}::${a.slot_name}`);
   return rows.map((r) => {
     const reviewReasons = parseReviewReasons(r.review_reasons);
     const nonAuthorableReason = reviewReasons.find((reason) => reason.startsWith("non-authorable:"));
@@ -10106,91 +10455,8 @@ 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) {
-  const row = db.prepare(
-    `SELECT s.id FROM sessions s
-       JOIN steps st ON st.session_id = s.id
-       WHERE st.command = ? AND st.status = 'complete'
-       ORDER BY st.started_at DESC, st.id DESC
-       LIMIT 1`
-  ).get(command);
-  return row?.id ?? null;
+  return getLatestCompletedSessionForCommand(db, command);
 }
 function seedCDFFromPreviewResponse(db, sessionId2, removedItems) {
   if (removedItems.length === 0) return 0;
@@ -10207,14 +10473,8 @@ function seedCDFFromPreviewResponse(db, sessionId2, removedItems) {
     const contentProps = new Set(item.contentProperties);
     const designProps = new Set(item.designProperties);
     for (const [propName, propSummary] of Object.entries(item.fullProperties)) {
-      const cdfType = mapServerTypeToCDFType(propSummary.type);
-      if (!cdfType) continue;
-      let cdfCategory = propSummary.category || null;
-      if (!cdfCategory || !["content", "design", "state"].includes(cdfCategory)) {
-        if (contentProps.has(propName)) cdfCategory = "content";
-        else if (designProps.has(propName)) cdfCategory = "design";
-        else cdfCategory = "state";
-      }
+      const cdfType = mapContentfulTypeToCdfType(propSummary.type);
+      const cdfCategory = resolveCdfCategory(propSummary.category, propName, contentProps, designProps);
       const result = updateStmt.run(cdfType, cdfCategory, sessionId2, localComponent.component_id, propName);
       totalSeeded += Number(result.changes);
     }
@@ -10244,14 +10504,8 @@ function seedDefaultsFromChangedItems(db, sessionId2, changedItems) {
         const result2 = updateDefaultStmt.run(defaultStr, sessionId2, localComponent.component_id, propName);
         totalSeeded += Number(result2.changes);
       }
-      const cdfType = mapServerTypeToCDFType(propSummary.type);
-      if (!cdfType) continue;
-      let cdfCategory = propSummary.category || null;
-      if (!cdfCategory || !["content", "design", "state"].includes(cdfCategory)) {
-        if (contentProps.has(propName)) cdfCategory = "content";
-        else if (designProps.has(propName)) cdfCategory = "design";
-        else cdfCategory = "state";
-      }
+      const cdfType = mapContentfulTypeToCdfType(propSummary.type);
+      const cdfCategory = resolveCdfCategory(propSummary.category, propName, contentProps, designProps);
       const result = updateCDFStmt.run(cdfType, cdfCategory, sessionId2, localComponent.component_id, propName);
       totalSeeded += Number(result.changes);
     }
@@ -10275,48 +10529,6 @@ function backfillUnclassifiedProps(db, sessionId2) {
   ).run(sessionId2, sessionId2);
   return Number(withCategory.changes) + Number(withoutCategory.changes);
 }
-function mapServerTypeToCDFType(serverType) {
-  switch (serverType.toLowerCase()) {
-    case "string":
-    case "text":
-      return "string";
-    case "richtext":
-      return "richtext";
-    case "media":
-      return "media";
-    case "link":
-      return "link";
-    case "enum":
-    case "symbol":
-      return "enum";
-    case "token":
-      return "token";
-    case "boolean":
-      return "boolean";
-    default:
-      return "string";
-  }
-}
-function computeComponentInputHash(component) {
-  const payload = {
-    framework: component.framework,
-    name: component.name,
-    source: component.source,
-    props: component.props.map((p) => ({
-      name: p.name,
-      type: p.type
-    })),
-    slots: component.slots.map((s) => ({
-      name: s.name,
-      isDefault: s.isDefault,
-      allowedComponents: [...s.allowedComponents ?? []].sort()
-    }))
-  };
-  return createHash2("sha256").update(JSON.stringify(payload)).digest("hex");
-}
-function computeTokenInputHash(rawTokenContent) {
-  return createHash2("sha256").update(rawTokenContent.trim()).digest("hex");
-}
 function computeMapTokensInputHash(db, sessionId2, componentSourceRefs = []) {
   const props = db.prepare(
     `SELECT rc.name AS component_name, rp.name AS prop_name, rp.cdf_token_kind, rp.default_value
@@ -10346,7 +10558,7 @@ function computeMapTokensInputHash(db, sessionId2, componentSourceRefs = []) {
       usesNotShown: [...ref.usesNotShown ?? []].sort()
     }))
   };
-  return createHash2("sha256").update(JSON.stringify(payload)).digest("hex");
+  return createHash5("sha256").update(JSON.stringify(payload)).digest("hex");
 }
 function lookupCache(db, inputHash, entityType, entityId, promptHash = "") {
   const row = db.prepare(
@@ -10654,8 +10866,25 @@ var SCHEMA, MAX_COMPONENT_SOURCE_CHARS, MAX_SIBLING_FILES, MAX_SIBLING_SNIPPET_C
 var init_db = __esm({
   "packages/experience-design-system-cli/src/session/db.ts"() {
     "use strict";
-    init_session_id();
     init_source_excerpt();
+    init_derive_component_id();
+    init_cdf_mappers();
+    init_index_rows_by_key();
+    init_read();
+    init_write();
+    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;
@@ -10932,11 +11161,11 @@ var init_persistence = __esm({
 });
 
 // packages/experience-design-system-cli/src/analyze/select/parser.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 import { access as access2 } from "node:fs/promises";
 import { isAbsolute, relative, resolve as resolve9 } from "node:path";
 function createComponentId(name, resolvedSourcePath) {
-  const sourceHash = createHash3("sha256").update(`${name}:${resolvedSourcePath}`).digest("hex").slice(0, 12);
+  const sourceHash = createHash6("sha256").update(`${name}:${resolvedSourcePath}`).digest("hex").slice(0, 12);
   return `${name}-${sourceHash}`;
 }
 async function resolveComponentSourcePath(source, reviewRoot) {
@@ -17364,7 +17593,7 @@ var init_save_conflict = __esm({
 });
 
 // packages/experience-design-system-cli/src/runs/fingerprint.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 import { readFile as readFile24, stat as stat5 } from "node:fs/promises";
 import { resolve as resolve23 } from "node:path";
 function rowField(row, key) {
@@ -17372,7 +17601,7 @@ function rowField(row, key) {
   return typeof v === "string" ? v : null;
 }
 function sha256Hex(buf) {
-  return createHash4("sha256").update(buf).digest("hex");
+  return createHash7("sha256").update(buf).digest("hex");
 }
 async function buildSourceFingerprint(opts) {
   const rows = opts.db.prepare("SELECT name, source_path FROM raw_components WHERE session_id = ?").all(opts.extractSessionId);
@@ -24861,7 +25090,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
       }));
@@ -26749,7 +26978,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
       }));
@@ -28098,7 +28327,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(
@@ -28107,7 +28336,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();
       }
@@ -30731,7 +30960,7 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
       try {
         for (let i = 0; i < components.length; i++) {
           const candidate = components[i];
-          const compHash = computeComponentInputHash(candidate.component);
+          const compHash = hashComponentShape(candidate.component);
           const hit = lookupSelectCache(db, compHash, promptHash, cliVersion2);
           if (hit) {
             const finalColor = hit.decision === "accepted" ? c.green : c.red;
@@ -30805,7 +31034,7 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
           const r = results[i];
           if (!r || r.failed || !r.decision) continue;
           const candidate = components[i];
-          const compHash = computeComponentInputHash(candidate.component);
+          const compHash = hashComponentShape(candidate.component);
           storeSelectCache(db, compHash, promptHash, cliVersion2, r.decision, r.reason ?? null);
         }
       } finally {
@@ -32751,7 +32980,7 @@ function printFallbackInstructions(options) {
 async function runOneComponent(agent, model, db, sessionId2, component, tokensInline, tokenMapInline, index, total, verbose, noCache, skillPathOverride, promptHash, existingContentfulEntities, existingTokensInline) {
   const pos = c.dim(`[${index + 1}/${total}]`);
   if (!noCache) {
-    const inputHash = computeComponentInputHash(component);
+    const inputHash = hashComponentShape(component);
     const cached = lookupCache(db, inputHash, "component", component.component_id, promptHash);
     if (cached) {
       copyComponentFromCache(db, cached.sourceSessionId, sessionId2, component.component_id);
@@ -32874,7 +33103,7 @@ ${outputBuf}`);
     }
     const applied = applyToolCalls(db, sessionId2, component.component_id, component.name, calls, warnings);
     if (!noCache) {
-      const inputHash = computeComponentInputHash(component);
+      const inputHash = hashComponentShape(component);
       storeCache(db, inputHash, "component", component.component_id, sessionId2, false, promptHash);
     }
     return {
@@ -33171,7 +33400,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
   } else if (skill === "tokens") {
     const noCache = opts.cache === false || process.env.EDS_NO_CACHE === "1";
     const tokenInputContent = rawTokensInline ?? "";
-    const tokenInputHash = computeTokenInputHash(tokenInputContent);
+    const tokenInputHash = hashTokenContent(tokenInputContent);
     const db = openPipelineDb();
     try {
       let resolvedSessionId = opts.session;
@@ -33329,7 +33558,7 @@ function registerGenerateCommand(program) {
 // packages/experience-design-system-cli/src/program.ts
 init_command();
 
-// packages/experience-design-system-cli/src/session/command.ts
+// packages/experience-design-system-cli/src/session/cli.ts
 init_db();
 
 // packages/experience-design-system-cli/src/session/stats.ts
@@ -33533,7 +33762,7 @@ function migrateImportDb(db, _now) {
   }
 }
 
-// packages/experience-design-system-cli/src/session/command.ts
+// packages/experience-design-system-cli/src/session/cli.ts
 function parseDuration(str) {
   const m = /^(\d+)([dwmy])$/.exec(str);
   if (!m) return null;
@@ -34195,7 +34424,7 @@ function registerPrintCommand(program) {
     const db = openPipelineDb();
     let result;
     try {
-      result = loadDTCGTokens(db, sessionId2);
+      result = getDtcgTokensForSession(db, sessionId2);
     } finally {
       db.close();
     }
@@ -34545,7 +34774,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 = [
@@ -34580,7 +34809,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(
@@ -35065,7 +35294,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;