From 852b47ae0700fd67c39abc5a0f30634de7e16b92 Mon Sep 17 00:00:00 2001
From: underscope <underscope@gmail.com>
Date: Tue, 31 Mar 2026 08:48:44 +0200
Subject: [PATCH 1/3] Enable container presets & collapsible behaviour

---
 .../src/schemas/partner-training-v2.schema.ts |   7 +
 .../src/edit/StructuredSubcontainer.vue       | 134 +++++++++++++-----
 .../structured-content/src/edit/config.js     |  20 ++-
 .../structured-content/src/edit/index.vue     |  90 +++++++++---
 4 files changed, 194 insertions(+), 57 deletions(-)

diff --git a/config/src/schemas/partner-training-v2.schema.ts b/config/src/schemas/partner-training-v2.schema.ts
index 62ce7566e..d74f62afe 100644
--- a/config/src/schemas/partner-training-v2.schema.ts
+++ b/config/src/schemas/partner-training-v2.schema.ts
@@ -137,6 +137,13 @@ const SectionContainer: ContentContainerConfig = {
   required: true,
   displayHeading: false,
   config: {
+    isCollapsible: true,
+    defaultSubcontainers: [
+      { type: ActivityType.Section, data: { title: 'Intro' } },
+      { type: ActivityType.Section, data: { title: 'Key Concepts' } },
+      { type: ActivityType.Section, data: { title: 'Top Advisors' } },
+      { type: ActivityType.Section, data: { title: 'Talking Points' } },
+    ],
     [ActivityType.Section]: {
       label: 'Section',
       meta: () => [...sectionMeta],
diff --git a/packages/core-extensions/content-containers/structured-content/src/edit/StructuredSubcontainer.vue b/packages/core-extensions/content-containers/structured-content/src/edit/StructuredSubcontainer.vue
index a96530fd6..d70e85f58 100644
--- a/packages/core-extensions/content-containers/structured-content/src/edit/StructuredSubcontainer.vue
+++ b/packages/core-extensions/content-containers/structured-content/src/edit/StructuredSubcontainer.vue
@@ -1,52 +1,86 @@
 <template>
   <VCard class="mb-8 py-2 px-5" elevation="4">
-    <div class="d-flex align-center mt-3 mx-1 mb-8">
-      <VCardTitle class="text-primary-darken-3 text-truncate">
-        <VIcon class="mr-2" color="primary-darken-4">
-          {{ icon }}
-        </VIcon>
+    <div
+      :class="{
+        'subcontainer-header-collapsible': isCollapsible,
+        'mb-8': isExpanded,
+      }"
+      class="d-flex align-center mt-3 mx-1"
+      @click="isCollapsible && toggleExpanded()"
+    >
+      <VCardTitle class="pb-4 text-primary-darken-3 text-truncate">
+        <VIcon class="mr-2" color="primary-darken-4">{{ icon }}</VIcon>
         {{ label }}
+        <span
+          v-if="!isExpanded && collapsedPreviewText"
+          class="ml-3 text-body-2 text-medium-emphasis font-weight-regular"
+        >
+          {{ collapsedPreviewText }}
+        </span>
       </VCardTitle>
       <VSpacer />
+      <VChip
+        v-if="!isExpanded && elementCount"
+        class="mr-2 flex-shrink-0"
+        color="primary-lighten-1"
+        size="x-small"
+        variant="tonal"
+      >
+        {{ elementCount }} {{ elementCount === 1 ? 'element' : 'elements' }}
+      </VChip>
+      <VBtn
+        v-if="isCollapsible"
+        :icon="isExpanded ? 'mdi-chevron-up' : 'mdi-chevron-down'"
+        class="mr-2"
+        color="primary-darken-3"
+        size="small"
+        variant="text"
+        @click.stop="toggleExpanded"
+      />
       <VBtn
+        v-if="isExpanded && !isDisabled"
         class="mr-5"
         color="secondary-darken-3"
         size="small"
         variant="tonal"
-        @click="emit('delete:subcontainer', container, label)"
+        @click.stop="emit('delete:subcontainer', container, label)"
       >
         Delete {{ label }}
       </VBtn>
     </div>
-    <VRow v-if="processedMeta.length">
-      <VCol
-        v-for="input in processedMeta"
-        :key="input.key"
-        :cols="input.cols || 12"
-        class="pt-0 pb-3 px-8"
-      >
-        <MetaInput
-          :meta="input"
-          @update="(key, val) => (containerData[key] = val)"
+    <VExpandTransition>
+      <div v-show="isExpanded">
+        <VRow v-if="processedMeta.length">
+          <VCol
+            v-for="input in processedMeta"
+            :key="input.key"
+            :cols="input.cols || 12"
+            class="pt-0 pb-3 px-8"
+          >
+            <MetaInput
+              :meta="input"
+              @update="(key, val) => (containerData[key] = val)"
+            />
+          </VCol>
+        </VRow>
+        <StructuredContent
+          v-if="!disableContentElementList"
+          v-bind="$attrs"
+          :activities="activities"
+          :container="container"
+          :elements="elements"
+          :is-disabled="isDisabled"
+          :label="'content elements'"
+          :layout="layout"
+          :supported-element-config="contentElementConfig"
+          @add:subcontainer="emit('add:subcontainer', $event)"
+          @update:subcontainer="emit('update:subcontainer', $event)"
+          @delete:subcontainer="emit('delete:subcontainer', $event)"
+          @delete:element="(el, force) => emit('delete:element', el, force)"
+          @reorder:element="emit('reorder:element', $event)"
         />
-      </VCol>
-    </VRow>
-    <StructuredContent
-      v-if="!disableContentElementList"
-      v-bind="$attrs"
-      :activities="activities"
-      :container="container"
-      :elements="elements"
-      :is-disabled="isDisabled"
-      :label="'content elements'"
-      :layout="layout"
-      :supported-element-config="contentElementConfig"
-      @add:subcontainer="emit('add:subcontainer', $event)"
-      @update:subcontainer="emit('update:subcontainer', $event)"
-      @delete:subcontainer="emit('delete:subcontainer', $event)"
-      @delete:element="(el, force) => emit('delete:element', el, force)"
-      @reorder:element="emit('reorder:element', $event)"
-    />
+      </div>
+    </VExpandTransition>
   </VCard>
 </template>
 
@@ -71,6 +105,9 @@ const props = defineProps<{
   layout?: boolean;
   contentElementConfig?: Array<any>;
   disableContentElementList?: boolean;
+  isCollapsible?: boolean;
+  expandAll?: boolean;
+  collapsedPreviewKey?: string | null;
 }>();
 
 const emit = defineEmits([
@@ -81,6 +118,30 @@ const emit = defineEmits([
   'delete:element',
 ]);
 
+const elementCount = computed(() => {
+  return Object.values(props.elements).filter(
+    (el) => el.activityId === props.container.id,
+  ).length;
+});
+
+const isExpanded = ref(true);
+
+const collapsedPreviewText = computed(() => {
+  const key = props.collapsedPreviewKey || props.meta?.[0]?.key;
+  return key ? props.container?.data?.[key] || '' : '';
+});
+
+const toggleExpanded = () => {
+  isExpanded.value = !isExpanded.value;
+};
+
+watch(
+  () => props.expandAll,
+  (expanded) => {
+    if (props.isCollapsible) isExpanded.value = !!expanded;
+  },
+);
+
 const containerData = ref({ ...props.container?.data }) as any;
 
 const processedMeta = computed(() =>
@@ -102,4 +163,9 @@ watch(containerData, save, { deep: true });
 .meta-container :deep(.v-messages) {
   text-align: left;
 }
+
+.subcontainer-header-collapsible {
+  cursor: pointer;
+  user-select: none;
+}
 </style>
diff --git a/packages/core-extensions/content-containers/structured-content/src/edit/config.js b/packages/core-extensions/content-containers/structured-content/src/edit/config.js
index b0d116e06..63d109406 100644
--- a/packages/core-extensions/content-containers/structured-content/src/edit/config.js
+++ b/packages/core-extensions/content-containers/structured-content/src/edit/config.js
@@ -14,10 +14,21 @@ const DEFAULT_CONFIG = {
 };
 
 export const parseConfig = (repository, outlineActivity, container, config) => {
-  if (!config) return DEFAULT_CONFIG;
-  return reduce(
+  if (!config) return { subcontainers: DEFAULT_CONFIG, defaultSubcontainers: [], isCollapsible: false };
+  // Container-level options (skipped by the sub-type reduce below):
+  // - isCollapsible: enable collapse/expand for subcontainers
+  // - collapsedPreviewKey: meta key to display in collapsed subcontainer header
+  // - defaultSubcontainers: initial subcontainers to create on mount
+  const CONTAINER_OPTIONS = ['isCollapsible', 'collapsedPreviewKey', 'defaultSubcontainers'];
+  const {
+    isCollapsible = false,
+    collapsedPreviewKey = null,
+    defaultSubcontainers = [],
+  } = config;
+  const subcontainers = reduce(
     config,
     (acc, val, key) => {
+      if (CONTAINER_OPTIONS.includes(key)) return acc;
       acc[key] = {
         ...val,
         icon: val.icon || 'mdi-text',
@@ -28,9 +39,12 @@ export const parseConfig = (repository, outlineActivity, container, config) => {
         contentElementConfig: val.contentElementConfig,
         disableContentElementList: !!val.disableContentElementList,
         disableAi: !!val.disableAi,
+        isCollapsible: val.isCollapsible ?? isCollapsible,
+        collapsedPreviewKey: val.collapsedPreviewKey || collapsedPreviewKey,
       };
       return acc;
     },
-    {},
+    {} as Record<string, any>,
   );
+  return { subcontainers, defaultSubcontainers, isCollapsible };
 };
diff --git a/packages/core-extensions/content-containers/structured-content/src/edit/index.vue b/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
index 88cdaf1e8..0ef9cdde5 100644
--- a/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
+++ b/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
@@ -1,22 +1,45 @@
 <template>
   <div class="bg-primary-darken-3">
     <div
-      v-if="isAiEnabled && !disabled && !isAiGeneratingContent"
       :class="{
-        'pr-2 pb-0': !subcontainers?.length,
-        'pr-12 pb-6': !!subcontainers?.length,
+        'pr-2 pb-2': !subcontainers?.length,
+        'pr-0 pb-6': !!subcontainers?.length,
       }"
-      class="d-flex flex-wrap justify-end"
+      class="d-flex items-center justify-end"
     >
-      <VBtn
-        color="teal-lighten-4"
-        size="small"
-        variant="tonal"
-        @click="generateStructuredContent"
+      <span v-if="isAiEnabled && !disabled && !isAiGeneratingContent">
+        <VBtn
+          class="mr-2"
+          color="teal-lighten-4"
+          size="small"
+          variant="tonal"
+          @click="generateStructuredContent"
+        >
+          Generate content
+          <VIcon end>mdi-magic-staff</VIcon>
+        </VBtn>
+      </span>
+      <span
+        v-if="isCollapsible && subcontainers.length > 1 && !disabled"
+        v-show="!isAiGeneratingContent"
+        class="d-flex justify-end"
       >
-        Do the magic
-        <VIcon end>mdi-magic-staff</VIcon>
-      </VBtn>
+        <VBtn
+          color="primary-lighten-4"
+          size="small"
+          variant="tonal"
+          @click="toggleAll"
+        >
+          <VIcon start>
+            {{
+              expandAll
+                ? 'mdi-unfold-less-horizontal'
+                : 'mdi-unfold-more-horizontal'
+            }}
+          </VIcon>
+          {{ expandAll ? 'Collapse all' : 'Expand all' }}
+        </VBtn>
+      </span>
     </div>
     <VSheet
       v-if="isAiGeneratingContent"
@@ -49,11 +72,12 @@
     >
       <VCol>
         <StructuredSubcontainer
-          v-bind="config[subcontainer.type]"
+          v-bind="subcontainerConfig[subcontainer.type]"
           :activities="activities"
           :elements="elements"
           :container="subcontainer"
           :is-disabled="disabled"
+          :expand-all="expandAll"
           :content-element-config="getContentElementConfig(subcontainer.type)"
           @add:element="emit('add:element', $event)"
           @save:element="emit('save:element', $event)"
@@ -99,16 +123,16 @@
       >
         <div class="pr-2">
           <VIcon size="x-small">mdi-plus</VIcon>
-          <VIcon size="small">{{ config[subcontainerType].icon }}</VIcon>
+          <VIcon size="small">{{ subcontainerConfig[subcontainerType].icon }}</VIcon>
         </div>
-        Add {{ config[subcontainerType].label }}
+        Add {{ subcontainerConfig[subcontainerType].label }}
       </VBtn>
     </VRow>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, ref } from 'vue';
+import { computed, inject, onMounted, ref } from 'vue';
 import { cloneDeep, filter, find, findIndex } from 'lodash-es';
 import { AiRequestType, AiResponseSchema } from '@tailor-cms/interfaces/ai';
 import { CircularProgress } from '@tailor-cms/core-components';
@@ -165,12 +189,38 @@ const subcontainers = computed(() => {
   return items.sort((a, b) => a.position - b.position);
 });
 
-const config = computed(() => {
+const parsedConfig = computed(() => {
   const { repository, container, config } = props;
   return parseConfig(repository, containerParent.value, container, config);
 });
 
-const subcontainerTypes = computed(() => Object.keys(config.value || []));
+const subcontainerConfig = computed(() => parsedConfig.value.subcontainers);
+const subcontainerTypes = computed(() => Object.keys(subcontainerConfig.value || []));
+const defaultSubcontainers = computed(() => parsedConfig.value.defaultSubcontainers);
+
+const initDefaultSubcontainers = () => {
+  if (subcontainers.value.length > 0 || !defaultSubcontainers.value.length) return;
+  defaultSubcontainers.value.forEach((item: any, index: number) => {
+    const typeConfig = subcontainerConfig.value[item.type];
+    const initData = typeConfig?.initMeta?.() || {};
+    emit('add:subcontainer', {
+      type: item.type,
+      parentId: props.container.id,
+      position: index + 1,
+      data: { ...initData, ...item.data },
+    });
+  });
+};
+
+onMounted(initDefaultSubcontainers);
+
+const isCollapsible = computed(() => parsedConfig.value.isCollapsible);
+
+const expandAll = ref(true);
+
+const toggleAll = () => {
+  expandAll.value = !expandAll.value;
+};
 
 const nextPosition = computed(() => {
   if (!subcontainers.value.length) return 1;
@@ -200,13 +250,13 @@ const reorder = (id: number, step: number) => {
 const createSubcontainer = (type: string) => {
   const parentId = props.container.id;
   const position = nextPosition.value;
-  const data = config.value[type]?.initMeta?.();
+  const data = subcontainerConfig.value[type]?.initMeta?.();
   emit('add:subcontainer', { type, parentId, position, data });
 };
 
 const getContentElementConfig = (subcontainerType: string) => {
   return (
-    props.config[subcontainerType]?.contentElementConfig ||
+    props.subcontainerConfig[subcontainerType]?.contentElementConfig ||
     props.contentElementConfig
   );
 };

From bc0c5d5e05894ebc5de584f144d08867f3df2098 Mon Sep 17 00:00:00 2001
From: underscope <underscope@gmail.com>
Date: Tue, 31 Mar 2026 10:38:02 +0200
Subject: [PATCH 2/3] Add support preset based gen AI

---
 .../shared/ai/schemas/CcStructuredContent.ts  | 109 +++++++++++++++---
 .../src/edit/{config.js => config.ts}         |  43 ++++---
 .../structured-content/src/edit/index.vue     |   4 +-
 packages/tailor-config-parser/src/schema.ts   |   6 +
 4 files changed, 129 insertions(+), 33 deletions(-)
 rename packages/core-extensions/content-containers/structured-content/src/edit/{config.js => config.ts} (53%)

diff --git a/apps/backend/shared/ai/schemas/CcStructuredContent.ts b/apps/backend/shared/ai/schemas/CcStructuredContent.ts
index 310a69572..47bca5edd 100644
--- a/apps/backend/shared/ai/schemas/CcStructuredContent.ts
+++ b/apps/backend/shared/ai/schemas/CcStructuredContent.ts
@@ -1,4 +1,5 @@
 import type { AiContext } from '@tailor-cms/interfaces/ai.ts';
+import type { Activity } from '@tailor-cms/interfaces/activity.ts';
 import {
   getSchema as getMetaInputSchema,
 } from '@tailor-cms/meta-element-collection/schema.js';
@@ -36,6 +37,7 @@ type SubcontainerConfigs = Record<string, SubcontainerConfig>;
 
 interface ParsedConfig {
   subcontainers: SubcontainerConfigs;
+  defaultSubcontainers: Pick<Activity, 'type' | 'data'>[];
   ai?: {
     definition?: string;
     outputRules?: { prompt?: string };
@@ -97,21 +99,32 @@ const toMetaFields = (meta: any[]): MetaField[] =>
     }),
   }));
 
+// Container-level options – not subcontainer type definitions.
+const CONTAINER_OPTIONS = [
+  'isCollapsible',
+  'collapsedPreviewKey',
+  'defaultSubcontainers',
+];
+
+const EMPTY_CONFIG: ParsedConfig = {
+  subcontainers: {},
+  defaultSubcontainers: [],
+};
+
 // Parse container schema config into per-subcontainer configs.
 // Resolves element types and meta field schemas for each
 // subcontainer type defined in the container config.
 const getConfigs = (context: AiContext): ParsedConfig => {
-  const empty: ParsedConfig = { subcontainers: {} };
   const { outlineActivityType, containerType } =
     context.repository;
-  if (!outlineActivityType || !containerType) return empty;
+  if (!outlineActivityType || !containerType) return EMPTY_CONFIG;
   const containers = schemaAPI.getSupportedContainers(
     outlineActivityType,
   );
   const container = containers.find(
     (c: any) => c.type === containerType,
   );
-  if (!container?.config) return empty;
+  if (!container?.config) return EMPTY_CONFIG;
   // Container-level element types as default fallback
   const defaultElementTypes = getElementTypeIds(
     container.contentElementConfig,
@@ -120,6 +133,7 @@ const getConfigs = (context: AiContext): ParsedConfig => {
   for (const [type, val] of Object.entries(
     container.config as Record<string, any>,
   )) {
+    if (CONTAINER_OPTIONS.includes(type)) continue;
     // Subcontainer config overrides container-level
     const elementTypes = val.contentElementConfig
       ? getElementTypeIds(val.contentElementConfig)
@@ -130,14 +144,22 @@ const getConfigs = (context: AiContext): ParsedConfig => {
       metaInputs: toMetaFields(getMetaDefinitions(val)),
     };
   }
-  return { subcontainers, ai: container.ai };
+  return {
+    subcontainers,
+    defaultSubcontainers:
+      container.config.defaultSubcontainers || [],
+    ai: container.ai,
+  };
 };
 
 // Build JSON schema for a single subcontainer type:
 // discriminated by type enum, with per-type elements and data.
+// When defaultData is provided, matching meta fields are
+// pinned to exact values via JSON Schema `const`.
 const buildSubcontainerSchema = (
   type: string,
   config: SubcontainerConfig,
+  defaultData?: Record<string, any>,
 ) => {
   const { metaInputs, elementTypes } = config;
   const props: Record<string, any> = {
@@ -149,10 +171,14 @@ const buildSubcontainerSchema = (
   const dataRequired: string[] = [];
   for (const field of metaInputs) {
     if (!field.schema) continue;
-    const values = field.options?.map((o) => o.value);
-    dataProps[field.key] = values?.length
-      ? { ...field.schema, enum: values }
-      : field.schema;
+    if (defaultData?.[field.key] != null) {
+      dataProps[field.key] = { ...field.schema, enum: [defaultData[field.key]] };
+    } else {
+      const values = field.options?.map((o) => o.value);
+      dataProps[field.key] = values?.length
+        ? { ...field.schema, enum: values }
+        : field.schema;
+    }
     dataRequired.push(field.key);
   }
   if (Object.keys(dataProps).length) {
@@ -165,8 +191,12 @@ const buildSubcontainerSchema = (
 // Build OpenAI structured output schema from container config.
 // Each subcontainer type becomes a discriminated union variant
 // with its own allowed element types and metadata fields.
+// When defaultSubcontainers are defined, uses a tuple to
+// enforce exact count, types, and data at each position.
 export const Schema = (context: AiContext): OpenAISchema => {
-  const { subcontainers } = getConfigs(context);
+  const {
+    subcontainers, defaultSubcontainers,
+  } = getConfigs(context);
   // Default to generic section when no config is defined
   const entries = Object.entries(subcontainers);
   if (!entries.length) {
@@ -174,18 +204,38 @@ export const Schema = (context: AiContext): OpenAISchema => {
       label: 'Section', metaInputs: [], elementTypes: [],
     }]);
   }
-  // Build per-subcontainer schema with type discriminator
-  const schemas = entries.map(([type, config]) =>
-    buildSubcontainerSchema(type, config),
-  );
-  const subcontainerSchema = schemas.length === 1
-    ? schemas[0]
-    : { anyOf: schemas };
+  const configByType = Object.fromEntries(entries);
+  let subcontainersSchema: Record<string, any>;
+  if (defaultSubcontainers.length) {
+    const schemas = defaultSubcontainers.map((defaultSub) => {
+      const config =
+        configByType[defaultSub.type] || entries[0][1];
+      return buildSubcontainerSchema(
+        defaultSub.type, config, defaultSub.data,
+      );
+    });
+    const itemSchema = schemas.length === 1
+      ? schemas[0]
+      : { anyOf: schemas };
+    subcontainersSchema = {
+      type: 'array',
+      items: itemSchema,
+      minItems: schemas.length,
+      maxItems: schemas.length,
+    };
+  } else {
+    const schemas = entries.map(([type, config]) =>
+      buildSubcontainerSchema(type, config));
+    const itemSchema = schemas.length === 1
+      ? schemas[0]
+      : { anyOf: schemas };
+    subcontainersSchema = { type: 'array', items: itemSchema };
+  }
   return {
     type: 'json_schema',
     name: 'cc_structured_content',
     schema: obj(
-      { subcontainers: { type: 'array', items: subcontainerSchema } },
+      { subcontainers: subcontainersSchema },
       ['subcontainers'],
     ),
   };
@@ -221,10 +271,25 @@ const describeSubcontainerTypes = (configs: SubcontainerConfigs): string => {
     .join('\n');
 };
 
+const describeDefaultSubcontainers = (
+  defaults: Pick<Activity, 'type' | 'data'>[],
+  configs: SubcontainerConfigs,
+): string =>
+  defaults
+    .map((defaultSub) => {
+      const label =
+        configs[defaultSub.type]?.label || defaultSub.type;
+      const title = defaultSub.data?.title;
+      return title
+        ? `  - "${title}" (${label})`
+        : `  - ${label}`;
+    })
+    .join('\n');
+
 // Build prompt with available element types, subcontainer types,
 // metadata fields, and container-level AI instructions.
 export const getPrompt = (context: AiContext) => {
-  const { subcontainers, ai } = getConfigs(context);
+  const { subcontainers, defaultSubcontainers, ai } = getConfigs(context);
   // Collect all unique element types across subcontainers
   const allElementTypes = [
     ...new Set(Object.values(subcontainers).flatMap((c) => c.elementTypes)),
@@ -248,6 +313,14 @@ export const getPrompt = (context: AiContext) => {
       '- Do not invent information not present in the documents',
     );
   }
+  if (defaultSubcontainers.length) {
+    guidelines.push(
+      '- Generate exactly these subcontainers in order:\n'
+      + describeDefaultSubcontainers(
+        defaultSubcontainers, subcontainers,
+      ),
+    );
+  }
   if (ai?.outputRules?.prompt) {
     guidelines.push(ai.outputRules.prompt.trim());
   }
diff --git a/packages/core-extensions/content-containers/structured-content/src/edit/config.js b/packages/core-extensions/content-containers/structured-content/src/edit/config.ts
similarity index 53%
rename from packages/core-extensions/content-containers/structured-content/src/edit/config.js
rename to packages/core-extensions/content-containers/structured-content/src/edit/config.ts
index 63d109406..05f476a02 100644
--- a/packages/core-extensions/content-containers/structured-content/src/edit/config.js
+++ b/packages/core-extensions/content-containers/structured-content/src/edit/config.ts
@@ -1,11 +1,21 @@
 import { capitalize, reduce, words } from 'lodash-es';
 
-const DefaultSubcontainers = {
+// Container-level options that are not subcontainer type definitions:
+// - isCollapsible: enable collapse/expand for subcontainers
+// - collapsedPreviewKey: meta key shown in collapsed header
+// - defaultSubcontainers: subcontainers to create on mount
+const CONTAINER_OPTIONS = [
+  'isCollapsible',
+  'collapsedPreviewKey',
+  'defaultSubcontainers',
+];
+
+const DefaultSubcontainerType = {
   Section: 'SECTION',
 };
 
-const DEFAULT_CONFIG = {
-  [DefaultSubcontainers.Section]: {
+const DEFAULT_SUBCONTAINERS = {
+  [DefaultSubcontainerType.Section]: {
     label: 'Section',
     icon: 'mdi-text-box-outline',
     layout: true,
@@ -13,13 +23,19 @@ const DEFAULT_CONFIG = {
   },
 };
 
-export const parseConfig = (repository, outlineActivity, container, config) => {
-  if (!config) return { subcontainers: DEFAULT_CONFIG, defaultSubcontainers: [], isCollapsible: false };
-  // Container-level options (skipped by the sub-type reduce below):
-  // - isCollapsible: enable collapse/expand for subcontainers
-  // - collapsedPreviewKey: meta key to display in collapsed subcontainer header
-  // - defaultSubcontainers: initial subcontainers to create on mount
-  const CONTAINER_OPTIONS = ['isCollapsible', 'collapsedPreviewKey', 'defaultSubcontainers'];
+const DEFAULT_RESULT = {
+  subcontainers: DEFAULT_SUBCONTAINERS,
+  defaultSubcontainers: [] as any[],
+  isCollapsible: false,
+};
+
+export const parseConfig = (
+  repository: any,
+  outlineActivity: any,
+  container: any,
+  config: any,
+) => {
+  if (!config) return DEFAULT_RESULT;
   const {
     isCollapsible = false,
     collapsedPreviewKey = null,
@@ -27,7 +43,7 @@ export const parseConfig = (repository, outlineActivity, container, config) => {
   } = config;
   const subcontainers = reduce(
     config,
-    (acc, val, key) => {
+    (acc: Record<string, any>, val: any, key: string) => {
       if (CONTAINER_OPTIONS.includes(key)) return acc;
       acc[key] = {
         ...val,
@@ -40,11 +56,12 @@ export const parseConfig = (repository, outlineActivity, container, config) => {
         disableContentElementList: !!val.disableContentElementList,
         disableAi: !!val.disableAi,
         isCollapsible: val.isCollapsible ?? isCollapsible,
-        collapsedPreviewKey: val.collapsedPreviewKey || collapsedPreviewKey,
+        collapsedPreviewKey:
+          val.collapsedPreviewKey || collapsedPreviewKey,
       };
       return acc;
     },
-    {} as Record<string, any>,
+    {},
   );
   return { subcontainers, defaultSubcontainers, isCollapsible };
 };
diff --git a/packages/core-extensions/content-containers/structured-content/src/edit/index.vue b/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
index 0ef9cdde5..ee3b9a46a 100644
--- a/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
+++ b/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
@@ -142,7 +142,7 @@ import type { Activity } from '@tailor-cms/interfaces/activity.js';
 import type { ContentElement } from '@tailor-cms/interfaces/content-element.js';
 import type { Repository } from '@tailor-cms/interfaces/repository.js';
 
-import { parseConfig } from './config';
+import { parseConfig } from './config.ts';
 import StructuredSubcontainer from './StructuredSubcontainer.vue';
 
 const Direction = { UP: -1, DOWN: 1 };
@@ -256,7 +256,7 @@ const createSubcontainer = (type: string) => {
 
 const getContentElementConfig = (subcontainerType: string) => {
   return (
-    props.subcontainerConfig[subcontainerType]?.contentElementConfig ||
+    subcontainerConfig.value[subcontainerType]?.contentElementConfig ||
     props.contentElementConfig
   );
 };
diff --git a/packages/tailor-config-parser/src/schema.ts b/packages/tailor-config-parser/src/schema.ts
index 60be8080a..dd897194e 100644
--- a/packages/tailor-config-parser/src/schema.ts
+++ b/packages/tailor-config-parser/src/schema.ts
@@ -58,6 +58,12 @@ const processSubcontainerConfigs = (config: any) => {
   return reduce(
     config,
     (acc, subcontainer, key) => {
+      if (typeof subcontainer !== 'object'
+        || subcontainer === null
+        || Array.isArray(subcontainer)) {
+        acc[key] = subcontainer;
+        return acc;
+      }
       const nestedConfig = get(subcontainer, 'contentElementConfig');
       acc[key] = {
         ...subcontainer,

From cb7562a950056e27083bce8dc0ba84f6ecbe661a Mon Sep 17 00:00:00 2001
From: underscope <underscope@gmail.com>
Date: Tue, 31 Mar 2026 11:01:15 +0200
Subject: [PATCH 3/3] Generation with preset should overwrite

---
 .../shared/ai/schemas/CcStructuredContent.ts    | 17 ++++++-----------
 .../editor/ActivityContent/ContainerList.vue    |  4 +++-
 .../structured-content/src/edit/index.vue       |  6 +++++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/backend/shared/ai/schemas/CcStructuredContent.ts b/apps/backend/shared/ai/schemas/CcStructuredContent.ts
index 47bca5edd..508283012 100644
--- a/apps/backend/shared/ai/schemas/CcStructuredContent.ts
+++ b/apps/backend/shared/ai/schemas/CcStructuredContent.ts
@@ -204,24 +204,18 @@ export const Schema = (context: AiContext): OpenAISchema => {
       label: 'Section', metaInputs: [], elementTypes: [],
     }]);
   }
-  const configByType = Object.fromEntries(entries);
   let subcontainersSchema: Record<string, any>;
   if (defaultSubcontainers.length) {
-    const schemas = defaultSubcontainers.map((defaultSub) => {
-      const config =
-        configByType[defaultSub.type] || entries[0][1];
-      return buildSubcontainerSchema(
-        defaultSub.type, config, defaultSub.data,
-      );
-    });
+    const schemas = entries.map(([type, config]) =>
+      buildSubcontainerSchema(type, config));
     const itemSchema = schemas.length === 1
       ? schemas[0]
       : { anyOf: schemas };
     subcontainersSchema = {
       type: 'array',
       items: itemSchema,
-      minItems: schemas.length,
-      maxItems: schemas.length,
+      minItems: defaultSubcontainers.length,
+      maxItems: defaultSubcontainers.length,
     };
   } else {
     const schemas = entries.map(([type, config]) =>
@@ -315,7 +309,8 @@ export const getPrompt = (context: AiContext) => {
   }
   if (defaultSubcontainers.length) {
     guidelines.push(
-      '- Generate exactly these subcontainers in order:\n'
+      '- Generate exactly these subcontainers in this exact order,'
+      + ' one per entry, each with a unique title as listed:\n'
       + describeDefaultSubcontainers(
         defaultSubcontainers, subcontainers,
       ),
diff --git a/apps/frontend/app/components/editor/ActivityContent/ContainerList.vue b/apps/frontend/app/components/editor/ActivityContent/ContainerList.vue
index d950fe0ad..0841a26ca 100644
--- a/apps/frontend/app/components/editor/ActivityContent/ContainerList.vue
+++ b/apps/frontend/app/components/editor/ActivityContent/ContainerList.vue
@@ -210,9 +210,11 @@ const requestDeletion = (
 
 const requestContainerDeletion = (
   container: Activity,
-  name: string = 'container',
+  opts: string | { force?: boolean } = 'container',
 ) => {
   const action = (val: Activity) => activityStore.remove(val.id);
+  if (typeof opts === 'object' && opts.force) return action(container);
+  const name = typeof opts === 'string' ? opts : 'container';
   requestDeletion(container, action, name);
 };
 
diff --git a/packages/core-extensions/content-containers/structured-content/src/edit/index.vue b/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
index ee3b9a46a..84b28e914 100644
--- a/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
+++ b/packages/core-extensions/content-containers/structured-content/src/edit/index.vue
@@ -275,8 +275,12 @@ const generateStructuredContent = async () => {
       ],
     });
     if (!result?.length) return;
+    // Remove existing subcontainers before populating with AI content
+    subcontainers.value.forEach((sub) => {
+      emit('delete:subcontainer', sub, { force: true });
+    });
     const { id: parentId, repositoryId } = props.container;
-    let position = nextPosition.value;
+    let position = 1;
     for (const it of result) {
       const activity = await createActivity({
         type: it.type || subcontainerTypes.value[0],