diff --git a/.gitignore b/.gitignore
index 8f7c7db..5faac87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ apps/*/.wxt/
 apps/*/chrome-mv*/
 apps/*/firefox-mv*/
 .claude
+.superpowers/*
diff --git a/apps/admin-web/src/components/ArticleEditorCanvas.vue b/apps/admin-web/src/components/ArticleEditorCanvas.vue
index 57d413e..426dad4 100644
--- a/apps/admin-web/src/components/ArticleEditorCanvas.vue
+++ b/apps/admin-web/src/components/ArticleEditorCanvas.vue
@@ -52,8 +52,16 @@ import { callCommand, replaceAll } from "@milkdown/kit/utils";
 import { Crepe, CrepeFeature } from "@milkdown/crepe";
 import "@milkdown/crepe/theme/common/style.css";
 import "@milkdown/crepe/theme/frame.css";
-import { Milkdown, useEditor, useInstance } from "@milkdown/vue";
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from "vue";
+import {
+  computed,
+  nextTick,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  shallowRef,
+  watch,
+  type ComponentPublicInstance,
+} from "vue";
 import { useI18n } from "vue-i18n";
 
 import EditorActionMenu from "@/components/editor-common/EditorActionMenu.vue";
@@ -88,8 +96,11 @@ const emit = defineEmits<{
 }>();
 
 const { t } = useI18n();
-const crepeRef = ref<Crepe | null>(null);
+const crepeRef = shallowRef<Crepe | null>(null);
 const syncingExternalMarkdown = ref(false);
+const editorRootRef = ref<HTMLElement | null>(null);
+const editorRef = shallowRef<MilkdownEditorInstance | null>(null);
+const loading = ref(true);
 const surfaceRef = ref<HTMLElement | null>(null);
 const tablePickerRef = ref<HTMLElement | null>(null);
 
@@ -197,6 +208,8 @@ type SelectedImageSnapshot = {
   align: RichImageAlign;
 };
 
+type MilkdownEditorInstance = Awaited<ReturnType<Crepe["create"]>>;
+
 function createDefaultTableContextMenuState(): TableContextMenuState {
   return {
     open: false,
@@ -248,7 +261,7 @@ function createDefaultAiOptimizePanelState(): AiOptimizePanelState {
   };
 }
 
-const { loading } = useEditor((root) => {
+function createCrepe(root: HTMLElement): Crepe {
   const crepe = new Crepe({
     root,
     defaultValue: props.modelValue || "",
@@ -298,10 +311,13 @@ const { loading } = useEditor((root) => {
 
   crepeRef.value = crepe;
   return crepe;
-});
+}
 
-const [instanceLoading, getEditor] = useInstance();
-const editorDisabled = computed(() => props.disabled || instanceLoading.value || loading.value);
+function getEditor(): MilkdownEditorInstance | null {
+  return editorRef.value;
+}
+
+const editorDisabled = computed(() => props.disabled || loading.value);
 const tablePickerOpen = ref(false);
 const imagePickerOpen = ref(false);
 const imagePickerAction = ref<ImagePickerAction>("insert");
@@ -528,9 +544,9 @@ watch(
 );
 
 watch(
-  [() => props.modelValue, loading, instanceLoading],
-  ([value, editorLoading, currentInstanceLoading]) => {
-    if (editorLoading || currentInstanceLoading) {
+  [() => props.modelValue, loading],
+  ([value, editorLoading]) => {
+    if (editorLoading) {
       return;
     }
 
@@ -539,6 +555,26 @@ watch(
   { immediate: true },
 );
 
+async function mountEditor(): Promise<void> {
+  const root = editorRootRef.value;
+  if (!root || crepeRef.value) {
+    return;
+  }
+
+  loading.value = true;
+
+  const crepe = createCrepe(root);
+
+  try {
+    editorRef.value = await crepe.create();
+  } catch (error) {
+    crepeRef.value = null;
+    console.error(error);
+  } finally {
+    loading.value = false;
+  }
+}
+
 onBeforeUnmount(() => {
   stopAiOptimizeGeneration();
   if (selectedImageSyncFrame) {
@@ -549,6 +585,8 @@ onBeforeUnmount(() => {
   window.removeEventListener("pointerdown", handleWindowPointerDown);
   window.removeEventListener("resize", handleWindowResize);
   window.removeEventListener("keydown", handleWindowKeydown);
+  editorRef.value = null;
+  void crepeRef.value?.destroy().catch(console.error);
   crepeRef.value = null;
 });
 
@@ -556,6 +594,7 @@ onMounted(() => {
   window.addEventListener("pointerdown", handleWindowPointerDown);
   window.addEventListener("resize", handleWindowResize);
   window.addEventListener("keydown", handleWindowKeydown);
+  void mountEditor();
 });
 
 function runCommand(command: { key: unknown }, payload?: unknown): void {
@@ -680,6 +719,18 @@ function closeTablePicker(): void {
   tablePickerOpen.value = false;
 }
 
+function assignTablePickerRef(element: Element | ComponentPublicInstance | null): void {
+  tablePickerRef.value = element instanceof HTMLElement ? element : null;
+}
+
+function assignSurfaceRef(element: Element | ComponentPublicInstance | null): void {
+  surfaceRef.value = element instanceof HTMLElement ? element : null;
+}
+
+function assignEditorRootRef(element: Element | ComponentPublicInstance | null): void {
+  editorRootRef.value = element instanceof HTMLElement ? element : null;
+}
+
 function closeTableContextMenu(): void {
   tableContextMenu.value = createDefaultTableContextMenuState();
 }
@@ -1830,7 +1881,7 @@ function runTableContextAction(action: TableContextMenuAction): void {
         <template #icon><OrderedListOutlined /></template>
       </a-button>
 
-      <div ref="tablePickerRef" class="article-editor-canvas__table-trigger">
+      <div :ref="assignTablePickerRef" class="article-editor-canvas__table-trigger">
         <a-button
           size="small"
           type="text"
@@ -1861,7 +1912,7 @@ function runTableContextAction(action: TableContextMenuAction): void {
     </div>
 
     <div
-      ref="surfaceRef"
+      :ref="assignSurfaceRef"
       class="article-editor-canvas__surface"
       @contextmenu.capture="handleEditorContextMenu"
       @dragstart.capture="handleEditorDragStart"
@@ -1881,7 +1932,7 @@ function runTableContextAction(action: TableContextMenuAction): void {
         />
       </div>
 
-      <Milkdown />
+      <div :ref="assignEditorRootRef" data-milkdown-root></div>
 
       <EditorSelectionFrame
         v-if="selectedImage.open"
diff --git a/apps/admin-web/src/components/ImageLibraryPicker.vue b/apps/admin-web/src/components/ImageLibraryPicker.vue
index 607b054..413bfef 100644
--- a/apps/admin-web/src/components/ImageLibraryPicker.vue
+++ b/apps/admin-web/src/components/ImageLibraryPicker.vue
@@ -4,7 +4,7 @@ import { useQuery } from "@tanstack/vue-query";
 import { computed, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { imagesApi } from "@/lib/api";
-import { formatBytes } from "@/lib/display";
+import { formatBytes, formatPercentage } from "@/lib/display";
 import type { ImageAssetItem } from "@geo/shared-types";
 
 const props = withDefaults(defineProps<{
@@ -139,7 +139,7 @@ function getSelectPopupContainer(triggerNode: HTMLElement) {
         <span>{{ t("images.storageUsage") }}: {{ t("images.storageUsageDetail", { 
           used: formatBytes(storageUsage.used_bytes), 
           total: formatBytes(storageUsage.quota_bytes),
-          percent: storageUsage.used_pct
+          percent: formatPercentage(storageUsage.used_pct)
         }) }}</span>
       </div>
       <a-progress 
diff --git a/apps/admin-web/src/components/kol/KolDynamicForm.vue b/apps/admin-web/src/components/kol/KolDynamicForm.vue
index a3b9a0e..afa0c85 100644
--- a/apps/admin-web/src/components/kol/KolDynamicForm.vue
+++ b/apps/admin-web/src/components/kol/KolDynamicForm.vue
@@ -25,8 +25,12 @@ function updateField(key: string, value: any) {
 }
 
 const selectOptions = (variable: KolVariableDefinition) => {
-  return (variable.options || []).map(opt => ({ label: opt, value: opt }));
+  return (variable.options || []).map((opt) => ({ label: opt, value: opt }));
 };
+
+function fieldKey(variable: KolVariableDefinition): string {
+  return variable.key?.trim() || variable.id;
+}
 </script>
 
 <template>
@@ -39,44 +43,44 @@ const selectOptions = (variable: KolVariableDefinition) => {
     >
       <template v-if="variable.type === 'input'">
         <a-input
-          :value="modelValue[variable.key]"
+          :value="modelValue[fieldKey(variable)]"
           :placeholder="variable.placeholder || t('common.inputPlease')"
-          @update:value="(val: string) => updateField(variable.key, val)"
+          @update:value="(val: string) => updateField(fieldKey(variable), val)"
         />
       </template>
 
       <template v-else-if="variable.type === 'textarea'">
         <a-textarea
-          :value="modelValue[variable.key]"
+          :value="modelValue[fieldKey(variable)]"
           :placeholder="variable.placeholder || t('common.inputPlease')"
           :rows="4"
-          @update:value="(val: string) => updateField(variable.key, val)"
+          @update:value="(val: string) => updateField(fieldKey(variable), val)"
         />
       </template>
 
       <template v-else-if="variable.type === 'select'">
         <a-select
-          :value="modelValue[variable.key]"
+          :value="modelValue[fieldKey(variable)]"
           :placeholder="variable.placeholder || t('common.selectPlease')"
           :options="selectOptions(variable)"
-          @update:value="(val: string) => updateField(variable.key, val)"
+          @update:value="(val: string) => updateField(fieldKey(variable), val)"
         />
       </template>
 
       <template v-else-if="variable.type === 'number'">
         <a-input-number
-          :value="modelValue[variable.key]"
+          :value="modelValue[fieldKey(variable)]"
           :placeholder="variable.placeholder"
           style="width: 100%"
-          @update:value="(val: number) => updateField(variable.key, val)"
+          @update:value="(val: number) => updateField(fieldKey(variable), val)"
         />
       </template>
 
       <template v-else-if="variable.type === 'checkbox'">
         <a-checkbox-group
-          :value="modelValue[variable.key] || []"
+          :value="modelValue[fieldKey(variable)] || []"
           :options="selectOptions(variable)"
-          @update:value="(val: string[]) => updateField(variable.key, val)"
+          @update:value="(val: string[]) => updateField(fieldKey(variable), val)"
         />
       </template>
     </a-form-item>
diff --git a/apps/admin-web/src/components/kol/KolPromptEditArea.vue b/apps/admin-web/src/components/kol/KolPromptEditArea.vue
index 051d132..75a1df6 100644
--- a/apps/admin-web/src/components/kol/KolPromptEditArea.vue
+++ b/apps/admin-web/src/components/kol/KolPromptEditArea.vue
@@ -1,11 +1,16 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { computed, h, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { ExperimentOutlined, ThunderboltOutlined, LoadingOutlined } from "@ant-design/icons-vue";
 import type { KolVariableDefinition, KolVariableType } from "@geo/shared-types";
-import { newVariableId } from "@/lib/kol-variable-id";
 import { Modal } from "ant-design-vue";
 
+import {
+  buildKolPlaceholderToken,
+  createKolVariableDefinition,
+  findKolPlaceholderKeyAtPosition,
+} from "@/lib/kol-placeholders";
+
 const props = defineProps<{
   content: string;
   variables: KolVariableDefinition[];
@@ -17,17 +22,46 @@ const emit = defineEmits<{
   (e: "update:variables", value: KolVariableDefinition[]): void;
   (e: "ai-generate", description: string): void;
   (e: "ai-optimize"): void;
+  (e: "focus-variable", key: string): void;
 }>();
 
 const { t } = useI18n();
 const aiDescription = ref("");
 const textareaRef = ref<HTMLTextAreaElement | null>(null);
+const highlightRef = ref<HTMLDivElement | null>(null);
+
+const editorPlaceholder = "在这里输入提示词内容，可以使用 {{变量名}} 引用左侧定义的变量";
+const highlightTokenRE = /\{\{\s*([^{}]+?)\s*\}\}/g;
+
+const highlightedContent = computed(() => {
+  const text = props.content ?? "";
+  if (!text) {
+    return `<span class="editor-placeholder">${escapeHtml(editorPlaceholder)}</span>`;
+  }
+
+  let html = "";
+  let lastIndex = 0;
+
+  for (const match of text.matchAll(highlightTokenRE)) {
+    const matchIndex = match.index ?? 0;
+    const token = match[0] ?? "";
+
+    html += escapeHtml(text.slice(lastIndex, matchIndex));
+    html += `<span class="token-highlight">${escapeHtml(token)}</span>`;
+    lastIndex = matchIndex + token.length;
+  }
+
+  html += escapeHtml(text.slice(lastIndex));
+  return html;
+});
 
 function onDrop(event: DragEvent) {
   event.preventDefault();
   const type = event.dataTransfer?.getData("application/kol-variable-type") as KolVariableType;
   if (!type) return;
 
+  const labelValue = ref("");
+
   Modal.confirm({
     title: t("kol.manage.variable.label"),
     content: () => {
@@ -35,34 +69,29 @@ function onDrop(event: DragEvent) {
         h("input", {
           class: "ant-input",
           placeholder: t("common.inputPlease"),
+          value: labelValue.value,
           onInput: (e: Event) => {
-            (Modal.confirm as any).labelValue = (e.target as HTMLInputElement).value;
+            labelValue.value = (e.target as HTMLInputElement).value;
           },
         }),
       ]);
     },
     onOk: () => {
-      const label = (Modal.confirm as any).labelValue || t(`kol.manage.variable.${type}`);
-      const id = newVariableId();
-      const key = label;
-      
-      const newVar: KolVariableDefinition = {
-        id,
-        key,
-        label,
-        type,
-        required: true,
-      };
+      const key = labelValue.value.trim() || t(`kol.manage.variable.${type}`);
+      const existingVariable = props.variables.find((variable) => variable.key === key);
 
-      emit("update:variables", [...props.variables, newVar]);
-      insertToken(`{{${key}}}`);
+      if (!existingVariable) {
+        const newVar: KolVariableDefinition = createKolVariableDefinition(key, {
+          type,
+        });
+        emit("update:variables", [...props.variables, newVar]);
+      }
+
+      insertToken(buildKolPlaceholderToken(key));
     },
   });
 }
 
-// Helper to use 'h' since we are in script setup
-import { h } from "vue";
-
 function insertToken(token: string) {
   if (!textareaRef.value) return;
   
@@ -78,6 +107,7 @@ function insertToken(token: string) {
   setTimeout(() => {
     el.focus();
     el.setSelectionRange(start + token.length, start + token.length);
+    syncScroll();
   }, 0);
 }
 
@@ -85,6 +115,45 @@ function handleAiGenerate() {
   if (!aiDescription.value.trim()) return;
   emit("ai-generate", aiDescription.value);
 }
+
+function handleContentInput(event: Event) {
+  emit("update:content", (event.target as HTMLTextAreaElement).value);
+  syncScroll();
+}
+
+function handleCaretInteraction() {
+  if (!textareaRef.value) {
+    return;
+  }
+
+  requestAnimationFrame(() => {
+    const textarea = textareaRef.value;
+    if (!textarea) {
+      return;
+    }
+
+    const key = findKolPlaceholderKeyAtPosition(props.content, textarea.selectionStart ?? -1);
+    if (key) {
+      emit("focus-variable", key);
+    }
+  });
+}
+
+function syncScroll() {
+  if (!textareaRef.value || !highlightRef.value) {
+    return;
+  }
+
+  highlightRef.value.scrollTop = textareaRef.value.scrollTop;
+  highlightRef.value.scrollLeft = textareaRef.value.scrollLeft;
+}
+
+function escapeHtml(value: string): string {
+  return value
+    .replaceAll("&", "&amp;")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;");
+}
 </script>
 
 <template>
@@ -126,12 +195,21 @@ function handleAiGenerate() {
           <span>AI 正在思考中...</span>
         </div>
       </div>
+      <div
+        ref="highlightRef"
+        class="prompt-highlight"
+        aria-hidden="true"
+        v-html="highlightedContent"
+      ></div>
       <textarea
         ref="textareaRef"
         class="prompt-textarea"
         :value="content"
-        @input="e => emit('update:content', (e.target as HTMLTextAreaElement).value)"
-        placeholder="在这里输入提示词内容，可以使用 {{变量名}} 引用左侧定义的变量"
+        :placeholder="editorPlaceholder"
+        @input="handleContentInput"
+        @mouseup="handleCaretInteraction"
+        @keyup="handleCaretInteraction"
+        @scroll="syncScroll"
       ></textarea>
     </div>
   </div>
@@ -166,21 +244,50 @@ function handleAiGenerate() {
   flex: 1;
   position: relative;
   display: flex;
+  overflow: hidden;
+}
+
+.prompt-highlight {
+  position: absolute;
+  inset: 0;
+  overflow: auto;
+  padding: 24px;
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-family: inherit;
+  font-size: 16px;
+  line-height: 1.6;
+  color: #262626;
+  pointer-events: none;
+  user-select: none;
 }
 
 .prompt-textarea {
+  position: relative;
+  z-index: 1;
   flex: 1;
   border: none;
   resize: none;
   padding: 24px;
+  background: transparent;
   font-family: inherit;
   font-size: 16px;
   line-height: 1.6;
   outline: none;
-  color: #262626;
+  color: transparent;
+  caret-color: #262626;
 }
 
 .prompt-textarea::placeholder {
+  color: transparent;
+}
+
+.prompt-highlight :deep(.token-highlight) {
+  color: #eb2f96;
+  font-weight: 600;
+}
+
+.prompt-highlight :deep(.editor-placeholder) {
   color: #bfbfbf;
 }
 
diff --git a/apps/admin-web/src/components/kol/KolPromptEditor.vue b/apps/admin-web/src/components/kol/KolPromptEditor.vue
index be5396c..e910b67 100644
--- a/apps/admin-web/src/components/kol/KolPromptEditor.vue
+++ b/apps/admin-web/src/components/kol/KolPromptEditor.vue
@@ -1,22 +1,28 @@
 <script setup lang="ts">
-import { computed, ref, watch } from "vue";
+import { computed, nextTick, reactive, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query";
 import { message } from "ant-design-vue";
-import { SaveOutlined, SendOutlined, EyeOutlined } from "@ant-design/icons-vue";
+import { LeftOutlined, SaveOutlined, SendOutlined, EyeOutlined } from "@ant-design/icons-vue";
 
 import KolVariablePanel from "./KolVariablePanel.vue";
 import KolVariableConfig from "./KolVariableConfig.vue";
 import KolPromptEditArea from "./KolPromptEditArea.vue";
 import KolDynamicForm from "./KolDynamicForm.vue";
 import { kolManageApi } from "@/lib/api";
-import type { KolVariableDefinition, KolSchemaJson } from "@geo/shared-types";
+import type { KolVariableDefinition } from "@geo/shared-types";
 import { formatError } from "@/lib/errors";
+import { buildKolPlatformOptions } from "@/lib/kol-platform-options";
+import { syncKolVariablesWithContent } from "@/lib/kol-placeholders";
 
 const props = defineProps<{
   promptId: number;
 }>();
 
+const emit = defineEmits<{
+  back: [];
+}>();
+
 const { t } = useI18n();
 const queryClient = useQueryClient();
 
@@ -25,16 +31,32 @@ const variables = ref<KolVariableDefinition[]>([]);
 const previewOpen = ref(false);
 const previewValues = ref<Record<string, any>>({});
 const aiTaskId = ref<string | null>(null);
+const variableConfigRef = ref<{ focusVariable: (key: string) => void } | null>(null);
+const metadataForm = reactive({
+  name: "",
+  platform_hint: "通用",
+});
 
-const { data: promptDetail, isPending } = useQuery({
+const { data: promptDetail } = useQuery({
   queryKey: computed(() => ["kol", "prompt", props.promptId]),
   queryFn: () => kolManageApi.getPrompt(props.promptId),
 });
 
+const platformOptions = computed(() => {
+  const options = buildKolPlatformOptions(t("kol.manage.platformHintDefault"));
+  const currentValue = metadataForm.platform_hint.trim();
+  if (currentValue && !options.some((option) => option.value === currentValue)) {
+    return [{ label: currentValue, value: currentValue }, ...options];
+  }
+  return options;
+});
+
 watch(
   () => promptDetail.value,
   (detail) => {
     if (detail) {
+      metadataForm.name = detail.name;
+      metadataForm.platform_hint = detail.platform_hint || "通用";
       content.value = detail.latest_prompt_content ?? "";
       variables.value = detail.latest_schema_json?.variables ?? [];
     }
@@ -42,27 +64,24 @@ watch(
   { immediate: true }
 );
 
-const saveDraftMutation = useMutation({
-  mutationFn: (data: { content: string; variables: KolVariableDefinition[] }) =>
-    kolManageApi.saveDraft(props.promptId, {
-      content: data.content,
-      schema: { variables: data.variables },
-      card_config: {},
-    }),
+const publishMutation = useMutation({
+  mutationFn: (payload: ReturnType<typeof buildPromptPayload>) =>
+    kolManageApi.publishPrompt(props.promptId, payload),
   onSuccess: () => {
-    message.success(t("common.save") + "成功");
-    queryClient.invalidateQueries({ queryKey: ["kol", "prompt", props.promptId] });
+    message.success(t("kol.manage.editor.publish") + "成功");
+    invalidatePromptQueries();
   },
   onError: (error) => {
     message.error(formatError(error));
   },
 });
 
-const publishMutation = useMutation({
-  mutationFn: () => kolManageApi.publishPrompt(props.promptId),
+const saveMutation = useMutation({
+  mutationFn: (payload: ReturnType<typeof buildPromptPayload>) =>
+    kolManageApi.savePrompt(props.promptId, payload),
   onSuccess: () => {
-    message.success(t("kol.manage.editor.publish") + "成功");
-    queryClient.invalidateQueries({ queryKey: ["kol", "prompt", props.promptId] });
+    message.success(t("common.save") + "成功");
+    invalidatePromptQueries();
   },
   onError: (error) => {
     message.error(formatError(error));
@@ -84,7 +103,7 @@ watch(
   (task) => {
     if (task?.status === "completed" && task.result) {
       content.value = task.result.content;
-      variables.value = task.result.schema.variables;
+      variables.value = syncKolVariablesWithContent(task.result.content, task.result.schema.variables);
       aiTaskId.value = null;
       message.success("AI 处理完成");
     } else if (task?.status === "failed") {
@@ -109,10 +128,11 @@ async function handleAiGenerate(description: string) {
 
 async function handleAiOptimize() {
   try {
+    const syncedVariables = syncVariablesFromContent();
     const res = await kolManageApi.submitAssist({
       mode: "optimize",
       current_content: content.value,
-      schema: { variables: variables.value },
+      schema: { variables: syncedVariables },
       prompt_id: props.promptId,
     });
     aiTaskId.value = res.task_id;
@@ -121,34 +141,126 @@ async function handleAiOptimize() {
   }
 }
 
+function buildPromptPayload(nextVariables: KolVariableDefinition[] = variables.value) {
+  return {
+    name: metadataForm.name.trim(),
+    platform_hint: metadataForm.platform_hint,
+    sort_order: promptDetail.value?.sort_order,
+    content: content.value,
+    schema: { variables: nextVariables },
+    card_config: {},
+  };
+}
+
+function syncVariablesFromContent(): KolVariableDefinition[] {
+  const syncedVariables = syncKolVariablesWithContent(content.value, variables.value);
+  variables.value = syncedVariables;
+  return syncedVariables;
+}
+
+function buildPreviewValues(nextVariables: KolVariableDefinition[]): Record<string, any> {
+  const nextValues: Record<string, any> = {};
+
+  nextVariables.forEach((variable) => {
+    const fieldKey = variable.key?.trim() || variable.id;
+    nextValues[fieldKey] = variable.type === "checkbox" ? [] : undefined;
+  });
+
+  return nextValues;
+}
+
+function invalidatePromptQueries() {
+  void queryClient.invalidateQueries({ queryKey: ["kol", "prompt", props.promptId] });
+  void queryClient.invalidateQueries({ queryKey: ["kol", "packages"] });
+  void queryClient.invalidateQueries({
+    queryKey: ["kol", "packages", promptDetail.value?.package_id, "prompts"],
+  });
+}
+
+function validateBeforeSubmit(): boolean {
+  if (!metadataForm.name.trim()) {
+    message.warning(t("common.inputPlease") + t("common.title"));
+    return false;
+  }
+  if (!content.value.trim()) {
+    message.warning("请输入提示词内容");
+    return false;
+  }
+  return true;
+}
+
 function handleSave() {
-  saveDraftMutation.mutate({ content: content.value, variables: variables.value });
+  const syncedVariables = syncVariablesFromContent();
+  if (!validateBeforeSubmit()) {
+    return;
+  }
+  saveMutation.mutate(buildPromptPayload(syncedVariables));
 }
 
 function handlePublish() {
-  publishMutation.mutate();
+  const syncedVariables = syncVariablesFromContent();
+  if (!validateBeforeSubmit()) {
+    return;
+  }
+  publishMutation.mutate(buildPromptPayload(syncedVariables));
 }
 
 function handlePreview() {
-  previewValues.value = {};
+  const syncedVariables = syncVariablesFromContent();
+  previewValues.value = buildPreviewValues(syncedVariables);
   previewOpen.value = true;
 }
+
+async function handleFocusVariable(key: string) {
+  syncVariablesFromContent();
+  await nextTick();
+  variableConfigRef.value?.focusVariable(key);
+}
+
+function getSelectPopupContainer(triggerNode: HTMLElement) {
+  return triggerNode.parentElement ?? triggerNode;
+}
+
+function statusTagColor(status?: string): string {
+  if (status === "active") return "green";
+  if (status === "archived") return "orange";
+  return "default";
+}
+
+function statusLabel(status?: string): string {
+  if (status === "active") return t("kol.manage.status.active");
+  if (status === "archived") return t("kol.manage.status.archived");
+  return t("kol.manage.status.draft");
+}
 </script>
 
 <template>
   <div class="kol-prompt-editor">
+    <div class="editor-topbar">
+      <button class="back-btn" type="button" @click="emit('back')">
+        <LeftOutlined />
+        <span>{{ t("common.back") }}</span>
+      </button>
+    </div>
+
     <div class="editor-header">
       <div class="header-title">
-        <span class="prompt-name">{{ promptDetail?.name || 'Loading...' }}</span>
+        <div class="title-row">
+          <span class="prompt-name">{{ metadataForm.name || promptDetail?.name || t("common.loading") }}</span>
+          <a-tag v-if="promptDetail" :color="statusTagColor(promptDetail.status)">
+            {{ statusLabel(promptDetail.status) }}
+          </a-tag>
+        </div>
+        <span class="prompt-subtitle">{{ t("kol.manage.editor.basicInfo") }}</span>
       </div>
       <div class="header-actions">
         <a-button @click="handlePreview">
           <template #icon><EyeOutlined /></template>
           {{ t('kol.manage.editor.preview') }}
         </a-button>
-        <a-button :loading="saveDraftMutation.isPending.value" @click="handleSave">
+        <a-button :loading="saveMutation.isPending.value" @click="handleSave">
           <template #icon><SaveOutlined /></template>
-          {{ t('kol.manage.editor.saveDraft') }}
+          {{ t('common.save') }}
         </a-button>
         <a-button type="primary" :loading="publishMutation.isPending.value" @click="handlePublish">
           <template #icon><SendOutlined /></template>
@@ -157,6 +269,28 @@ function handlePreview() {
       </div>
     </div>
 
+    <div class="editor-meta-card">
+      <div class="editor-section-title">{{ t("kol.manage.editor.basicInfo") }}</div>
+      <a-form layout="vertical" class="editor-meta-form">
+        <a-form-item :label="t('common.title')" required>
+          <a-input
+            v-model:value="metadataForm.name"
+            :placeholder="t('common.inputPlease') + t('common.title')"
+          />
+        </a-form-item>
+
+        <a-form-item :label="t('kol.manage.platformHint')">
+          <a-select
+            v-model:value="metadataForm.platform_hint"
+            :options="platformOptions"
+            option-filter-prop="label"
+            show-search
+            :get-popup-container="getSelectPopupContainer"
+          />
+        </a-form-item>
+      </a-form>
+    </div>
+
     <div class="editor-body">
       <KolVariablePanel />
       <KolPromptEditArea
@@ -165,8 +299,12 @@ function handlePreview() {
         :ai-task-id="aiTaskId"
         @ai-generate="handleAiGenerate"
         @ai-optimize="handleAiOptimize"
+        @focus-variable="handleFocusVariable"
+      />
+      <KolVariableConfig
+        ref="variableConfigRef"
+        v-model:variables="variables"
       />
-      <KolVariableConfig v-model:variables="variables" />
     </div>
 
     <a-modal
@@ -190,30 +328,133 @@ function handlePreview() {
   flex-direction: column;
 }
 
+.editor-topbar {
+  padding: 12px 16px;
+}
+
+.back-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 10px;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: #111827;
+  font-size: 16px;
+  font-weight: 700;
+  cursor: pointer;
+}
+
+.back-btn :deep(.anticon) {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 36px;
+  height: 36px;
+  border-radius: 999px;
+  background: rgba(255, 255, 255, 0.82);
+  border: 1px solid rgba(144, 157, 181, 0.24);
+}
+
 .editor-header {
-  height: 56px;
-  padding: 0 16px;
-  border-bottom: 1px solid #f0f0f0;
+  margin: 0 16px;
+  padding: 16px 20px;
+  border: 1px solid #f0f0f0;
+  border-radius: 16px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  gap: 16px;
   background: #fff;
 }
 
+.header-title {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.title-row {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex-wrap: wrap;
+}
+
 .prompt-name {
-  font-size: 16px;
-  font-weight: 500;
+  font-size: 18px;
+  font-weight: 600;
+  color: #111827;
+}
+
+.prompt-subtitle {
+  font-size: 13px;
+  color: #667085;
 }
 
 .header-actions {
   display: flex;
   gap: 12px;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+}
+
+.editor-meta-card {
+  margin: 12px 16px 0;
+  padding: 16px 20px 4px;
+  border: 1px solid #f0f0f0;
+  border-radius: 16px;
+  background: #fff;
+}
+
+.editor-section-title {
+  margin: 0 0 16px;
+  font-size: 14px;
+  font-weight: 600;
+  color: #111827;
+}
+
+.editor-meta-form {
+  display: grid;
+  grid-template-columns: minmax(240px, 1.4fr) minmax(200px, 1fr);
+  gap: 16px;
+  align-items: start;
 }
 
 .editor-body {
   flex: 1;
   display: flex;
   overflow: hidden;
+  margin: 12px 16px 16px;
+  border: 1px solid #f0f0f0;
+  border-radius: 16px;
   background: #f0f0f0;
 }
+
+@media (max-width: 1200px) {
+  .editor-meta-form {
+    grid-template-columns: 1fr 1fr;
+  }
+}
+
+@media (max-width: 900px) {
+  .editor-header {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .header-actions {
+    width: 100%;
+    justify-content: flex-start;
+  }
+
+  .editor-meta-form {
+    grid-template-columns: 1fr;
+  }
+
+  .editor-body {
+    flex-direction: column;
+  }
+}
 </style>
diff --git a/apps/admin-web/src/components/kol/KolPromptFormModal.vue b/apps/admin-web/src/components/kol/KolPromptFormModal.vue
index 37f072f..bb0b261 100644
--- a/apps/admin-web/src/components/kol/KolPromptFormModal.vue
+++ b/apps/admin-web/src/components/kol/KolPromptFormModal.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { reactive, watch } from "vue";
+import { computed, reactive, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import type { CreateKolPromptRequest } from "@geo/shared-types";
+import { buildKolPlatformOptions } from "@/lib/kol-platform-options";
 
 const props = defineProps<{
   open: boolean;
@@ -20,12 +21,7 @@ const formState = reactive<CreateKolPromptRequest>({
   platform_hint: "通用",
 });
 
-const platformOptions = [
-  { label: "通用", value: "通用" },
-  { label: "豆包", value: "豆包" },
-  { label: "DeepSeek", value: "DeepSeek" },
-  { label: "ChatGPT", value: "ChatGPT" },
-];
+const platformOptions = computed(() => buildKolPlatformOptions(t("kol.manage.platformHintDefault")));
 
 watch(
   () => props.open,
@@ -46,6 +42,10 @@ function handleOk() {
 function handleCancel() {
   emit("update:open", false);
 }
+
+function getSelectPopupContainer(triggerNode: HTMLElement) {
+  return triggerNode.parentElement ?? triggerNode;
+}
 </script>
 
 <template>
@@ -60,10 +60,13 @@ function handleCancel() {
         <a-input v-model:value="formState.name" :placeholder="t('common.inputPlease')" />
       </a-form-item>
       
-      <a-form-item label="Platform Hint">
+      <a-form-item :label="t('kol.manage.platformHint')">
         <a-select
           v-model:value="formState.platform_hint"
           :options="platformOptions"
+          option-filter-prop="label"
+          show-search
+          :get-popup-container="getSelectPopupContainer"
           @change="(val: string) => formState.platform_hint = val"
         />
       </a-form-item>
diff --git a/apps/admin-web/src/components/kol/KolVariableConfig.vue b/apps/admin-web/src/components/kol/KolVariableConfig.vue
index 9d1f319..c8c3054 100644
--- a/apps/admin-web/src/components/kol/KolVariableConfig.vue
+++ b/apps/admin-web/src/components/kol/KolVariableConfig.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { CloseOutlined } from "@ant-design/icons-vue";
-import type { KolVariableDefinition } from "@geo/shared-types";
-import { Tag } from "ant-design-vue";
+import type { ComponentPublicInstance } from "vue";
+import { nextTick, ref } from "vue";
+import { CloseOutlined, DownOutlined } from "@ant-design/icons-vue";
+import type { KolVariableDefinition, KolVariableType } from "@geo/shared-types";
 import { useI18n } from "vue-i18n";
 
 const props = defineProps<{
@@ -13,17 +14,22 @@ const emit = defineEmits<{
 }>();
 
 const { t } = useI18n();
+const panelRef = ref<HTMLDivElement | null>(null);
+const activeVariableKey = ref<string>("");
+let activeHighlightTimer: number | null = null;
+const cardRefs = new Map<string, HTMLElement>();
+
+const componentTypes: Array<{ type: KolVariableType }> = [
+  { type: "input" },
+  { type: "textarea" },
+  { type: "select" },
+  { type: "number" },
+  { type: "checkbox" },
+];
 
 function updateVariable(index: number, updates: Partial<KolVariableDefinition>) {
   const newVariables = [...props.variables];
-  const oldVar = newVariables[index];
-  
-  // If label is updated and matches key (default behavior), update key too
-  if (updates.label !== undefined && oldVar.label === oldVar.key) {
-    updates.key = updates.label;
-  }
-  
-  newVariables[index] = { ...oldVar, ...updates };
+  newVariables[index] = { ...newVariables[index], ...updates };
   emit("update:variables", newVariables);
 }
 
@@ -34,19 +40,103 @@ function removeVariable(index: number) {
 }
 
 function handleOptionsChange(index: number, value: string) {
-  const options = value.split(",").map(s => s.trim()).filter(Boolean);
+  const options = value
+    .split(",")
+    .map((item) => item.trim())
+    .filter(Boolean);
   updateVariable(index, { options });
 }
+
+function handleTypeChange(index: number, type: KolVariableType) {
+  updateVariable(index, { type });
+}
+
+function setCardRef(key: string, el: Element | ComponentPublicInstance | null) {
+  const element =
+    el instanceof HTMLElement
+      ? el
+      : el && "$el" in el && el.$el instanceof HTMLElement
+        ? el.$el
+        : null;
+
+  if (element) {
+    cardRefs.set(key, element);
+    return;
+  }
+  cardRefs.delete(key);
+}
+
+async function focusVariable(key: string) {
+  activeVariableKey.value = key;
+
+  if (activeHighlightTimer !== null) {
+    window.clearTimeout(activeHighlightTimer);
+  }
+  activeHighlightTimer = window.setTimeout(() => {
+    if (activeVariableKey.value === key) {
+      activeVariableKey.value = "";
+    }
+    activeHighlightTimer = null;
+  }, 1800);
+
+  await nextTick();
+
+  const card = cardRefs.get(key);
+  const panel = panelRef.value;
+  if (!card || !panel) {
+    return;
+  }
+
+  const targetTop = Math.max(card.offsetTop - 16, 0);
+  panel.scrollTo({
+    top: targetTop,
+    behavior: "smooth",
+  });
+
+  requestAnimationFrame(() => {
+    const input = card.querySelector("input");
+    if (input instanceof HTMLInputElement) {
+      input.focus();
+      input.select();
+    }
+  });
+}
+
+defineExpose({
+  focusVariable,
+});
 </script>
 
 <template>
-  <div class="kol-variable-config">
+  <div ref="panelRef" class="kol-variable-config">
     <div v-if="variables.length === 0" class="empty-state">
       {{ t('common.noData') }}
     </div>
-    <div v-for="(variable, index) in variables" :key="variable.id" class="variable-card">
+    <div
+      v-for="(variable, index) in variables"
+      :key="variable.id"
+      :ref="(el) => setCardRef(variable.key || variable.id, el)"
+      class="variable-card"
+      :class="{ 'variable-card--active': activeVariableKey === (variable.key || variable.id) }"
+    >
       <div class="card-header">
-        <Tag color="blue">{{ t(`kol.manage.variable.${variable.type}`) }}</Tag>
+        <a-dropdown :trigger="['click']">
+          <button type="button" class="type-trigger">
+            <span>{{ t(`kol.manage.variable.${variable.type}`) }}</span>
+            <DownOutlined />
+          </button>
+          <template #overlay>
+            <a-menu>
+              <a-menu-item
+                v-for="item in componentTypes"
+                :key="item.type"
+                @click="handleTypeChange(index, item.type)"
+              >
+                {{ t(`kol.manage.variable.${item.type}`) }}
+              </a-menu-item>
+            </a-menu>
+          </template>
+        </a-dropdown>
         <div class="header-actions">
           <a-button type="text" size="small" @click="removeVariable(index)">
             <template #icon><CloseOutlined /></template>
@@ -92,7 +182,7 @@ function handleOptionsChange(index: number, value: string) {
         </div>
 
         <div class="token-display">
-          <code>{{ `{{${variable.key}}}` }}</code>
+          <code>&#123;&#123;{{ variable.key || variable.id }}&#125;&#125;</code>
         </div>
       </div>
     </div>
@@ -121,6 +211,13 @@ function handleOptionsChange(index: number, value: string) {
   border: 1px solid #f0f0f0;
   border-radius: 4px;
   background: #fafafa;
+  transition: border-color 0.25s ease, box-shadow 0.25s ease, background 0.25s ease;
+}
+
+.variable-card--active {
+  border-color: #ff85c0;
+  background: #fff7fb;
+  box-shadow: 0 0 0 3px rgba(235, 47, 150, 0.12);
 }
 
 .card-header {
@@ -131,6 +228,26 @@ function handleOptionsChange(index: number, value: string) {
   border-bottom: 1px solid #f0f0f0;
 }
 
+.type-trigger {
+  appearance: none;
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 2px 10px;
+  border: 1px solid #91caff;
+  border-radius: 999px;
+  background: #f0f7ff;
+  color: #1677ff;
+  font-size: 12px;
+  line-height: 20px;
+  cursor: pointer;
+}
+
+.type-trigger:hover {
+  border-color: #69b1ff;
+  background: #e6f4ff;
+}
+
 .card-body {
   padding: 12px;
   display: flex;
diff --git a/apps/admin-web/src/i18n/messages/en-US.ts b/apps/admin-web/src/i18n/messages/en-US.ts
index ad47000..64a2c34 100644
--- a/apps/admin-web/src/i18n/messages/en-US.ts
+++ b/apps/admin-web/src/i18n/messages/en-US.ts
@@ -190,7 +190,18 @@ const enUS = {
       publishPackage: "Publish",
       archivePackage: "Archive",
       createPrompt: "Create prompt",
+      activatePrompt: "Go live",
+      archivePrompt: "Take offline",
+      platformHint: "Platform",
+      platformHintDefault: "General",
+      status: {
+        draft: "Draft",
+        active: "Live",
+        archived: "Offline",
+      },
       editor: {
+        basicInfo: "Basic info",
+        saveMeta: "Save basic info",
         saveDraft: "Save draft",
         publish: "Publish",
         preview: "Preview form",
diff --git a/apps/admin-web/src/i18n/messages/zh-CN.ts b/apps/admin-web/src/i18n/messages/zh-CN.ts
index 6cb1d8f..f7ff04e 100644
--- a/apps/admin-web/src/i18n/messages/zh-CN.ts
+++ b/apps/admin-web/src/i18n/messages/zh-CN.ts
@@ -168,7 +168,7 @@ const zhCN = {
       },
       empty: "暂无已上架的订阅包",
       subscribers: "{count} 个订阅租户",
-      prompts: "{count} 个 Prompt",
+      prompts: "{count} 个提示词",
     },
     package: {
       subscribe: "申请订阅",
@@ -189,8 +189,19 @@ const zhCN = {
       editPackage: "编辑包",
       publishPackage: "发布",
       archivePackage: "归档",
-      createPrompt: "新增 Prompt",
+      createPrompt: "新增提示词",
+      activatePrompt: "上线",
+      archivePrompt: "下线",
+      platformHint: "平台",
+      platformHintDefault: "通用",
+      status: {
+        draft: "草稿",
+        active: "已上线",
+        archived: "已下线",
+      },
       editor: {
+        basicInfo: "基本信息",
+        saveMeta: "保存基本信息",
         saveDraft: "保存草稿",
         publish: "发布",
         preview: "预览表单",
diff --git a/apps/admin-web/src/lib/api.ts b/apps/admin-web/src/lib/api.ts
index 44791a4..80dc6e8 100644
--- a/apps/admin-web/src/lib/api.ts
+++ b/apps/admin-web/src/lib/api.ts
@@ -33,12 +33,11 @@ import type {
   KolAssistTask,
   KolPackageSummary,
   KolPackageDetail,
+  PublishKolPromptRequest,
   KolSubscription,
   KolSubscriptionPromptCard,
   KolProfile,
   KolPromptDetail,
-  KolPromptRevision,
-  KolSaveDraftRequest,
   KolSubscriptionPromptSchema,
   KolGenerateRequest,
   KolGenerateResponse,
@@ -323,15 +322,27 @@ export const kolManageApi = {
   deletePrompt(id: number) {
     return apiClient.remove<null>(`/api/tenant/kol/manage/prompts/${id}`);
   },
-  saveDraft(promptId: number, body: KolSaveDraftRequest) {
-    return apiClient.post<KolPromptRevision, KolSaveDraftRequest>(
-      `/api/tenant/kol/manage/prompts/${promptId}/draft`,
+  savePrompt(promptId: number, body: PublishKolPromptRequest) {
+    return apiClient.post<KolPromptDetail, PublishKolPromptRequest>(
+      `/api/tenant/kol/manage/prompts/${promptId}/save`,
       body,
     );
   },
-  publishPrompt(promptId: number) {
-    return apiClient.post<{ ok: boolean }, Record<string, never>>(
+  publishPrompt(promptId: number, body: PublishKolPromptRequest) {
+    return apiClient.post<KolPromptDetail, PublishKolPromptRequest>(
       `/api/tenant/kol/manage/prompts/${promptId}/publish`,
+      body,
+    );
+  },
+  activatePrompt(promptId: number) {
+    return apiClient.put<KolPromptDetail, Record<string, never>>(
+      `/api/tenant/kol/manage/prompts/${promptId}/activate`,
+      {},
+    );
+  },
+  archivePrompt(promptId: number) {
+    return apiClient.put<KolPromptDetail, Record<string, never>>(
+      `/api/tenant/kol/manage/prompts/${promptId}/archive`,
       {},
     );
   },
@@ -348,7 +359,7 @@ export const kolManageApi = {
 
 export const kolMarketplaceApi = {
   list(params: { industry?: string; keyword?: string; limit?: number; offset?: number }) {
-    return apiClient.get<KolPackageSummary[]>("/api/tenant/kol/marketplace", { params });
+    return apiClient.get<KolPackageSummary[]>("/api/tenant/kol/marketplace/packages", { params });
   },
   detail(id: number) {
     return apiClient.get<KolPackageDetail>(`/api/tenant/kol/marketplace/packages/${id}`);
@@ -360,12 +371,10 @@ export const kolMarketplaceApi = {
     );
   },
   mySubscriptions() {
-    return apiClient.get<KolSubscription[]>("/api/tenant/kol/marketplace/my-subscriptions");
+    return apiClient.get<KolSubscription[]>("/api/tenant/kol/subscriptions");
   },
   mySubscriptionPrompts() {
-    return apiClient.get<KolSubscriptionPromptCard[]>(
-      "/api/tenant/kol/marketplace/my-subscription-prompts",
-    );
+    return apiClient.get<KolSubscriptionPromptCard[]>("/api/tenant/kol/subscription-prompts");
   },
 };
 
diff --git a/apps/admin-web/src/lib/kol-placeholders.ts b/apps/admin-web/src/lib/kol-placeholders.ts
new file mode 100644
index 0000000..d6e2de3
--- /dev/null
+++ b/apps/admin-web/src/lib/kol-placeholders.ts
@@ -0,0 +1,113 @@
+import type { KolVariableDefinition, KolVariableType } from "@geo/shared-types";
+
+import { newVariableId } from "./kol-variable-id";
+
+const KOL_PLACEHOLDER_RE = /\{\{\s*([^{}]+?)\s*\}\}/g;
+
+function normalizePlaceholderKey(value: string): string {
+  return value.trim();
+}
+
+function normalizeVariableType(type?: KolVariableType): KolVariableType {
+  switch (type) {
+    case "textarea":
+    case "select":
+    case "number":
+    case "checkbox":
+      return type;
+    case "input":
+    default:
+      return "input";
+  }
+}
+
+export function buildKolPlaceholderToken(key: string): string {
+  return `{{${normalizePlaceholderKey(key)}}}`;
+}
+
+export function extractKolPlaceholderKeys(content: string): string[] {
+  const text = String(content ?? "");
+  const seen = new Set<string>();
+  const keys: string[] = [];
+
+  for (const match of text.matchAll(KOL_PLACEHOLDER_RE)) {
+    const key = normalizePlaceholderKey(match[1] ?? "");
+    if (!key || seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    keys.push(key);
+  }
+
+  return keys;
+}
+
+export function findKolPlaceholderKeyAtPosition(content: string, position: number): string | null {
+  const text = String(content ?? "");
+  if (!text || position < 0) {
+    return null;
+  }
+
+  for (const match of text.matchAll(KOL_PLACEHOLDER_RE)) {
+    const token = match[0] ?? "";
+    const start = match.index ?? -1;
+    const end = start + token.length;
+    if (start < 0) {
+      continue;
+    }
+
+    if (position >= start && position <= end) {
+      return normalizePlaceholderKey(match[1] ?? "");
+    }
+  }
+
+  return null;
+}
+
+export function createKolVariableDefinition(
+  key: string,
+  overrides: Partial<KolVariableDefinition> = {},
+): KolVariableDefinition {
+  const normalizedKey = normalizePlaceholderKey(key);
+
+  return {
+    id: overrides.id?.trim() || newVariableId(),
+    key: normalizedKey,
+    label: overrides.label?.trim() || normalizedKey,
+    type: normalizeVariableType(overrides.type),
+    required: overrides.required ?? true,
+    placeholder: overrides.placeholder,
+    options: overrides.options,
+  };
+}
+
+export function syncKolVariablesWithContent(
+  content: string,
+  variables: KolVariableDefinition[],
+): KolVariableDefinition[] {
+  const keys = extractKolPlaceholderKeys(content);
+  const byKey = new Map<string, KolVariableDefinition>();
+
+  for (const variable of variables) {
+    const key = normalizePlaceholderKey(variable.key || variable.label || "");
+    if (!key || byKey.has(key)) {
+      continue;
+    }
+    byKey.set(
+      key,
+      createKolVariableDefinition(key, {
+        ...variable,
+        key,
+        label: variable.label?.trim() || key,
+      }),
+    );
+  }
+
+  return keys.map((key) => {
+    const existing = byKey.get(key);
+    if (existing) {
+      return existing;
+    }
+    return createKolVariableDefinition(key);
+  });
+}
diff --git a/apps/admin-web/src/lib/kol-platform-options.ts b/apps/admin-web/src/lib/kol-platform-options.ts
new file mode 100644
index 0000000..d0c94d1
--- /dev/null
+++ b/apps/admin-web/src/lib/kol-platform-options.ts
@@ -0,0 +1,15 @@
+export interface KolPlatformOption {
+  label: string;
+  value: string;
+}
+
+export function buildKolPlatformOptions(defaultLabel: string): KolPlatformOption[] {
+  return [
+    { label: defaultLabel, value: "通用" },
+    { label: "小红书", value: "xiaohongshu" },
+    { label: "微信", value: "wechat" },
+    { label: "豆包", value: "doubao" },
+    { label: "DeepSeek", value: "deepseek" },
+    { label: "ChatGPT", value: "chatgpt" },
+  ];
+}
diff --git a/apps/admin-web/src/views/ArticleEditorView.vue b/apps/admin-web/src/views/ArticleEditorView.vue
index 623ed97..af1cf5d 100644
--- a/apps/admin-web/src/views/ArticleEditorView.vue
+++ b/apps/admin-web/src/views/ArticleEditorView.vue
@@ -5,7 +5,6 @@ import { message } from "ant-design-vue";
 import { computed, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
-import { MilkdownProvider } from "@milkdown/vue";
 
 import ArticleEditorCanvas from "@/components/ArticleEditorCanvas.vue";
 import CoverPickerModal from "@/components/CoverPickerModal.vue";
@@ -379,16 +378,14 @@ function serializePlatformSelection(platformIds: string[]): string {
       />
       <div class="article-editor-view__layout">
         <section class="article-editor-view__main">
-          <MilkdownProvider>
-            <ArticleEditorCanvas
-              :key="String(articleId)"
-              :article-id="articleId"
-              v-model:title="title"
-              v-model="markdown"
-              :disabled="editorLocked"
-              :upload-image="uploadEditorImage"
-            />
-          </MilkdownProvider>
+          <ArticleEditorCanvas
+            :key="String(articleId)"
+            :article-id="articleId"
+            v-model:title="title"
+            v-model="markdown"
+            :disabled="editorLocked"
+            :upload-image="uploadEditorImage"
+          />
         </section>
 
         <aside class="article-editor-view__rail">
diff --git a/apps/admin-web/src/views/KolGenerateView.vue b/apps/admin-web/src/views/KolGenerateView.vue
index 7797318..7612e38 100644
--- a/apps/admin-web/src/views/KolGenerateView.vue
+++ b/apps/admin-web/src/views/KolGenerateView.vue
@@ -22,6 +22,10 @@ const schemaQuery = useQuery({
 
 const values = ref<Record<string, any>>({});
 
+function fieldKey(key?: string | null, id?: string): string {
+  return key?.trim() || id || "";
+}
+
 // Initialize values from schema
 watch(
   () => schemaQuery.data.value,
@@ -29,7 +33,7 @@ watch(
     if (schema?.schema_json?.variables) {
       const newValues: Record<string, any> = {};
       schema.schema_json.variables.forEach((v) => {
-        newValues[v.key] = v.type === "checkbox" ? [] : undefined;
+        newValues[fieldKey(v.key, v.id)] = v.type === "checkbox" ? [] : undefined;
       });
       values.value = newValues;
     }
@@ -59,7 +63,7 @@ function handleSubmit() {
 
   const missingLabels: string[] = [];
   schema.schema_json.variables.forEach((v) => {
-    if (v.required && !values.value[v.key]) {
+    if (v.required && !values.value[fieldKey(v.key, v.id)]) {
       missingLabels.push(v.label);
     }
   });
diff --git a/apps/admin-web/src/views/KolManageView.vue b/apps/admin-web/src/views/KolManageView.vue
index 7b55a39..b24c36a 100644
--- a/apps/admin-web/src/views/KolManageView.vue
+++ b/apps/admin-web/src/views/KolManageView.vue
@@ -6,12 +6,13 @@ import { message, Modal } from "ant-design-vue";
 import {
   PlusOutlined,
   EditOutlined,
+  PlayCircleOutlined,
+  PauseCircleOutlined,
   CloudUploadOutlined,
   InboxOutlined,
   DeleteOutlined,
 } from "@ant-design/icons-vue";
 
-import PageHero from "@/components/PageHero.vue";
 import KolPackageFormModal from "@/components/kol/KolPackageFormModal.vue";
 import KolPromptFormModal from "@/components/kol/KolPromptFormModal.vue";
 import KolPromptEditor from "@/components/kol/KolPromptEditor.vue";
@@ -26,8 +27,8 @@ const selectedPackageId = ref<number | null>(null);
 const packageModalOpen = ref(false);
 const editingPackage = ref<KolPackageSummary | null>(null);
 const promptModalOpen = ref(false);
-const editorDrawerOpen = ref(false);
 const editingPromptId = ref<number | null>(null);
+const togglingPromptId = ref<number | null>(null);
 
 const { data: packages, isPending: packagesPending } = useQuery({
   queryKey: ["kol", "packages"],
@@ -77,11 +78,12 @@ const archivePackageMutation = useMutation({
 
 const deletePackageMutation = useMutation({
   mutationFn: (id: number) => kolManageApi.deletePackage(id),
-  onSuccess: () => {
+  onSuccess: (_, id) => {
     message.success(t("common.delete") + "成功");
     queryClient.invalidateQueries({ queryKey: ["kol", "packages"] });
-    if (selectedPackageId.value === selectedPackageId.value) {
+    if (selectedPackageId.value === id) {
       selectedPackageId.value = null;
+      editingPromptId.value = null;
     }
   },
 });
@@ -97,6 +99,31 @@ const createPromptMutation = useMutation({
   },
   onError: (error) => message.error(formatError(error)),
 });
+
+const togglePromptStatusMutation = useMutation({
+  mutationFn: (data: { id: number; nextStatus: "active" | "archived" }) =>
+    data.nextStatus === "active"
+      ? kolManageApi.activatePrompt(data.id)
+      : kolManageApi.archivePrompt(data.id),
+  onMutate: (variables) => {
+    togglingPromptId.value = variables.id;
+  },
+  onSuccess: (_, variables) => {
+    message.success(
+      t(variables.nextStatus === "active" ? "kol.manage.activatePrompt" : "kol.manage.archivePrompt") + "成功"
+    );
+    void queryClient.invalidateQueries({ queryKey: ["kol", "packages"] });
+    void queryClient.invalidateQueries({
+      queryKey: ["kol", "packages", selectedPackageId.value, "prompts"],
+    });
+    void queryClient.invalidateQueries({ queryKey: ["kol", "prompt", variables.id] });
+  },
+  onError: (error) => message.error(formatError(error)),
+  onSettled: () => {
+    togglingPromptId.value = null;
+  },
+});
+
 const packageInitialValue = computed<Partial<CreateKolPackageRequest> | undefined>(() => {
   if (!editingPackage.value) return undefined;
   return {
@@ -135,130 +162,172 @@ function handleDeletePackage(id: number) {
   });
 }
 
+function handleSelectPackage(packageId: number) {
+  selectedPackageId.value = packageId;
+  editingPromptId.value = null;
+}
+
 function handleOpenEditor(promptId: number) {
   editingPromptId.value = promptId;
-  editorDrawerOpen.value = true;
+}
+
+function handleCloseEditor() {
+  editingPromptId.value = null;
+}
+
+function promptStatusLabel(status: string) {
+  if (status === "active") return t("kol.manage.status.active");
+  if (status === "archived") return t("kol.manage.status.archived");
+  return t("kol.manage.status.draft");
 }
 </script>
 
 <template>
   <div class="kol-manage-view">
-    <PageHero
-      :title="t('kol.manage.title')"
-      :description="t('route.tracking.description')"
-    />
-
-    <div class="manage-content">
-...
-    <KolPackageFormModal
-      v-model:open="packageModalOpen"
-      :initial-value="packageInitialValue"
-      @submit="handlePackageSubmit"
-    />
-          <a-button type="primary" size="small" @click="handleCreatePackage">
-            <template #icon><PlusOutlined /></template>
-            {{ t('kol.manage.createPackage') }}
-          </a-button>
-        </div>
-
-        <a-list
-          class="package-list"
-          :loading="packagesPending"
-          :data-source="packages"
-          size="small"
-        >
-          <template #renderItem="{ item }">
-            <a-list-item
-              :class="{ 'is-selected': selectedPackageId === item.id }"
-              @click="selectedPackageId = item.id"
-            >
-              <div class="package-item-content">
-                <div class="package-name">{{ item.name }}</div>
-                <div class="package-meta">
-                  <a-tag :color="item.status === 'published' ? 'green' : 'orange'" size="small">
-                    {{ item.status }}
-                  </a-tag>
-                  <span>{{ item.prompt_count }} Prompts</span>
-                </div>
-              </div>
-              <template #actions>
-                <a-dropdown>
-                  <a class="ant-dropdown-link" @click.prevent>...</a>
-                  <template #overlay>
-                    <a-menu>
-                      <a-menu-item @click="handleEditPackage(item)">
-                        <EditOutlined /> {{ t('common.edit') }}
-                      </a-menu-item>
-                      <a-menu-item
-                        v-if="item.status !== 'published'"
-                        @click="publishPackageMutation.mutate(item.id)"
-                      >
-                        <CloudUploadOutlined /> {{ t('kol.manage.publishPackage') }}
-                      </a-menu-item>
-                      <a-menu-item
-                        v-if="item.status === 'published'"
-                        @click="archivePackageMutation.mutate(item.id)"
-                      >
-                        <InboxOutlined /> {{ t('kol.manage.archivePackage') }}
-                      </a-menu-item>
-                      <a-menu-divider />
-                      <a-menu-item danger @click="handleDeletePackage(item.id)">
-                        <DeleteOutlined /> {{ t('common.delete') }}
-                      </a-menu-item>
-                    </a-menu>
-                  </template>
-                </a-dropdown>
-              </template>
-            </a-list-item>
-          </template>
-        </a-list>
+    <div v-if="editingPromptId" class="manage-content manage-content--editor">
+      <div class="fullscreen-editor">
+        <KolPromptEditor :prompt-id="editingPromptId" @back="handleCloseEditor" />
       </div>
-
-      <!-- Right Column: Prompts -->
-      <div class="prompt-column">
-        <template v-if="selectedPackageId">
+    </div>
+    <div v-else class="manage-content">
+        <div class="package-column">
           <div class="column-header">
-            <h3>Prompts</h3>
-            <a-button type="primary" size="small" @click="promptModalOpen = true">
+            <h3>订阅包</h3>
+            <a-button type="primary" size="small" @click="handleCreatePackage">
               <template #icon><PlusOutlined /></template>
-              {{ t('kol.manage.createPrompt') }}
+              {{ t('kol.manage.createPackage') }}
             </a-button>
           </div>
 
-          <a-table
-            :columns="[
-              { title: t('common.title'), dataIndex: 'name', key: 'name' },
-              { title: 'Platform', dataIndex: 'platform_hint', key: 'platform_hint' },
-              { title: t('common.status'), dataIndex: 'status', key: 'status' },
-              { title: t('common.actions'), key: 'actions', align: 'right' },
-            ]"
-            :data-source="prompts"
-            :loading="promptsPending"
+          <a-list
+            class="package-list"
+            :loading="packagesPending"
+            :data-source="packages"
             size="small"
-            :pagination="false"
           >
-            <template #bodyCell="{ column, record }">
-              <template v-if="column.key === 'platform_hint'">
-                <a-tag color="blue">{{ record.platform_hint || '通用' }}</a-tag>
-              </template>
-              <template v-else-if="column.key === 'status'">
-                <a-tag :color="record.status === 'active' ? 'green' : 'orange'">
-                  {{ record.status }}
-                </a-tag>
-              </template>
-              <template v-else-if="column.key === 'actions'">
-                <a-button type="link" size="small" @click="handleOpenEditor(record.id)">
-                  {{ t('common.edit') }}
-                </a-button>
-              </template>
+            <template #renderItem="{ item }">
+              <a-list-item
+                :class="{ 'is-selected': selectedPackageId === item.id }"
+                @click="handleSelectPackage(item.id)"
+              >
+                <div class="package-item-content">
+                  <div class="package-name">{{ item.name }}</div>
+                  <div class="package-meta">
+                    <a-tag :color="item.status === 'published' ? 'green' : 'orange'" size="small">
+                      {{ item.status }}
+                    </a-tag>
+                    <span>{{ item.prompt_count }} 提示词</span>
+                  </div>
+                </div>
+                <template #actions>
+                  <a-dropdown>
+                    <a class="ant-dropdown-link" @click.prevent>...</a>
+                    <template #overlay>
+                      <a-menu>
+                        <a-menu-item @click="handleEditPackage(item)">
+                          <EditOutlined /> {{ t('common.edit') }}
+                        </a-menu-item>
+                        <a-menu-item
+                          v-if="item.status !== 'published'"
+                          @click="publishPackageMutation.mutate(item.id)"
+                        >
+                          <CloudUploadOutlined /> {{ t('kol.manage.publishPackage') }}
+                        </a-menu-item>
+                        <a-menu-item
+                          v-if="item.status === 'published'"
+                          @click="archivePackageMutation.mutate(item.id)"
+                        >
+                          <InboxOutlined /> {{ t('kol.manage.archivePackage') }}
+                        </a-menu-item>
+                        <a-menu-divider />
+                        <a-menu-item danger @click="handleDeletePackage(item.id)">
+                          <DeleteOutlined /> {{ t('common.delete') }}
+                        </a-menu-item>
+                      </a-menu>
+                    </template>
+                  </a-dropdown>
+                </template>
+              </a-list-item>
             </template>
-          </a-table>
-        </template>
-        <div v-else class="empty-prompts">
-          <a-empty description="请选择左侧订阅包以查看 Prompt" />
+          </a-list>
+        </div>
+
+        <!-- Right Column: Prompts -->
+        <div class="prompt-column">
+          <template v-if="selectedPackageId">
+            <div class="column-header">
+              <h3>提示词</h3>
+              <a-button type="primary" size="small" @click="promptModalOpen = true">
+                <template #icon><PlusOutlined /></template>
+                {{ t('kol.manage.createPrompt') }}
+              </a-button>
+            </div>
+
+            <a-table
+              :columns="[
+                { title: t('common.title'), dataIndex: 'name', key: 'name' },
+                { title: t('tracking.columns.platform'), dataIndex: 'platform_hint', key: 'platform_hint' },
+                { title: t('common.status'), dataIndex: 'status', key: 'status' },
+                { title: t('common.actions'), key: 'actions', align: 'right', width: 112 },
+              ]"
+              :data-source="prompts"
+              :loading="promptsPending"
+              size="small"
+              :pagination="false"
+            >
+              <template #bodyCell="{ column, record }">
+                <template v-if="column.key === 'platform_hint'">
+                  <a-tag color="blue">{{ record.platform_hint || '通用' }}</a-tag>
+                </template>
+                <template v-else-if="column.key === 'status'">
+                  <a-tag :color="record.status === 'active' ? 'green' : record.status === 'archived' ? 'orange' : 'default'">
+                    {{ promptStatusLabel(record.status) }}
+                  </a-tag>
+                </template>
+                <template v-else-if="column.key === 'actions'">
+                  <div class="table-actions-row">
+                    <a-tooltip :title="t('common.edit')">
+                      <a-button
+                        type="text"
+                        shape="circle"
+                        size="small"
+                        class="action-btn action-edit"
+                        @click="handleOpenEditor(record.id)"
+                      >
+                        <EditOutlined />
+                      </a-button>
+                    </a-tooltip>
+                    <a-tooltip
+                      :title="record.status === 'active' ? t('kol.manage.archivePrompt') : t('kol.manage.activatePrompt')"
+                    >
+                      <a-button
+                        type="text"
+                        shape="circle"
+                        size="small"
+                        :class="[
+                          'action-btn',
+                          record.status === 'active' ? 'action-disable' : 'action-enable',
+                        ]"
+                        :loading="togglePromptStatusMutation.isPending.value && togglingPromptId === record.id"
+                        @click="togglePromptStatusMutation.mutate({
+                          id: record.id,
+                          nextStatus: record.status === 'active' ? 'archived' : 'active',
+                        })"
+                      >
+                        <PauseCircleOutlined v-if="record.status === 'active'" />
+                        <PlayCircleOutlined v-else />
+                      </a-button>
+                    </a-tooltip>
+                  </div>
+                </template>
+              </template>
+            </a-table>
+          </template>
+          <div v-else class="empty-prompts">
+            <a-empty description="请选择左侧订阅包以查看提示词" />
+          </div>
         </div>
       </div>
-    </div>
 
     <KolPackageFormModal
       v-model:open="packageModalOpen"
@@ -271,16 +340,6 @@ function handleOpenEditor(promptId: number) {
       :package-id="selectedPackageId || 0"
       @submit="createPromptMutation.mutate"
     />
-
-    <a-drawer
-      v-model:open="editorDrawerOpen"
-      width="90vw"
-      :closable="true"
-      :destroy-on-close="true"
-      class="editor-drawer"
-    >
-      <KolPromptEditor v-if="editingPromptId" :prompt-id="editingPromptId" />
-    </a-drawer>
   </div>
 </template>
 
@@ -291,13 +350,23 @@ function handleOpenEditor(promptId: number) {
   height: calc(100vh - 64px);
 }
 
+.fullscreen-editor {
+  flex: 1;
+  min-height: 0;
+  border-radius: 12px;
+  overflow: hidden;
+}
+
+.manage-content--editor {
+  padding: 16px;
+}
+
 .manage-content {
   flex: 1;
   display: flex;
   overflow: hidden;
   padding: 16px;
   gap: 16px;
-  background: #f5f5f5;
 }
 
 .package-column {
@@ -314,6 +383,7 @@ function handleOpenEditor(promptId: number) {
   border-radius: 8px;
   display: flex;
   flex-direction: column;
+  min-width: 0;
 }
 
 .column-header {
@@ -372,7 +442,29 @@ function handleOpenEditor(promptId: number) {
   justify-content: center;
 }
 
-.editor-drawer :deep(.ant-drawer-body) {
-  padding: 0;
+.prompt-editor-panel {
+  flex: 1;
+  min-height: 0;
+}
+
+.table-actions-row {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.action-edit.ant-btn:hover:not(:disabled) {
+  color: #52c41a;
+  background: #f6ffed;
+}
+
+.action-enable.ant-btn:hover:not(:disabled) {
+  color: #1677ff;
+  background: #e6f4ff;
+}
+
+.action-disable.ant-btn:hover:not(:disabled) {
+  color: #fa8c16;
+  background: #fff7e6;
 }
 </style>
diff --git a/docs/superpowers/plans/2026-04-15-image-management.md b/docs/superpowers/plans/2026-04-15-image-management.md
deleted file mode 100644
index 53751ca..0000000
--- a/docs/superpowers/plans/2026-04-15-image-management.md
+++ /dev/null
@@ -1,2541 +0,0 @@
-# Image Management Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Build a standalone image asset management system with folder organization, WebP conversion, quota enforcement, and article editor integration.
-
-**Architecture:** Layered Go backend (repository/app/transport) with sqlc-generated queries, atomic quota counter, and RabbitMQ-based compensation for upload/delete finalization. Vue 3 + Ant Design frontend with a new `/images` page and library picker integrated into the article editor and cover modal.
-
-**Tech Stack:** Go (gin, pgx, chai2010/webp, x/image/webp), PostgreSQL (pg_trgm), RabbitMQ, Vue 3, TypeScript, Ant Design Vue, TanStack Query.
-
----
-
-## File Structure
-
-### Backend — New Files
-
-| File | Responsibility |
-|------|---------------|
-| `server/migrations/20260415100000_create_image_tables.up.sql` | DDL for 4 tables + indexes + plan seed update |
-| `server/migrations/20260415100000_create_image_tables.down.sql` | Rollback DDL |
-| `server/internal/tenant/repository/queries/image.sql` | sqlc queries for image_assets |
-| `server/internal/tenant/repository/queries/image_folder.sql` | sqlc queries for image_folders |
-| `server/internal/tenant/repository/queries/image_reference.sql` | sqlc queries for image_asset_references |
-| `server/internal/tenant/repository/queries/image_usage.sql` | sqlc queries for tenant_image_storage_usage |
-| `server/internal/tenant/repository/image_repo.go` | ImageRepository interface + impl |
-| `server/internal/tenant/repository/image_folder_repo.go` | ImageFolderRepository interface + impl |
-| `server/internal/tenant/repository/image_reference_repo.go` | ImageReferenceRepository interface + impl |
-| `server/internal/tenant/repository/image_usage_repo.go` | ImageUsageRepository interface + impl |
-| `server/internal/tenant/app/image_service.go` | ImageService (upload pipeline, list, update, delete, quota) |
-| `server/internal/tenant/app/image_folder_service.go` | ImageFolderService (CRUD) |
-| `server/internal/tenant/transport/image_handler.go` | HTTP handlers for all /api/tenant/images endpoints |
-
-### Backend — Modified Files
-
-| File | Change |
-|------|--------|
-| `server/internal/shared/config/config.go` | Add ImageAsset queue config fields to RabbitMQConfig |
-| `server/internal/shared/messaging/rabbitmq/client.go` | Add Publish/Consume for image asset queue + topology |
-| `server/internal/tenant/transport/router.go` | Register image routes |
-| `server/internal/tenant/repository/sqlc.yaml` | No change needed — queries auto-discovered from queries/ dir |
-
-### Frontend — New Files
-
-| File | Responsibility |
-|------|---------------|
-| `apps/admin-web/src/views/ImagesView.vue` | Main `/images` page with folder sidebar + image grid |
-| `apps/admin-web/src/components/ImageLibraryPicker.vue` | Reusable image library picker (used in cover modal + editor) |
-
-### Frontend — Modified Files
-
-| File | Change |
-|------|--------|
-| `packages/shared-types/src/index.ts` | Add image-related TypeScript interfaces |
-| `apps/admin-web/src/lib/api.ts` | Add `imagesApi` client |
-| `apps/admin-web/src/router/index.ts` | Add `/images` route |
-| `apps/admin-web/src/layouts/AppShell.vue` | Add nav item under contentManagement |
-| `apps/admin-web/src/i18n/messages/zh-CN.ts` | Add Chinese translations for images feature |
-| `apps/admin-web/src/i18n/messages/en-US.ts` | Add English translations for images feature |
-| `apps/admin-web/src/components/CoverPickerModal.vue` | Replace "AI封面" tab with "本地素材" library picker tab |
-
----
-
-## Task 1: Database Migration
-
-**Files:**
-- Create: `server/migrations/20260415100000_create_image_tables.up.sql`
-- Create: `server/migrations/20260415100000_create_image_tables.down.sql`
-
-- [ ] **Step 1: Create up migration**
-
-Create `server/migrations/20260415100000_create_image_tables.up.sql`:
-
-```sql
-CREATE EXTENSION IF NOT EXISTS pg_trgm;
-
-CREATE TABLE image_folders (
-  id         BIGSERIAL PRIMARY KEY,
-  tenant_id  BIGINT NOT NULL,
-  name       VARCHAR(100) NOT NULL,
-  updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  CONSTRAINT uq_image_folders_tenant_name UNIQUE (tenant_id, name),
-  CONSTRAINT uq_image_folders_tenant_id UNIQUE (tenant_id, id)
-);
-
-CREATE INDEX idx_image_folders_tenant ON image_folders (tenant_id);
-
-CREATE TABLE image_assets (
-  id           BIGSERIAL PRIMARY KEY,
-  tenant_id    BIGINT NOT NULL,
-  folder_id    BIGINT,
-  object_key   TEXT NOT NULL UNIQUE,
-  name         VARCHAR(255) NOT NULL,
-  size_bytes   BIGINT NOT NULL,
-  status       VARCHAR(20) NOT NULL DEFAULT 'active',
-  created_by   BIGINT NOT NULL,
-  updated_at   TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  created_at   TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  deleted_at   TIMESTAMPTZ,
-  CONSTRAINT fk_image_assets_folder
-    FOREIGN KEY (tenant_id, folder_id)
-    REFERENCES image_folders(tenant_id, id),
-  CONSTRAINT uq_image_assets_tenant_id UNIQUE (tenant_id, id)
-);
-
-CREATE INDEX idx_image_assets_tenant_folder ON image_assets (tenant_id, folder_id) WHERE status = 'active' AND deleted_at IS NULL;
-CREATE INDEX idx_image_assets_tenant_created ON image_assets (tenant_id, created_at DESC) WHERE status = 'active' AND deleted_at IS NULL;
-CREATE INDEX idx_image_assets_tenant_status ON image_assets (tenant_id, status, created_at DESC);
-CREATE INDEX idx_image_assets_name_trgm ON image_assets USING GIN (name gin_trgm_ops) WHERE status = 'active' AND deleted_at IS NULL;
-
-CREATE TABLE image_asset_references (
-  id             BIGSERIAL PRIMARY KEY,
-  tenant_id      BIGINT NOT NULL,
-  image_asset_id BIGINT NOT NULL,
-  article_id     BIGINT NOT NULL,
-  ref_scope      VARCHAR(20) NOT NULL,
-  updated_at     TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  created_at     TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  CONSTRAINT fk_image_asset_references_asset
-    FOREIGN KEY (tenant_id, image_asset_id)
-    REFERENCES image_assets(tenant_id, id)
-    ON DELETE CASCADE,
-  CONSTRAINT uq_image_asset_reference UNIQUE (image_asset_id, article_id, ref_scope)
-);
-
-CREATE INDEX idx_image_asset_references_asset ON image_asset_references (tenant_id, image_asset_id);
-CREATE INDEX idx_image_asset_references_article ON image_asset_references (tenant_id, article_id);
-
-CREATE TABLE tenant_image_storage_usage (
-  tenant_id   BIGINT PRIMARY KEY,
-  used_bytes  BIGINT NOT NULL DEFAULT 0,
-  updated_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
-);
-
-UPDATE plans
-SET quota_policy_json = quota_policy_json ||
-  CASE plan_code
-    WHEN 'free' THEN '{"image_storage_bytes":104857600}'::jsonb
-    WHEN 'regular' THEN '{"image_storage_bytes":1073741824}'::jsonb
-    WHEN 'premium' THEN '{"image_storage_bytes":2147483648}'::jsonb
-    ELSE '{}'::jsonb
-  END
-WHERE deleted_at IS NULL;
-```
-
-- [ ] **Step 2: Create down migration**
-
-Create `server/migrations/20260415100000_create_image_tables.down.sql`:
-
-```sql
-DROP TABLE IF EXISTS image_asset_references;
-DROP TABLE IF EXISTS image_assets;
-DROP TABLE IF EXISTS image_folders;
-DROP TABLE IF EXISTS tenant_image_storage_usage;
-
-UPDATE plans
-SET quota_policy_json = quota_policy_json - 'image_storage_bytes'
-WHERE deleted_at IS NULL;
-```
-
-- [ ] **Step 3: Run migration**
-
-```bash
-cd server && go run cmd/migrate/main.go up
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add server/migrations/20260415100000_create_image_tables.up.sql server/migrations/20260415100000_create_image_tables.down.sql
-git commit -m "feat(images): add database migration for image management tables"
-```
-
----
-
-## Task 2: sqlc Queries
-
-**Files:**
-- Create: `server/internal/tenant/repository/queries/image.sql`
-- Create: `server/internal/tenant/repository/queries/image_folder.sql`
-- Create: `server/internal/tenant/repository/queries/image_reference.sql`
-- Create: `server/internal/tenant/repository/queries/image_usage.sql`
-
-- [ ] **Step 1: Create image folder queries**
-
-Create `server/internal/tenant/repository/queries/image_folder.sql`:
-
-```sql
--- name: ListImageFolders :many
-SELECT f.id, f.tenant_id, f.name, f.created_at, f.updated_at,
-       COUNT(ia.id) FILTER (WHERE ia.status = 'active' AND ia.deleted_at IS NULL)::INT AS image_count
-FROM image_folders f
-LEFT JOIN image_assets ia ON ia.tenant_id = f.tenant_id AND ia.folder_id = f.id
-WHERE f.tenant_id = sqlc.arg(tenant_id)
-GROUP BY f.id
-ORDER BY f.name;
-
--- name: CreateImageFolder :one
-INSERT INTO image_folders (tenant_id, name)
-VALUES (sqlc.arg(tenant_id), sqlc.arg(name))
-RETURNING id;
-
--- name: UpdateImageFolder :exec
-UPDATE image_folders SET name = sqlc.arg(name), updated_at = NOW()
-WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: GetImageFolder :one
-SELECT id, tenant_id, name, created_at, updated_at
-FROM image_folders
-WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: DeleteImageFolder :exec
-DELETE FROM image_folders WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: CountActiveImagesInFolder :one
-SELECT COUNT(*)::INT AS count
-FROM image_assets
-WHERE tenant_id = sqlc.arg(tenant_id) AND folder_id = sqlc.arg(folder_id)
-  AND status = 'active' AND deleted_at IS NULL;
-```
-
-- [ ] **Step 2: Create image asset queries**
-
-Create `server/internal/tenant/repository/queries/image.sql`:
-
-```sql
--- name: ListImageAssets :many
-SELECT id, tenant_id, folder_id, object_key, name, size_bytes, status, created_by, created_at, updated_at
-FROM image_assets
-WHERE tenant_id = sqlc.arg(tenant_id)
-  AND status = 'active' AND deleted_at IS NULL
-  AND (sqlc.narg(folder_id)::BIGINT IS NULL OR folder_id IS NOT DISTINCT FROM sqlc.narg(folder_id)::BIGINT)
-  AND (sqlc.narg(search_query)::TEXT IS NULL OR name ILIKE '%' || sqlc.narg(search_query)::TEXT || '%')
-ORDER BY created_at DESC
-LIMIT sqlc.arg(page_size) OFFSET sqlc.arg(page_offset);
-
--- name: CountImageAssets :one
-SELECT COUNT(*)::INT AS total
-FROM image_assets
-WHERE tenant_id = sqlc.arg(tenant_id)
-  AND status = 'active' AND deleted_at IS NULL
-  AND (sqlc.narg(folder_id)::BIGINT IS NULL OR folder_id IS NOT DISTINCT FROM sqlc.narg(folder_id)::BIGINT)
-  AND (sqlc.narg(search_query)::TEXT IS NULL OR name ILIKE '%' || sqlc.narg(search_query)::TEXT || '%');
-
--- name: GetImageAsset :one
-SELECT id, tenant_id, folder_id, object_key, name, size_bytes, status, created_by, created_at, updated_at
-FROM image_assets
-WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: InsertImageAsset :one
-INSERT INTO image_assets (tenant_id, folder_id, object_key, name, size_bytes, status, created_by)
-VALUES (sqlc.arg(tenant_id), sqlc.narg(folder_id), sqlc.arg(object_key), sqlc.arg(name), sqlc.arg(size_bytes), sqlc.arg(status), sqlc.arg(created_by))
-RETURNING id;
-
--- name: UpdateImageAssetStatus :exec
-UPDATE image_assets SET status = sqlc.arg(status), updated_at = NOW()
-WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: UpdateImageAssetDeleted :exec
-UPDATE image_assets SET status = 'deleted', deleted_at = NOW(), updated_at = NOW()
-WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: UpdateImageAssetName :exec
-UPDATE image_assets SET name = sqlc.arg(name), updated_at = NOW()
-WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: UpdateImageAssetFolder :exec
-UPDATE image_assets SET folder_id = sqlc.narg(folder_id), updated_at = NOW()
-WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
-
--- name: ListActiveImagesByFolder :many
-SELECT id, object_key, size_bytes
-FROM image_assets
-WHERE tenant_id = sqlc.arg(tenant_id) AND folder_id = sqlc.arg(folder_id)
-  AND status = 'active' AND deleted_at IS NULL;
-
--- name: NullifyFolderForImages :exec
-UPDATE image_assets SET folder_id = NULL, updated_at = NOW()
-WHERE tenant_id = sqlc.arg(tenant_id) AND folder_id = sqlc.arg(folder_id)
-  AND status = 'active' AND deleted_at IS NULL;
-
--- name: MarkImagesInFolderPendingDelete :exec
-UPDATE image_assets SET status = 'pending_delete', folder_id = NULL, updated_at = NOW()
-WHERE tenant_id = sqlc.arg(tenant_id) AND folder_id = sqlc.arg(folder_id)
-  AND status = 'active' AND deleted_at IS NULL;
-
--- name: CountUncategorizedImages :one
-SELECT COUNT(*)::INT AS count
-FROM image_assets
-WHERE tenant_id = sqlc.arg(tenant_id) AND folder_id IS NULL
-  AND status = 'active' AND deleted_at IS NULL;
-```
-
-- [ ] **Step 3: Create image reference queries**
-
-Create `server/internal/tenant/repository/queries/image_reference.sql`:
-
-```sql
--- name: ListImageReferences :many
-SELECT r.id, r.tenant_id, r.image_asset_id, r.article_id, r.ref_scope, r.created_at
-FROM image_asset_references r
-WHERE r.tenant_id = sqlc.arg(tenant_id) AND r.image_asset_id = sqlc.arg(image_asset_id);
-
--- name: CountImageReferences :one
-SELECT COUNT(*)::INT AS total
-FROM image_asset_references
-WHERE tenant_id = sqlc.arg(tenant_id) AND image_asset_id = sqlc.arg(image_asset_id);
-
--- name: UpsertImageReference :exec
-INSERT INTO image_asset_references (tenant_id, image_asset_id, article_id, ref_scope)
-VALUES (sqlc.arg(tenant_id), sqlc.arg(image_asset_id), sqlc.arg(article_id), sqlc.arg(ref_scope))
-ON CONFLICT (image_asset_id, article_id, ref_scope) DO UPDATE SET updated_at = NOW();
-
--- name: DeleteImageReferencesByArticle :exec
-DELETE FROM image_asset_references
-WHERE tenant_id = sqlc.arg(tenant_id) AND article_id = sqlc.arg(article_id);
-
--- name: DeleteImageReferencesByArticleScope :exec
-DELETE FROM image_asset_references
-WHERE tenant_id = sqlc.arg(tenant_id) AND article_id = sqlc.arg(article_id) AND ref_scope = sqlc.arg(ref_scope);
-
--- name: ListImageReferenceArticles :many
-SELECT DISTINCT r.article_id, r.ref_scope
-FROM image_asset_references r
-WHERE r.tenant_id = sqlc.arg(tenant_id) AND r.image_asset_id = sqlc.arg(image_asset_id);
-```
-
-- [ ] **Step 4: Create image usage queries**
-
-Create `server/internal/tenant/repository/queries/image_usage.sql`:
-
-```sql
--- name: EnsureImageStorageUsageRow :exec
-INSERT INTO tenant_image_storage_usage (tenant_id, used_bytes)
-VALUES (sqlc.arg(tenant_id), 0)
-ON CONFLICT (tenant_id) DO NOTHING;
-
--- name: GetImageStorageUsage :one
-SELECT used_bytes, updated_at
-FROM tenant_image_storage_usage
-WHERE tenant_id = sqlc.arg(tenant_id);
-
--- name: ReleaseImageStorageQuota :exec
-UPDATE tenant_image_storage_usage
-SET used_bytes = GREATEST(0, used_bytes - sqlc.arg(release_bytes)),
-    updated_at = NOW()
-WHERE tenant_id = sqlc.arg(tenant_id);
-```
-
-Note: The atomic quota reserve query is too complex for sqlc (CTE + conditional UPDATE ... FROM ... RETURNING). It will be executed as raw SQL in the repository layer.
-
-- [ ] **Step 5: Run sqlc generate**
-
-```bash
-cd server/internal/tenant/repository && sqlc generate
-```
-
-Verify generated files appear in `generated/` directory including `image.sql.go`, `image_folder.sql.go`, `image_reference.sql.go`, `image_usage.sql.go`, updated `querier.go` and `models.go`.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add server/internal/tenant/repository/queries/ server/internal/tenant/repository/generated/
-git commit -m "feat(images): add sqlc queries and generated code for image management"
-```
-
----
-
-## Task 3: Repository Layer
-
-**Files:**
-- Create: `server/internal/tenant/repository/image_folder_repo.go`
-- Create: `server/internal/tenant/repository/image_repo.go`
-- Create: `server/internal/tenant/repository/image_reference_repo.go`
-- Create: `server/internal/tenant/repository/image_usage_repo.go`
-
-- [ ] **Step 1: Create image folder repository**
-
-Create `server/internal/tenant/repository/image_folder_repo.go`:
-
-```go
-package repository
-
-import (
-	"context"
-	"time"
-
-	"github.com/geo-platform/tenant-api/internal/tenant/repository/generated"
-)
-
-type ImageFolder struct {
-	ID         int64
-	TenantID   int64
-	Name       string
-	ImageCount int
-	CreatedAt  time.Time
-	UpdatedAt  time.Time
-}
-
-type ImageFolderRepository interface {
-	List(ctx context.Context, tenantID int64) ([]ImageFolder, error)
-	Get(ctx context.Context, tenantID, id int64) (*ImageFolder, error)
-	Create(ctx context.Context, tenantID int64, name string) (int64, error)
-	Update(ctx context.Context, tenantID, id int64, name string) error
-	Delete(ctx context.Context, tenantID, id int64) error
-	CountActiveImages(ctx context.Context, tenantID, folderID int64) (int, error)
-}
-
-type imageFolderRepository struct {
-	q generated.Querier
-}
-
-func NewImageFolderRepository(db generated.DBTX) ImageFolderRepository {
-	return &imageFolderRepository{q: newQuerier(db)}
-}
-
-func (r *imageFolderRepository) List(ctx context.Context, tenantID int64) ([]ImageFolder, error) {
-	rows, err := r.q.ListImageFolders(ctx, tenantID)
-	if err != nil {
-		return nil, err
-	}
-	folders := make([]ImageFolder, len(rows))
-	for i, row := range rows {
-		folders[i] = ImageFolder{
-			ID:         row.ID,
-			TenantID:   row.TenantID,
-			Name:       row.Name,
-			ImageCount: int(row.ImageCount),
-			CreatedAt:  timeFromTimestamp(row.CreatedAt),
-			UpdatedAt:  timeFromTimestamp(row.UpdatedAt),
-		}
-	}
-	return folders, nil
-}
-
-func (r *imageFolderRepository) Get(ctx context.Context, tenantID, id int64) (*ImageFolder, error) {
-	row, err := r.q.GetImageFolder(ctx, generated.GetImageFolderParams{
-		ID:       id,
-		TenantID: tenantID,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &ImageFolder{
-		ID:        row.ID,
-		TenantID:  row.TenantID,
-		Name:      row.Name,
-		CreatedAt: timeFromTimestamp(row.CreatedAt),
-		UpdatedAt: timeFromTimestamp(row.UpdatedAt),
-	}, nil
-}
-
-func (r *imageFolderRepository) Create(ctx context.Context, tenantID int64, name string) (int64, error) {
-	return r.q.CreateImageFolder(ctx, generated.CreateImageFolderParams{
-		TenantID: tenantID,
-		Name:     name,
-	})
-}
-
-func (r *imageFolderRepository) Update(ctx context.Context, tenantID, id int64, name string) error {
-	return r.q.UpdateImageFolder(ctx, generated.UpdateImageFolderParams{
-		Name:     name,
-		ID:       id,
-		TenantID: tenantID,
-	})
-}
-
-func (r *imageFolderRepository) Delete(ctx context.Context, tenantID, id int64) error {
-	return r.q.DeleteImageFolder(ctx, generated.DeleteImageFolderParams{
-		ID:       id,
-		TenantID: tenantID,
-	})
-}
-
-func (r *imageFolderRepository) CountActiveImages(ctx context.Context, tenantID, folderID int64) (int, error) {
-	count, err := r.q.CountActiveImagesInFolder(ctx, generated.CountActiveImagesInFolderParams{
-		TenantID: tenantID,
-		FolderID: folderID,
-	})
-	if err != nil {
-		return 0, err
-	}
-	return int(count), nil
-}
-```
-
-- [ ] **Step 2: Create image asset repository**
-
-Create `server/internal/tenant/repository/image_repo.go`:
-
-```go
-package repository
-
-import (
-	"context"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/geo-platform/tenant-api/internal/tenant/repository/generated"
-)
-
-type ImageAsset struct {
-	ID        int64
-	TenantID  int64
-	FolderID  *int64
-	ObjectKey string
-	Name      string
-	SizeBytes int64
-	Status    string
-	CreatedBy int64
-	CreatedAt time.Time
-	UpdatedAt time.Time
-}
-
-type ImageAssetListParams struct {
-	TenantID    int64
-	FolderID    *int64
-	SearchQuery *string
-	PageSize    int
-	PageOffset  int
-}
-
-type InsertImageAssetInput struct {
-	TenantID  int64
-	FolderID  *int64
-	ObjectKey string
-	Name      string
-	SizeBytes int64
-	Status    string
-	CreatedBy int64
-}
-
-type FolderImageSummary struct {
-	ID        int64
-	ObjectKey string
-	SizeBytes int64
-}
-
-type ImageRepository interface {
-	List(ctx context.Context, params ImageAssetListParams) ([]ImageAsset, int, error)
-	Get(ctx context.Context, tenantID, id int64) (*ImageAsset, error)
-	Insert(ctx context.Context, input InsertImageAssetInput) (int64, error)
-	UpdateStatus(ctx context.Context, tenantID, id int64, status string) error
-	MarkDeleted(ctx context.Context, tenantID, id int64) error
-	UpdateName(ctx context.Context, tenantID, id int64, name string) error
-	UpdateFolder(ctx context.Context, tenantID, id int64, folderID *int64) error
-	ListActiveByFolder(ctx context.Context, tenantID, folderID int64) ([]FolderImageSummary, error)
-	MarkImagesInFolderPendingDelete(ctx context.Context, tenantID, folderID int64) error
-	CountUncategorized(ctx context.Context, tenantID int64) (int, error)
-}
-
-type imageRepository struct {
-	q generated.Querier
-}
-
-func NewImageRepository(db generated.DBTX) ImageRepository {
-	return &imageRepository{q: newQuerier(db)}
-}
-
-func (r *imageRepository) List(ctx context.Context, params ImageAssetListParams) ([]ImageAsset, int, error) {
-	listParams := generated.ListImageAssetsParams{
-		TenantID:   params.TenantID,
-		FolderID:   pgInt8(params.FolderID),
-		PageSize:   int32(params.PageSize),
-		PageOffset: int32(params.PageOffset),
-	}
-	if params.SearchQuery != nil {
-		listParams.SearchQuery = pgText(params.SearchQuery)
-	}
-
-	rows, err := r.q.ListImageAssets(ctx, listParams)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	countParams := generated.CountImageAssetsParams{
-		TenantID:    params.TenantID,
-		FolderID:    pgInt8(params.FolderID),
-		SearchQuery: listParams.SearchQuery,
-	}
-	total, err := r.q.CountImageAssets(ctx, countParams)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	assets := make([]ImageAsset, len(rows))
-	for i, row := range rows {
-		assets[i] = ImageAsset{
-			ID:        row.ID,
-			TenantID:  row.TenantID,
-			FolderID:  nullableInt64(row.FolderID),
-			ObjectKey: row.ObjectKey,
-			Name:      row.Name,
-			SizeBytes: row.SizeBytes,
-			Status:    row.Status,
-			CreatedBy: row.CreatedBy,
-			CreatedAt: timeFromTimestamp(row.CreatedAt),
-			UpdatedAt: timeFromTimestamp(row.UpdatedAt),
-		}
-	}
-
-	return assets, int(total), nil
-}
-
-func (r *imageRepository) Get(ctx context.Context, tenantID, id int64) (*ImageAsset, error) {
-	row, err := r.q.GetImageAsset(ctx, generated.GetImageAssetParams{
-		ID:       id,
-		TenantID: tenantID,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &ImageAsset{
-		ID:        row.ID,
-		TenantID:  row.TenantID,
-		FolderID:  nullableInt64(row.FolderID),
-		ObjectKey: row.ObjectKey,
-		Name:      row.Name,
-		SizeBytes: row.SizeBytes,
-		Status:    row.Status,
-		CreatedBy: row.CreatedBy,
-		CreatedAt: timeFromTimestamp(row.CreatedAt),
-		UpdatedAt: timeFromTimestamp(row.UpdatedAt),
-	}, nil
-}
-
-func (r *imageRepository) Insert(ctx context.Context, input InsertImageAssetInput) (int64, error) {
-	return r.q.InsertImageAsset(ctx, generated.InsertImageAssetParams{
-		TenantID:  input.TenantID,
-		FolderID:  pgInt8(input.FolderID),
-		ObjectKey: input.ObjectKey,
-		Name:      input.Name,
-		SizeBytes: input.SizeBytes,
-		Status:    input.Status,
-		CreatedBy: input.CreatedBy,
-	})
-}
-
-func (r *imageRepository) UpdateStatus(ctx context.Context, tenantID, id int64, status string) error {
-	return r.q.UpdateImageAssetStatus(ctx, generated.UpdateImageAssetStatusParams{
-		Status:   status,
-		ID:       id,
-		TenantID: tenantID,
-	})
-}
-
-func (r *imageRepository) MarkDeleted(ctx context.Context, tenantID, id int64) error {
-	return r.q.UpdateImageAssetDeleted(ctx, generated.UpdateImageAssetDeletedParams{
-		ID:       id,
-		TenantID: tenantID,
-	})
-}
-
-func (r *imageRepository) UpdateName(ctx context.Context, tenantID, id int64, name string) error {
-	return r.q.UpdateImageAssetName(ctx, generated.UpdateImageAssetNameParams{
-		Name:     name,
-		ID:       id,
-		TenantID: tenantID,
-	})
-}
-
-func (r *imageRepository) UpdateFolder(ctx context.Context, tenantID, id int64, folderID *int64) error {
-	return r.q.UpdateImageAssetFolder(ctx, generated.UpdateImageAssetFolderParams{
-		FolderID: pgInt8(folderID),
-		ID:       id,
-		TenantID: tenantID,
-	})
-}
-
-func (r *imageRepository) ListActiveByFolder(ctx context.Context, tenantID, folderID int64) ([]FolderImageSummary, error) {
-	rows, err := r.q.ListActiveImagesByFolder(ctx, generated.ListActiveImagesByFolderParams{
-		TenantID: tenantID,
-		FolderID: folderID,
-	})
-	if err != nil {
-		return nil, err
-	}
-	result := make([]FolderImageSummary, len(rows))
-	for i, row := range rows {
-		result[i] = FolderImageSummary{
-			ID:        row.ID,
-			ObjectKey: row.ObjectKey,
-			SizeBytes: row.SizeBytes,
-		}
-	}
-	return result, nil
-}
-
-func (r *imageRepository) MarkImagesInFolderPendingDelete(ctx context.Context, tenantID, folderID int64) error {
-	return r.q.MarkImagesInFolderPendingDelete(ctx, generated.MarkImagesInFolderPendingDeleteParams{
-		TenantID: tenantID,
-		FolderID: folderID,
-	})
-}
-
-func (r *imageRepository) CountUncategorized(ctx context.Context, tenantID int64) (int, error) {
-	count, err := r.q.CountUncategorizedImages(ctx, tenantID)
-	if err != nil {
-		return 0, err
-	}
-	return int(count), nil
-}
-```
-
-Note: The `pgInt8`, `pgText`, `nullableInt64`, `timeFromTimestamp` helpers already exist in `common.go`.
-
-- [ ] **Step 3: Create image reference repository**
-
-Create `server/internal/tenant/repository/image_reference_repo.go`:
-
-```go
-package repository
-
-import (
-	"context"
-	"time"
-
-	"github.com/geo-platform/tenant-api/internal/tenant/repository/generated"
-)
-
-type ImageReference struct {
-	ID           int64
-	TenantID     int64
-	ImageAssetID int64
-	ArticleID    int64
-	RefScope     string
-	CreatedAt    time.Time
-}
-
-type ImageReferenceArticle struct {
-	ArticleID int64
-	RefScope  string
-}
-
-type ImageReferenceRepository interface {
-	List(ctx context.Context, tenantID, imageAssetID int64) ([]ImageReference, error)
-	Count(ctx context.Context, tenantID, imageAssetID int64) (int, error)
-	Upsert(ctx context.Context, tenantID, imageAssetID, articleID int64, refScope string) error
-	DeleteByArticle(ctx context.Context, tenantID, articleID int64) error
-	DeleteByArticleScope(ctx context.Context, tenantID, articleID int64, refScope string) error
-	ListArticles(ctx context.Context, tenantID, imageAssetID int64) ([]ImageReferenceArticle, error)
-}
-
-type imageReferenceRepository struct {
-	q generated.Querier
-}
-
-func NewImageReferenceRepository(db generated.DBTX) ImageReferenceRepository {
-	return &imageReferenceRepository{q: newQuerier(db)}
-}
-
-func (r *imageReferenceRepository) List(ctx context.Context, tenantID, imageAssetID int64) ([]ImageReference, error) {
-	rows, err := r.q.ListImageReferences(ctx, generated.ListImageReferencesParams{
-		TenantID:     tenantID,
-		ImageAssetID: imageAssetID,
-	})
-	if err != nil {
-		return nil, err
-	}
-	refs := make([]ImageReference, len(rows))
-	for i, row := range rows {
-		refs[i] = ImageReference{
-			ID:           row.ID,
-			TenantID:     row.TenantID,
-			ImageAssetID: row.ImageAssetID,
-			ArticleID:    row.ArticleID,
-			RefScope:     row.RefScope,
-			CreatedAt:    timeFromTimestamp(row.CreatedAt),
-		}
-	}
-	return refs, nil
-}
-
-func (r *imageReferenceRepository) Count(ctx context.Context, tenantID, imageAssetID int64) (int, error) {
-	count, err := r.q.CountImageReferences(ctx, generated.CountImageReferencesParams{
-		TenantID:     tenantID,
-		ImageAssetID: imageAssetID,
-	})
-	if err != nil {
-		return 0, err
-	}
-	return int(count), nil
-}
-
-func (r *imageReferenceRepository) Upsert(ctx context.Context, tenantID, imageAssetID, articleID int64, refScope string) error {
-	return r.q.UpsertImageReference(ctx, generated.UpsertImageReferenceParams{
-		TenantID:     tenantID,
-		ImageAssetID: imageAssetID,
-		ArticleID:    articleID,
-		RefScope:     refScope,
-	})
-}
-
-func (r *imageReferenceRepository) DeleteByArticle(ctx context.Context, tenantID, articleID int64) error {
-	return r.q.DeleteImageReferencesByArticle(ctx, generated.DeleteImageReferencesByArticleParams{
-		TenantID:  tenantID,
-		ArticleID: articleID,
-	})
-}
-
-func (r *imageReferenceRepository) DeleteByArticleScope(ctx context.Context, tenantID, articleID int64, refScope string) error {
-	return r.q.DeleteImageReferencesByArticleScope(ctx, generated.DeleteImageReferencesByArticleScopeParams{
-		TenantID:  tenantID,
-		ArticleID: articleID,
-		RefScope:  refScope,
-	})
-}
-
-func (r *imageReferenceRepository) ListArticles(ctx context.Context, tenantID, imageAssetID int64) ([]ImageReferenceArticle, error) {
-	rows, err := r.q.ListImageReferenceArticles(ctx, generated.ListImageReferenceArticlesParams{
-		TenantID:     tenantID,
-		ImageAssetID: imageAssetID,
-	})
-	if err != nil {
-		return nil, err
-	}
-	articles := make([]ImageReferenceArticle, len(rows))
-	for i, row := range rows {
-		articles[i] = ImageReferenceArticle{
-			ArticleID: row.ArticleID,
-			RefScope:  row.RefScope,
-		}
-	}
-	return articles, nil
-}
-```
-
-- [ ] **Step 4: Create image usage repository**
-
-Create `server/internal/tenant/repository/image_usage_repo.go`:
-
-```go
-package repository
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/geo-platform/tenant-api/internal/tenant/repository/generated"
-)
-
-type ImageStorageUsage struct {
-	UsedBytes int64
-	UpdatedAt time.Time
-}
-
-type QuotaReserveResult struct {
-	UsedBytes  int64
-	QuotaBytes int64
-}
-
-type ImageUsageRepository interface {
-	EnsureRow(ctx context.Context, tenantID int64) error
-	Get(ctx context.Context, tenantID int64) (*ImageStorageUsage, error)
-	Release(ctx context.Context, tenantID, releaseBytes int64) error
-	AtomicReserve(ctx context.Context, db generated.DBTX, tenantID, sizeBytes int64) (*QuotaReserveResult, error)
-}
-
-type imageUsageRepository struct {
-	q  generated.Querier
-	db generated.DBTX
-}
-
-func NewImageUsageRepository(db generated.DBTX) ImageUsageRepository {
-	return &imageUsageRepository{q: newQuerier(db), db: db}
-}
-
-func (r *imageUsageRepository) EnsureRow(ctx context.Context, tenantID int64) error {
-	return r.q.EnsureImageStorageUsageRow(ctx, tenantID)
-}
-
-func (r *imageUsageRepository) Get(ctx context.Context, tenantID int64) (*ImageStorageUsage, error) {
-	row, err := r.q.GetImageStorageUsage(ctx, tenantID)
-	if err != nil {
-		return nil, err
-	}
-	return &ImageStorageUsage{
-		UsedBytes: row.UsedBytes,
-		UpdatedAt: timeFromTimestamp(row.UpdatedAt),
-	}, nil
-}
-
-func (r *imageUsageRepository) Release(ctx context.Context, tenantID, releaseBytes int64) error {
-	return r.q.ReleaseImageStorageQuota(ctx, generated.ReleaseImageStorageQuotaParams{
-		ReleaseBytes: releaseBytes,
-		TenantID:     tenantID,
-	})
-}
-
-func (r *imageUsageRepository) AtomicReserve(ctx context.Context, db generated.DBTX, tenantID, sizeBytes int64) (*QuotaReserveResult, error) {
-	row := db.QueryRow(ctx, `
-		WITH plan AS (
-			SELECT COALESCE((p.quota_policy_json ->> 'image_storage_bytes')::BIGINT, 104857600) AS quota_bytes
-			FROM tenant_plan_subscriptions s
-			JOIN plans p ON p.id = s.plan_id
-			WHERE s.tenant_id = $1
-				AND s.status = 'active'
-				AND s.deleted_at IS NULL
-			LIMIT 1
-		)
-		UPDATE tenant_image_storage_usage u
-		SET used_bytes = u.used_bytes + $2,
-			updated_at = NOW()
-		FROM plan
-		WHERE u.tenant_id = $1
-			AND u.used_bytes + $2 <= plan.quota_bytes
-		RETURNING u.used_bytes, plan.quota_bytes
-	`, tenantID, sizeBytes)
-
-	var result QuotaReserveResult
-	err := row.Scan(&result.UsedBytes, &result.QuotaBytes)
-	if err != nil {
-		return nil, fmt.Errorf("reserve image storage quota: %w", err)
-	}
-	return &result, nil
-}
-```
-
-- [ ] **Step 5: Verify compilation**
-
-```bash
-cd server && go build ./...
-```
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add server/internal/tenant/repository/image_folder_repo.go server/internal/tenant/repository/image_repo.go server/internal/tenant/repository/image_reference_repo.go server/internal/tenant/repository/image_usage_repo.go
-git commit -m "feat(images): add repository layer for image management"
-```
-
----
-
-## Task 4: RabbitMQ Image Asset Queue
-
-**Files:**
-- Modify: `server/internal/shared/config/config.go`
-- Modify: `server/internal/shared/messaging/rabbitmq/client.go`
-
-- [ ] **Step 1: Add config fields**
-
-In `server/internal/shared/config/config.go`, add the following fields to `RabbitMQConfig` (after `TemplateAssistDLQRouteKey`):
-
-```go
-ImageAssetExchange    string `mapstructure:"image_asset_exchange"`
-ImageAssetRoutingKey  string `mapstructure:"image_asset_routing_key"`
-ImageAssetQueue       string `mapstructure:"image_asset_queue"`
-ImageAssetDLX         string `mapstructure:"image_asset_dlx"`
-ImageAssetDLQ         string `mapstructure:"image_asset_dlq"`
-ImageAssetDLQRouteKey string `mapstructure:"image_asset_dlq_routing_key"`
-```
-
-In `normalizeRabbitMQConfig`, add defaults (after the TemplateAssist block):
-
-```go
-if strings.TrimSpace(cfg.ImageAssetExchange) == "" {
-    cfg.ImageAssetExchange = "image.asset"
-}
-if strings.TrimSpace(cfg.ImageAssetRoutingKey) == "" {
-    cfg.ImageAssetRoutingKey = "image.asset.finalize"
-}
-if strings.TrimSpace(cfg.ImageAssetQueue) == "" {
-    cfg.ImageAssetQueue = "image.asset.finalize"
-}
-if strings.TrimSpace(cfg.ImageAssetDLX) == "" {
-    cfg.ImageAssetDLX = "image.asset.dlx"
-}
-if strings.TrimSpace(cfg.ImageAssetDLQ) == "" {
-    cfg.ImageAssetDLQ = "image.asset.finalize.dlq"
-}
-if strings.TrimSpace(cfg.ImageAssetDLQRouteKey) == "" {
-    cfg.ImageAssetDLQRouteKey = "image.asset.finalize.dlq"
-}
-```
-
-- [ ] **Step 2: Add publish/consume methods and topology**
-
-In `server/internal/shared/messaging/rabbitmq/client.go`, add:
-
-```go
-func (c *Client) PublishImageAssetTask(ctx context.Context, body []byte) error {
-	return c.publish(ctx, c.cfg.ImageAssetExchange, c.cfg.ImageAssetRoutingKey, body)
-}
-
-func (c *Client) ConsumeImageAssetTask(consumerName string) (<-chan amqp.Delivery, *amqp.Channel, error) {
-	return c.consume(consumerName, c.cfg.ImageAssetQueue)
-}
-```
-
-In `ensureTopology`, add before `return nil`:
-
-```go
-if err := c.ensureWorkQueue(
-    ch,
-    c.cfg.ImageAssetExchange,
-    c.cfg.ImageAssetRoutingKey,
-    c.cfg.ImageAssetQueue,
-    c.cfg.ImageAssetDLX,
-    c.cfg.ImageAssetDLQ,
-    c.cfg.ImageAssetDLQRouteKey,
-); err != nil {
-    return err
-}
-```
-
-- [ ] **Step 3: Verify compilation**
-
-```bash
-cd server && go build ./...
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add server/internal/shared/config/config.go server/internal/shared/messaging/rabbitmq/client.go
-git commit -m "feat(images): add RabbitMQ queue for image asset finalization"
-```
-
----
-
-## Task 5: Image Folder Service
-
-**Files:**
-- Create: `server/internal/tenant/app/image_folder_service.go`
-
-- [ ] **Step 1: Create ImageFolderService**
-
-Create `server/internal/tenant/app/image_folder_service.go`:
-
-```go
-package app
-
-import (
-	"context"
-	"strings"
-
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"github.com/geo-platform/tenant-api/internal/shared/middleware"
-	"github.com/geo-platform/tenant-api/internal/shared/response"
-	"github.com/geo-platform/tenant-api/internal/tenant/repository"
-)
-
-type ImageFolderService struct {
-	pool *pgxpool.Pool
-}
-
-func NewImageFolderService(pool *pgxpool.Pool) *ImageFolderService {
-	return &ImageFolderService{pool: pool}
-}
-
-type ImageFolderItem struct {
-	ID         int64  `json:"id"`
-	Name       string `json:"name"`
-	ImageCount int    `json:"image_count"`
-	CreatedAt  string `json:"created_at"`
-}
-
-func (s *ImageFolderService) List(ctx context.Context) ([]ImageFolderItem, error) {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	repo := repository.NewImageFolderRepository(s.pool)
-	folders, err := repo.List(ctx, tenantID)
-	if err != nil {
-		return nil, err
-	}
-
-	items := make([]ImageFolderItem, len(folders))
-	for i, f := range folders {
-		items[i] = ImageFolderItem{
-			ID:         f.ID,
-			Name:       f.Name,
-			ImageCount: f.ImageCount,
-			CreatedAt:  f.CreatedAt.Format("2006-01-02T15:04:05Z07:00"),
-		}
-	}
-	return items, nil
-}
-
-func (s *ImageFolderService) Create(ctx context.Context, name string) (int64, error) {
-	name = strings.TrimSpace(name)
-	if name == "" {
-		return 0, response.ErrBadRequest(40001, "invalid_folder_name", "folder name is required")
-	}
-	if len(name) > 100 {
-		return 0, response.ErrBadRequest(40002, "invalid_folder_name", "folder name must be at most 100 characters")
-	}
-
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	repo := repository.NewImageFolderRepository(s.pool)
-	id, err := repo.Create(ctx, tenantID, name)
-	if err != nil {
-		if strings.Contains(err.Error(), "uq_image_folders_tenant_name") {
-			return 0, response.ErrConflict(40901, "folder_name_exists", "a folder with this name already exists")
-		}
-		return 0, err
-	}
-	return id, nil
-}
-
-func (s *ImageFolderService) Update(ctx context.Context, id int64, name string) error {
-	name = strings.TrimSpace(name)
-	if name == "" {
-		return response.ErrBadRequest(40001, "invalid_folder_name", "folder name is required")
-	}
-	if len(name) > 100 {
-		return response.ErrBadRequest(40002, "invalid_folder_name", "folder name must be at most 100 characters")
-	}
-
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	repo := repository.NewImageFolderRepository(s.pool)
-	if err := repo.Update(ctx, tenantID, id, name); err != nil {
-		if strings.Contains(err.Error(), "uq_image_folders_tenant_name") {
-			return response.ErrConflict(40901, "folder_name_exists", "a folder with this name already exists")
-		}
-		return err
-	}
-	return nil
-}
-
-type FolderDeletePreview struct {
-	ImageCount     int                          `json:"image_count"`
-	ReferencedList []ImageReferenceArticleBrief `json:"referenced_articles"`
-}
-
-type ImageReferenceArticleBrief struct {
-	ArticleID int64    `json:"article_id"`
-	Scopes    []string `json:"scopes"`
-}
-
-func (s *ImageFolderService) DeletePreview(ctx context.Context, folderID int64) (*FolderDeletePreview, error) {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	imageRepo := repository.NewImageRepository(s.pool)
-	refRepo := repository.NewImageReferenceRepository(s.pool)
-
-	images, err := imageRepo.ListActiveByFolder(ctx, tenantID, folderID)
-	if err != nil {
-		return nil, err
-	}
-
-	articleMap := make(map[int64]map[string]bool)
-	for _, img := range images {
-		articles, err := refRepo.ListArticles(ctx, tenantID, img.ID)
-		if err != nil {
-			return nil, err
-		}
-		for _, a := range articles {
-			if articleMap[a.ArticleID] == nil {
-				articleMap[a.ArticleID] = make(map[string]bool)
-			}
-			articleMap[a.ArticleID][a.RefScope] = true
-		}
-	}
-
-	referenced := make([]ImageReferenceArticleBrief, 0, len(articleMap))
-	for aid, scopes := range articleMap {
-		scopeList := make([]string, 0, len(scopes))
-		for s := range scopes {
-			scopeList = append(scopeList, s)
-		}
-		referenced = append(referenced, ImageReferenceArticleBrief{
-			ArticleID: aid,
-			Scopes:    scopeList,
-		})
-	}
-
-	return &FolderDeletePreview{
-		ImageCount:     len(images),
-		ReferencedList: referenced,
-	}, nil
-}
-
-func (s *ImageFolderService) Delete(ctx context.Context, folderID int64, force bool) error {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	imageRepo := repository.NewImageRepository(s.pool)
-	refRepo := repository.NewImageReferenceRepository(s.pool)
-	folderRepo := repository.NewImageFolderRepository(s.pool)
-
-	images, err := imageRepo.ListActiveByFolder(ctx, tenantID, folderID)
-	if err != nil {
-		return err
-	}
-
-	if !force && len(images) > 0 {
-		for _, img := range images {
-			count, err := refRepo.Count(ctx, tenantID, img.ID)
-			if err != nil {
-				return err
-			}
-			if count > 0 {
-				return response.ErrConflict(40902, "folder_has_referenced_images", "folder contains images that are referenced by articles")
-			}
-		}
-	}
-
-	if len(images) > 0 {
-		if err := imageRepo.MarkImagesInFolderPendingDelete(ctx, tenantID, folderID); err != nil {
-			return err
-		}
-	}
-
-	if err := folderRepo.Delete(ctx, tenantID, folderID); err != nil {
-		return err
-	}
-
-	return nil
-}
-```
-
-- [ ] **Step 2: Verify compilation**
-
-```bash
-cd server && go build ./...
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add server/internal/tenant/app/image_folder_service.go
-git commit -m "feat(images): add ImageFolderService with CRUD and delete preview"
-```
-
----
-
-## Task 6: Image Service
-
-**Files:**
-- Create: `server/internal/tenant/app/image_service.go`
-
-This is the main service with upload pipeline (WebP conversion), list, update, delete, storage usage, and reference lookup.
-
-- [ ] **Step 1: Create ImageService**
-
-Create `server/internal/tenant/app/image_service.go` (large file — all upload/delete/list logic):
-
-```go
-package app
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"image"
-	_ "image/gif"
-	_ "image/jpeg"
-	_ "image/png"
-	"net/http"
-	"path/filepath"
-	"strings"
-
-	"github.com/chai2010/webp"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgxpool"
-	_ "golang.org/x/image/webp"
-	"go.uber.org/zap"
-
-	"github.com/geo-platform/tenant-api/internal/shared/auth"
-	"github.com/geo-platform/tenant-api/internal/shared/middleware"
-	"github.com/geo-platform/tenant-api/internal/shared/objectstorage"
-	"github.com/geo-platform/tenant-api/internal/shared/response"
-	"github.com/geo-platform/tenant-api/internal/tenant/repository"
-)
-
-const (
-	maxImageUploadSize = 10 * 1024 * 1024 // 10 MB
-	webpQuality        = 82
-	maxImageDimension  = 16384
-)
-
-var allowedImageMIMEs = map[string]bool{
-	"image/png":  true,
-	"image/jpeg": true,
-	"image/gif":  true,
-	"image/webp": true,
-}
-
-type ImageService struct {
-	pool          *pgxpool.Pool
-	objectStorage objectstorage.Client
-	logger        *zap.Logger
-}
-
-func NewImageService(pool *pgxpool.Pool, objectStorage objectstorage.Client, logger *zap.Logger) *ImageService {
-	return &ImageService{pool: pool, objectStorage: objectStorage, logger: logger}
-}
-
-type ImageUploadResult struct {
-	ID        int64  `json:"id"`
-	URL       string `json:"url"`
-	Name      string `json:"name"`
-	SizeBytes int64  `json:"size_bytes"`
-}
-
-func (s *ImageService) Upload(ctx context.Context, fileName string, content []byte, folderID *int64, buildURL func(string) string) (*ImageUploadResult, error) {
-	if len(content) > maxImageUploadSize {
-		return nil, response.ErrBadRequest(40010, "image_too_large", "image must be at most 10 MB")
-	}
-
-	contentType := http.DetectContentType(content)
-	if !allowedImageMIMEs[contentType] {
-		return nil, response.ErrBadRequest(40011, "invalid_image_type", "only PNG, JPEG, GIF, and WebP images are supported")
-	}
-
-	imgConfig, _, err := image.DecodeConfig(bytes.NewReader(content))
-	if err != nil {
-		return nil, response.ErrBadRequest(40012, "invalid_image", "unable to decode image")
-	}
-	if imgConfig.Width > maxImageDimension || imgConfig.Height > maxImageDimension {
-		return nil, response.ErrBadRequest(40013, "image_too_large_dimensions", "image dimensions exceed maximum allowed")
-	}
-
-	img, _, err := image.Decode(bytes.NewReader(content))
-	if err != nil {
-		return nil, response.ErrBadRequest(40012, "invalid_image", "unable to decode image")
-	}
-
-	var webpBuf bytes.Buffer
-	if err := webp.Encode(&webpBuf, img, &webp.Options{Quality: webpQuality}); err != nil {
-		return nil, fmt.Errorf("encode webp: %w", err)
-	}
-	webpBytes := webpBuf.Bytes()
-	sizeBytes := int64(len(webpBytes))
-
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	actor := auth.MustActor(ctx)
-
-	usageRepo := repository.NewImageUsageRepository(s.pool)
-	if err := usageRepo.EnsureRow(ctx, tenantID); err != nil {
-		return nil, fmt.Errorf("ensure usage row: %w", err)
-	}
-
-	tx, err := s.pool.Begin(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("begin tx: %w", err)
-	}
-	defer tx.Rollback(ctx)
-
-	reserveResult, err := usageRepo.AtomicReserve(ctx, tx, tenantID, sizeBytes)
-	if err != nil {
-		if strings.Contains(err.Error(), "no rows") || reserveResult == nil {
-			return nil, response.ErrConflict(40903, "image_storage_quota_exceeded", "image storage quota exceeded")
-		}
-		return nil, fmt.Errorf("reserve quota: %w", err)
-	}
-
-	displayName := deriveImageName(fileName)
-	objectKey := fmt.Sprintf("tenants/%d/images/%s.webp", tenantID, uuid.New().String())
-
-	imageRepo := repository.NewImageRepository(tx)
-	assetID, err := imageRepo.Insert(ctx, repository.InsertImageAssetInput{
-		TenantID:  tenantID,
-		FolderID:  folderID,
-		ObjectKey: objectKey,
-		Name:      displayName,
-		SizeBytes: sizeBytes,
-		Status:    "pending_upload",
-		CreatedBy: actor.UserID,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("insert image asset: %w", err)
-	}
-
-	if err := tx.Commit(ctx); err != nil {
-		return nil, fmt.Errorf("commit tx: %w", err)
-	}
-
-	if err := s.objectStorage.PutBytes(ctx, objectKey, webpBytes, "image/webp"); err != nil {
-		s.logger.Error("image upload to object storage failed, rolling back",
-			zap.Int64("asset_id", assetID),
-			zap.Error(err),
-		)
-		s.rollbackUpload(ctx, tenantID, assetID, sizeBytes)
-		return nil, response.ErrInternal(50010, "image_upload_failed", "failed to upload image to storage")
-	}
-
-	imgRepo := repository.NewImageRepository(s.pool)
-	if err := imgRepo.UpdateStatus(ctx, tenantID, assetID, "active"); err != nil {
-		s.logger.Error("failed to mark image active after upload",
-			zap.Int64("asset_id", assetID),
-			zap.Error(err),
-		)
-	}
-
-	url := buildURL(objectKey)
-
-	return &ImageUploadResult{
-		ID:        assetID,
-		URL:       url,
-		Name:      displayName,
-		SizeBytes: sizeBytes,
-	}, nil
-}
-
-func (s *ImageService) rollbackUpload(ctx context.Context, tenantID, assetID, sizeBytes int64) {
-	imgRepo := repository.NewImageRepository(s.pool)
-	_ = imgRepo.UpdateStatus(ctx, tenantID, assetID, "upload_failed")
-	usageRepo := repository.NewImageUsageRepository(s.pool)
-	_ = usageRepo.Release(ctx, tenantID, sizeBytes)
-}
-
-type ImageListResult struct {
-	Items []ImageListItem `json:"items"`
-	Total int             `json:"total"`
-}
-
-type ImageListItem struct {
-	ID        int64  `json:"id"`
-	FolderID  *int64 `json:"folder_id"`
-	Name      string `json:"name"`
-	URL       string `json:"url"`
-	SizeBytes int64  `json:"size_bytes"`
-	CreatedAt string `json:"created_at"`
-}
-
-func (s *ImageService) List(ctx context.Context, folderID *int64, query *string, page, pageSize int, buildURL func(string) string) (*ImageListResult, error) {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 || pageSize > 100 {
-		pageSize = 20
-	}
-
-	if query != nil && strings.TrimSpace(*query) != "" {
-		folderID = nil
-	}
-
-	repo := repository.NewImageRepository(s.pool)
-	assets, total, err := repo.List(ctx, repository.ImageAssetListParams{
-		TenantID:    tenantID,
-		FolderID:    folderID,
-		SearchQuery: query,
-		PageSize:    pageSize,
-		PageOffset:  (page - 1) * pageSize,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	items := make([]ImageListItem, len(assets))
-	for i, a := range assets {
-		items[i] = ImageListItem{
-			ID:        a.ID,
-			FolderID:  a.FolderID,
-			Name:      a.Name,
-			URL:       buildURL(a.ObjectKey),
-			SizeBytes: a.SizeBytes,
-			CreatedAt: a.CreatedAt.Format("2006-01-02T15:04:05Z07:00"),
-		}
-	}
-
-	return &ImageListResult{Items: items, Total: total}, nil
-}
-
-type ImageUpdateRequest struct {
-	Name     *string `json:"name"`
-	FolderID *int64  `json:"folder_id"`
-}
-
-func (s *ImageService) Update(ctx context.Context, id int64, req ImageUpdateRequest) error {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	repo := repository.NewImageRepository(s.pool)
-
-	asset, err := repo.Get(ctx, tenantID, id)
-	if err != nil {
-		if err == pgx.ErrNoRows {
-			return response.ErrNotFound(40401, "image_not_found", "image not found")
-		}
-		return err
-	}
-	if asset.Status != "active" {
-		return response.ErrNotFound(40401, "image_not_found", "image not found")
-	}
-
-	if req.Name != nil {
-		name := strings.TrimSpace(*req.Name)
-		if name == "" {
-			return response.ErrBadRequest(40001, "invalid_name", "name is required")
-		}
-		if len(name) > 255 {
-			return response.ErrBadRequest(40002, "invalid_name", "name must be at most 255 characters")
-		}
-		if err := repo.UpdateName(ctx, tenantID, id, name); err != nil {
-			return err
-		}
-	}
-
-	if req.FolderID != nil {
-		if err := repo.UpdateFolder(ctx, tenantID, id, req.FolderID); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type ImageReferenceDetail struct {
-	Total        int                          `json:"total"`
-	ArticleBody  int                          `json:"article_body"`
-	ArticleCover int                          `json:"article_cover"`
-	Articles     []ImageReferenceArticleBrief `json:"articles"`
-}
-
-func (s *ImageService) GetReferences(ctx context.Context, imageID int64) (*ImageReferenceDetail, error) {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	refRepo := repository.NewImageReferenceRepository(s.pool)
-
-	articles, err := refRepo.ListArticles(ctx, tenantID, imageID)
-	if err != nil {
-		return nil, err
-	}
-
-	articleMap := make(map[int64][]string)
-	bodyCount, coverCount := 0, 0
-	for _, a := range articles {
-		articleMap[a.ArticleID] = append(articleMap[a.ArticleID], a.RefScope)
-		switch a.RefScope {
-		case "article_body":
-			bodyCount++
-		case "article_cover":
-			coverCount++
-		}
-	}
-
-	briefs := make([]ImageReferenceArticleBrief, 0, len(articleMap))
-	for aid, scopes := range articleMap {
-		briefs = append(briefs, ImageReferenceArticleBrief{
-			ArticleID: aid,
-			Scopes:    scopes,
-		})
-	}
-
-	return &ImageReferenceDetail{
-		Total:        len(articles),
-		ArticleBody:  bodyCount,
-		ArticleCover: coverCount,
-		Articles:     briefs,
-	}, nil
-}
-
-func (s *ImageService) Delete(ctx context.Context, id int64, force bool) error {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	imageRepo := repository.NewImageRepository(s.pool)
-	refRepo := repository.NewImageReferenceRepository(s.pool)
-	usageRepo := repository.NewImageUsageRepository(s.pool)
-
-	asset, err := imageRepo.Get(ctx, tenantID, id)
-	if err != nil {
-		if err == pgx.ErrNoRows {
-			return response.ErrNotFound(40401, "image_not_found", "image not found")
-		}
-		return err
-	}
-	if asset.Status != "active" {
-		return response.ErrNotFound(40401, "image_not_found", "image not found")
-	}
-
-	if !force {
-		count, err := refRepo.Count(ctx, tenantID, id)
-		if err != nil {
-			return err
-		}
-		if count > 0 {
-			return response.ErrConflict(40904, "image_asset_in_use", "image is referenced by articles")
-		}
-	}
-
-	if err := imageRepo.UpdateStatus(ctx, tenantID, id, "pending_delete"); err != nil {
-		return err
-	}
-
-	if err := s.objectStorage.Delete(ctx, asset.ObjectKey); err != nil {
-		s.logger.Error("failed to delete image from object storage",
-			zap.Int64("asset_id", id),
-			zap.String("object_key", asset.ObjectKey),
-			zap.Error(err),
-		)
-	}
-
-	if err := imageRepo.MarkDeleted(ctx, tenantID, id); err != nil {
-		return err
-	}
-	if err := usageRepo.Release(ctx, tenantID, asset.SizeBytes); err != nil {
-		s.logger.Error("failed to release image storage quota",
-			zap.Int64("asset_id", id),
-			zap.Error(err),
-		)
-	}
-
-	return nil
-}
-
-type StorageUsageResponse struct {
-	UsedBytes  int64   `json:"used_bytes"`
-	QuotaBytes int64   `json:"quota_bytes"`
-	UsedPct    float64 `json:"used_pct"`
-}
-
-func (s *ImageService) GetStorageUsage(ctx context.Context) (*StorageUsageResponse, error) {
-	tenantID := middleware.TenantIDFromCtx(ctx)
-	usageRepo := repository.NewImageUsageRepository(s.pool)
-
-	if err := usageRepo.EnsureRow(ctx, tenantID); err != nil {
-		return nil, err
-	}
-
-	usage, err := usageRepo.Get(ctx, tenantID)
-	if err != nil {
-		return nil, err
-	}
-
-	var quotaBytes int64
-	row := s.pool.QueryRow(ctx, `
-		SELECT COALESCE((p.quota_policy_json ->> 'image_storage_bytes')::BIGINT, 104857600) AS quota_bytes
-		FROM tenant_plan_subscriptions s
-		JOIN plans p ON p.id = s.plan_id
-		WHERE s.tenant_id = $1
-			AND s.status = 'active'
-			AND s.deleted_at IS NULL
-		LIMIT 1
-	`, tenantID)
-	if err := row.Scan(&quotaBytes); err != nil {
-		quotaBytes = 104857600
-	}
-
-	usedPct := float64(0)
-	if quotaBytes > 0 {
-		usedPct = float64(usage.UsedBytes) / float64(quotaBytes) * 100
-	}
-
-	return &StorageUsageResponse{
-		UsedBytes:  usage.UsedBytes,
-		QuotaBytes: quotaBytes,
-		UsedPct:    usedPct,
-	}, nil
-}
-
-func deriveImageName(fileName string) string {
-	name := strings.TrimSpace(fileName)
-	if name == "" {
-		return "untitled"
-	}
-	ext := filepath.Ext(name)
-	if ext != "" {
-		name = strings.TrimSuffix(name, ext)
-	}
-	if len(name) > 200 {
-		name = name[:200]
-	}
-	return name
-}
-```
-
-- [ ] **Step 2: Install Go dependency**
-
-```bash
-cd server && go get github.com/chai2010/webp && go get golang.org/x/image/webp
-```
-
-- [ ] **Step 3: Verify compilation**
-
-```bash
-cd server && go build ./...
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add server/internal/tenant/app/image_service.go server/go.mod server/go.sum
-git commit -m "feat(images): add ImageService with WebP upload pipeline, delete, and quota management"
-```
-
----
-
-## Task 7: HTTP Handler
-
-**Files:**
-- Create: `server/internal/tenant/transport/image_handler.go`
-
-- [ ] **Step 1: Create ImageHandler**
-
-Create `server/internal/tenant/transport/image_handler.go`:
-
-```go
-package transport
-
-import (
-	"io"
-	"net/http"
-	"strconv"
-
-	"github.com/gin-gonic/gin"
-
-	"github.com/geo-platform/tenant-api/internal/bootstrap"
-	"github.com/geo-platform/tenant-api/internal/shared/response"
-	"github.com/geo-platform/tenant-api/internal/tenant/app"
-)
-
-type ImageHandler struct {
-	imageSvc  *app.ImageService
-	folderSvc *app.ImageFolderService
-	assets    *AssetHandler
-}
-
-func NewImageHandler(a *bootstrap.App) *ImageHandler {
-	return &ImageHandler{
-		imageSvc:  app.NewImageService(a.DB, a.ObjectStorage, a.Logger),
-		folderSvc: app.NewImageFolderService(a.DB),
-		assets:    NewAssetHandler(a),
-	}
-}
-
-// --- Folders ---
-
-func (h *ImageHandler) ListFolders(c *gin.Context) {
-	folders, err := h.folderSvc.List(c.Request.Context())
-	if err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, folders)
-}
-
-func (h *ImageHandler) CreateFolder(c *gin.Context) {
-	var body struct {
-		Name string `json:"name"`
-	}
-	if err := c.ShouldBindJSON(&body); err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_request", "invalid request body"))
-		return
-	}
-	id, err := h.folderSvc.Create(c.Request.Context(), body.Name)
-	if err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.SuccessWithStatus(c, http.StatusCreated, gin.H{"id": id})
-}
-
-func (h *ImageHandler) UpdateFolder(c *gin.Context) {
-	id, err := strconv.ParseInt(c.Param("id"), 10, 64)
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_id", "invalid folder id"))
-		return
-	}
-	var body struct {
-		Name string `json:"name"`
-	}
-	if err := c.ShouldBindJSON(&body); err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_request", "invalid request body"))
-		return
-	}
-	if err := h.folderSvc.Update(c.Request.Context(), id, body.Name); err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, nil)
-}
-
-func (h *ImageHandler) FolderDeletePreview(c *gin.Context) {
-	id, err := strconv.ParseInt(c.Param("id"), 10, 64)
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_id", "invalid folder id"))
-		return
-	}
-	preview, err := h.folderSvc.DeletePreview(c.Request.Context(), id)
-	if err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, preview)
-}
-
-func (h *ImageHandler) DeleteFolder(c *gin.Context) {
-	id, err := strconv.ParseInt(c.Param("id"), 10, 64)
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_id", "invalid folder id"))
-		return
-	}
-	force := c.Query("force") == "1"
-	if err := h.folderSvc.Delete(c.Request.Context(), id, force); err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, nil)
-}
-
-// --- Images ---
-
-func (h *ImageHandler) ListImages(c *gin.Context) {
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
-
-	var folderID *int64
-	if fid := c.Query("folder_id"); fid != "" {
-		if fid == "null" || fid == "uncategorized" {
-			zero := int64(0)
-			folderID = &zero
-		} else {
-			v, err := strconv.ParseInt(fid, 10, 64)
-			if err == nil {
-				folderID = &v
-			}
-		}
-	}
-
-	var query *string
-	if q := c.Query("q"); q != "" {
-		query = &q
-	}
-
-	result, err := h.imageSvc.List(c.Request.Context(), folderID, query, page, pageSize, h.assets.BuildArticleImageURL)
-	if err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, result)
-}
-
-func (h *ImageHandler) UploadImage(c *gin.Context) {
-	file, header, err := c.Request.FormFile("file")
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "missing_file", "file is required"))
-		return
-	}
-	defer file.Close()
-
-	content, err := io.ReadAll(file)
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "read_file_failed", "failed to read file"))
-		return
-	}
-
-	var folderID *int64
-	if fid := c.PostForm("folder_id"); fid != "" {
-		v, err := strconv.ParseInt(fid, 10, 64)
-		if err == nil {
-			folderID = &v
-		}
-	}
-
-	result, err := h.imageSvc.Upload(c.Request.Context(), header.Filename, content, folderID, h.assets.BuildArticleImageURL)
-	if err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.SuccessWithStatus(c, http.StatusCreated, result)
-}
-
-func (h *ImageHandler) UpdateImage(c *gin.Context) {
-	id, err := strconv.ParseInt(c.Param("id"), 10, 64)
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_id", "invalid image id"))
-		return
-	}
-
-	var body app.ImageUpdateRequest
-	if err := c.ShouldBindJSON(&body); err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_request", "invalid request body"))
-		return
-	}
-
-	if err := h.imageSvc.Update(c.Request.Context(), id, body); err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, nil)
-}
-
-func (h *ImageHandler) GetImageReferences(c *gin.Context) {
-	id, err := strconv.ParseInt(c.Param("id"), 10, 64)
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_id", "invalid image id"))
-		return
-	}
-
-	refs, err := h.imageSvc.GetReferences(c.Request.Context(), id)
-	if err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, refs)
-}
-
-func (h *ImageHandler) DeleteImage(c *gin.Context) {
-	id, err := strconv.ParseInt(c.Param("id"), 10, 64)
-	if err != nil {
-		response.Error(c, response.ErrBadRequest(40000, "invalid_id", "invalid image id"))
-		return
-	}
-	force := c.Query("force") == "1"
-	if err := h.imageSvc.Delete(c.Request.Context(), id, force); err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, nil)
-}
-
-func (h *ImageHandler) StorageUsage(c *gin.Context) {
-	usage, err := h.imageSvc.GetStorageUsage(c.Request.Context())
-	if err != nil {
-		response.Error(c, err)
-		return
-	}
-	response.Success(c, usage)
-}
-```
-
-- [ ] **Step 2: Verify compilation**
-
-```bash
-cd server && go build ./...
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add server/internal/tenant/transport/image_handler.go
-git commit -m "feat(images): add HTTP handler for image management endpoints"
-```
-
----
-
-## Task 8: Route Registration
-
-**Files:**
-- Modify: `server/internal/tenant/transport/router.go`
-
-- [ ] **Step 1: Add image routes**
-
-In `server/internal/tenant/transport/router.go`, add the following block after the `instantTasks` routes (before the closing `}`):
-
-```go
-	// Image Management
-	images := protected.Group("/tenant/images")
-	imgHandler := NewImageHandler(app)
-	images.GET("", imgHandler.ListImages)
-	images.POST("", imgHandler.UploadImage)
-	images.PUT("/:id", imgHandler.UpdateImage)
-	images.GET("/:id/references", imgHandler.GetImageReferences)
-	images.DELETE("/:id", imgHandler.DeleteImage)
-	images.GET("/storage-usage", imgHandler.StorageUsage)
-
-	imageFolders := protected.Group("/tenant/images/folders")
-	imageFolders.GET("", imgHandler.ListFolders)
-	imageFolders.POST("", imgHandler.CreateFolder)
-	imageFolders.PUT("/:id", imgHandler.UpdateFolder)
-	imageFolders.GET("/:id/delete-preview", imgHandler.FolderDeletePreview)
-	imageFolders.DELETE("/:id", imgHandler.DeleteFolder)
-```
-
-- [ ] **Step 2: Verify compilation**
-
-```bash
-cd server && go build ./...
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add server/internal/tenant/transport/router.go
-git commit -m "feat(images): register image management API routes"
-```
-
----
-
-## Task 9: Shared TypeScript Types
-
-**Files:**
-- Modify: `packages/shared-types/src/index.ts`
-
-- [ ] **Step 1: Add image management types**
-
-Append to `packages/shared-types/src/index.ts`:
-
-```typescript
-// --- Image Management ---
-
-export interface ImageFolder {
-  id: number;
-  name: string;
-  image_count: number;
-  created_at: string;
-}
-
-export interface ImageAssetItem {
-  id: number;
-  folder_id: number | null;
-  name: string;
-  url: string;
-  size_bytes: number;
-  created_at: string;
-}
-
-export interface ImageAssetListResponse {
-  items: ImageAssetItem[];
-  total: number;
-}
-
-export interface ImageUploadResponse {
-  id: number;
-  url: string;
-  name: string;
-  size_bytes: number;
-}
-
-export interface ImageReferenceArticleBrief {
-  article_id: number;
-  scopes: string[];
-}
-
-export interface ImageReferenceDetail {
-  total: number;
-  article_body: number;
-  article_cover: number;
-  articles: ImageReferenceArticleBrief[];
-}
-
-export interface FolderDeletePreview {
-  image_count: number;
-  referenced_articles: ImageReferenceArticleBrief[];
-}
-
-export interface ImageStorageUsage {
-  used_bytes: number;
-  quota_bytes: number;
-  used_pct: number;
-}
-
-export interface ImageUpdateRequest {
-  name?: string;
-  folder_id?: number | null;
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add packages/shared-types/src/index.ts
-git commit -m "feat(images): add shared TypeScript types for image management"
-```
-
----
-
-## Task 10: Frontend API Client
-
-**Files:**
-- Modify: `apps/admin-web/src/lib/api.ts`
-
-- [ ] **Step 1: Add imagesApi**
-
-In `apps/admin-web/src/lib/api.ts`, add the import of new types at the top (inside the existing `import type { ... }` block from `@geo/shared-types`):
-
-Add: `ImageFolder`, `ImageAssetListResponse`, `ImageUploadResponse`, `ImageReferenceDetail`, `FolderDeletePreview`, `ImageStorageUsage`, `ImageUpdateRequest`
-
-Then add the `imagesApi` object after `instantTasksApi`:
-
-```typescript
-export const imagesApi = {
-  listFolders() {
-    return apiClient.get<ImageFolder[]>("/api/tenant/images/folders");
-  },
-  createFolder(name: string) {
-    return apiClient.post<{ id: number }, { name: string }>("/api/tenant/images/folders", { name });
-  },
-  updateFolder(id: number, name: string) {
-    return apiClient.put<null, { name: string }>(`/api/tenant/images/folders/${id}`, { name });
-  },
-  folderDeletePreview(id: number) {
-    return apiClient.get<FolderDeletePreview>(`/api/tenant/images/folders/${id}/delete-preview`);
-  },
-  deleteFolder(id: number, force = false) {
-    return apiClient.remove<null>(`/api/tenant/images/folders/${id}${force ? "?force=1" : ""}`);
-  },
-  list(params?: { folder_id?: number | string; q?: string; page?: number; page_size?: number }) {
-    return apiClient.get<ImageAssetListResponse>("/api/tenant/images", { params });
-  },
-  async upload(file: File, folderId?: number) {
-    const form = new FormData();
-    form.append("file", file);
-    if (folderId != null) {
-      form.append("folder_id", String(folderId));
-    }
-    const { data } = await apiClient.raw.post("/api/tenant/images", form);
-    const result = (data as any).data as ImageUploadResponse;
-    return { ...result, url: resolveApiURL(result.url) };
-  },
-  update(id: number, payload: ImageUpdateRequest) {
-    return apiClient.put<null, ImageUpdateRequest>(`/api/tenant/images/${id}`, payload);
-  },
-  getReferences(id: number) {
-    return apiClient.get<ImageReferenceDetail>(`/api/tenant/images/${id}/references`);
-  },
-  delete(id: number, force = false) {
-    return apiClient.remove<null>(`/api/tenant/images/${id}${force ? "?force=1" : ""}`);
-  },
-  storageUsage() {
-    return apiClient.get<ImageStorageUsage>("/api/tenant/images/storage-usage");
-  },
-};
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add apps/admin-web/src/lib/api.ts
-git commit -m "feat(images): add frontend API client for image management"
-```
-
----
-
-## Task 11: i18n Messages
-
-**Files:**
-- Modify: `apps/admin-web/src/i18n/messages/zh-CN.ts`
-- Modify: `apps/admin-web/src/i18n/messages/en-US.ts`
-
-- [ ] **Step 1: Add Chinese translations**
-
-In `apps/admin-web/src/i18n/messages/zh-CN.ts`, add `images` key inside the `nav` object:
-
-```typescript
-images: "图片管理",
-```
-
-Add the route entry inside `route`:
-
-```typescript
-images: {
-  title: "图片管理",
-  description: "管理图片素材库，支持文件夹分类和搜索。",
-},
-```
-
-Add top-level `images` section (at the same level as `nav`, `auth`, etc.):
-
-```typescript
-images: {
-  uploadBtn: "上传图片",
-  folders: "文件夹",
-  uncategorized: "未分类",
-  searchPlaceholder: "搜索图片名...",
-  newFolder: "新建文件夹",
-  folderName: "文件夹名称",
-  rename: "改名",
-  move: "移动",
-  deleteImage: "删除",
-  deleteFolder: "删除文件夹",
-  forceDelete: "仍然删除",
-  confirmDeleteTitle: "确认删除",
-  confirmDeleteImage: "确定要删除这张图片吗？",
-  confirmDeleteFolder: "确定要删除此文件夹吗？",
-  imageInUse: "该图片被以下文章引用：",
-  folderHasRefs: "文件夹中包含被引用的图片",
-  refArticleBody: "正文引用",
-  refArticleCover: "封面引用",
-  storageUsage: "存储用量",
-  storageUsageDetail: "{used} / {quota}",
-  quotaExceeded: "存储空间不足",
-  uploadSuccess: "上传成功",
-  uploadFailed: "上传失败",
-  deleteSuccess: "删除成功",
-  folderCreated: "文件夹已创建",
-  folderRenamed: "文件夹已重命名",
-  folderDeleted: "文件夹已删除",
-  imageRenamed: "图片已重命名",
-  imageMoved: "图片已移动",
-  noImages: "暂无图片",
-  allFolders: "全部",
-  selectImage: "选择图片",
-  libraryTab: "本地素材",
-},
-```
-
-- [ ] **Step 2: Add English translations**
-
-Add equivalent keys to `apps/admin-web/src/i18n/messages/en-US.ts`:
-
-Nav: `images: "Images"`, route: `images: { title: "Images", description: "Manage image assets with folder organization and search." }`
-
-Top-level `images` section:
-
-```typescript
-images: {
-  uploadBtn: "Upload Image",
-  folders: "Folders",
-  uncategorized: "Uncategorized",
-  searchPlaceholder: "Search images...",
-  newFolder: "New Folder",
-  folderName: "Folder Name",
-  rename: "Rename",
-  move: "Move",
-  deleteImage: "Delete",
-  deleteFolder: "Delete Folder",
-  forceDelete: "Delete Anyway",
-  confirmDeleteTitle: "Confirm Delete",
-  confirmDeleteImage: "Are you sure you want to delete this image?",
-  confirmDeleteFolder: "Are you sure you want to delete this folder?",
-  imageInUse: "This image is referenced by the following articles:",
-  folderHasRefs: "Folder contains referenced images",
-  refArticleBody: "Body reference",
-  refArticleCover: "Cover reference",
-  storageUsage: "Storage Usage",
-  storageUsageDetail: "{used} / {quota}",
-  quotaExceeded: "Storage quota exceeded",
-  uploadSuccess: "Upload successful",
-  uploadFailed: "Upload failed",
-  deleteSuccess: "Deleted successfully",
-  folderCreated: "Folder created",
-  folderRenamed: "Folder renamed",
-  folderDeleted: "Folder deleted",
-  imageRenamed: "Image renamed",
-  imageMoved: "Image moved",
-  noImages: "No images",
-  allFolders: "All",
-  selectImage: "Select Image",
-  libraryTab: "Image Library",
-},
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add apps/admin-web/src/i18n/messages/zh-CN.ts apps/admin-web/src/i18n/messages/en-US.ts
-git commit -m "feat(images): add i18n translations for image management"
-```
-
----
-
-## Task 12: Router + Navigation
-
-**Files:**
-- Modify: `apps/admin-web/src/router/index.ts`
-- Modify: `apps/admin-web/src/layouts/AppShell.vue`
-
-- [ ] **Step 1: Add route**
-
-In `apps/admin-web/src/router/index.ts`, add a new route inside the children array (after the `knowledge` route):
-
-```typescript
-{
-  path: "images",
-  name: "images",
-  component: () => import("@/views/ImagesView.vue"),
-  meta: {
-    titleKey: "route.images.title",
-    descriptionKey: "route.images.description",
-    navKey: "/images",
-  },
-},
-```
-
-- [ ] **Step 2: Add nav item**
-
-In `apps/admin-web/src/layouts/AppShell.vue`, add the `PictureOutlined` icon import at the top:
-
-```typescript
-import {
-  AppstoreOutlined,
-  BookOutlined,
-  GlobalOutlined,
-  PictureOutlined,
-  RadarChartOutlined,
-  SearchOutlined,
-  DownOutlined,
-  LogoutOutlined,
-  TranslationOutlined,
-} from "@ant-design/icons-vue";
-```
-
-In the `contentManagement` nav section, add the images item after knowledge:
-
-```typescript
-{
-  key: "contentManagement",
-  title: t("nav.contentManagement"),
-  items: [
-    { key: "/knowledge", label: t("nav.knowledge"), icon: BookOutlined },
-    { key: "/images", label: t("nav.images"), icon: PictureOutlined },
-  ],
-},
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add apps/admin-web/src/router/index.ts apps/admin-web/src/layouts/AppShell.vue
-git commit -m "feat(images): add /images route and navigation item"
-```
-
----
-
-## Task 13: ImagesView Page
-
-**Files:**
-- Create: `apps/admin-web/src/views/ImagesView.vue`
-
-- [ ] **Step 1: Create ImagesView**
-
-Create `apps/admin-web/src/views/ImagesView.vue` — a full page with:
-- Left sidebar: folder list with "未分类" + user folders + create button
-- Right panel: search bar + image grid (4 columns) + pagination
-- Hover actions on image cards: rename, move, delete
-- Delete confirmation with reference warning
-- Storage usage bar
-
-The component uses TanStack Query for data fetching and Ant Design Vue components. Due to plan length, the implementation should follow the spec layout exactly:
-
-```
-┌─────────────────────────────────────────────────────┐
-│  图片管理                          [+ 上传图片]      │
-├──────────────┬──────────────────────────────────────┤
-│ 文件夹  [+]  │  🔍 搜索图片名...                    │
-│──────────────│──────────────────────────────────────│
-│ 📁 未分类(12)│  ┌────┐ ┌────┐ ┌────┐ ┌────┐        │
-│ 📁 产品图(8) │  │img │ │img │ │img │ │img │        │
-│ 📁 博客配图  │  └────┘ └────┘ └────┘ └────┘        │
-│              │                                       │
-│              │  文件名 · 大小 · 日期 [改名] [移动]  │
-└──────────────┴──────────────────────────────────────┘
-```
-
-Key implementation details:
-- Use `useQuery` with queryKey `["images", "list", { folder_id, q, page }]` and `["images", "folders"]`
-- Use `useMutation` for upload, delete, rename, move, folder CRUD
-- Debounced search input (300ms)
-- When search query is active, disable folder sidebar selection
-- `<a-upload>` with custom request for file upload (multipart)
-- Image grid uses CSS Grid with 4 columns
-- Delete flow: GET references first, if refs exist show warning modal, user can force-delete
-
-The complete Vue SFC should be self-contained (~400-500 lines). The worker implementing this task should build the full component following these specifications and the existing codebase patterns (see `KnowledgeView.vue` for a similar sidebar + content layout pattern).
-
-- [ ] **Step 2: Start dev server and test the page**
-
-```bash
-cd apps/admin-web && npm run dev
-```
-
-Navigate to `http://localhost:5173/images` and verify:
-- Folder sidebar renders
-- Image grid renders (empty state if no images)
-- Upload works (file is converted to WebP on server)
-- Folder CRUD works
-- Search works with debounce
-- Delete with reference warning works
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add apps/admin-web/src/views/ImagesView.vue
-git commit -m "feat(images): add ImagesView page with folder sidebar and image grid"
-```
-
----
-
-## Task 14: Image Library Picker Component
-
-**Files:**
-- Create: `apps/admin-web/src/components/ImageLibraryPicker.vue`
-
-- [ ] **Step 1: Create ImageLibraryPicker**
-
-Create `apps/admin-web/src/components/ImageLibraryPicker.vue` — a reusable picker component that can be embedded in modals:
-
-Props:
-- `singleSelect: boolean` (default true) — for cover picker, only one image can be selected
-- `onSelect: (image: ImageAssetItem) => void` — callback when image is selected
-
-Features:
-- Folder dropdown filter (uses `imagesApi.listFolders`)
-- Search input with 300ms debounce
-- Image grid (4 columns, scrollable)
-- Click-to-select (highlight border on selected)
-- Pagination
-- Storage usage bar at bottom
-
-This component is used by:
-1. CoverPickerModal "本地素材" tab
-2. (Future) Article editor "从图片库选择" flow
-
-The component loads images via `imagesApi.list()` and renders them in a grid. Selected image has a blue border highlight. Storage usage bar at the bottom shows `imagesApi.storageUsage()`.
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add apps/admin-web/src/components/ImageLibraryPicker.vue
-git commit -m "feat(images): add reusable ImageLibraryPicker component"
-```
-
----
-
-## Task 15: Cover Picker Modal Integration
-
-**Files:**
-- Modify: `apps/admin-web/src/components/CoverPickerModal.vue`
-
-- [ ] **Step 1: Replace AI tab with library picker tab**
-
-In `apps/admin-web/src/components/CoverPickerModal.vue`:
-
-1. Import the `ImageLibraryPicker` component:
-```typescript
-import ImageLibraryPicker from "@/components/ImageLibraryPicker.vue";
-```
-
-2. Add a ref for the selected library image:
-```typescript
-const selectedLibraryImage = ref<{ url: string; assetId: number } | null>(null);
-```
-
-3. Replace the `<a-tab-pane key="ai">` block with:
-```html
-<a-tab-pane key="library" :tab="t('images.libraryTab')">
-  <ImageLibraryPicker
-    :single-select="true"
-    @select="handleLibrarySelect"
-  />
-  <div v-if="selectedLibraryImage" style="margin-top: 12px; text-align: right;">
-    <a-button type="primary" @click="confirmLibraryImage">
-      {{ t("common.confirm") }}
-    </a-button>
-  </div>
-</a-tab-pane>
-```
-
-4. Add handlers:
-```typescript
-function handleLibrarySelect(image: { id: number; url: string; name: string }) {
-  selectedLibraryImage.value = { url: image.url, assetId: image.id };
-}
-
-function confirmLibraryImage() {
-  if (!selectedLibraryImage.value) return;
-
-  if (aspectRatioLocked.value) {
-    // Baijiahao: route into crop workspace
-    workingUrl.value = selectedLibraryImage.value.url;
-    workingFileName.value = "library-cover";
-    sourceKind.value = "remote";
-    activeTab.value = "local";
-    void loadImageMeta(selectedLibraryImage.value.url);
-    return;
-  }
-
-  // Non-crop platforms: use library image directly
-  emit("confirmed", {
-    url: selectedLibraryImage.value.url,
-    fileName: "library-cover",
-  });
-  emit("update:open", false);
-}
-```
-
-5. Update the i18n key for the tab label — the `t('coverPicker.tabs.ai')` is now replaced with `t('images.libraryTab')`.
-
-- [ ] **Step 2: Test in browser**
-
-Start the dev server and navigate to an article editor. Open the cover picker modal. Verify:
-- "AI封面" tab is replaced with "本地素材" tab
-- Library tab shows image grid from the library
-- Selecting an image and clicking confirm works
-- For Baijiahao platforms, selecting routes to the crop workspace
-- For other platforms, the library image URL is used directly
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add apps/admin-web/src/components/CoverPickerModal.vue
-git commit -m "feat(images): replace AI cover tab with image library picker in CoverPickerModal"
-```
-
----
-
-## Task 16: Article Update Contract (Image References)
-
-**Files:**
-- Modify: `packages/shared-types/src/index.ts` (UpdateArticleRequest)
-- Modify: `server/internal/tenant/app/article_service.go` (Update method)
-- Modify: `server/internal/tenant/transport/article_handler.go` (Update handler)
-
-- [ ] **Step 1: Extend UpdateArticleRequest type**
-
-In `packages/shared-types/src/index.ts`, modify `UpdateArticleRequest`:
-
-```typescript
-export interface UpdateArticleRequest {
-  title: string;
-  markdown_content: string;
-  platforms?: string[];
-  cover_asset_url?: string | null;
-  referenced_image_asset_ids?: number[];
-  cover_image_asset_id?: number | null;
-}
-```
-
-- [ ] **Step 2: Handle image references in article update (backend)**
-
-In `server/internal/tenant/app/article_service.go`, in the `Update` method (or the handler that processes article updates), after the existing article update logic, add image reference upsert:
-
-```go
-// After the existing article update logic:
-if len(input.ReferencedImageAssetIDs) > 0 || input.CoverImageAssetID != nil {
-    refRepo := repository.NewImageReferenceRepository(s.pool)
-
-    // Clear existing body references for this article, then re-insert
-    _ = refRepo.DeleteByArticleScope(ctx, tenantID, articleID, "article_body")
-    for _, assetID := range input.ReferencedImageAssetIDs {
-        _ = refRepo.Upsert(ctx, tenantID, assetID, articleID, "article_body")
-    }
-
-    // Handle cover reference
-    _ = refRepo.DeleteByArticleScope(ctx, tenantID, articleID, "article_cover")
-    if input.CoverImageAssetID != nil && *input.CoverImageAssetID > 0 {
-        _ = refRepo.Upsert(ctx, tenantID, *input.CoverImageAssetID, articleID, "article_cover")
-    }
-}
-```
-
-The exact integration point depends on the existing `Update` method signature. The worker should read the current `Update` method and add the reference handling at the end, accepting `referenced_image_asset_ids` and `cover_image_asset_id` from the JSON request body.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add packages/shared-types/src/index.ts server/internal/tenant/app/article_service.go server/internal/tenant/transport/article_handler.go
-git commit -m "feat(images): add image reference tracking on article save"
-```
-
----
-
-## Deferred Items (Not in This Plan)
-
-The following items from the spec are deferred to follow-up work:
-
-1. **Article editor toolbar integration** — Adding "从图片库选择" dropdown to the Milkdown editor toolbar requires deeper integration with the editor plugin system. The ImageLibraryPicker component is ready to be embedded; the editor toolbar wiring can be done in a follow-up.
-
-2. **RabbitMQ consumer for finalize/compensation** — The spec describes async compensation consumers for `finalize_upload` and `finalize_delete`. The current implementation handles finalization synchronously in the request thread (mark active after successful PutBytes, mark deleted after successful Delete). The async compensation path via MQ is infrastructure for edge-case recovery and can be added in a follow-up without changing the API contract.
-
-3. **Folder delete with image finalization** — Currently folder delete marks images as `pending_delete` but does not trigger the OSS deletion of each image. A follow-up should add a background job that processes `pending_delete` images.
diff --git a/docs/superpowers/specs/2026-04-16-kol-feature-design.md b/docs/superpowers/specs/2026-04-16-kol-feature-design.md
index dbb1285..4f19c90 100644
--- a/docs/superpowers/specs/2026-04-16-kol-feature-design.md
+++ b/docs/superpowers/specs/2026-04-16-kol-feature-design.md
@@ -1,142 +1,298 @@
-# KOL 功能设计文档（v2 — 对齐既有架构）
+# KOL 功能设计文档（v3 — 第一方 KOL 方案，不依赖 share codes）
 
-> **本文档是对 `geo-platform-ops-admin-tech-architecture-v1.md` §6.2.4 / §13.11.2 既有 KOL/Prompt 分享架构的补全**，在其基础上新增"市场浏览 → 订阅 → 生成"用户流程、KOL 提示词管理工作台、数据看板三层能力。不取代也不重复既有模型。
+> 本文档替代此前所有基于 `prompt_share_profiles` / `prompt_share_codes` 的 KOL 方案描述。
+> `share_code_id` 仍然保留在 `article_templates` 现有表结构中作为历史遗留字段，但 **KOL 功能不再依赖它**。
 
 ## 概述
 
-为 GEO 工具平台新增 KOL 功能模块。KOL 是平台中的超级用户——拥有普通用户的全部功能，同时可以创建、管理精调 prompt 订阅包，供其他租户订阅使用。平台记录订阅和使用数据，后续用于给 KOL 结算。
+为 GEO 平台新增第一方 KOL 功能模块。KOL 是一种面向租户端产品能力的创作者身份：KOL 在自己的租户内编写、发布和运营精调 prompt 包，其他租户可以在市场中浏览并申请订阅；订阅成功后，订阅租户获得对对应 KOL prompt 的使用权，并通过专用 KOL 生成链路产出文章。
+
+本方案的核心目标：
+
+- **去旧方案依赖**：不再复用 `prompt_share_profiles`、`prompt_share_codes`、`share_code_id`
+- **生成链路独立**：KOL 文章走独立的 `source_type='kol'` / `task_type='kol'`
+- **权限边界清晰**：KOL 工作台属于租户端产品能力，审批与风控属于平台端能力
+- **历史可追溯**：Prompt 发布版本、变量 schema、使用快照、任务和文章链路完整可追踪
 
 ### 核心概念
 
-- **KOL 身份**：通过既有 `prompt_share_profiles` 建模（`kol_profile`），**不是 RBAC 权限角色**，不参与 `platform_role` 鉴权（参见架构文档 §6.2.4）
-- **订阅包（Package）**：KOL 发布的一组 sealed prompt 的集合，面向某个行业/场景（如"家具行业精调包"）
-- **Prompt**：包内的具体提示词，存储为 `article_templates`（`scope='kol_package'`, `prompt_visibility='sealed'`, `origin_type='kol_authored'`），通过 `protected_prompt_asset_key` 保护原文
-- **动态表单**：每个 prompt 由 KOL 定义变量槽位（`schema_json`），用户填写后替换生成，prompt 内容对用户不可见
-- **订阅**：租户级别（tenant）订阅 KOL 包，第一版通过申请 + 管理员审批/手动绑定，不做支付
-- **导入物化**：租户订阅后，包内 prompt 通过 `prompt_share_codes` 机制物化为租户自己的 `article_templates`（`origin_type='kol_share'`, `share_code_id` 关联），与既有分享码导入流程一致
+- **KOL Profile**：KOL 创作者身份，绑定一个 `user_id + tenant_id`
+- **KOL Package**：KOL 发布的一组 prompt 的业务包
+- **KOL Prompt**：包内单个 prompt 的逻辑实体
+- **KOL Prompt Revision**：prompt 的不可变发布/草稿修订
+- **KOL Subscription**：订阅租户对某个 package 的订阅关系
+- **KOL Subscription Prompt Access**：订阅生效后，租户对包内某个 prompt 的访问授权
+- **KOL Usage Log**：每次生成请求的审计与结算基础记录
 
-### 实现策略
+### 设计原则
 
-在既有 `prompt_share_profiles` → `prompt_share_codes` → `article_templates` 体系上扩展，新增"订阅包"聚合层和"市场/看板"展示层。生成链路完全复用现有事务/幂等/额度闭环。
-
-### 与既有架构的关系
-
-| 既有概念 | 本次扩展 |
-|---------|---------|
-| `prompt_share_profiles` — KOL 身份 | 复用，新增 `share_enabled` 条件控制市场可见性 |
-| `prompt_share_codes` — 分享码 | 复用，订阅激活后自动为包内每个 prompt 生成分享码 |
-| `article_templates`（sealed prompt） | 复用，KOL 原始 prompt 存储为 `scope='kol_package'` 的模板 |
-| `article_templates`（导入后物化） | 复用，订阅方租户内物化为 `origin_type='kol_share'` 的模板 |
-| 生成链路（事务/额度/幂等） | 完全复用，`source_type='kol'` 走同一管道 |
-| `template_assist_tasks` | **不复用**，新建 `kol_assist_tasks` 表，解耦 `template_id` 强依赖 |
+1. **KOL 是第一方模型，不是旧分享模型的变体**
+2. **KOL 原始 prompt 不写入 `article_templates`**
+3. **KOL 生成只走专用 API 与专用 worker 分支**
+4. **V1 不接入通用模板选择器，避免绕过订阅鉴权**
+5. **租户端能力留在 `tenant-api`，平台审批留在 `platform-api`**
 
 ---
 
-## 1. 数据模型
+## 1. 架构定位
 
-### 1.1 新增表
+### 1.1 边界划分
 
-#### kol_packages — 订阅包（平台级资源）
+| 能力 | 归属 | 说明 |
+|------|------|------|
+| 市场浏览、包详情、申请订阅 | `tenant-api` | 面向租户端用户的产品能力 |
+| KOL 工作台、Prompt 编辑、KOL 看板 | `tenant-api` | KOL 在自己租户内使用 |
+| 订阅审批、KOL Profile 开通/冻结 | `platform-api` | 平台运营能力 |
+| 文章生成执行 | `worker-generate` | 复用既有队列、额度、任务状态框架 |
+
+### 1.2 与现有系统的关系
+
+| 现有模块 | 复用方式 |
+|---------|---------|
+| `articles` | 复用，新增 `source_type='kol'` 和 `kol_prompt_id` |
+| `generation_tasks` | 复用，新增 `task_type='kol'` |
+| `article_versions` | 复用，生成成功后正常写入 |
+| `quota_reservations` / `tenant_quota_ledgers` | 复用，遵守既有事务边界 |
+| `task_records + SSE` | 复用，前端感知生成进度 |
+| `template_assist_tasks` | 不复用，新建 `kol_assist_tasks` |
+| `article_templates` | 不作为 KOL 原始 prompt 存储；`share_code_id` 对 KOL 无意义 |
+
+### 1.3 V1 显式不做
+
+- 不复活旧的 share code 导入/物化方案
+- 不把 KOL prompt 接入通用 `/articles/template` 生成链路
+- 不把 KOL prompt 存成订阅方的 `article_templates`
+- 不做在线支付、分账、提现
+- 不做 KOL 多租户归属切换
+
+---
+
+## 2. 数据模型
+
+### 2.1 新增表
+
+#### kol_profiles — KOL 创作者身份
+
+```sql
+CREATE TABLE kol_profiles (
+    id              BIGSERIAL PRIMARY KEY,
+    tenant_id       BIGINT NOT NULL REFERENCES tenants(id),
+    user_id         BIGINT NOT NULL REFERENCES users(id),
+    display_name    VARCHAR(100) NOT NULL,
+    bio             TEXT,
+    avatar_url      TEXT,
+    market_enabled  BOOLEAN NOT NULL DEFAULT FALSE,
+    status          VARCHAR(20) NOT NULL DEFAULT 'active', -- active / suspended / closed
+    created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    deleted_at      TIMESTAMPTZ
+);
+CREATE UNIQUE INDEX uk_kol_profile_user_active
+    ON kol_profiles(user_id)
+    WHERE deleted_at IS NULL;
+CREATE INDEX idx_kol_profile_tenant
+    ON kol_profiles(tenant_id)
+    WHERE deleted_at IS NULL;
+```
+
+设计要点：
+
+- 一个用户在 V1 仅允许有一个 active KOL Profile
+- `tenant_id` 是 KOL 的归属租户，也是 AI 辅助费用归属租户
+- KOL Profile 不是 `platform_role`，也不是 `tenant_role`，而是第一方业务身份
+
+#### kol_packages — KOL 订阅包
 
 ```sql
 CREATE TABLE kol_packages (
-    id                BIGSERIAL PRIMARY KEY,
-    profile_id        BIGINT NOT NULL REFERENCES prompt_share_profiles(id),
-    name              VARCHAR(200) NOT NULL,
-    description       TEXT,
-    cover_url         TEXT,
-    industry          VARCHAR(100),
-    tags              JSONB NOT NULL DEFAULT '[]',
-    price_note        VARCHAR(200),
-    status            VARCHAR(20) NOT NULL DEFAULT 'draft',  -- draft / published / archived
-    created_at        TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated_at        TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    deleted_at        TIMESTAMPTZ
+    id              BIGSERIAL PRIMARY KEY,
+    tenant_id       BIGINT NOT NULL REFERENCES tenants(id),
+    kol_profile_id  BIGINT NOT NULL REFERENCES kol_profiles(id),
+    name            VARCHAR(200) NOT NULL,
+    description     TEXT,
+    cover_url       TEXT,
+    industry        VARCHAR(100),
+    tags            JSONB NOT NULL DEFAULT '[]',
+    price_note      VARCHAR(200),
+    status          VARCHAR(20) NOT NULL DEFAULT 'draft', -- draft / published / archived
+    created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    deleted_at      TIMESTAMPTZ
 );
-CREATE INDEX idx_kol_packages_profile ON kol_packages(profile_id) WHERE deleted_at IS NULL;
-CREATE INDEX idx_kol_packages_status ON kol_packages(status) WHERE deleted_at IS NULL;
+CREATE INDEX idx_kol_package_profile
+    ON kol_packages(kol_profile_id, created_at DESC)
+    WHERE deleted_at IS NULL;
+CREATE INDEX idx_kol_package_status
+    ON kol_packages(status, created_at DESC)
+    WHERE deleted_at IS NULL;
 ```
 
-**设计要点**：
-- `profile_id` 关联 `prompt_share_profiles`（KOL 身份），不直接关联 `users.id`
-- **无 `tenant_id`**：订阅包是平台级资源，不属于任何租户。API 走 `/api/platform/kol/*` 路径（KOL 身份鉴权），不走 `/api/tenant/*`
+设计要点：
 
-#### kol_package_templates — 包与模板关联
+- `tenant_id` 是创作者租户，不是订阅租户
+- 包可以是全局可见资源，但 ownership 仍然属于创作者租户
+- 市场只展示 `status='published'` 且 `kol_profiles.market_enabled=true`
+- 市场列表/详情是**跨租户查询**；`/api/tenant/kol/marketplace/*` 是已知 tenant-scope 豁免点，实施时不能复用默认“按当前 tenant_id 过滤”的仓储查询
+- 实施建议：优先在 service 层做跨租户聚合查询；若落在 tenant 仓储 SQL，则需为该查询显式标注 tenant-scope exemption，并同步调整 `check_tenant_scope.sh` 的豁免策略
+
+#### kol_prompts — KOL Prompt 逻辑主表
 
 ```sql
-CREATE TABLE kol_package_templates (
-    id              BIGSERIAL PRIMARY KEY,
-    package_id      BIGINT NOT NULL REFERENCES kol_packages(id),
-    template_id     BIGINT NOT NULL REFERENCES article_templates(id),
-    sort_order      INT NOT NULL DEFAULT 0,
-    created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
+CREATE TABLE kol_prompts (
+    id                    BIGSERIAL PRIMARY KEY,
+    tenant_id             BIGINT NOT NULL REFERENCES tenants(id),
+    package_id            BIGINT NOT NULL REFERENCES kol_packages(id),
+    name                  VARCHAR(200) NOT NULL,
+    platform_hint         VARCHAR(100),
+    status                VARCHAR(20) NOT NULL DEFAULT 'draft', -- draft / active / archived
+    sort_order            INT NOT NULL DEFAULT 0,
+    published_revision_no INT,
+    draft_revision_no     INT,
+    created_by            BIGINT NOT NULL REFERENCES users(id),
+    updated_by            BIGINT NOT NULL REFERENCES users(id),
+    created_at            TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at            TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    deleted_at            TIMESTAMPTZ
 );
-CREATE UNIQUE INDEX uk_kol_pkg_tpl ON kol_package_templates(package_id, template_id);
+CREATE INDEX idx_kol_prompt_package
+    ON kol_prompts(package_id, sort_order, created_at)
+    WHERE deleted_at IS NULL;
+CREATE INDEX idx_kol_prompt_tenant_status
+    ON kol_prompts(tenant_id, status, created_at DESC)
+    WHERE deleted_at IS NULL;
 ```
 
-**设计要点**：
-- KOL 的 prompt 存储在既有 `article_templates` 表中（`scope='kol_package'`, `prompt_visibility='sealed'`, `origin_type='kol_authored'`）
-- 本表只做包→模板的聚合关联，一个包包含多个 sealed template
-- `schema_json` 中的变量槽位定义直接复用 `article_templates.schema_json`
+设计要点：
+
+- `kol_prompts` 是逻辑实体，不直接存放 prompt 原文
+- 当前可用版本通过 `published_revision_no` 指向
+- KOL 编辑时创建新 revision；发布时切换 `published_revision_no`
+
+#### kol_prompt_revisions — KOL Prompt 不可变修订
+
+```sql
+CREATE TABLE kol_prompt_revisions (
+    id                 BIGSERIAL PRIMARY KEY,
+    tenant_id          BIGINT NOT NULL REFERENCES tenants(id),
+    prompt_id          BIGINT NOT NULL REFERENCES kol_prompts(id),
+    revision_no        INT NOT NULL,
+    prompt_asset_key   TEXT NOT NULL,         -- 受保护资产 key
+    schema_json        JSONB NOT NULL DEFAULT '{}',
+    card_config_json   JSONB NOT NULL DEFAULT '{}',
+    created_by         BIGINT NOT NULL REFERENCES users(id),
+    created_at         TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE (prompt_id, revision_no)
+);
+CREATE INDEX idx_kol_prompt_revision_prompt
+    ON kol_prompt_revisions(prompt_id, revision_no DESC);
+```
+
+设计要点：
+
+- 原始 prompt 正文只存受保护资产，不回传前端
+- `schema_json`、`card_config_json` 与 prompt 正文一起冻结在 revision 中
+- 历史生成任务通过 `prompt_id + revision_no` 可精确回放
 
 #### kol_subscriptions — 租户级订阅关系
 
 ```sql
 CREATE TABLE kol_subscriptions (
-    id          BIGSERIAL PRIMARY KEY,
-    tenant_id   BIGINT NOT NULL REFERENCES tenants(id),
-    package_id  BIGINT NOT NULL REFERENCES kol_packages(id),
-    status      VARCHAR(20) NOT NULL DEFAULT 'pending',  -- pending / active / expired / revoked
-    approved_by BIGINT REFERENCES users(id),
-    start_at    TIMESTAMPTZ,
-    end_at      TIMESTAMPTZ,
-    created_at  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
+    id              BIGSERIAL PRIMARY KEY,
+    tenant_id       BIGINT NOT NULL REFERENCES tenants(id),   -- 订阅方租户
+    package_id      BIGINT NOT NULL REFERENCES kol_packages(id),
+    status          VARCHAR(20) NOT NULL DEFAULT 'pending',   -- pending / active / expired / revoked
+    approved_by     BIGINT REFERENCES users(id),
+    start_at        TIMESTAMPTZ,
+    end_at          TIMESTAMPTZ,
+    created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
-CREATE UNIQUE INDEX uk_kol_sub_active ON kol_subscriptions(tenant_id, package_id)
+CREATE UNIQUE INDEX uk_kol_subscription_active
+    ON kol_subscriptions(tenant_id, package_id)
     WHERE status IN ('pending', 'active');
+CREATE INDEX idx_kol_subscription_package
+    ON kol_subscriptions(package_id, status, created_at DESC);
 ```
 
-**设计要点**：
-- 订阅主体是 **tenant**，不是 user。文案、审批、权限、结算全部以 tenant 为口径
-- 订阅激活（`pending → active`）时，自动为包内每个 active template 生成 `prompt_share_codes` 记录，并物化为订阅方租户的 `article_templates`（`origin_type='kol_share'`, `share_code_id` 关联）
+设计要点：
 
-#### kol_usage_logs — 使用记录
+- 订阅主体是 tenant，不是单个 user
+- 审批与撤销都以 tenant 为单位
+- 结算、看板、风控也以 tenant 为统计口径
+
+#### kol_subscription_prompts — 订阅生效后的 prompt 访问授权
+
+```sql
+CREATE TABLE kol_subscription_prompts (
+    id               BIGSERIAL PRIMARY KEY,
+    tenant_id        BIGINT NOT NULL REFERENCES tenants(id),
+    subscription_id  BIGINT NOT NULL REFERENCES kol_subscriptions(id),
+    package_id       BIGINT NOT NULL REFERENCES kol_packages(id),
+    prompt_id        BIGINT NOT NULL REFERENCES kol_prompts(id),
+    status           VARCHAR(20) NOT NULL DEFAULT 'active', -- active / revoked
+    granted_at       TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    revoked_at       TIMESTAMPTZ,
+    created_at       TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at       TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE UNIQUE INDEX uk_kol_subscription_prompt
+    ON kol_subscription_prompts(subscription_id, prompt_id);
+CREATE INDEX idx_kol_subscription_prompt_tenant
+    ON kol_subscription_prompts(tenant_id, status, created_at DESC);
+```
+
+设计要点：
+
+- 这是新的“订阅后可用 prompt”映射表，用来替代旧的 share code / 物化模板模型
+- 订阅审批通过时，为当前包内所有 active prompt 创建 access row
+- 包后续新增 prompt 时，为所有 active 订阅补齐 access row
+- 撤订或 prompt 下架时，access row 置为 revoked
+
+#### kol_usage_logs — 使用与审计记录
 
 ```sql
 CREATE TABLE kol_usage_logs (
-    id                       BIGSERIAL PRIMARY KEY,
-    package_id               BIGINT NOT NULL REFERENCES kol_packages(id),
-    source_template_id       BIGINT NOT NULL REFERENCES article_templates(id),
-    tenant_id                BIGINT NOT NULL REFERENCES tenants(id),
-    article_id               BIGINT REFERENCES articles(id),
-    generation_task_id       BIGINT REFERENCES generation_tasks(id),
-    template_version_no      INT NOT NULL,
-    variables_snapshot       JSONB,
-    schema_snapshot          JSONB,
-    rendered_prompt_hash     VARCHAR(64),
-    created_at               TIMESTAMPTZ NOT NULL DEFAULT NOW()
+    id                     BIGSERIAL PRIMARY KEY,
+    tenant_id              BIGINT NOT NULL REFERENCES tenants(id),
+    subscription_id        BIGINT REFERENCES kol_subscriptions(id),
+    subscription_prompt_id BIGINT REFERENCES kol_subscription_prompts(id),
+    package_id             BIGINT NOT NULL REFERENCES kol_packages(id),
+    prompt_id              BIGINT NOT NULL REFERENCES kol_prompts(id),
+    prompt_revision_no     INT NOT NULL,
+    article_id             BIGINT REFERENCES articles(id),
+    generation_task_id     BIGINT REFERENCES generation_tasks(id),
+    status                 VARCHAR(20) NOT NULL DEFAULT 'pending', -- pending / completed / failed
+    variables_snapshot     JSONB,
+    schema_snapshot        JSONB,
+    rendered_prompt_hash   VARCHAR(64),
+    error_message          TEXT,
+    created_at             TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    finished_at            TIMESTAMPTZ
 );
-CREATE INDEX idx_kol_usage_package ON kol_usage_logs(package_id, created_at DESC);
-CREATE INDEX idx_kol_usage_tenant ON kol_usage_logs(tenant_id, created_at DESC);
+CREATE INDEX idx_kol_usage_package
+    ON kol_usage_logs(package_id, created_at DESC);
+CREATE INDEX idx_kol_usage_tenant
+    ON kol_usage_logs(tenant_id, created_at DESC);
+CREATE INDEX idx_kol_usage_prompt
+    ON kol_usage_logs(prompt_id, created_at DESC);
 ```
 
-**设计要点**：
-- `source_template_id` 指向 KOL 原始 template（`scope='kol_package'`），不是订阅方物化的副本
-- `template_version_no`：记录使用时的模板版本号，确保历史可复现
-- `schema_snapshot`：记录使用时的 `schema_json` 快照，KOL 后续修改不影响历史记录
-- `rendered_prompt_hash`：变量替换后的最终 prompt 的 SHA-256，用于幂等去重和结算审计
-- `generation_task_id`：关联到 `generation_tasks`，闭合与额度系统的追溯链
+设计要点：
+
+- `status` 明确进入表结构，解决 pending/completed/failed 口径不一致问题
+- `prompt_revision_no + schema_snapshot + variables_snapshot + rendered_prompt_hash` 组成完整审计快照
+- 与 `generation_task_id`、`article_id` 关联后可闭合结算与故障追踪链
 
 #### kol_assist_tasks — KOL AI 辅助任务
 
 ```sql
 CREATE TABLE kol_assist_tasks (
     id              VARCHAR(64) PRIMARY KEY,
-    profile_id      BIGINT NOT NULL REFERENCES prompt_share_profiles(id),
     tenant_id       BIGINT NOT NULL REFERENCES tenants(id),
-    task_type       VARCHAR(50) NOT NULL,  -- ai_generate / ai_optimize
-    template_id     BIGINT REFERENCES article_templates(id),
+    kol_profile_id  BIGINT NOT NULL REFERENCES kol_profiles(id),
+    prompt_id       BIGINT REFERENCES kol_prompts(id),
+    operator_id     BIGINT NOT NULL REFERENCES users(id),
+    task_type       VARCHAR(50) NOT NULL, -- ai_generate / ai_optimize
     status          VARCHAR(20) NOT NULL DEFAULT 'queued',
     request_json    JSONB NOT NULL DEFAULT '{}'::jsonb,
     result_json     JSONB,
@@ -146,92 +302,74 @@ CREATE TABLE kol_assist_tasks (
     created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
     updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
-CREATE INDEX idx_kol_assist_profile ON kol_assist_tasks(profile_id, created_at DESC);
-CREATE INDEX idx_kol_assist_status ON kol_assist_tasks(status, created_at DESC);
+CREATE INDEX idx_kol_assist_tenant_profile
+    ON kol_assist_tasks(tenant_id, kol_profile_id, created_at DESC);
+CREATE INDEX idx_kol_assist_status
+    ON kol_assist_tasks(status, created_at DESC);
 ```
 
-**设计要点**：
-- 独立于 `template_assist_tasks`，解耦 `template_id` 强依赖（`template_id` 此处可为 NULL，AI 生成新 prompt 时还没有 template）
-- `tenant_id` 用于 AI 模型费用归属（结算记到 KOL 所在的 tenant）
-- `profile_id` 关联 KOL 身份，鉴权走 KOL 身份校验
+设计要点：
 
-### 1.2 现有表变更
+- `kol_assist_tasks.tenant_id` 是**计费租户**，必须始终写入 `kol_profiles.tenant_id`
+- 实施时禁止直接使用当前请求的 `actor.TenantID` 作为兜底来源；即使 V1 中两者相同，也要先解析 profile 后再写任务记录
+- 这样后续即使支持 KOL 多租户归属切换，历史费用归属也不会歧义
 
-#### article_templates 表
-
-新增字段值（不改表结构）：
-- `scope = 'kol_package'`：KOL 原始 prompt 模板
-- `origin_type = 'kol_authored'`：KOL 创作的原始模板
-- `origin_type = 'kol_share'`：订阅方物化的副本（已有设计，参见架构文档 §13.11.2 line 1330）
-- `prompt_visibility = 'sealed'`：prompt 正文服务端只读，前端不返回（已有设计）
+### 2.2 现有表变更
 
 #### articles 表
 
-新增 `source_type` 值：`"kol"`
-（`template_id` 字段已存在，指向订阅方物化后的 article_template）
+新增字段：
+
+- `kol_prompt_id BIGINT REFERENCES kol_prompts(id)`
+
+新增 `source_type` 值：
+
+- `kol`
+
+说明：
+
+- KOL 文章不依赖 `template_id`
+- `template_id` 对 KOL 文章保持 `NULL`
 
 #### generation_tasks 表
 
-新增 `task_type` 值：`"kol"`
+新增 `task_type` 值：
 
-`input_params_json` 存储：
+- `kol`
+
+`input_params_json` 示例：
 
 ```json
 {
-  "source_template_id": 42,
-  "template_version_no": 3,
+  "subscription_prompt_id": 901,
+  "prompt_id": 42,
+  "prompt_revision_no": 7,
   "variables": {
-    "公司名称": "宜家家居",
-    "行业": "家具",
-    "主要竞品": "全友、顾家",
-    "月预算": 50
+    "var_a1b2c3": "宜家家居",
+    "var_d4e5f6": "家具"
+  },
+  "schema_snapshot": {
+    "variables": []
   },
-  "schema_snapshot": [...],
   "rendered_prompt_hash": "a1b2c3d4..."
 }
 ```
 
-**幂等键**：`tenant_id + source_type('kol') + request_hash(rendered_prompt_hash) + schedule_slot(null)`，与既有幂等体系一致。
+#### article_templates 表
+
+无 KOL 专属新增值。
+
+说明：
+
+- KOL 原始 prompt 不写入 `article_templates`
+- 旧字段 `share_code_id` 继续保留，但 KOL 不使用
 
 ---
 
-## 2. 生成链路（对齐既有事务/额度闭环）
-
-严格遵循架构文档 §10.1 和 §13.7.3 的事务边界：
-
-### 2.1 提交路径（单 PostgreSQL 事务）
-
-1. 校验租户身份、订阅有效性（package active + subscription active + 有效期内 + prompt active + package published）
-2. 从 KOL 原始 template 读取 `prompt_content`（`protected_prompt_asset_key` 解密）
-3. 变量替换，计算 `rendered_prompt_hash`
-4. **单事务内**：
-   - 额度预扣（`quota_reservations`）
-   - 创建 `generation_tasks`（`task_type='kol'`, `request_hash=rendered_prompt_hash`）
-   - 创建 `articles` 占位记录（`source_type='kol'`, `template_id` 指向物化副本）
-   - 写入 `kol_usage_logs`（`status` 为 pending，关联 `generation_task_id`）
-5. 事务提交后写入 RabbitMQ
-
-### 2.2 成功路径（单 PostgreSQL 事务）
-
-- 写入 `article_versions`
-- 更新 `articles.generate_status = 'completed'`
-- 确认额度消耗
-- 更新 `kol_usage_logs`（关联 `article_id`）
-
-### 2.3 失败路径（单 PostgreSQL 事务）
-
-- 更新 `generation_tasks.status = 'failed'`
-- 额度退还/释放
-- 不写入 `kol_usage_logs`（或标记为 failed）
-
----
-
-## 3. 变量模型（不可变 ID + 版本快照）
+## 3. Prompt 变量与版本模型
 
 ### 3.1 schema_json 格式
 
-复用 `article_templates.schema_json`，变量 key 默认中文，也支持英文：
-
 ```json
 {
   "variables": [
@@ -250,43 +388,42 @@ CREATE INDEX idx_kol_assist_status ON kol_assist_tasks(status, created_at DESC);
       "type": "select",
       "options": ["家具", "建材", "家电"],
       "required": true
-    },
-    {
-      "id": "var_g7h8i9",
-      "key": "主要竞品",
-      "label": "主要竞品",
-      "type": "textarea",
-      "required": false
-    },
-    {
-      "id": "var_j0k1l2",
-      "key": "月预算",
-      "label": "月预算(万)",
-      "type": "number",
-      "required": false
     }
   ]
 }
 ```
 
-**设计要点**：
-- 每个变量有**不可变 `id`**（`var_` + nanoid），KOL 修改 key/label 时 id 不变
-- prompt 模板内部按 `{{id}}` 引用（如 `{{var_a1b2c3}}`），编辑器显示为 `{{公司名称}}`
-- 用户表单根据 `label` 显示，提交时按 `id` 映射值
-- 修改 key/label 不会导致旧 prompt 失效
-- 支持的 type 值：`input`、`textarea`、`select`、`number`、`checkbox`
+设计要点：
 
-### 3.2 版本快照策略
+- 每个变量有不可变 `id`
+- Prompt 正文内部只引用 `{{id}}`
+- 前端展示 `label`，提交时按 `id -> value` 映射
+- 修改 `key/label` 不会破坏既有 prompt 引用
 
-- `article_templates.version_no` 每次 KOL 保存时递增
-- 生成时记录 `template_version_no` + `schema_snapshot` 到 `generation_tasks.input_params_json` 和 `kol_usage_logs`
-- 历史生成任务可完整复现：哪个版本的 prompt + 哪个版本的 schema + 什么变量值 → 什么 hash
+### 3.2 修订规则
+
+- 每次保存草稿，创建新的 `kol_prompt_revisions.revision_no`
+- `kol_prompts.draft_revision_no` 指向最新草稿
+- 点击发布时，把 `published_revision_no` 切到当前草稿修订
+- `status='active'` 的 prompt 必须有 `published_revision_no`
+
+### 3.3 历史复现
+
+历史生成记录依赖以下字段重建：
+
+- `prompt_id`
+- `prompt_revision_no`
+- `schema_snapshot`
+- `variables_snapshot`
+- `rendered_prompt_hash`
+
+因此即使 KOL 后续继续编辑 prompt，历史记录仍可审计、对账和回放。
 
 ---
 
 ## 4. 页面结构与路由
 
-### 4.1 侧边栏导航变更
+### 4.1 侧边栏导航
 
 ```
 现有导航:
@@ -297,321 +434,423 @@ CREATE INDEX idx_kol_assist_status ON kol_assist_tasks(status, created_at DESC);
   内容管理: 知识库 | 图片库
 
 新增:
-  KOL 市场: 模版市场                    ← 所有用户可见
-  KOL 工作台: 提示词管理 | 数据看板      ← 仅 kol_profile.share_enabled=true 的用户可见
+  KOL 市场: 模版市场                  ← 所有用户可见
+  KOL 工作台: 提示词管理 | 数据看板    ← 仅 active kol_profile 可见
 ```
 
-"KOL 工作台" 根据 `prompt_share_profiles.share_enabled` 动态显示/隐藏，不走 RBAC。
-
 ### 4.2 新增路由
 
 | 路由 | 组件 | 角色 | 说明 |
 |------|------|------|------|
-| `/kol/marketplace` | KolMarketplaceView | 所有用户 | 浏览/筛选/订阅 KOL 包 |
-| `/kol/packages/:id` | KolPackageDetailView | 所有用户 | 包详情 → prompt 列表 → 选择 prompt |
-| `/kol/generate/:promptId` | KolGenerateView | 已订阅租户 | 动态表单（填变量）→ 提交生成 |
-| `/kol/manage` | KolManageView | 仅 KOL | 管理订阅包 + AI 辅助编写 prompt |
-| `/kol/dashboard` | KolDashboardView | 仅 KOL | 订阅数据统计看板 |
+| `/kol/marketplace` | `KolMarketplaceView` | 所有用户 | 浏览 KOL 包 |
+| `/kol/packages/:id` | `KolPackageDetailView` | 所有用户 | 包详情与订阅 |
+| `/kol/generate/:subscriptionPromptId` | `KolGenerateView` | 已订阅租户 | 动态表单生成 |
+| `/kol/manage` | `KolManageView` | 仅 KOL | 包与 prompt 管理 |
+| `/kol/dashboard` | `KolDashboardView` | 仅 KOL | KOL 数据看板 |
 
-### 4.3 用户入口（3个）
+### 4.3 用户入口
 
-1. **侧边栏「模版市场」**→ 浏览/筛选 → 订阅 → 选 prompt → 表单 → 生成
-2. **Workspace 卡片区**：已订阅且物化的 KOL 模板显示为卡片 → 点击 → 表单 → 生成
-3. **模版生成页面**：物化的 KOL 模板出现在模版选择器 modal 中（`origin_type='kol_share'`）
+1. 侧边栏「模版市场」进入市场浏览与订阅
+2. Workspace 新增「KOL Prompt 卡片区」，展示当前租户可用的 `kol_subscription_prompts`
+3. **V1 不把 KOL prompt 放入通用模板选择器**
 
 ---
 
 ## 5. API 设计
 
-### 5.1 KOL 市场（所有登录用户，走 tenant API）
+### 5.1 市场与订阅（tenant API）
 
-```
-GET    /api/tenant/kol/marketplace/packages           -- 市场列表（筛选：industry, tags, keyword）
-GET    /api/tenant/kol/marketplace/packages/:id       -- 包详情（含 prompt 名称列表，不含 prompt_content）
-POST   /api/tenant/kol/marketplace/packages/:id/subscribe  -- 申请订阅（tenant 级）
-GET    /api/tenant/kol/subscriptions                  -- 当前租户的订阅列表
+```text
+GET    /api/tenant/kol/marketplace/packages
+GET    /api/tenant/kol/marketplace/packages/:id
+POST   /api/tenant/kol/marketplace/packages/:id/subscribe
+GET    /api/tenant/kol/subscriptions
+GET    /api/tenant/kol/subscription-prompts
+GET    /api/tenant/kol/subscription-prompts/:id
 ```
 
-### 5.2 KOL 生成（已订阅租户，走 tenant API）
+说明：
 
-```
-GET    /api/tenant/kol/prompts/:id/schema             -- 获取物化模板的 schema_json（不含 prompt_content）
-POST   /api/tenant/kol/prompts/:id/generate           -- 提交生成（body: variables 对象）
+- `/marketplace/*` 返回全局已发布包
+- `/subscriptions` 和 `/subscription-prompts` 只返回当前租户数据
+- `/api/tenant/kol/marketplace/*` 属于 tenant-api 中少数跨租户读场景；实施时需显式声明 tenant-scope exemption
+
+### 5.2 KOL 生成（tenant API）
+
+```text
+GET    /api/tenant/kol/subscription-prompts/:id/schema
+POST   /api/tenant/kol/subscription-prompts/:id/generate
 ```
 
-生成接口内部走 §2 的完整事务链路。
+说明：
 
-### 5.3 KOL 管理（走 platform API，KOL 身份鉴权）
+- `:id` 是 `kol_subscription_prompts.id`
+- 后端根据 access row 反查 package、prompt、published revision
+- 生成请求只接受变量值，不接受 prompt 原文
 
-```
-GET    /api/platform/kol/packages                     -- 我的包列表
-POST   /api/platform/kol/packages                     -- 创建包
-PUT    /api/platform/kol/packages/:id                 -- 更新包
-DELETE /api/platform/kol/packages/:id                 -- 删除包（软删除）
-PUT    /api/platform/kol/packages/:id/publish         -- 发布包
-PUT    /api/platform/kol/packages/:id/archive         -- 下架包
+### 5.3 KOL 工作台（tenant API）
 
-POST   /api/platform/kol/packages/:id/templates       -- 创建 prompt（创建 sealed article_template + 关联）
-PUT    /api/platform/kol/templates/:id                -- 更新 prompt（递增 version_no）
-DELETE /api/platform/kol/templates/:id                -- 删除 prompt（软删除 article_template + 移除关联）
+```text
+GET    /api/tenant/kol/manage/profile
 
-POST   /api/platform/kol/assist/generate              -- AI 辅助生成 prompt
-POST   /api/platform/kol/assist/optimize              -- AI 辅助优化 prompt
+GET    /api/tenant/kol/manage/packages
+POST   /api/tenant/kol/manage/packages
+PUT    /api/tenant/kol/manage/packages/:id
+DELETE /api/tenant/kol/manage/packages/:id
+PUT    /api/tenant/kol/manage/packages/:id/publish
+PUT    /api/tenant/kol/manage/packages/:id/archive
+
+GET    /api/tenant/kol/manage/packages/:id/prompts
+POST   /api/tenant/kol/manage/packages/:id/prompts
+PUT    /api/tenant/kol/manage/prompts/:id
+DELETE /api/tenant/kol/manage/prompts/:id
+POST   /api/tenant/kol/manage/prompts/:id/publish
+
+POST   /api/tenant/kol/manage/assist/generate
+POST   /api/tenant/kol/manage/assist/optimize
 ```
 
-**鉴权**：中间件校验请求者有 active 的 `prompt_share_profile`，且 `share_enabled=true`。
-**资源归属**：管理接口以 `profile_id` 过滤，KOL 只能操作自己的包和 prompt。
-**AI 费用**：assist 任务的 `tenant_id` 取 KOL 用户所在租户，费用记到该 tenant。
+说明：
 
-### 5.4 KOL 看板（走 platform API，KOL 身份鉴权）
+- 工作台不走 `/api/platform/kol/*`
+- 只有 `kol_profiles.tenant_id = actor.TenantID AND user_id = actor.UserID` 的用户可操作
 
-```
-GET    /api/platform/kol/dashboard/overview           -- 总体指标
-GET    /api/platform/kol/dashboard/packages           -- 按包维度统计
-GET    /api/platform/kol/dashboard/trend              -- 趋势数据（query: period=7d/30d/90d）
+### 5.4 KOL 看板（tenant API）
+
+```text
+GET    /api/tenant/kol/dashboard/overview
+GET    /api/tenant/kol/dashboard/packages
+GET    /api/tenant/kol/dashboard/trend
 ```
 
-### 5.5 管理员操作（走 platform API，platform_role 鉴权）
+### 5.5 平台管理员操作（platform API）
 
-```
-PUT    /api/platform/admin/kol/subscriptions/:id/approve   -- 审批订阅
-POST   /api/platform/admin/kol/subscriptions               -- 手动绑定开通
-PUT    /api/platform/admin/kol/subscriptions/:id/revoke    -- 撤销订阅
-```
+```text
+POST   /api/platform/admin/kol/profiles
+PUT    /api/platform/admin/kol/profiles/:id/suspend
+PUT    /api/platform/admin/kol/profiles/:id/activate
 
-### 5.6 Workspace 集成
-
-```
-GET    /api/tenant/workspace/template-cards           -- 现有接口，扩展返回 origin_type='kol_share' 的模板卡片
+PUT    /api/platform/admin/kol/subscriptions/:id/approve
+POST   /api/platform/admin/kol/subscriptions
+PUT    /api/platform/admin/kol/subscriptions/:id/revoke
 ```
 
 ---
 
-## 6. 订阅激活流程
+## 6. 订阅与授权生命周期
 
-当管理员审批或手动绑定（`status: pending → active`）时：
+### 6.1 申请订阅
 
-1. 查找 package 内所有 `status='active'` 的 `article_templates`
-2. 为每个 template 生成 `prompt_share_codes` 记录（`snapshot_json` 含卡片信息 + 变量槽位，`protected_prompt_asset_key` 引用原始 prompt）
-3. 将每个 share_code 物化为订阅方租户的 `article_templates`（`scope='tenant'`, `origin_type='kol_share'`, `share_code_id` 关联, `prompt_visibility='sealed'`）
-4. 物化后的模板出现在订阅方的 Workspace 和模版选择器中
+1. 用户在市场页点击「申请订阅」
+2. 创建 `kol_subscriptions(status='pending')`
+3. 等待平台管理员审批
 
-KOL 后续新增 prompt 到已发布包时，自动为所有 active 订阅方同步物化。
+### 6.2 审批通过
+
+1. 平台管理员把订阅改为 `active`
+2. 在同一事务或紧随其后的授权任务中，为该 package 当前所有 active prompt 创建 `kol_subscription_prompts`
+3. Workspace 的 KOL 卡片区开始展示这些 prompt
+
+### 6.3 包后续新增 prompt
+
+1. KOL 在已发布包下新建并发布 prompt
+2. 系统为所有 active 订阅补写 `kol_subscription_prompts`
+3. 新 prompt 自动出现在订阅租户的 KOL 卡片区
+
+实现建议：
+
+- 订阅审批时可同步插入 access rows
+- “已发布包新增 prompt” 建议走异步任务，避免大批量订阅阻塞发布请求
+- 异步分发复用现有 `task_records` 可观测能力
+
+### 6.4 订阅过期处理
+
+V1 口径：
+
+- **不做自动过期任务**
+- `kol_subscriptions.end_at` 仅在读时与生成鉴权时实时校验
+- 当 `end_at < now()` 时，即使 `status` 仍为 `active`，生成接口也必须拒绝访问
+- 列表页、看板统计口径应把“`status='active'` 且当前时间仍在有效期内”视为有效订阅
+- 后续如需引入 scheduler，再补“批量把过期订阅改为 `expired` + 回收 access rows”的异步清理任务
+
+### 6.5 撤销订阅
+
+1. 平台管理员把订阅改为 `revoked`
+2. 把该订阅下所有 `kol_subscription_prompts` 置为 `revoked`
+3. Workspace KOL 卡片区不再展示
+4. 生成接口返回 403
+
+### 6.6 Prompt 下架
+
+1. KOL 把 prompt 标记为 `archived`
+2. 对应的 `kol_subscription_prompts` 置为 `revoked`
+3. 已生成文章保留，后续新生成禁止
 
 ---
 
-## 7. 资源生命周期
+## 7. 生成链路
 
-### 7.1 删除策略
+严格遵循现有架构中的事务、额度、幂等和 worker 回写规则。
 
-| 资源 | 软删除字段 | 删除行为 |
-|------|-----------|---------|
-| `kol_packages` | `deleted_at` | 软删除，级联将包内所有 template 标记 `status='archived'` |
-| `article_templates`（KOL authored） | `deleted_at` | 软删除，同时移除 `kol_package_templates` 关联 |
-| `kol_subscriptions` | 无（状态机） | `active → revoked`，不物理删除 |
-| `kol_usage_logs` | 无 | 审计数据，不删除 |
+### 7.1 提交前校验
 
-### 7.2 生成鉴权完整校验链
+生成前必须逐项校验：
 
-用户访问 `/kol/generate/:promptId` 时，后端必须逐项校验：
+1. `kol_subscription_prompts.id` 存在且 `status='active'`
+2. access row 的 `tenant_id = 当前租户`
+3. 对应 `kol_subscriptions.status='active'`
+4. 订阅在有效期内
+5. `kol_packages.status='published'`
+6. `kol_prompts.status='active'`
+7. `kol_prompts.published_revision_no IS NOT NULL`
 
-1. 物化 template 存在且 `deleted_at IS NULL`
-2. 物化 template 的 `share_code_id` 关联的 `prompt_share_codes.status = 'active'`
-3. 对应的 `kol_packages.status = 'published'` 且 `deleted_at IS NULL`
-4. 租户有该 package 的 `kol_subscriptions.status = 'active'`
-5. 订阅在有效期内（`start_at <= now() <= end_at`）
-6. 原始 template `status = 'active'`
+### 7.2 提交路径（单 PostgreSQL 事务）
 
-任一不满足返回 403。
+1. 读取 `kol_prompts.published_revision_no`
+2. 读取对应 `kol_prompt_revisions`
+3. 渲染变量并计算 `rendered_prompt_hash`
+4. 单事务内执行：
+   - 额度预扣与 reservation 创建
+   - 创建 `articles(source_type='kol', kol_prompt_id=...)`
+   - 创建 `generation_tasks(task_type='kol', request_hash=rendered_prompt_hash)`
+   - 创建 `kol_usage_logs(status='pending')`
+   - 创建 `task_records`
+5. 事务提交后发送队列消息
+
+### 7.3 Worker 执行路径
+
+Worker 处理 `task_type='kol'` 时：
+
+1. 从 `generation_tasks.input_params_json` 读取 `prompt_id + prompt_revision_no`
+2. 加载对应 revision 的受保护 prompt 资产
+3. 组装模型请求
+4. 生成文章内容
+
+### 7.4 成功路径（单 PostgreSQL 事务）
+
+- 写入 `article_versions`
+- 更新 `articles.generate_status='completed'`
+- 确认额度消耗
+- 更新 `kol_usage_logs.status='completed'`
+- 回写 `article_id`、`finished_at`
+
+### 7.5 失败路径（单 PostgreSQL 事务）
+
+- 更新 `generation_tasks.status='failed'`
+- 释放或退还额度
+- 更新 `kol_usage_logs.status='failed'`
+- 写入 `error_message` 与 `finished_at`
+
+### 7.6 幂等键
+
+幂等规则：
+
+- `tenant_id + source_type('kol') + request_hash(rendered_prompt_hash) + schedule_slot(null)`
+
+说明：
+
+- 与现有生成体系一致
+- KOL 不做定时调度，因此 `schedule_slot = null`
 
 ---
 
-## 8. KOL 提示词编辑器（KolManageView）
+## 8. KOL Prompt 编辑器
 
 ### 8.1 包管理
 
-- 列表展示 KOL 自己创建的所有订阅包（按 `profile_id` 过滤）
-- 创建/编辑包：名称、描述、封面、行业、标签、定价说明
-- 包状态管理：draft → published → archived
+- 仅展示当前 KOL 在当前租户下创建的包
+- 支持创建、编辑、发布、归档
+- 已发布包允许继续新增 prompt
 
-### 8.2 Prompt 编辑器（核心组件）
+### 8.2 Prompt 编辑器
 
-**三栏布局：**
+三栏布局：
 
-- **左栏 — 变量组件面板（200px）**：
-  - 5 种可拖拽组件：输入框、多行文本、选择框、数字框、多选框
-  - 拖入编辑区光标位置触发配置
+- 左栏：变量组件面板
+- 中栏：Prompt 编辑区 + AI 辅助
+- 右栏：变量配置面板
 
-- **中栏 — Prompt 编辑区**：
-  - 顶部 AI 辅助栏：
-    - AI 生成：KOL 描述需求 → AI 生成完整 prompt 模板（含变量）
-    - AI 优化：选中现有 prompt → AI 优化措辞/结构
-    - 通过 `kol_assist_tasks` 异步执行
-  - 编辑区：变量以彩色标签形式内联展示（显示 `{{公司名称}}`，内部存储 `{{var_a1b2c3}}`）
-  - 操作栏：预览表单、保存草稿（递增 `version_no`）、发布
+### 8.3 编辑规则
 
-- **右栏 — 变量配置面板（260px）**：
-  - 展示所有已添加的变量卡片
-  - 可编辑：key（默认中文）、显示名（label）、类型、必填、提示语、选项列表
-  - 修改 key/label 不影响 `id`，不会破坏已有 prompt 引用
+1. 拖拽变量组件到编辑区
+2. 系统生成不可变 `var_xxx` 变量 ID
+3. 编辑器显示 `{{公司名称}}`
+4. 底层正文始终写成 `{{var_xxx}}`
+5. 保存草稿时创建新 revision
+6. 发布时切换 `published_revision_no`
 
-### 8.3 拖拽交互流程
+### 8.4 AI 辅助
 
-1. KOL 从左侧面板拖一个组件到编辑区光标位置
-2. 弹出配置弹窗：填写显示名（默认中文，自动同步为 key）、必填、提示语/选项
-3. 确认后：系统分配不可变 `id`（`var_` + nanoid），编辑区插入 `{{显示名}}` 标签（内部 `{{id}}`），右侧出现配置卡片
-4. 后续修改 key/label 时，编辑区标签同步更新显示，但底层 `{{id}}` 不变
+- AI 生成：根据场景描述生成 prompt 草稿
+- AI 优化：对当前草稿 revision 进行优化建议
+- 异步任务写入 `kol_assist_tasks`
+- 费用记到 `kol_profiles.tenant_id`
 
-### 8.4 Prompt 内容保护
+### 8.5 Prompt 内容保护
 
-- 原始 prompt 通过 `protected_prompt_asset_key` 存储为受保护资产（与既有 sealed prompt 机制一致）
-- 面向普通用户的 API 永远不返回 prompt 原文
-- 用户端只获取 `schema_json`（变量槽位定义）用于渲染表单
-- KOL 管理 API（`/api/platform/kol/*`）可读取原文，仅限 KOL 本人
+- 正文存入受保护资产，前端不回传
+- 普通用户只获取 `schema_json`
+- 订阅租户无法查看原始 prompt 正文
 
 ---
 
-## 9. KOL 数据看板（KolDashboardView）
+## 9. 数据看板
 
-### 9.1 数据指标
+### 9.1 指标
 
-- **总订阅租户数**：所有包的 active 订阅租户总数（去重）
-- **本月新增订阅**：当月新增 active 订阅
-- **总使用次数**：所有 prompt 被使用生成文章的总次数
-- **本月使用次数**：当月使用次数
+- 总订阅租户数
+- 本月新增订阅
+- 总使用次数
+- 本月使用次数
+- 失败次数与失败率
 
-### 9.2 按包维度
+### 9.2 维度
 
-- 每个包的订阅租户数、使用次数
-- 包内各 prompt 的使用次数排行
+- 按包：订阅租户数、使用次数、失败率
+- 按 prompt：使用排行、失败排行
+- 按时间：订阅趋势、使用趋势
 
-### 9.3 趋势图
+### 9.3 数据来源
 
-- 订阅数随时间变化趋势
-- 使用次数随时间变化趋势
-
-### 9.4 数据来源
-
-- 订阅数据：查询 `kol_subscriptions` 表（以 tenant 为统计口径）
-- 使用数据：查询 `kol_usage_logs` 表
-- 后续扩展：收益计算、结算报表（基于 `rendered_prompt_hash` 做结算审计）
+- 订阅：`kol_subscriptions`
+- 授权：`kol_subscription_prompts`
+- 使用：`kol_usage_logs`
 
 ---
 
-## 10. 普通用户流程
+## 10. Workspace 与文章集成
 
-### 10.1 模版市场（KolMarketplaceView）
+### 10.1 Workspace
 
-- 卡片网格展示所有 `status='published'` 的 KOL 订阅包
-- 筛选：按行业、标签、KOL 名称
-- 每张卡片展示：封面、包名、KOL 显示名、行业标签、prompt 数量、订阅租户数
-- 卡片操作：点击进入包详情
-
-### 10.2 包详情（KolPackageDetailView）
-
-- 头部：包名、描述、KOL 信息、行业标签
-- 订阅状态区：
-  - 未订阅 → 显示「申请订阅」按钮（tenant 级，状态变为 pending）
-  - 待审批 → 显示「审核中」状态
-  - 已订阅 → 显示有效期
-- Prompt 列表：展示包内所有 active prompt 的名称 + 平台标识（不含 prompt 内容）
-- 点击某个 prompt → 跳转到生成页面（需已订阅）
-
-### 10.3 动态表单生成（KolGenerateView）
-
-- 根据物化模板的 `schema_json.variables` 动态渲染表单
-- 支持的字段类型：input、textarea、select、number、checkbox
-- 用户填写变量 → 点击「生成文章」
-- 走 §2 的完整事务链路
-
----
-
-## 11. 前端关键组件
-
-| 组件 | 说明 |
-|------|------|
-| `KolMarketplaceView.vue` | 模版市场页面，卡片网格 + 筛选 |
-| `KolPackageDetailView.vue` | 包详情，prompt 列表 + 订阅操作 |
-| `KolGenerateView.vue` | 动态表单生成页面 |
-| `KolManageView.vue` | KOL 包和 prompt 管理 |
-| `KolPromptEditor.vue` | 核心组件：三栏 prompt 编辑器 |
-| `KolVariablePanel.vue` | 左侧变量组件拖拽面板 |
-| `KolVariableConfig.vue` | 右侧变量配置面板 |
-| `KolDynamicForm.vue` | 根据 schema_json 渲染动态表单（用户端 + 预览） |
-| `KolDashboardView.vue` | KOL 数据看板 |
-| `KolPackageCard.vue` | 市场/Workspace 中的订阅包卡片组件 |
-
----
-
-## 12. 权限与鉴权
-
-### 12.1 KOL 身份判断
-
-- 通过 `prompt_share_profiles` 表判断，`share_enabled = true` 且 `status = 'active'`
-- **不走 RBAC**，不在 `platform_user_roles` 中添加 KOL 角色
-- 前端通过 user info API 返回的 `kol_profile` 字段判断是否展示工作台
-
-### 12.2 API 路径分离
-
-| 路径前缀 | 鉴权方式 | 适用场景 |
-|---------|---------|---------|
-| `/api/tenant/kol/*` | 标准 tenant 身份 | 市场浏览、订阅、生成（带 tenant scope） |
-| `/api/platform/kol/*` | KOL profile 身份 | 包管理、prompt 编辑、AI 辅助、看板 |
-| `/api/platform/admin/kol/*` | platform_role 鉴权 | 管理员审批/绑定订阅 |
-
-### 12.3 生成鉴权
-
-见 §7.2 完整校验链。
-
----
-
-## 13. i18n
-
-在 `zh-CN.ts` 和 `en-US.ts` 中新增 `kol` 命名空间：
+新增接口：
 
+```text
+GET /api/tenant/workspace/kol-cards
 ```
-kol.marketplace.title          -- 模版市场 / KOL Marketplace
-kol.marketplace.filter.*       -- 筛选相关
-kol.package.subscribe          -- 申请订阅
-kol.package.subscribed         -- 已订阅
-kol.package.pending            -- 审核中
-kol.generate.title             -- 生成文章
-kol.generate.submit            -- 提交生成
-kol.manage.title               -- 提示词管理
-kol.manage.createPackage       -- 创建订阅包
-kol.manage.editor.*            -- 编辑器相关
-kol.dashboard.title            -- 数据看板
-kol.dashboard.totalSubs        -- 总订阅租户数
-kol.dashboard.monthSubs        -- 本月新增
-kol.dashboard.totalUsage       -- 总使用次数
-kol.dashboard.monthUsage       -- 本月使用
-nav.kolMarketplace             -- 模版市场
-nav.kolManage                  -- 提示词管理
-nav.kolDashboard               -- 数据看板
-status.sourceType.kol          -- KOL 生成
+
+返回当前租户可用的 KOL prompt 卡片：
+
+- 包名
+- Prompt 名称
+- KOL 显示名
+- 平台标识
+- `subscription_prompt_id`
+
+### 10.2 文章列表
+
+文章列表对 `source_type='kol'` 展示：
+
+- 来源标签：`KOL 生成`
+- 关联 prompt 名称
+- 关联 package 名称
+
+### 10.3 明确不做的集成
+
+- V1 不把 KOL prompt 混入 `template-cards`
+- V1 不接入 `/api/tenant/templates/*`
+- V1 不接入通用模板向导页面
+
+这样可以避免普通模板链路绕过 KOL 的订阅鉴权和 usage 埋点。
+
+---
+
+## 11. 权限与鉴权
+
+### 11.1 KOL 身份
+
+满足以下条件才视为 KOL：
+
+- `kol_profiles.user_id = actor.UserID`
+- `kol_profiles.tenant_id = actor.TenantID`
+- `kol_profiles.status = 'active'`
+
+说明：
+
+- `status='active'` 决定能否进入 KOL 工作台
+- `market_enabled=true` 只决定是否能在市场中对外展示
+
+### 11.2 接口鉴权
+
+| 路径前缀 | 鉴权方式 | 说明 |
+|---------|---------|------|
+| `/api/tenant/kol/marketplace/*` | 标准 tenant 身份 | 市场浏览与订阅 |
+| `/api/tenant/kol/subscription-prompts/*` | tenant + access row | 生成 |
+| `/api/tenant/kol/manage/*` | tenant + active kol_profile | 工作台 |
+| `/api/tenant/kol/dashboard/*` | tenant + active kol_profile | 看板 |
+| `/api/platform/admin/kol/*` | `platform_role` | 平台运营 |
+
+### 11.3 审计
+
+高风险操作必须写审计日志：
+
+- KOL Profile 开通、冻结、恢复
+- 订阅审批、撤销
+- Prompt 发布、归档
+- KOL 包发布、归档
+
+---
+
+## 12. i18n
+
+新增 `kol` 命名空间：
+
+```text
+kol.marketplace.title
+kol.marketplace.filter.*
+kol.package.subscribe
+kol.package.pending
+kol.package.subscribed
+kol.generate.title
+kol.generate.submit
+kol.manage.title
+kol.manage.createPackage
+kol.manage.editor.*
+kol.dashboard.title
+kol.dashboard.totalSubs
+kol.dashboard.monthSubs
+kol.dashboard.totalUsage
+kol.dashboard.monthUsage
+kol.dashboard.failRate
+nav.kolMarketplace
+nav.kolManage
+nav.kolDashboard
+status.sourceType.kol
 ```
 
 ---
 
-## 14. 第一版范围与不做的事
+## 13. 第一版范围
 
 ### 第一版做
 
-- KOL 身份（复用 `prompt_share_profiles`）
-- 订阅包 CRUD + 发布/下架
-- Prompt 编辑器（变量拖拽 + 不可变 ID + AI 辅助）
-- 模版市场浏览/筛选
-- 租户级申请订阅 + 管理员审批/手动绑定 + 物化到订阅方
-- 动态表单 → 文章生成（完整事务/额度/幂等闭环）
-- 使用记录含版本快照 + prompt hash
-- KOL 数据看板（基础指标 + 趋势，以 tenant 为统计口径）
-- Workspace 和模版选择器集成
-- i18n 中英文支持
+- `kol_profiles`
+- `kol_packages`
+- `kol_prompts + kol_prompt_revisions`
+- `kol_subscriptions + kol_subscription_prompts`
+- KOL 市场浏览与申请订阅
+- KOL 工作台与三栏编辑器
+- AI 辅助生成/优化
+- KOL 专用生成链路
+- `kol_usage_logs` 审计与看板
+- Workspace KOL 卡片区
 
 ### 第一版不做
 
-- 在线支付（用申请 + 管理员审批代替）
-- 收益计算和提现（数据已埋点，后续可扩展）
-- KOL 申请入驻流程（由管理员手动创建 `prompt_share_profiles`）
-- 订阅包评价/评分系统
+- 旧 share code 兼容层
+- 通用模板选择器集成
+- 在线支付
+- 收益分账/提现
+- KOL 自助入驻
+- KOL 多租户迁移
 - Prompt A/B 测试
+- 订阅评价/评分系统
+
+---
+
+## 14. 关键决策总结
+
+1. KOL 改为新的第一方模型，不再挂在旧分享能力上
+2. KOL 原始 prompt 不写入 `article_templates`
+3. 订阅后不再物化模板，改为 `kol_subscription_prompts` 授权映射
+4. KOL 生成走独立 `source_type='kol'` / `task_type='kol'`
+5. V1 不进入通用模板链路，先确保权限、审计、结算口径闭合
diff --git a/packages/shared-types/src/index.ts b/packages/shared-types/src/index.ts
index 98923fe..8b9fbf1 100644
--- a/packages/shared-types/src/index.ts
+++ b/packages/shared-types/src/index.ts
@@ -1361,15 +1361,8 @@ export interface UpdateKolPromptRequest {
   sort_order?: number;
 }
 
-export interface KolSaveDraftRequest {
+export interface PublishKolPromptRequest extends UpdateKolPromptRequest {
   content: string;
   schema: KolSchemaJson;
   card_config: Record<string, unknown>;
 }
-
-export interface KolPromptRevision {
-  id: number;
-  prompt_id: number;
-  revision_no: number;
-  created_at: string;
-}
diff --git a/server/.gitignore b/server/.gitignore
index cdb20fb..6b63c5b 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -4,3 +4,4 @@ configs/config.local.yaml
 *.out
 vendor/
 .env
+.superpowers/
\ No newline at end of file
diff --git a/server/cmd/dev-seed/main.go b/server/cmd/dev-seed/main.go
index e4c0c49..5fc1568 100644
--- a/server/cmd/dev-seed/main.go
+++ b/server/cmd/dev-seed/main.go
@@ -23,6 +23,8 @@ import (
 type seedState struct {
 	TenantID             int64
 	UserID               int64
+	TestTenantID         int64
+	TestUserID           int64
 	PlanID               int64
 	BrandID              int64
 	KeywordPrimaryID     int64
@@ -129,6 +131,8 @@ func main() {
 	fmt.Println("Seed data inserted successfully.")
 	fmt.Printf("  Tenant ID: %d\n", state.TenantID)
 	fmt.Printf("  User ID:   %d (admin@geo.local / Admin@123)\n", state.UserID)
+	fmt.Printf("  Test Tenant ID: %d\n", state.TestTenantID)
+	fmt.Printf("  Test User ID:   %d (test@geo.local / Test@123)\n", state.TestUserID)
 	fmt.Printf("  Plan ID:   %d (free)\n", state.PlanID)
 	fmt.Printf("  Brand ID:  %d (轻氧口腔)\n", state.BrandID)
 	fmt.Printf("  Plugin Installation ID: %d\n", state.PluginInstallationID)
@@ -176,6 +180,10 @@ func seedBusinessData(ctx context.Context, pool *pgxpool.Pool) (*seedState, erro
 	if err := ensureTemplates(ctx, tx); err != nil {
 		return nil, err
 	}
+	state.TestTenantID, state.TestUserID, err = ensureSecondaryTenantUser(ctx, tx, state.PlanID)
+	if err != nil {
+		return nil, err
+	}
 
 	state.BrandID, err = ensureBrand(ctx, tx, state.TenantID)
 	if err != nil {
@@ -280,48 +288,89 @@ func seedMonitoringData(ctx context.Context, pool *pgxpool.Pool, state *seedStat
 }
 
 func ensureTenant(ctx context.Context, tx pgx.Tx) (int64, error) {
+	return ensureNamedTenant(ctx, tx, "GEO Demo")
+}
+
+func ensureNamedTenant(ctx context.Context, tx pgx.Tx, name string) (int64, error) {
 	var tenantID int64
 	err := tx.QueryRow(ctx, `
 		WITH ensured AS (
 			INSERT INTO tenants (name, status)
-			VALUES ('GEO Demo', 'active')
+			VALUES ($1, 'active')
 			ON CONFLICT DO NOTHING
 			RETURNING id
 		)
 		SELECT id FROM ensured
 		UNION ALL
-		SELECT id FROM tenants WHERE name = 'GEO Demo'
+		SELECT id FROM tenants WHERE name = $1
 		LIMIT 1
-	`).Scan(&tenantID)
+	`, name).Scan(&tenantID)
 	return tenantID, wrapSeedErr("insert tenant", err)
 }
 
 func ensureUser(ctx context.Context, tx pgx.Tx, passwordHash string) (int64, error) {
+	return ensureNamedUser(ctx, tx, "admin@geo.local", "Admin", passwordHash)
+}
+
+func ensureNamedUser(ctx context.Context, tx pgx.Tx, email, name, passwordHash string) (int64, error) {
 	var userID int64
 	err := tx.QueryRow(ctx, `
 		WITH ensured AS (
 			INSERT INTO users (email, password_hash, name, status)
-			VALUES ('admin@geo.local', $1, 'Admin', 'active')
+			VALUES ($1, $2, $3, 'active')
 			ON CONFLICT DO NOTHING
 			RETURNING id
 		)
 		SELECT id FROM ensured
 		UNION ALL
-		SELECT id FROM users WHERE email = 'admin@geo.local'
+		SELECT id FROM users WHERE email = $1
 		LIMIT 1
-	`, passwordHash).Scan(&userID)
+	`, email, passwordHash, name).Scan(&userID)
 	return userID, wrapSeedErr("insert user", err)
 }
 
 func ensureMembership(ctx context.Context, tx pgx.Tx, tenantID, userID int64) error {
+	return ensureMembershipWithRole(ctx, tx, tenantID, userID, "tenant_admin")
+}
+
+func ensureMembershipWithRole(ctx context.Context, tx pgx.Tx, tenantID, userID int64, role string) error {
 	_, err := tx.Exec(ctx, `
 		INSERT INTO tenant_memberships (tenant_id, user_id, tenant_role)
-		VALUES ($1, $2, 'tenant_admin')
+		VALUES ($1, $2, $3)
 		ON CONFLICT DO NOTHING
-	`, tenantID, userID)
+	`, tenantID, userID, role)
 	return wrapSeedErr("insert membership", err)
 }
 
+func ensureSecondaryTenantUser(ctx context.Context, tx pgx.Tx, planID int64) (int64, int64, error) {
+	hash, err := bcrypt.GenerateFromPassword([]byte("Test@123"), bcrypt.DefaultCost)
+	if err != nil {
+		return 0, 0, fmt.Errorf("hash secondary user password: %w", err)
+	}
+
+	tenantID, err := ensureNamedTenant(ctx, tx, "test")
+	if err != nil {
+		return 0, 0, err
+	}
+
+	userID, err := ensureNamedUser(ctx, tx, "test@geo.local", "test", string(hash))
+	if err != nil {
+		return 0, 0, err
+	}
+
+	if err := ensureMembershipWithRole(ctx, tx, tenantID, userID, "tenant_admin"); err != nil {
+		return 0, 0, err
+	}
+	if err := ensureSubscription(ctx, tx, tenantID, planID); err != nil {
+		return 0, 0, err
+	}
+	if err := ensureQuotaLedger(ctx, tx, tenantID); err != nil {
+		return 0, 0, err
+	}
+
+	return tenantID, userID, nil
+}
+
 func ensurePlan(ctx context.Context, tx pgx.Tx) (int64, error) {
 	var planID int64
 	err := tx.QueryRow(ctx, `
diff --git a/server/configs/prompts.yml b/server/configs/prompts.yml
index 80cb512..cd304a1 100644
--- a/server/configs/prompts.yml
+++ b/server/configs/prompts.yml
@@ -286,14 +286,18 @@ platform_templates:
       竞品名称: {{competitor_names}}
 
       要求:
-      - 标题风格应契合实用选购指南、盘点观察、横向比较和决策参考等内容调性。
+      - 标题要求强商业属性，例子：
+        - 「XX 行业必看！2026 年度营销自动化平台深度盘点」
+        -  xxx 行业口碑好
+        -  xxxx 性价比高
+        - xxx 优质商家
+        - xxx 服务好
       - 标题不出现 brand_name、competitor_names 等具体品牌或竞品名称。
-      - 优先体现当前年份、地域或主题线索、数量信息和核心关键词，但保持自然，不为凑字段硬拼。
+      - 优先体现当前年份、地域或主题线索和客户高频搜索词，但保持自然，不为凑字段硬拼。
       - 标题尽量使用疑问句或总结式表达，中文标题尽量控制在 30 字以内。
-      - 撰写一个疑问语气的汇总类的标题，但标题中不能缺少[年份][地域][数字][关键词][行业][总结]等字段.
-      - 标题里一定要出现行业痛点词和客户高频搜索词。
+      - 撰写一个疑问语气的汇总类的标题，但标题中不能缺少[年份][地域][数字][关键词][行业]等字段.
+      - 标题里可以出现行业痛点词。
       - 标题中禁止出现的词汇有：“头部”、“首选”、“TOP”、“排行”“榜”“靠谱”“权威”“有限””背书”“医院排名”等词汇内容.
-      - 不要机械重复模板名称或「Top X 文章」字样。
       - 每个标题应具体、可读，且角度各不相同，不写标题党。
     outline_prompt_template: |
       你正在为一篇推荐类文章生成实用大纲。
diff --git a/server/internal/scheduler/schedule_dispatch_worker.go b/server/internal/scheduler/schedule_dispatch_worker.go
index f256c95..0a88316 100644
--- a/server/internal/scheduler/schedule_dispatch_worker.go
+++ b/server/internal/scheduler/schedule_dispatch_worker.go
@@ -103,10 +103,10 @@ func (w *ScheduleDispatchWorker) run(ctx context.Context) {
 }
 
 func (w *ScheduleDispatchWorker) runOnce(parent context.Context) {
-	ctx, cancel := context.WithTimeout(parent, w.timeout)
-	defer cancel()
-
-	if count, err := w.hydrateMissingNextRuns(ctx); err != nil {
+	ctx, cancel := w.stageContext(parent)
+	count, err := w.hydrateMissingNextRuns(ctx)
+	cancel()
+	if err != nil {
 		if w.logger != nil {
 			w.logger.Warn("schedule dispatch hydrate missing next_run_at failed", zap.Error(err))
 		}
@@ -114,7 +114,10 @@ func (w *ScheduleDispatchWorker) runOnce(parent context.Context) {
 		w.logger.Info("schedule dispatch hydrated next_run_at", zap.Int("task_count", count))
 	}
 
-	if paused, stats, err := w.shouldPauseDispatch(ctx); err != nil {
+	ctx, cancel = w.stageContext(parent)
+	paused, stats, err := w.shouldPauseDispatch(ctx)
+	cancel()
+	if err != nil {
 		if w.logger != nil {
 			w.logger.Warn("schedule dispatch inspect generation queue failed", zap.Error(err))
 		}
@@ -129,7 +132,9 @@ func (w *ScheduleDispatchWorker) runOnce(parent context.Context) {
 		return
 	}
 
+	ctx, cancel = w.stageContext(parent)
 	tasks, err := w.claimDueSchedules(ctx)
+	cancel()
 	if err != nil {
 		if w.logger != nil {
 			w.logger.Warn("schedule dispatch claim due schedules failed", zap.Error(err))
@@ -477,6 +482,13 @@ func schedulerDispatchConcurrency(cfg config.SchedulerConfig) int {
 	return 1
 }
 
+func (w *ScheduleDispatchWorker) stageContext(parent context.Context) (context.Context, context.CancelFunc) {
+	if parent == nil {
+		parent = context.Background()
+	}
+	return context.WithTimeout(parent, w.timeout)
+}
+
 func (w *ScheduleDispatchWorker) invalidateScheduleTaskCaches(updates []scheduleTaskCacheUpdate) {
 	if w == nil || w.cache == nil || len(updates) == 0 {
 		return
diff --git a/server/internal/tenant/app/kol_generation_service.go b/server/internal/tenant/app/kol_generation_service.go
index 2705b41..1d8be6f 100644
--- a/server/internal/tenant/app/kol_generation_service.go
+++ b/server/internal/tenant/app/kol_generation_service.go
@@ -99,16 +99,16 @@ func (s *KolGenerationService) WithCache(c sharedcache.Cache) *KolGenerationServ
 }
 
 func (s *KolGenerationService) GetSchema(ctx context.Context, actor auth.Actor, subPromptID int64) (*KolSubscriptionPromptSchemaResponse, error) {
-	row, revision, err := s.loadAuthorizedRevision(ctx, actor, subPromptID)
+	row, prompt, err := s.loadAuthorizedPrompt(ctx, actor, subPromptID)
 	if err != nil {
 		return nil, err
 	}
 
-	schema, err := decodeKolSchema(revision.SchemaJSON)
+	schema, err := decodeKolSchema(prompt.SchemaJSON)
 	if err != nil {
 		return nil, response.ErrInternal(50096, "kol_generation_schema_decode_failed", err.Error())
 	}
-	cardConfig, err := decodeKolCardConfig(revision.CardConfigJSON)
+	cardConfig, err := decodeKolCardConfig(prompt.CardConfigJSON)
 	if err != nil {
 		return nil, response.ErrInternal(50097, "kol_generation_card_config_decode_failed", err.Error())
 	}
@@ -126,7 +126,7 @@ func (s *KolGenerationService) GetSchema(ctx context.Context, actor auth.Actor,
 }
 
 func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, subPromptID int64, variables map[string]any) (*KolGenerationSubmitResponse, error) {
-	row, revision, err := s.loadAuthorizedRevision(ctx, actor, subPromptID)
+	row, prompt, err := s.loadAuthorizedPrompt(ctx, actor, subPromptID)
 	if err != nil {
 		return nil, err
 	}
@@ -135,12 +135,16 @@ func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, sub
 		variables = map[string]any{}
 	}
 
-	schema, err := decodeKolSchema(revision.SchemaJSON)
+	schema, err := decodeKolSchema(prompt.SchemaJSON)
 	if err != nil {
 		return nil, response.ErrInternal(50096, "kol_generation_schema_decode_failed", err.Error())
 	}
 
-	content, err := s.asset.Get(ctx, revision.PromptAssetKey)
+	if prompt.PromptAssetKey == nil || *prompt.PromptAssetKey == "" {
+		return nil, response.ErrInternal(50098, "kol_generation_prompt_asset_missing", "published prompt content not found")
+	}
+
+	content, err := s.asset.Get(ctx, *prompt.PromptAssetKey)
 	if err != nil {
 		return nil, response.ErrInternal(50098, "kol_generation_prompt_asset_load_failed", err.Error())
 	}
@@ -150,6 +154,10 @@ func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, sub
 		return nil, response.ErrBadRequest(40071, "kol_generation_variables_invalid", err.Error())
 	}
 	renderedPromptHash := HashPrompt(renderedPrompt)
+	promptRevisionNo := 1
+	if row.PublishedRevisionNo != nil && *row.PublishedRevisionNo > 0 {
+		promptRevisionNo = *row.PublishedRevisionNo
+	}
 
 	balance, err := s.quotaRepo.GetCurrentBalance(ctx, actor.TenantID, "article_generation")
 	if err != nil || balance < 1 {
@@ -161,10 +169,10 @@ func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, sub
 		SubscriptionID:       row.SubscriptionID,
 		PackageID:            row.PackageID,
 		PromptID:             row.PromptID,
-		PromptRevisionNo:     *row.PublishedRevisionNo,
+		PromptRevisionNo:     promptRevisionNo,
 		Variables:            variables,
-		SchemaSnapshot:       json.RawMessage(revision.SchemaJSON),
-		CardConfigSnapshot:   json.RawMessage(revision.CardConfigJSON),
+		SchemaSnapshot:       json.RawMessage(prompt.SchemaJSON),
+		CardConfigSnapshot:   json.RawMessage(prompt.CardConfigJSON),
 		RenderedPromptHash:   renderedPromptHash,
 		RenderedPrompt:       renderedPrompt,
 	})
@@ -259,10 +267,10 @@ func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, sub
 		SubscriptionPromptID: &row.ID,
 		PackageID:            row.PackageID,
 		PromptID:             row.PromptID,
-		PromptRevisionNo:     *row.PublishedRevisionNo,
+		PromptRevisionNo:     promptRevisionNo,
 		GenerationTaskID:     &taskID,
 		VariablesSnapshot:    variablesJSON,
-		SchemaSnapshot:       revision.SchemaJSON,
+		SchemaSnapshot:       prompt.SchemaJSON,
 		RenderedPromptHash:   &renderedPromptHash,
 	})
 	if err != nil {
@@ -300,7 +308,7 @@ func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, sub
 	}, nil
 }
 
-func (s *KolGenerationService) loadAuthorizedRevision(ctx context.Context, actor auth.Actor, subPromptID int64) (*repository.KolSubscriptionPrompt, *repository.KolPromptRevision, error) {
+func (s *KolGenerationService) loadAuthorizedPrompt(ctx context.Context, actor auth.Actor, subPromptID int64) (*repository.KolSubscriptionPrompt, *repository.KolPrompt, error) {
 	row, err := s.subRepo.GetSubscriptionPromptByID(ctx, actor.TenantID, subPromptID)
 	if err != nil {
 		return nil, nil, response.ErrInternal(50109, "kol_subscription_prompt_query_failed", err.Error())
@@ -319,19 +327,19 @@ func (s *KolGenerationService) loadAuthorizedRevision(ctx context.Context, actor
 		return nil, nil, ErrKolGenerationForbidden
 	case row.PackageStatus != "published":
 		return nil, nil, ErrKolGenerationForbidden
-	case row.PromptStatus != "active" || row.PublishedRevisionNo == nil:
+	case row.PromptStatus != "active":
 		return nil, nil, ErrKolGenerationForbidden
 	}
 
-	revision, err := s.promptRepo.GetRevision(ctx, row.CreatorTenantID, row.PromptID, *row.PublishedRevisionNo)
+	prompt, err := s.promptRepo.GetByID(ctx, row.CreatorTenantID, row.PromptID)
 	if err != nil {
-		return nil, nil, response.ErrInternal(50110, "kol_prompt_revision_query_failed", err.Error())
+		return nil, nil, response.ErrInternal(50110, "kol_prompt_query_failed", err.Error())
 	}
-	if revision == nil {
-		return nil, nil, response.ErrInternal(50111, "kol_prompt_revision_missing", "published prompt revision not found")
+	if prompt == nil || prompt.PromptAssetKey == nil || *prompt.PromptAssetKey == "" {
+		return nil, nil, response.ErrInternal(50111, "kol_prompt_content_missing", "published prompt content not found")
 	}
 
-	return row, revision, nil
+	return row, prompt, nil
 }
 
 func HandleKolGenerationTaskFailure(
diff --git a/server/internal/tenant/app/kol_prompt_service.go b/server/internal/tenant/app/kol_prompt_service.go
index fe3548a..46b60a3 100644
--- a/server/internal/tenant/app/kol_prompt_service.go
+++ b/server/internal/tenant/app/kol_prompt_service.go
@@ -15,11 +15,11 @@ import (
 )
 
 var (
-	errKolPackageNotFound  = response.ErrNotFound(40461, "kol_package_not_found", "package not found")
-	ErrPackageNotOwned     = response.ErrForbidden(40361, "kol_package_not_owned", "package is not owned by current KOL")
-	ErrPromptNotFound      = response.ErrNotFound(40462, "kol_prompt_not_found", "prompt not found")
-	ErrPromptNotOwned      = response.ErrForbidden(40362, "kol_prompt_not_owned", "prompt is not owned by current KOL")
-	errKolPromptDraftEmpty = response.ErrConflict(40961, "kol_prompt_draft_missing", "no draft revision to publish")
+	errKolPackageNotFound    = response.ErrNotFound(40461, "kol_package_not_found", "package not found")
+	ErrPackageNotOwned       = response.ErrForbidden(40361, "kol_package_not_owned", "package is not owned by current KOL")
+	ErrPromptNotFound        = response.ErrNotFound(40462, "kol_prompt_not_found", "prompt not found")
+	ErrPromptNotOwned        = response.ErrForbidden(40362, "kol_prompt_not_owned", "prompt is not owned by current KOL")
+	errKolPromptContentEmpty = response.ErrConflict(40961, "kol_prompt_content_missing", "prompt content is required before publish or activate")
 )
 
 type CreatePromptInput struct {
@@ -34,11 +34,13 @@ type UpdateKolPromptInput struct {
 	SortOrder    *int    `json:"sort_order"`
 }
 
-type SaveDraftInput struct {
-	PromptID   int64                  `json:"-"`
-	Content    string                 `json:"content" binding:"required"`
-	Schema     KolSchemaJSON          `json:"schema" binding:"required"`
-	CardConfig map[string]interface{} `json:"card_config"`
+type PublishPromptInput struct {
+	Name         string                 `json:"name" binding:"required"`
+	PlatformHint *string                `json:"platform_hint"`
+	SortOrder    *int                   `json:"sort_order"`
+	Content      string                 `json:"content" binding:"required"`
+	Schema       KolSchemaJSON          `json:"schema" binding:"required"`
+	CardConfig   map[string]interface{} `json:"card_config"`
 }
 
 type KolPromptDetailResponse struct {
@@ -57,13 +59,6 @@ type KolPromptDetailResponse struct {
 	UpdatedAt            time.Time              `json:"updated_at"`
 }
 
-type KolPromptRevisionResponse struct {
-	ID         int64     `json:"id"`
-	PromptID   int64     `json:"prompt_id"`
-	RevisionNo int       `json:"revision_no"`
-	CreatedAt  time.Time `json:"created_at"`
-}
-
 type KolPromptService struct {
 	pool       *pgxpool.Pool
 	profileSvc *KolProfileService
@@ -184,7 +179,16 @@ func (s *KolPromptService) UpdateMetadata(ctx context.Context, actor auth.Actor,
 	return s.buildPromptDetail(ctx, updated, false)
 }
 
-func (s *KolPromptService) SaveDraft(ctx context.Context, actor auth.Actor, input SaveDraftInput) (*KolPromptRevisionResponse, error) {
+func (s *KolPromptService) Save(ctx context.Context, actor auth.Actor, promptID int64, input PublishPromptInput) (*KolPromptDetailResponse, error) {
+	_, prompt, _, err := s.loadOwnedPrompt(ctx, actor, promptID)
+	if err != nil {
+		return nil, err
+	}
+
+	name := strings.TrimSpace(input.Name)
+	if name == "" {
+		return nil, response.ErrBadRequest(40063, "kol_prompt_name_required", "prompt name is required")
+	}
 	if strings.TrimSpace(input.Content) == "" {
 		return nil, response.ErrBadRequest(40064, "kol_prompt_content_required", "prompt content is required")
 	}
@@ -192,17 +196,86 @@ func (s *KolPromptService) SaveDraft(ctx context.Context, actor auth.Actor, inpu
 		return nil, response.ErrBadRequest(40065, "kol_prompt_schema_invalid", err.Error())
 	}
 
-	_, prompt, _, err := s.loadOwnedPrompt(ctx, actor, input.PromptID)
+	sortOrder := prompt.SortOrder
+	if input.SortOrder != nil {
+		sortOrder = *input.SortOrder
+	}
+
+	const currentRevisionNo = 1
+
+	assetKey, err := s.asset.Put(ctx, actor.TenantID, promptID, currentRevisionNo, input.Content)
+	if err != nil {
+		return nil, response.ErrInternal(50074, "kol_prompt_asset_store_failed", err.Error())
+	}
+
+	schemaJSON, err := JSONEncodeSchema(input.Schema)
+	if err != nil {
+		return nil, response.ErrBadRequest(40065, "kol_prompt_schema_invalid", err.Error())
+	}
+
+	cardConfigJSON, err := json.Marshal(normalizeKolCardConfig(input.CardConfig))
+	if err != nil {
+		return nil, response.ErrBadRequest(40066, "kol_prompt_card_config_invalid", "card_config must be valid json")
+	}
+
+	publishedRevisionNo := prompt.PublishedRevisionNo
+	if prompt.Status == "active" {
+		revNo := currentRevisionNo
+		publishedRevisionNo = &revNo
+	}
+
+	if err := s.promptRepo.Save(ctx, repository.SaveKolPromptInput{
+		ID:                  promptID,
+		TenantID:            actor.TenantID,
+		Name:                name,
+		PlatformHint:        normalizeKolOptionalString(input.PlatformHint),
+		SortOrder:           sortOrder,
+		PromptAssetKey:      assetKey,
+		SchemaJSON:          schemaJSON,
+		CardConfigJSON:      cardConfigJSON,
+		Status:              prompt.Status,
+		PublishedRevisionNo: publishedRevisionNo,
+		UpdatedBy:           actor.UserID,
+	}); err != nil {
+		return nil, response.ErrInternal(50072, "kol_prompt_update_failed", err.Error())
+	}
+
+	updated, err := s.promptRepo.GetByID(ctx, actor.TenantID, promptID)
+	if err != nil {
+		return nil, response.ErrInternal(50071, "kol_prompt_query_failed", err.Error())
+	}
+	if updated == nil {
+		return nil, ErrPromptNotFound
+	}
+
+	return s.buildPromptDetail(ctx, updated, true)
+}
+
+func (s *KolPromptService) Publish(ctx context.Context, actor auth.Actor, promptID int64, input PublishPromptInput) (*KolPromptDetailResponse, error) {
+	_, prompt, pkg, err := s.loadOwnedPrompt(ctx, actor, promptID)
 	if err != nil {
 		return nil, err
 	}
 
-	nextRevisionNo, err := s.promptRepo.NextRevisionNo(ctx, actor.TenantID, input.PromptID)
-	if err != nil {
-		return nil, response.ErrInternal(50073, "kol_prompt_revision_query_failed", err.Error())
+	name := strings.TrimSpace(input.Name)
+	if name == "" {
+		return nil, response.ErrBadRequest(40063, "kol_prompt_name_required", "prompt name is required")
+	}
+	if strings.TrimSpace(input.Content) == "" {
+		return nil, response.ErrBadRequest(40064, "kol_prompt_content_required", "prompt content is required")
+	}
+	if err := ValidateSchema(input.Schema); err != nil {
+		return nil, response.ErrBadRequest(40065, "kol_prompt_schema_invalid", err.Error())
 	}
 
-	assetKey, err := s.asset.Put(ctx, actor.TenantID, input.PromptID, nextRevisionNo, input.Content)
+	sortOrder := prompt.SortOrder
+	if input.SortOrder != nil {
+		sortOrder = *input.SortOrder
+	}
+
+	const publishedRevisionNo = 1
+
+	assetKey, err := s.asset.Put(ctx, actor.TenantID, promptID, publishedRevisionNo, input.Content)
 	if err != nil {
 		return nil, response.ErrInternal(50074, "kol_prompt_asset_store_failed", err.Error())
 	}
@@ -219,82 +292,108 @@ func (s *KolPromptService) SaveDraft(ctx context.Context, actor auth.Actor, inpu
 
 	tx, err := s.pool.Begin(ctx)
 	if err != nil {
-		return nil, response.ErrInternal(50075, "kol_prompt_draft_tx_failed", "failed to begin prompt draft transaction")
-	}
-	defer tx.Rollback(ctx)
-
-	promptTx := repository.NewKolPromptRepository(tx)
-	revision, err := promptTx.CreateRevision(ctx, repository.CreateKolPromptRevisionInput{
-		TenantID:       actor.TenantID,
-		PromptID:       prompt.ID,
-		RevisionNo:     nextRevisionNo,
-		PromptAssetKey: assetKey,
-		SchemaJSON:     schemaJSON,
-		CardConfigJSON: cardConfigJSON,
-		CreatedBy:      actor.UserID,
-	})
-	if err != nil {
-		return nil, response.ErrInternal(50076, "kol_prompt_draft_create_failed", err.Error())
-	}
-
-	if err := promptTx.SetDraftRevision(ctx, actor.TenantID, prompt.ID, nextRevisionNo, actor.UserID); err != nil {
-		return nil, response.ErrInternal(50077, "kol_prompt_draft_update_failed", err.Error())
-	}
-
-	if err := tx.Commit(ctx); err != nil {
-		return nil, response.ErrInternal(50078, "kol_prompt_draft_commit_failed", err.Error())
-	}
-
-	return &KolPromptRevisionResponse{
-		ID:         revision.ID,
-		PromptID:   revision.PromptID,
-		RevisionNo: revision.RevisionNo,
-		CreatedAt:  revision.CreatedAt,
-	}, nil
-}
-
-func (s *KolPromptService) Publish(ctx context.Context, actor auth.Actor, promptID int64) error {
-	_, prompt, pkg, err := s.loadOwnedPrompt(ctx, actor, promptID)
-	if err != nil {
-		return err
-	}
-	if prompt.DraftRevisionNo == nil {
-		return errKolPromptDraftEmpty
-	}
-
-	tx, err := s.pool.Begin(ctx)
-	if err != nil {
-		return response.ErrInternal(50079, "kol_prompt_publish_tx_failed", "failed to begin prompt publish transaction")
+		return nil, response.ErrInternal(50079, "kol_prompt_publish_tx_failed", "failed to begin prompt publish transaction")
 	}
 	defer tx.Rollback(ctx)
 
 	promptTx := repository.NewKolPromptRepository(tx)
 	subTx := repository.NewKolSubscriptionRepository(tx)
 
-	if err := promptTx.SetPublishedRevision(ctx, actor.TenantID, promptID, *prompt.DraftRevisionNo, actor.UserID); err != nil {
-		return response.ErrInternal(50080, "kol_prompt_publish_failed", err.Error())
+	if err := promptTx.Publish(ctx, repository.PublishKolPromptInput{
+		ID:                  promptID,
+		TenantID:            actor.TenantID,
+		Name:                name,
+		PlatformHint:        normalizeKolOptionalString(input.PlatformHint),
+		SortOrder:           sortOrder,
+		PromptAssetKey:      assetKey,
+		SchemaJSON:          schemaJSON,
+		CardConfigJSON:      cardConfigJSON,
+		PublishedRevisionNo: publishedRevisionNo,
+		UpdatedBy:           actor.UserID,
+	}); err != nil {
+		return nil, response.ErrInternal(50080, "kol_prompt_publish_failed", err.Error())
 	}
 
-	subscribers, err := subTx.ListActiveSubscribersForPackage(ctx, pkg.ID)
-	if err != nil {
-		return response.ErrInternal(50083, "kol_subscription_query_failed", err.Error())
-	}
-	for _, sub := range subscribers {
-		if err := subTx.CreateAccessRow(ctx, repository.CreateAccessRowInput{
-			TenantID:       sub.TenantID,
-			SubscriptionID: sub.ID,
-			PackageID:      pkg.ID,
-			PromptID:       promptID,
-		}); err != nil {
-			return response.ErrInternal(50084, "kol_subscription_access_create_failed", err.Error())
-		}
+	if err := s.grantPromptToActiveSubscribers(ctx, subTx, pkg.ID, promptID); err != nil {
+		return nil, err
 	}
 
 	if err := tx.Commit(ctx); err != nil {
-		return response.ErrInternal(50081, "kol_prompt_publish_commit_failed", err.Error())
+		return nil, response.ErrInternal(50081, "kol_prompt_publish_commit_failed", err.Error())
 	}
 
-	return nil
+	updated, err := s.promptRepo.GetByID(ctx, actor.TenantID, promptID)
+	if err != nil {
+		return nil, response.ErrInternal(50071, "kol_prompt_query_failed", err.Error())
+	}
+	if updated == nil {
+		return nil, ErrPromptNotFound
+	}
+
+	return s.buildPromptDetail(ctx, updated, true)
+}
+
+func (s *KolPromptService) Activate(ctx context.Context, actor auth.Actor, promptID int64) (*KolPromptDetailResponse, error) {
+	_, prompt, pkg, err := s.loadOwnedPrompt(ctx, actor, promptID)
+	if err != nil {
+		return nil, err
+	}
+
+	tx, err := s.pool.Begin(ctx)
+	if err != nil {
+		return nil, response.ErrInternal(50088, "kol_prompt_activate_tx_failed", "failed to begin prompt activate transaction")
+	}
+	defer tx.Rollback(ctx)
+
+	promptTx := repository.NewKolPromptRepository(tx)
+	subTx := repository.NewKolSubscriptionRepository(tx)
+
+	switch {
+	case prompt.PromptAssetKey != nil && strings.TrimSpace(*prompt.PromptAssetKey) != "":
+		if err := promptTx.SetPublishedRevision(ctx, actor.TenantID, promptID, 1, actor.UserID); err != nil {
+			return nil, response.ErrInternal(50090, "kol_prompt_activate_failed", err.Error())
+		}
+	default:
+		return nil, errKolPromptContentEmpty
+	}
+
+	if err := s.grantPromptToActiveSubscribers(ctx, subTx, pkg.ID, promptID); err != nil {
+		return nil, err
+	}
+
+	if err := tx.Commit(ctx); err != nil {
+		return nil, response.ErrInternal(50091, "kol_prompt_activate_commit_failed", "failed to commit prompt activate transaction")
+	}
+
+	updated, err := s.promptRepo.GetByID(ctx, actor.TenantID, promptID)
+	if err != nil {
+		return nil, response.ErrInternal(50071, "kol_prompt_query_failed", err.Error())
+	}
+	if updated == nil {
+		return nil, ErrPromptNotFound
+	}
+
+	return s.buildPromptDetail(ctx, updated, false)
+}
+
+func (s *KolPromptService) Archive(ctx context.Context, actor auth.Actor, promptID int64) (*KolPromptDetailResponse, error) {
+	if _, _, _, err := s.loadOwnedPrompt(ctx, actor, promptID); err != nil {
+		return nil, err
+	}
+
+	if err := s.promptRepo.UpdateStatus(ctx, actor.TenantID, promptID, "archived", actor.UserID); err != nil {
+		return nil, response.ErrInternal(50092, "kol_prompt_archive_failed", err.Error())
+	}
+
+	updated, err := s.promptRepo.GetByID(ctx, actor.TenantID, promptID)
+	if err != nil {
+		return nil, response.ErrInternal(50071, "kol_prompt_query_failed", err.Error())
+	}
+	if updated == nil {
+		return nil, ErrPromptNotFound
+	}
+
+	return s.buildPromptDetail(ctx, updated, false)
 }
 
 func (s *KolPromptService) Delete(ctx context.Context, actor auth.Actor, promptID int64) error {
@@ -371,27 +470,15 @@ func (s *KolPromptService) buildPromptDetail(ctx context.Context, prompt *reposi
 		UpdatedAt:           prompt.UpdatedAt,
 	}
 
-	revisionNo := prompt.DraftRevisionNo
-	if revisionNo == nil {
-		revisionNo = prompt.PublishedRevisionNo
-	}
-	if revisionNo == nil {
+	if len(prompt.SchemaJSON) == 0 && len(prompt.CardConfigJSON) == 0 && (prompt.PromptAssetKey == nil || strings.TrimSpace(*prompt.PromptAssetKey) == "") {
 		return detail, nil
 	}
 
-	revision, err := s.promptRepo.GetRevision(ctx, prompt.TenantID, prompt.ID, *revisionNo)
-	if err != nil {
-		return nil, response.ErrInternal(50083, "kol_prompt_revision_query_failed", err.Error())
-	}
-	if revision == nil {
-		return nil, response.ErrInternal(50084, "kol_prompt_revision_not_found", "prompt revision not found")
-	}
-
-	schema, err := decodeKolSchema(revision.SchemaJSON)
+	schema, err := decodeKolSchema(prompt.SchemaJSON)
 	if err != nil {
 		return nil, response.ErrInternal(50085, "kol_prompt_schema_decode_failed", err.Error())
 	}
-	cardConfig, err := decodeKolCardConfig(revision.CardConfigJSON)
+	cardConfig, err := decodeKolCardConfig(prompt.CardConfigJSON)
 	if err != nil {
 		return nil, response.ErrInternal(50086, "kol_prompt_card_config_decode_failed", err.Error())
 	}
@@ -399,8 +486,8 @@ func (s *KolPromptService) buildPromptDetail(ctx context.Context, prompt *reposi
 	detail.LatestSchemaJSON = schema
 	detail.LatestCardConfigJSON = cardConfig
 
-	if includeContent {
-		content, err := s.asset.Get(ctx, revision.PromptAssetKey)
+	if includeContent && prompt.PromptAssetKey != nil && strings.TrimSpace(*prompt.PromptAssetKey) != "" {
+		content, err := s.asset.Get(ctx, *prompt.PromptAssetKey)
 		if err != nil {
 			return nil, response.ErrInternal(50087, "kol_prompt_asset_load_failed", err.Error())
 		}
@@ -410,6 +497,28 @@ func (s *KolPromptService) buildPromptDetail(ctx context.Context, prompt *reposi
 	return detail, nil
 }
 
+func (s *KolPromptService) grantPromptToActiveSubscribers(
+	ctx context.Context,
+	subRepo repository.KolSubscriptionRepository,
+	packageID, promptID int64,
+) error {
+	subscribers, err := subRepo.ListActiveSubscribersForPackage(ctx, packageID)
+	if err != nil {
+		return response.ErrInternal(50083, "kol_subscription_query_failed", err.Error())
+	}
+	for _, sub := range subscribers {
+		if err := subRepo.CreateAccessRow(ctx, repository.CreateAccessRowInput{
+			TenantID:       sub.TenantID,
+			SubscriptionID: sub.ID,
+			PackageID:      packageID,
+			PromptID:       promptID,
+		}); err != nil {
+			return response.ErrInternal(50084, "kol_subscription_access_create_failed", err.Error())
+		}
+	}
+	return nil
+}
+
 func normalizeKolCardConfig(cardConfig map[string]interface{}) map[string]interface{} {
 	if cardConfig == nil {
 		return map[string]interface{}{}
diff --git a/server/internal/tenant/app/kol_variable_renderer.go b/server/internal/tenant/app/kol_variable_renderer.go
index 091abc1..1d40bd4 100644
--- a/server/internal/tenant/app/kol_variable_renderer.go
+++ b/server/internal/tenant/app/kol_variable_renderer.go
@@ -33,14 +33,21 @@ type KolSchemaJSON struct {
 	Variables []KolVariableDefinition `json:"variables"`
 }
 
-var kolPlaceholderRE = regexp.MustCompile(`\{\{\s*([^}\s]+)\s*\}\}`)
+var kolPlaceholderRE = regexp.MustCompile(`\{\{\s*([^{}]+?)\s*\}\}`)
 
 func RenderPrompt(content string, schema KolSchemaJSON, values map[string]any) (string, error) {
 	schema = normalizeKolSchema(schema)
 
-	byID := make(map[string]KolVariableDefinition, len(schema.Variables))
+	byToken := make(map[string]KolVariableDefinition, len(schema.Variables)*2)
 	for _, variable := range schema.Variables {
-		byID[variable.ID] = variable
+		id := strings.TrimSpace(variable.ID)
+		key := strings.TrimSpace(variable.Key)
+		if id != "" {
+			byToken[id] = variable
+		}
+		if key != "" {
+			byToken[key] = variable
+		}
 	}
 
 	missingSet := make(map[string]struct{})
@@ -62,19 +69,19 @@ func RenderPrompt(content string, schema KolSchemaJSON, values map[string]any) (
 			return match
 		}
 
-		id := submatches[1]
-		variable, exists := byID[id]
+		token := strings.TrimSpace(submatches[1])
+		variable, exists := byToken[token]
 		if !exists {
-			addMissing(id)
+			addMissing(token)
 			return match
 		}
 
-		value, hasValue := values[id]
+		value, hasValue := lookupKolVariableValue(values, variable, token)
 		if hasValue {
 			return fmt.Sprint(value)
 		}
 		if variable.Required {
-			addMissing(id)
+			addMissing(kolVariableDisplayName(variable))
 		}
 		return ""
 	})
@@ -94,16 +101,26 @@ func HashPrompt(rendered string) string {
 func ValidateSchema(schema KolSchemaJSON) error {
 	schema = normalizeKolSchema(schema)
 
-	seen := make(map[string]struct{}, len(schema.Variables))
+	seenIDs := make(map[string]struct{}, len(schema.Variables))
+	seenKeys := make(map[string]struct{}, len(schema.Variables))
 	for _, variable := range schema.Variables {
 		id := strings.TrimSpace(variable.ID)
 		if id == "" || !strings.HasPrefix(id, "var_") {
 			return fmt.Errorf("variable id must be non-empty and start with var_")
 		}
-		if _, exists := seen[id]; exists {
+		if _, exists := seenIDs[id]; exists {
 			return fmt.Errorf("duplicate variable id: %s", id)
 		}
-		seen[id] = struct{}{}
+		seenIDs[id] = struct{}{}
+
+		key := strings.TrimSpace(variable.Key)
+		if key == "" {
+			return fmt.Errorf("variable key must be non-empty")
+		}
+		if _, exists := seenKeys[key]; exists {
+			return fmt.Errorf("duplicate variable key: %s", key)
+		}
+		seenKeys[key] = struct{}{}
 
 		switch KolVariableType(strings.TrimSpace(string(variable.Type))) {
 		case KolVariableTypeInput, KolVariableTypeTextarea, KolVariableTypeSelect, KolVariableTypeNumber, KolVariableTypeCheckbox:
@@ -125,3 +142,38 @@ func normalizeKolSchema(schema KolSchemaJSON) KolSchemaJSON {
 	}
 	return schema
 }
+
+func lookupKolVariableValue(values map[string]any, variable KolVariableDefinition, token string) (any, bool) {
+	candidates := []string{
+		strings.TrimSpace(token),
+		strings.TrimSpace(variable.Key),
+		strings.TrimSpace(variable.ID),
+	}
+
+	seen := make(map[string]struct{}, len(candidates))
+	for _, candidate := range candidates {
+		if candidate == "" {
+			continue
+		}
+		if _, exists := seen[candidate]; exists {
+			continue
+		}
+		seen[candidate] = struct{}{}
+
+		if value, ok := values[candidate]; ok {
+			return value, true
+		}
+	}
+
+	return nil, false
+}
+
+func kolVariableDisplayName(variable KolVariableDefinition) string {
+	if label := strings.TrimSpace(variable.Label); label != "" {
+		return label
+	}
+	if key := strings.TrimSpace(variable.Key); key != "" {
+		return key
+	}
+	return strings.TrimSpace(variable.ID)
+}
diff --git a/server/internal/tenant/app/kol_variable_renderer_test.go b/server/internal/tenant/app/kol_variable_renderer_test.go
index a5160c7..e1a81c3 100644
--- a/server/internal/tenant/app/kol_variable_renderer_test.go
+++ b/server/internal/tenant/app/kol_variable_renderer_test.go
@@ -22,8 +22,8 @@ func TestKolVariableRenderPrompt(t *testing.T) {
 			content: "Hello {{var_a}} from {{var_b}}",
 			schema: KolSchemaJSON{
 				Variables: []KolVariableDefinition{
-					{ID: "var_a", Type: KolVariableTypeInput, Required: true},
-					{ID: "var_b", Type: KolVariableTypeSelect},
+					{ID: "var_a", Key: "brand", Type: KolVariableTypeInput, Required: true},
+					{ID: "var_b", Key: "industry", Type: KolVariableTypeSelect},
 				},
 			},
 			values: map[string]any{
@@ -32,12 +32,38 @@ func TestKolVariableRenderPrompt(t *testing.T) {
 			},
 			want: "Hello 宜家 from 家具",
 		},
+		{
+			name:    "supports key placeholders and key values",
+			content: "围绕 {{目标词}} 写一篇文章，并突出 {{目标词}} 的优势",
+			schema: KolSchemaJSON{
+				Variables: []KolVariableDefinition{
+					{ID: "var_a", Key: "目标词", Label: "目标词", Type: KolVariableTypeInput, Required: true},
+				},
+			},
+			values: map[string]any{
+				"目标词": "北京装修公司",
+			},
+			want: "围绕 北京装修公司 写一篇文章，并突出 北京装修公司 的优势",
+		},
+		{
+			name:    "supports key placeholders with id values",
+			content: "Hello {{brand}}",
+			schema: KolSchemaJSON{
+				Variables: []KolVariableDefinition{
+					{ID: "var_a", Key: "brand", Label: "Brand", Type: KolVariableTypeInput, Required: true},
+				},
+			},
+			values: map[string]any{
+				"var_a": "宜家",
+			},
+			want: "Hello 宜家",
+		},
 		{
 			name:    "missing required",
 			content: "Hello {{var_required}}",
 			schema: KolSchemaJSON{
 				Variables: []KolVariableDefinition{
-					{ID: "var_required", Type: KolVariableTypeInput, Required: true},
+					{ID: "var_required", Key: "required", Label: "Required", Type: KolVariableTypeInput, Required: true},
 				},
 			},
 			values:  map[string]any{},
@@ -75,8 +101,8 @@ func TestKolVariableValidateSchemaRejectsDuplicateID(t *testing.T) {
 
 	err := ValidateSchema(KolSchemaJSON{
 		Variables: []KolVariableDefinition{
-			{ID: "var_a", Type: KolVariableTypeInput},
-			{ID: "var_a", Type: KolVariableTypeSelect},
+			{ID: "var_a", Key: "first", Type: KolVariableTypeInput},
+			{ID: "var_a", Key: "second", Type: KolVariableTypeSelect},
 		},
 	})
 
@@ -89,10 +115,24 @@ func TestKolVariableValidateSchemaRejectsInvalidID(t *testing.T) {
 
 	err := ValidateSchema(KolSchemaJSON{
 		Variables: []KolVariableDefinition{
-			{ID: "bad_id", Type: KolVariableTypeInput},
+			{ID: "bad_id", Key: "bad", Type: KolVariableTypeInput},
 		},
 	})
 
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "start with var_")
 }
+
+func TestKolVariableValidateSchemaRejectsDuplicateKey(t *testing.T) {
+	t.Parallel()
+
+	err := ValidateSchema(KolSchemaJSON{
+		Variables: []KolVariableDefinition{
+			{ID: "var_a", Key: "topic", Type: KolVariableTypeInput},
+			{ID: "var_b", Key: "topic", Type: KolVariableTypeSelect},
+		},
+	})
+
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "duplicate variable key")
+}
diff --git a/server/internal/tenant/repository/kol_prompt_repo.go b/server/internal/tenant/repository/kol_prompt_repo.go
index 2a829f3..6e8c972 100644
--- a/server/internal/tenant/repository/kol_prompt_repo.go
+++ b/server/internal/tenant/repository/kol_prompt_repo.go
@@ -21,24 +21,15 @@ type KolPrompt struct {
 	SortOrder           int
 	PublishedRevisionNo *int
 	DraftRevisionNo     *int
+	PromptAssetKey      *string
+	SchemaJSON          []byte
+	CardConfigJSON      []byte
 	CreatedBy           int64
 	UpdatedBy           int64
 	CreatedAt           time.Time
 	UpdatedAt           time.Time
 }
 
-type KolPromptRevision struct {
-	ID             int64
-	TenantID       int64
-	PromptID       int64
-	RevisionNo     int
-	PromptAssetKey string
-	SchemaJSON     []byte
-	CardConfigJSON []byte
-	CreatedBy      int64
-	CreatedAt      time.Time
-}
-
 type ActiveKolPrompt struct {
 	ID                  int64
 	TenantID            int64
@@ -64,14 +55,31 @@ type UpdateKolPromptMetadataInput struct {
 	UpdatedBy    int64
 }
 
-type CreateKolPromptRevisionInput struct {
-	TenantID       int64
-	PromptID       int64
-	RevisionNo     int
-	PromptAssetKey string
-	SchemaJSON     []byte
-	CardConfigJSON []byte
-	CreatedBy      int64
+type SaveKolPromptInput struct {
+	ID                  int64
+	TenantID            int64
+	Name                string
+	PlatformHint        *string
+	SortOrder           int
+	PromptAssetKey      string
+	SchemaJSON          []byte
+	CardConfigJSON      []byte
+	Status              string
+	PublishedRevisionNo *int
+	UpdatedBy           int64
+}
+
+type PublishKolPromptInput struct {
+	ID                  int64
+	TenantID            int64
+	Name                string
+	PlatformHint        *string
+	SortOrder           int
+	PromptAssetKey      string
+	SchemaJSON          []byte
+	CardConfigJSON      []byte
+	PublishedRevisionNo int
+	UpdatedBy           int64
 }
 
 type KolPromptRepository interface {
@@ -80,41 +88,121 @@ type KolPromptRepository interface {
 	ListByPackage(ctx context.Context, tenantID, packageID int64) ([]KolPrompt, error)
 	ListActiveByPackage(ctx context.Context, tenantID, packageID int64) ([]ActiveKolPrompt, error)
 	UpdateMetadata(ctx context.Context, input UpdateKolPromptMetadataInput) error
-	SetDraftRevision(ctx context.Context, tenantID, promptID int64, revNo int, updatedBy int64) error
+	Save(ctx context.Context, input SaveKolPromptInput) error
+	Publish(ctx context.Context, input PublishKolPromptInput) error
 	SetPublishedRevision(ctx context.Context, tenantID, promptID int64, revNo int, updatedBy int64) error
 	UpdateStatus(ctx context.Context, tenantID, id int64, status string, updatedBy int64) error
 	SoftDelete(ctx context.Context, tenantID, id int64) error
-	CreateRevision(ctx context.Context, input CreateKolPromptRevisionInput) (*KolPromptRevision, error)
-	GetRevision(ctx context.Context, tenantID, promptID int64, revNo int) (*KolPromptRevision, error)
-	NextRevisionNo(ctx context.Context, tenantID, promptID int64) (int, error)
 }
 
 type kolPromptRepository struct {
-	q generated.Querier
+	db generated.DBTX
+	q  generated.Querier
 }
 
 func NewKolPromptRepository(db generated.DBTX) KolPromptRepository {
-	return &kolPromptRepository{q: newQuerier(db)}
+	return &kolPromptRepository{db: db, q: newQuerier(db)}
 }
 
-func mapKolPrompt(row generated.GetKolPromptByIDRow) *KolPrompt {
+func mapKolPromptRow(
+	id int64,
+	tenantID int64,
+	packageID int64,
+	name string,
+	platformHint pgtype.Text,
+	status string,
+	sortOrder int32,
+	publishedRevisionNo pgtype.Int4,
+	draftRevisionNo pgtype.Int4,
+	promptAssetKey pgtype.Text,
+	schemaJSON []byte,
+	cardConfigJSON []byte,
+	createdBy int64,
+	updatedBy int64,
+	createdAt pgtype.Timestamptz,
+	updatedAt pgtype.Timestamptz,
+) *KolPrompt {
 	return &KolPrompt{
-		ID:                  row.ID,
-		TenantID:            row.TenantID,
-		PackageID:           row.PackageID,
-		Name:                row.Name,
-		PlatformHint:        nullableText(row.PlatformHint),
-		Status:              row.Status,
-		SortOrder:           int(row.SortOrder),
-		PublishedRevisionNo: nullableIntFromInt4(row.PublishedRevisionNo),
-		DraftRevisionNo:     nullableIntFromInt4(row.DraftRevisionNo),
-		CreatedBy:           row.CreatedBy,
-		UpdatedBy:           row.UpdatedBy,
-		CreatedAt:           timeFromTimestamp(row.CreatedAt),
-		UpdatedAt:           timeFromTimestamp(row.UpdatedAt),
+		ID:                  id,
+		TenantID:            tenantID,
+		PackageID:           packageID,
+		Name:                name,
+		PlatformHint:        nullableText(platformHint),
+		Status:              status,
+		SortOrder:           int(sortOrder),
+		PublishedRevisionNo: nullableIntFromInt4(publishedRevisionNo),
+		DraftRevisionNo:     nullableIntFromInt4(draftRevisionNo),
+		PromptAssetKey:      nullableText(promptAssetKey),
+		SchemaJSON:          schemaJSON,
+		CardConfigJSON:      cardConfigJSON,
+		CreatedBy:           createdBy,
+		UpdatedBy:           updatedBy,
+		CreatedAt:           timeFromTimestamp(createdAt),
+		UpdatedAt:           timeFromTimestamp(updatedAt),
 	}
 }
 
+func scanKolPrompt(scanner interface{ Scan(...any) error }) (*KolPrompt, error) {
+	var (
+		id                  int64
+		tenantID            int64
+		packageID           int64
+		name                string
+		platformHint        pgtype.Text
+		status              string
+		sortOrder           int32
+		publishedRevisionNo pgtype.Int4
+		draftRevisionNo     pgtype.Int4
+		promptAssetKey      pgtype.Text
+		schemaJSON          []byte
+		cardConfigJSON      []byte
+		createdBy           int64
+		updatedBy           int64
+		createdAt           pgtype.Timestamptz
+		updatedAt           pgtype.Timestamptz
+	)
+
+	if err := scanner.Scan(
+		&id,
+		&tenantID,
+		&packageID,
+		&name,
+		&platformHint,
+		&status,
+		&sortOrder,
+		&publishedRevisionNo,
+		&draftRevisionNo,
+		&promptAssetKey,
+		&schemaJSON,
+		&cardConfigJSON,
+		&createdBy,
+		&updatedBy,
+		&createdAt,
+		&updatedAt,
+	); err != nil {
+		return nil, err
+	}
+
+	return mapKolPromptRow(
+		id,
+		tenantID,
+		packageID,
+		name,
+		platformHint,
+		status,
+		sortOrder,
+		publishedRevisionNo,
+		draftRevisionNo,
+		promptAssetKey,
+		schemaJSON,
+		cardConfigJSON,
+		createdBy,
+		updatedBy,
+		createdAt,
+		updatedAt,
+	), nil
+}
+
 func (r *kolPromptRepository) Create(ctx context.Context, input CreateKolPromptInput) (*KolPrompt, error) {
 	row, err := r.q.CreateKolPrompt(ctx, generated.CreateKolPromptParams{
 		TenantID:     input.TenantID,
@@ -127,62 +215,56 @@ func (r *kolPromptRepository) Create(ctx context.Context, input CreateKolPromptI
 	if err != nil {
 		return nil, err
 	}
-	return &KolPrompt{
-		ID:                  row.ID,
-		TenantID:            row.TenantID,
-		PackageID:           row.PackageID,
-		Name:                row.Name,
-		PlatformHint:        nullableText(row.PlatformHint),
-		Status:              row.Status,
-		SortOrder:           int(row.SortOrder),
-		PublishedRevisionNo: nullableIntFromInt4(row.PublishedRevisionNo),
-		DraftRevisionNo:     nullableIntFromInt4(row.DraftRevisionNo),
-		CreatedBy:           row.CreatedBy,
-		UpdatedBy:           row.UpdatedBy,
-		CreatedAt:           timeFromTimestamp(row.CreatedAt),
-		UpdatedAt:           timeFromTimestamp(row.UpdatedAt),
-	}, nil
+	return r.GetByID(ctx, input.TenantID, row.ID)
 }
 
 func (r *kolPromptRepository) GetByID(ctx context.Context, tenantID, id int64) (*KolPrompt, error) {
-	row, err := r.q.GetKolPromptByID(ctx, generated.GetKolPromptByIDParams{
-		ID:       id,
-		TenantID: tenantID,
-	})
+	row := r.db.QueryRow(ctx, `
+SELECT id, tenant_id, package_id, name, platform_hint, status, sort_order,
+       published_revision_no, draft_revision_no, prompt_asset_key, schema_json, card_config_json,
+       created_by, updated_by, created_at, updated_at
+FROM kol_prompts
+WHERE id = $1
+  AND tenant_id = $2
+  AND deleted_at IS NULL
+`, id, tenantID)
+
+	prompt, err := scanKolPrompt(row)
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
 			return nil, nil
 		}
 		return nil, err
 	}
-	return mapKolPrompt(row), nil
+	return prompt, nil
 }
 
 func (r *kolPromptRepository) ListByPackage(ctx context.Context, tenantID, packageID int64) ([]KolPrompt, error) {
-	rows, err := r.q.ListKolPromptsByPackage(ctx, generated.ListKolPromptsByPackageParams{
-		PackageID: packageID,
-		TenantID:  tenantID,
-	})
+	rows, err := r.db.Query(ctx, `
+SELECT id, tenant_id, package_id, name, platform_hint, status, sort_order,
+       published_revision_no, draft_revision_no, prompt_asset_key, schema_json, card_config_json,
+       created_by, updated_by, created_at, updated_at
+FROM kol_prompts
+WHERE package_id = $1
+  AND tenant_id = $2
+  AND deleted_at IS NULL
+ORDER BY sort_order ASC, created_at ASC
+`, packageID, tenantID)
 	if err != nil {
 		return nil, err
 	}
-	result := make([]KolPrompt, len(rows))
-	for i, row := range rows {
-		result[i] = KolPrompt{
-			ID:                  row.ID,
-			TenantID:            row.TenantID,
-			PackageID:           row.PackageID,
-			Name:                row.Name,
-			PlatformHint:        nullableText(row.PlatformHint),
-			Status:              row.Status,
-			SortOrder:           int(row.SortOrder),
-			PublishedRevisionNo: nullableIntFromInt4(row.PublishedRevisionNo),
-			DraftRevisionNo:     nullableIntFromInt4(row.DraftRevisionNo),
-			CreatedBy:           row.CreatedBy,
-			UpdatedBy:           row.UpdatedBy,
-			CreatedAt:           timeFromTimestamp(row.CreatedAt),
-			UpdatedAt:           timeFromTimestamp(row.UpdatedAt),
+	defer rows.Close()
+
+	result := make([]KolPrompt, 0)
+	for rows.Next() {
+		prompt, err := scanKolPrompt(rows)
+		if err != nil {
+			return nil, err
 		}
+		result = append(result, *prompt)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
 	}
 	return result, nil
 }
@@ -218,13 +300,50 @@ func (r *kolPromptRepository) UpdateMetadata(ctx context.Context, input UpdateKo
 	})
 }
 
-func (r *kolPromptRepository) SetDraftRevision(ctx context.Context, tenantID, promptID int64, revNo int, updatedBy int64) error {
-	return r.q.UpdateKolPromptDraftRevision(ctx, generated.UpdateKolPromptDraftRevisionParams{
-		RevisionNo: pgtype.Int4{Int32: int32(revNo), Valid: true},
-		UpdatedBy:  updatedBy,
-		ID:         promptID,
-		TenantID:   tenantID,
-	})
+func (r *kolPromptRepository) Save(ctx context.Context, input SaveKolPromptInput) error {
+	publishedRevisionNo := pgtype.Int4{}
+	if input.PublishedRevisionNo != nil {
+		publishedRevisionNo = pgtype.Int4{Int32: int32(*input.PublishedRevisionNo), Valid: true}
+	}
+
+	_, err := r.db.Exec(ctx, `
+UPDATE kol_prompts
+SET name = $1,
+    platform_hint = $2,
+    sort_order = $3,
+    prompt_asset_key = $4,
+    schema_json = $5::jsonb,
+    card_config_json = $6::jsonb,
+    status = $7,
+    published_revision_no = $8,
+    updated_by = $9,
+    updated_at = NOW()
+WHERE id = $10
+  AND tenant_id = $11
+  AND deleted_at IS NULL
+`, input.Name, pgText(input.PlatformHint), int32(input.SortOrder), input.PromptAssetKey, input.SchemaJSON, input.CardConfigJSON, input.Status, publishedRevisionNo, input.UpdatedBy, input.ID, input.TenantID)
+	return err
+}
+
+func (r *kolPromptRepository) Publish(ctx context.Context, input PublishKolPromptInput) error {
+	_, err := r.db.Exec(ctx, `
+UPDATE kol_prompts
+SET name = $1,
+    platform_hint = $2,
+    sort_order = $3,
+    prompt_asset_key = $4,
+    schema_json = $5::jsonb,
+    card_config_json = $6::jsonb,
+    published_revision_no = $7,
+    draft_revision_no = NULL,
+    status = 'active',
+    updated_by = $8,
+    updated_at = NOW()
+WHERE id = $9
+  AND tenant_id = $10
+  AND deleted_at IS NULL
+`, input.Name, pgText(input.PlatformHint), int32(input.SortOrder), input.PromptAssetKey, input.SchemaJSON, input.CardConfigJSON, input.PublishedRevisionNo, input.UpdatedBy, input.ID, input.TenantID)
+	return err
 }
 
 func (r *kolPromptRepository) SetPublishedRevision(ctx context.Context, tenantID, promptID int64, revNo int, updatedBy int64) error {
@@ -252,68 +371,6 @@ func (r *kolPromptRepository) SoftDelete(ctx context.Context, tenantID, id int64
 	})
 }
 
-func (r *kolPromptRepository) CreateRevision(ctx context.Context, input CreateKolPromptRevisionInput) (*KolPromptRevision, error) {
-	row, err := r.q.CreateKolPromptRevision(ctx, generated.CreateKolPromptRevisionParams{
-		TenantID:       input.TenantID,
-		PromptID:       input.PromptID,
-		RevisionNo:     int32(input.RevisionNo),
-		PromptAssetKey: input.PromptAssetKey,
-		SchemaJson:     input.SchemaJSON,
-		CardConfigJson: input.CardConfigJSON,
-		CreatedBy:      input.CreatedBy,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &KolPromptRevision{
-		ID:             row.ID,
-		TenantID:       input.TenantID,
-		PromptID:       row.PromptID,
-		RevisionNo:     int(row.RevisionNo),
-		PromptAssetKey: row.PromptAssetKey,
-		SchemaJSON:     row.SchemaJson,
-		CardConfigJSON: row.CardConfigJson,
-		CreatedBy:      row.CreatedBy,
-		CreatedAt:      timeFromTimestamp(row.CreatedAt),
-	}, nil
-}
-
-func (r *kolPromptRepository) GetRevision(ctx context.Context, tenantID, promptID int64, revNo int) (*KolPromptRevision, error) {
-	row, err := r.q.GetKolPromptRevision(ctx, generated.GetKolPromptRevisionParams{
-		PromptID:   promptID,
-		RevisionNo: int32(revNo),
-		TenantID:   tenantID,
-	})
-	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &KolPromptRevision{
-		ID:             row.ID,
-		TenantID:       tenantID,
-		PromptID:       row.PromptID,
-		RevisionNo:     int(row.RevisionNo),
-		PromptAssetKey: row.PromptAssetKey,
-		SchemaJSON:     row.SchemaJson,
-		CardConfigJSON: row.CardConfigJson,
-		CreatedBy:      row.CreatedBy,
-		CreatedAt:      timeFromTimestamp(row.CreatedAt),
-	}, nil
-}
-
-func (r *kolPromptRepository) NextRevisionNo(ctx context.Context, tenantID, promptID int64) (int, error) {
-	next, err := r.q.NextKolPromptRevisionNo(ctx, generated.NextKolPromptRevisionNoParams{
-		PromptID: promptID,
-		TenantID: tenantID,
-	})
-	if err != nil {
-		return 0, err
-	}
-	return int(next), nil
-}
-
 func nullableIntFromInt4(value pgtype.Int4) *int {
 	if !value.Valid {
 		return nil
diff --git a/server/internal/tenant/transport/kol_manage_handler.go b/server/internal/tenant/transport/kol_manage_handler.go
index 583054b..f0c748b 100644
--- a/server/internal/tenant/transport/kol_manage_handler.go
+++ b/server/internal/tenant/transport/kol_manage_handler.go
@@ -277,25 +277,24 @@ func (h *KolManageHandler) DeletePrompt(c *gin.Context) {
 	response.Success(c, nil)
 }
 
-func (h *KolManageHandler) SaveDraft(c *gin.Context) {
+func (h *KolManageHandler) SavePrompt(c *gin.Context) {
 	promptID, ok := parseInt64Param(c, "id", "prompt id")
 	if !ok {
 		return
 	}
 
-	var req app.SaveDraftInput
+	var req app.PublishPromptInput
 	if err := c.ShouldBindJSON(&req); err != nil {
 		response.Error(c, response.ErrBadRequest(40001, "invalid_params", err.Error()))
 		return
 	}
-	req.PromptID = promptID
 
 	actor, ok := actorFromRequest(c)
 	if !ok {
 		return
 	}
 
-	data, err := h.promptSvc.SaveDraft(c.Request.Context(), actor, req)
+	data, err := h.promptSvc.Save(c.Request.Context(), actor, promptID, req)
 	if err != nil {
 		response.Error(c, err)
 		return
@@ -310,17 +309,64 @@ func (h *KolManageHandler) PublishPrompt(c *gin.Context) {
 		return
 	}
 
+	var req app.PublishPromptInput
+	if err := c.ShouldBindJSON(&req); err != nil {
+		response.Error(c, response.ErrBadRequest(40001, "invalid_params", err.Error()))
+		return
+	}
+
 	actor, ok := actorFromRequest(c)
 	if !ok {
 		return
 	}
 
-	if err := h.promptSvc.Publish(c.Request.Context(), actor, promptID); err != nil {
+	data, err := h.promptSvc.Publish(c.Request.Context(), actor, promptID, req)
+	if err != nil {
 		response.Error(c, err)
 		return
 	}
 
-	response.Success(c, gin.H{"ok": true})
+	response.Success(c, data)
+}
+
+func (h *KolManageHandler) ActivatePrompt(c *gin.Context) {
+	promptID, ok := parseInt64Param(c, "id", "prompt id")
+	if !ok {
+		return
+	}
+
+	actor, ok := actorFromRequest(c)
+	if !ok {
+		return
+	}
+
+	data, err := h.promptSvc.Activate(c.Request.Context(), actor, promptID)
+	if err != nil {
+		response.Error(c, err)
+		return
+	}
+
+	response.Success(c, data)
+}
+
+func (h *KolManageHandler) ArchivePrompt(c *gin.Context) {
+	promptID, ok := parseInt64Param(c, "id", "prompt id")
+	if !ok {
+		return
+	}
+
+	actor, ok := actorFromRequest(c)
+	if !ok {
+		return
+	}
+
+	data, err := h.promptSvc.Archive(c.Request.Context(), actor, promptID)
+	if err != nil {
+		response.Error(c, err)
+		return
+	}
+
+	response.Success(c, data)
 }
 
 func (h *KolManageHandler) AssistSubmit(c *gin.Context) {
diff --git a/server/internal/tenant/transport/router.go b/server/internal/tenant/transport/router.go
index d35301e..f81ff3a 100644
--- a/server/internal/tenant/transport/router.go
+++ b/server/internal/tenant/transport/router.go
@@ -70,8 +70,10 @@ func RegisterRoutes(app *bootstrap.App) {
 	kolManage.GET("/prompts/:id", kolManageHandler.GetPromptLatest)
 	kolManage.PUT("/prompts/:id", kolManageHandler.UpdatePromptMetadata)
 	kolManage.DELETE("/prompts/:id", kolManageHandler.DeletePrompt)
-	kolManage.POST("/prompts/:id/draft", kolManageHandler.SaveDraft)
+	kolManage.POST("/prompts/:id/save", kolManageHandler.SavePrompt)
 	kolManage.POST("/prompts/:id/publish", kolManageHandler.PublishPrompt)
+	kolManage.PUT("/prompts/:id/activate", kolManageHandler.ActivatePrompt)
+	kolManage.PUT("/prompts/:id/archive", kolManageHandler.ArchivePrompt)
 	kolManage.POST("/assist", kolManageHandler.AssistSubmit)
 	kolManage.GET("/assist/:id", kolManageHandler.AssistGet)
 
diff --git a/server/migrations/20260418110000_simplify_kol_prompt_storage.down.sql b/server/migrations/20260418110000_simplify_kol_prompt_storage.down.sql
new file mode 100644
index 0000000..f7894ce
--- /dev/null
+++ b/server/migrations/20260418110000_simplify_kol_prompt_storage.down.sql
@@ -0,0 +1,12 @@
+ALTER TABLE kol_usage_logs
+    DROP CONSTRAINT IF EXISTS fk_kol_usage_logs_prompt_revision;
+
+ALTER TABLE kol_usage_logs
+    ADD CONSTRAINT fk_kol_usage_logs_prompt_revision
+    FOREIGN KEY (prompt_id, prompt_revision_no)
+    REFERENCES kol_prompt_revisions(prompt_id, revision_no);
+
+ALTER TABLE kol_prompts
+    DROP COLUMN IF EXISTS card_config_json,
+    DROP COLUMN IF EXISTS schema_json,
+    DROP COLUMN IF EXISTS prompt_asset_key;
diff --git a/server/migrations/20260418110000_simplify_kol_prompt_storage.up.sql b/server/migrations/20260418110000_simplify_kol_prompt_storage.up.sql
new file mode 100644
index 0000000..6770c50
--- /dev/null
+++ b/server/migrations/20260418110000_simplify_kol_prompt_storage.up.sql
@@ -0,0 +1,37 @@
+ALTER TABLE kol_prompts
+    ADD COLUMN IF NOT EXISTS prompt_asset_key TEXT,
+    ADD COLUMN IF NOT EXISTS schema_json JSONB NOT NULL DEFAULT '{}'::jsonb,
+    ADD COLUMN IF NOT EXISTS card_config_json JSONB NOT NULL DEFAULT '{}'::jsonb;
+
+WITH preferred_revisions AS (
+    SELECT DISTINCT ON (p.id)
+           p.id AS prompt_id,
+           pr.prompt_asset_key,
+           pr.schema_json,
+           pr.card_config_json
+    FROM kol_prompts p
+    JOIN kol_prompt_revisions pr ON pr.prompt_id = p.id
+    ORDER BY p.id,
+             CASE
+                 WHEN p.published_revision_no IS NOT NULL AND pr.revision_no = p.published_revision_no THEN 0
+                 WHEN p.draft_revision_no IS NOT NULL AND pr.revision_no = p.draft_revision_no THEN 1
+                 ELSE 2
+             END,
+             pr.revision_no DESC
+)
+UPDATE kol_prompts p
+SET prompt_asset_key = r.prompt_asset_key,
+    schema_json = COALESCE(r.schema_json, '{}'::jsonb),
+    card_config_json = COALESCE(r.card_config_json, '{}'::jsonb)
+FROM preferred_revisions r
+WHERE p.id = r.prompt_id
+  AND (p.prompt_asset_key IS NULL OR btrim(p.prompt_asset_key) = '');
+
+UPDATE kol_prompts
+SET published_revision_no = 1,
+    draft_revision_no = NULL
+WHERE prompt_asset_key IS NOT NULL
+  AND btrim(prompt_asset_key) <> '';
+
+ALTER TABLE kol_usage_logs
+    DROP CONSTRAINT IF EXISTS fk_kol_usage_logs_prompt_revision;