astro-tractstack 2.0.41 → 2.0.42

package/templates/src/pages/storykeep/branding.astro

@@ -6,6 +6,7 @@ import { requireAdminOrEditor, isAuthenticated, isAdmin } from '@/utils/auth';
 import { getFullContentMap } from '@/stores/analytics';
 import { getBrandConfig } from '@/utils/api/brandConfig';
 import { preHealthCheck } from '@/utils/backend';
+import type { LoadData } from '@/types/compositorTypes';
 
 const tenantId =
   Astro.locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
@@ -23,10 +24,25 @@ if (authCheck) {
 const userIsAuthenticated = isAuthenticated(Astro);
 const userIsAdmin = isAdmin(Astro);
 const role = userIsAdmin ? `admin` : userIsAuthenticated ? `editor` : null;
-
 const brandConfig = await getBrandConfig(tenantId);
 const initializing = !brandConfig.SITE_INIT;
 
+let initialSuitcase: LoadData | null = null;
+if (initializing) {
+  const goBackend =
+    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+  try {
+    const response = await fetch(`${goBackend}/api/v1/setup/suitcase`, {
+      headers: { 'X-Tenant-Id': tenantId },
+    });
+    if (response.ok) {
+      initialSuitcase = await response.json();
+    }
+  } catch (e) {
+    console.warn('[Branding] Failed to probe suitcase:', e);
+  }
+}
+
 const title = 'Branding | StoryKeep';
 
 let fullContentMap;
@@ -52,6 +68,7 @@ try {
         role={role}
         initializing={initializing}
         initialBrandConfig={brandConfig}
+        initialSuitcase={initialSuitcase}
       />
     </div>
   </main>

package/templates/src/pages/storykeep/init.astro

@@ -1,7 +1,7 @@
 ---
 import { freshInstallStore } from '@/stores/backend';
 import { preHealthCheck } from '@/utils/backend';
-import SetupWizard from '@/components/storykeep/widgets/SetupWizard';
+import InitWizard from '@/components/storykeep/widgets/InitWizard';
 
 const isMultiTenant = import.meta.env.PUBLIC_ENABLE_MULTI_TENANT === 'true';
 
@@ -41,7 +41,7 @@ const mainStylesUrl = isDev
         </div>
       ) : (
         <div class="max-w-5xl p-3.5 md:p-8">
-          <SetupWizard client:load />
+          <InitWizard client:load />
         </div>
       )
     }

package/templates/src/stores/analytics.ts

@@ -11,7 +11,6 @@ export interface AppliedFilter {
   value: string;
 }
 
-// Internal tenant-keyed storage
 const tenantEpinetCustomFilters = atom<
   Record<
     string,
@@ -50,13 +49,13 @@ const tenantFullContentMaps = atom<
 
 // Helper to get current tenant ID
 function getCurrentTenantId(): string {
-  if (typeof window !== 'undefined' && window.TRACTSTACK_CONFIG?.tenantId) {
-    return window.TRACTSTACK_CONFIG.tenantId;
-  }
-  return import.meta.env.PUBLIC_TENANTID || 'default';
+  const resolvedTenantId =
+    (typeof window !== 'undefined' && window.TRACTSTACK_CONFIG?.tenantId) ||
+    import.meta.env.PUBLIC_TENANTID ||
+    'default';
+  return resolvedTenantId;
 }
 
-// Default filter state
 const defaultEpinetFilters = {
   enabled: false,
   visitorType: 'all' as 'all' | 'anonymous' | 'known',
@@ -69,7 +68,6 @@ const defaultEpinetFilters = {
   appliedFilters: [],
 };
 
-// Create tenant-aware atoms that work with useStore
 const createEpinetFiltersStore = () => {
   const store = {
     get: () => {
@@ -95,8 +93,6 @@ const createEpinetFiltersStore = () => {
         callback(filters[tenantId] || defaultEpinetFilters);
       });
     },
-
-    // Required nanostore properties for useStore
     lc: 0,
     listen: function (callback: any) {
       return this.subscribe(callback);
@@ -131,8 +127,6 @@ const createFullContentMapStore = () => {
         callback(maps[tenantId] || null);
       });
     },
-
-    // Required nanostore properties for useStore
     lc: 0,
     listen: function (callback: any) {
       return this.subscribe(callback);
@@ -152,15 +146,12 @@ export const fullContentMapStore = createFullContentMapStore();
 
 export async function getFullContentMap(tenantId: string): Promise<any[]> {
   const api = new TractStackAPI(tenantId);
-
-  // Check tenant-specific cache
   const cached = tenantFullContentMaps.get()[tenantId];
 
   try {
     const response = await api.getContentMapWithTimestamp(cached?.lastUpdated);
 
     if (response.success && response.data) {
-      // Update tenant-specific cache
       const newData = {
         data: response.data.data,
         lastUpdated: response.data.lastUpdated,

package/templates/src/stores/nodes.ts

@@ -609,7 +609,7 @@ export class NodesContext {
       return { left: originalNode, right: null };
     }
 
-    // Handle split at the beginning of the string (THE FIX)
+    // Handle split at the beginning of the string
     if (offset === 0) {
       if (VERBOSE)
         console.log(
@@ -1992,8 +1992,6 @@ export class NodesContext {
 
     let autoCreatedMarkdownNode: MarkdownPaneFragmentNode | null = null;
 
-    //console.log(`--- [TRAP - TEMPLATE BEFORE] ---`, cloneDeep(node));
-    // 3. HANDLE EMPTY PANE BY AUTO-CREATING A MARKDOWN NODE
     if (targetNode.nodeType === 'Pane') {
       // Create a minimal markdown node to act as the container
       const newMarkdownNode: MarkdownPaneFragmentNode = {
@@ -2070,8 +2068,6 @@ export class NodesContext {
       );
     }
 
-    //console.log(`--- [TRAP - FLATTENED AFTER] ---`, cloneDeep(flattenedNodes));
-
     // 5. PERFORM REMAINING STATE MUTATIONS
     if (originalPaneNode) {
       this.modifyNodes([{ ...originalPaneNode, isChanged: true }], {
@@ -2838,7 +2834,6 @@ export class NodesContext {
 
   getDirtyNodesClassData(): { dirtyPaneIds: string[]; classes: string[] } {
     const dirtyNodes = this.getDirtyNodes();
-
     const dirtyPaneIds = dirtyNodes
       .filter((node) => node.nodeType === 'Pane')
       .map((node) => node.id);

package/templates/src/stores/orphanAnalysis.ts

@@ -24,10 +24,11 @@ const tenantOrphanAnalysis = atom<Record<string, OrphanAnalysisState>>({});
 
 // Helper to get current tenant ID
 function getCurrentTenantId(): string {
-  if (typeof window !== 'undefined' && window.TRACTSTACK_CONFIG?.tenantId) {
-    return window.TRACTSTACK_CONFIG.tenantId;
-  }
-  return import.meta.env.PUBLIC_TENANTID || 'default';
+  const resolvedTenantId =
+    (typeof window !== 'undefined' && window.TRACTSTACK_CONFIG?.tenantId) ||
+    import.meta.env.PUBLIC_TENANTID ||
+    'default';
+  return resolvedTenantId;
 }
 
 // Default state
@@ -38,7 +39,6 @@ const defaultOrphanState: OrphanAnalysisState = {
   lastFetched: null,
 };
 
-// Create tenant-aware store that works with useStore
 const createOrphanAnalysisStore = () => {
   const store = {
     get: () => {
@@ -52,8 +52,6 @@ const createOrphanAnalysisStore = () => {
         callback(analysis[tenantId] || defaultOrphanState);
       });
     },
-
-    // Required nanostore properties for useStore
     lc: 0,
     listen: function (callback: any) {
       return this.subscribe(callback);
@@ -71,7 +69,6 @@ const createOrphanAnalysisStore = () => {
 
 export const orphanAnalysisStore = createOrphanAnalysisStore();
 
-// Helper to update state for specific tenant
 function updateTenantState(
   tenantId: string,
   updates: Partial<OrphanAnalysisState>
@@ -88,7 +85,6 @@ function updateTenantState(
   });
 }
 
-// Helper function to count orphans from the analysis data
 export function countOrphans(data: OrphanAnalysisData | null): number {
   if (!data) return 0;
 
@@ -374,34 +370,3 @@ function stopPolling(tenantId: string): void {
   // Clean up polling state
   pollingState.delete(tenantId);
 }
-
-export function clearOrphanAnalysis(): void {
-  const tenantId = getCurrentTenantId();
-  stopPolling(tenantId);
-  fetchingStates.set(tenantId, false);
-
-  updateTenantState(tenantId, defaultOrphanState);
-}
-
-// Enhanced utility function to get polling status for debugging
-export function getPollingStatus(tenantId?: string): Record<string, any> {
-  const targetTenantId = tenantId || getCurrentTenantId();
-  const state = pollingState.get(targetTenantId);
-  const isActive = pollingIntervals.has(targetTenantId);
-
-  if (!state && !isActive) {
-    return { status: 'inactive', tenantId: targetTenantId };
-  }
-
-  return {
-    status: isActive ? 'active' : 'stopped',
-    tenantId: targetTenantId,
-    attempts: state?.attempts || 0,
-    maxAttempts: MAX_POLLING_ATTEMPTS,
-    consecutiveErrors: state?.consecutiveErrors || 0,
-    startTime: state?.startTime,
-    lastAttemptTime: state?.lastAttemptTime,
-    elapsed: state?.startTime ? Date.now() - state.startTime : 0,
-    maxDuration: MAX_POLLING_DURATION,
-  };
-}

package/templates/src/types/compositorTypes.ts

@@ -239,7 +239,7 @@ export interface PaneNode extends BaseNode {
 export interface StoryFragmentNode extends BaseNode {
   title: string;
   slug: string;
-  tractStackId?: string;
+  tractStackId: string;
   paneIds: string[];
   menuId?: string;
   tailwindBgColour?: string;

package/templates/src/types/tractstack.ts

@@ -184,6 +184,7 @@ export interface BrandConfig {
   KNOWN_RESOURCES?: KnownResourcesConfig;
   DESIGN_LIBRARY?: DesignLibraryConfig;
   HAS_AAI?: boolean;
+  HAS_HYDRATION_TOKEN?: boolean;
 }
 
 export interface BrandConfigState {
@@ -217,6 +218,7 @@ export interface BrandConfigState {
   knownResources: KnownResourcesConfig;
   designLibrary?: DesignLibraryConfig;
   hasAAI: boolean;
+  hasHydrationToken: boolean;
 }
 
 // Form validation types

package/templates/src/utils/actions/actionButton.ts

@@ -18,6 +18,8 @@ async function sendAnalyticsEvent(event: {
   try {
     const config = window.TRACTSTACK_CONFIG;
     if (!config || !config.sessionId) return;
+    const backendUrl =
+      import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
 
     const sessionId = config.sessionId;
     const formData: { [key: string]: string } = {
@@ -31,7 +33,7 @@ async function sendAnalyticsEvent(event: {
       formData.duration = event.duration.toString();
     }
 
-    await fetch(`${config.backendUrl}/api/v1/state`, {
+    await fetch(`${backendUrl}/api/v1/state`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',

package/templates/src/utils/api/brandHelpers.ts

@@ -40,6 +40,7 @@ export function convertToLocalState(
     knownResources: brandConfig.KNOWN_RESOURCES ?? {},
     designLibrary: brandConfig.DESIGN_LIBRARY ?? undefined,
     hasAAI: brandConfig.HAS_AAI ?? false,
+    hasHydrationToken: brandConfig.HAS_HYDRATION_TOKEN ?? false,
   };
 }
 

package/templates/src/utils/api/setupHelpers.ts

@@ -1,4 +1,10 @@
+import { getCtx } from '@/stores/nodes';
 import { TractStackAPI } from '@/utils/api';
+import { pendingHomePageSlugStore } from '@/stores/storykeep';
+import type { FullContentMapItem } from '@/types/tractstack';
+import type { LoadData, TractStackNode } from '@/types/compositorTypes';
+
+const VERBOSE = false;
 
 export interface SetupWizardState {
   email: string;
@@ -18,43 +24,57 @@ export const initialSetupState: SetupWizardState = {
   tursoAuthToken: '',
 };
 
-/**
- * State interceptor (Preserving existing UI patterns)
- */
 export function setupStateIntercept(
   newState: SetupWizardState,
   field: keyof SetupWizardState,
   value: any
 ): SetupWizardState {
-  // Pattern: Clear Turso fields when disabled
+  if (VERBOSE)
+    console.log(
+      `[setupStateIntercept] Intercepting field: ${String(field)}, Value:`,
+      value
+    );
+
   if (field === 'tursoEnabled' && !value) {
-    return {
+    const result = {
       ...newState,
       tursoEnabled: false,
       tursoDatabaseURL: '',
       tursoAuthToken: '',
     };
+    if (VERBOSE)
+      console.log(
+        '[setupStateIntercept] Turso disabled. Resetting Turso fields.',
+        result
+      );
+    return result;
   }
 
-  // Pattern: Clear confirmation password when main password changes
   if (field === 'adminPassword') {
-    return {
+    const result = {
       ...newState,
       adminPassword: value,
       confirmPassword: '',
     };
+    if (VERBOSE)
+      console.log(
+        '[setupStateIntercept] Admin password changed. Clearing confirm password.'
+      );
+    return result;
   }
 
+  if (VERBOSE)
+    console.log(
+      '[setupStateIntercept] No special handling required. Returning new state.'
+    );
   return newState;
 }
 
-/**
- * Validation Logic (Preserving existing Regex and Rules)
- */
 export function validateSetup(state: SetupWizardState): Record<string, string> {
+  if (VERBOSE)
+    console.log('[validateSetup] Starting validation for state:', state);
   const errors: Record<string, string> = {};
 
-  // Email Validation pattern
   const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
   if (!state.email.trim()) {
     errors.email = 'Email is required';
@@ -62,19 +82,16 @@ export function validateSetup(state: SetupWizardState): Record<string, string> {
     errors.email = 'Please enter a valid email address';
   }
 
-  // Password Validation pattern
   if (!state.adminPassword.trim()) {
     errors.adminPassword = 'Admin password is required';
   } else if (state.adminPassword.length < 8) {
     errors.adminPassword = 'Admin password must be at least 8 characters long';
   }
 
-  // Confirmation Pattern
   if (!errors.adminPassword && state.adminPassword !== state.confirmPassword) {
     errors.confirmPassword = 'Passwords do not match';
   }
 
-  // Turso Validation Pattern
   if (state.tursoEnabled) {
     if (!state.tursoDatabaseURL.trim()) {
       errors.tursoDatabaseURL = 'Turso Database URL is required';
@@ -88,14 +105,26 @@ export function validateSetup(state: SetupWizardState): Record<string, string> {
     }
   }
 
+  if (Object.keys(errors).length > 0) {
+    if (VERBOSE)
+      console.error('[validateSetup] Validation failed with errors:', errors);
+  } else {
+    if (VERBOSE) console.log('[validateSetup] Validation successful.');
+  }
+
   return errors;
 }
 
-/**
- * API Call (Preserving Payload Structure)
- */
 export async function initializeSystem(state: SetupWizardState): Promise<void> {
-  const api = new TractStackAPI('default');
+  if (VERBOSE)
+    console.log('[initializeSystem] Starting system initialization.');
+
+  const tenantId =
+    window.TRACTSTACK_CONFIG?.tenantId ||
+    import.meta.env.PUBLIC_TENANTID ||
+    'default';
+
+  const api = new TractStackAPI(tenantId);
 
   const payload = {
     adminEmail: state.email.trim(),
@@ -106,9 +135,137 @@ export async function initializeSystem(state: SetupWizardState): Promise<void> {
     }),
   };
 
-  const response = await api.post('/api/v1/setup/initialize', payload);
+  const endpoint = '/api/v1/setup/initialize';
+  if (VERBOSE)
+    console.log(
+      `[initializeSystem] POSTing to ${endpoint}. Payload (passwords masked):`,
+      {
+        ...payload,
+        adminPassword: '***',
+      }
+    );
+
+  const response = await api.post(endpoint, payload);
+  if (VERBOSE)
+    console.log('[initializeSystem] API Response received:', response);
 
   if (!response.success) {
-    throw new Error(response.error || 'Setup failed');
+    const errorMessage = response.error || 'Setup failed';
+    if (VERBOSE)
+      console.error('[initializeSystem] Setup failed. Throwing error.');
+    throw new Error(errorMessage);
+  }
+
+  if (VERBOSE)
+    console.log('[initializeSystem] System initialization successful.');
+}
+
+function forceMarkAllDirty(ctx: any) {
+  if (VERBOSE)
+    console.log('[forceMarkAllDirty] Flagging all nodes for SaveModal...');
+  const allNodes = Array.from(ctx.allNodes.get().values());
+  const dirtyUpdates = allNodes.map((n: any) => ({ ...n, isChanged: true }));
+  ctx.modifyNodes(dirtyUpdates);
+}
+
+export function prepareHydrationContext(
+  data: LoadData,
+  fullContentMap?: FullContentMapItem[]
+): void {
+  if (VERBOSE)
+    console.log(
+      '[prepareHydrationContext] Preparing context for suitcase hydration.'
+    );
+
+  const ctx = getCtx();
+
+  if (!fullContentMap) {
+    throw new Error(
+      'Content map is required for suitcase installation to perform strict takeover.'
+    );
+  }
+
+  const tractStackNodeItem = fullContentMap.find(
+    (n) => n.type === 'TractStack'
+  );
+  if (!tractStackNodeItem) {
+    throw new Error(
+      'Missing TractStack node in content map. Cannot link content.'
+    );
   }
+
+  const helloFragment = fullContentMap.find(
+    (n) =>
+      (n.type === 'StoryFragment' || n.type === 'StoryFragment') &&
+      n.slug === 'hello'
+  );
+  if (!helloFragment) {
+    throw new Error(
+      "Missing 'hello' StoryFragment in content map. Cannot perform takeover."
+    );
+  }
+
+  if (!data.storyfragmentNodes || data.storyfragmentNodes.length !== 1) {
+    throw new Error(
+      'Suitcase must contain exactly one StoryFragment for takeover hydration.'
+    );
+  }
+
+  const incomingFragment = data.storyfragmentNodes[0];
+  const oldId = incomingFragment.id;
+  const targetId = helloFragment.id;
+
+  if (VERBOSE)
+    console.log(
+      `[prepareHydrationContext] TAKEOVER: Mapping 'hello' (${targetId}) with content from '${incomingFragment.title}'`
+    );
+
+  incomingFragment.id = targetId;
+  incomingFragment.slug = 'hello';
+  incomingFragment.tractStackId = tractStackNodeItem.id;
+  incomingFragment.parentId = tractStackNodeItem.id;
+
+  if (!data.tractstackNodes) {
+    data.tractstackNodes = [];
+  }
+  const rootTractStack = {
+    id: tractStackNodeItem.id,
+    nodeType: 'TractStack' as const,
+    parentId: null,
+    title: tractStackNodeItem.title || 'Tract Stack',
+    slug: tractStackNodeItem.slug || 'root',
+    socialImagePath: '',
+  };
+  data.tractstackNodes.push(rootTractStack as TractStackNode);
+
+  if (data.paneNodes) {
+    let patchedPanes = 0;
+    data.paneNodes.forEach((pane) => {
+      if (pane.parentId === oldId) {
+        pane.parentId = targetId;
+        patchedPanes++;
+      }
+    });
+    if (VERBOSE)
+      console.log(
+        `[prepareHydrationContext] Re-parented ${patchedPanes} panes from ${oldId} to ${targetId}`
+      );
+  }
+
+  if (VERBOSE)
+    console.log(`[prepareHydrationContext] Building the Nodes Context tree`);
+
+  ctx.buildNodesTreeFromRowDataMadeNodes(data);
+
+  if (VERBOSE)
+    console.log(
+      `[prepareHydrationContext] Marking the Nodes Context tree as dirty`
+    );
+  forceMarkAllDirty(ctx);
+
+  if (VERBOSE)
+    console.log(
+      '[prepareHydrationContext] Setting pending home page slug to "hello"'
+    );
+  pendingHomePageSlugStore.set('hello');
 }

package/templates/src/utils/api.ts

@@ -20,28 +20,13 @@ export interface TractStackEvent {
 }
 
 function getConfig() {
-  if (typeof window === 'undefined') {
-    return {
-      goBackend: import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080',
-      tenantId: import.meta.env.PUBLIC_TENANTID || 'default',
-    };
-  }
-
   return {
-    goBackend:
-      window.TRACTSTACK_CONFIG?.backendUrl ||
-      import.meta.env.PUBLIC_GO_BACKEND ||
-      'http://localhost:8080',
-    tenantId:
-      window.TRACTSTACK_CONFIG?.tenantId ||
-      import.meta.env.PUBLIC_TENANTID ||
-      'default',
+    goBackend: import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080',
   };
 }
 
 export class TractStackAPI {
   private explicitTenantId?: string;
-
   constructor(tenantId?: string) {
     this.explicitTenantId = tenantId;
   }
@@ -51,7 +36,19 @@ export class TractStackAPI {
     options: RequestInit = {}
   ): Promise<APIResponse<T>> {
     const config = getConfig();
-    const effectiveTenantId = this.explicitTenantId || config.tenantId;
+
+    const effectiveTenantId = this.explicitTenantId;
+
+    if (!effectiveTenantId) {
+      console.error(
+        '[TractStackAPI] CRITICAL ERROR: Tenant ID is required but was not provided to the constructor. Failing request.'
+      );
+      return {
+        success: false,
+        error: 'Tenant ID missing. Must be provided in constructor.',
+      };
+    }
+
     const baseUrl = config.goBackend;
 
     const url = `${baseUrl}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`;
@@ -147,15 +144,6 @@ export class TractStackAPI {
     return this.get(`/api/v1/fragments/${fragmentId}`);
   }
 
-  getTenantId(): string {
-    const config = getConfig();
-    return this.explicitTenantId || config.tenantId;
-  }
-
-  setTenantId(tenantId: string): void {
-    this.explicitTenantId = tenantId;
-  }
-
   async getContentMapWithTimestamp(
     lastUpdated?: number
   ): Promise<APIResponse<{ data: any[]; lastUpdated: number }>> {

package/templates/src/utils/compositor/nodesHelper.ts

@@ -326,6 +326,7 @@ export function createEmptyStorykeep(id: string) {
   return {
     id,
     nodeType: 'StoryFragment',
+    tractStackId: 'temp',
     parentId: null,
     isChanged: false,
     paneIds: [],
@@ -503,13 +504,16 @@ export function extractClassesFromNodes(dirtyNodes: BaseNode[]): string[] {
   const uniqueClasses = new Set<string>();
 
   dirtyNodes.forEach((node) => {
-    // Extract from parentCss arrays (like legacy getTailwindWhitelist)
     if ('parentCss' in node && Array.isArray(node.parentCss)) {
       node.parentCss.forEach((classString: string) => {
         classString.split(' ').forEach((className: string) => {
           if (className.trim()) uniqueClasses.add(className.trim());
         });
       });
+    } else if ('parentCss' in node && typeof node.parentCss === `string`) {
+      node.parentCss.split(' ').forEach((className: string) => {
+        if (className.trim()) uniqueClasses.add(className.trim());
+      });
     }
 
     // Extract from elementCss strings (like legacy getTailwindWhitelist)

package/templates/src/utils/tenantResolver.ts

@@ -1,4 +1,4 @@
-const VERBOSE = true;
+const VERBOSE = false;
 
 interface TenantResolution {
   id: string;

package/utils/inject-files.ts

@@ -2105,9 +2105,15 @@ export async function injectTemplateFiles(
     },
     {
       src: resolve(
-        '../templates/src/components/storykeep/widgets/SetupWizard.tsx'
+        '../templates/src/components/storykeep/widgets/HydrateWizard.tsx'
       ),
-      dest: 'src/components/storykeep/widgets/SetupWizard.tsx',
+      dest: 'src/components/storykeep/widgets/HydrateWizard.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/widgets/InitWizard.tsx'
+      ),
+      dest: 'src/components/storykeep/widgets/InitWizard.tsx',
     },
     {
       src: resolve('../templates/src/pages/storykeep/init.astro'),