diff --git a/apps/admin-web/src/components/ArticleDetailDrawer.vue b/apps/admin-web/src/components/ArticleDetailDrawer.vue
index 7cbdde5..ea530e2 100644
--- a/apps/admin-web/src/components/ArticleDetailDrawer.vue
+++ b/apps/admin-web/src/components/ArticleDetailDrawer.vue
@@ -22,6 +22,7 @@ import {
   getSourceTypeLabel,
   hasActiveGenerationStatus,
 } from '@/lib/display'
+import { useCompanyStore } from '@/stores/company'
 
 const props = defineProps<{
   open: boolean
@@ -34,6 +35,7 @@ const emit = defineEmits<{
 
 const queryClient = useQueryClient()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 const activeTab = ref('content')
 const enabled = computed(() => props.open && Boolean(props.articleId))
 const streamTitle = ref('')
@@ -42,20 +44,25 @@ const streamStatus = ref<string | null>(null)
 const streamFeatureEnabled = isGenerationStreamEnabled()
 
 const detailQuery = useQuery({
-  queryKey: computed(() => ['articles', 'detail', props.articleId]),
-  enabled,
+  queryKey: computed(() => ['articles', 'detail', companyStore.currentBrandId, props.articleId]),
+  enabled: computed(() => enabled.value && Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.detail(props.articleId as number),
 })
 
 const versionsQuery = useQuery({
-  queryKey: computed(() => ['articles', 'versions', props.articleId]),
-  enabled,
+  queryKey: computed(() => ['articles', 'versions', companyStore.currentBrandId, props.articleId]),
+  enabled: computed(() => enabled.value && Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.versions(props.articleId as number),
 })
 
 const publishRecordsQuery = useQuery({
-  queryKey: computed(() => ['articles', 'publish-records', props.articleId]),
-  enabled,
+  queryKey: computed(() => [
+    'articles',
+    'publish-records',
+    companyStore.currentBrandId,
+    props.articleId,
+  ]),
+  enabled: computed(() => enabled.value && Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.publishRecords(props.articleId as number),
 })
 
diff --git a/apps/admin-web/src/components/ArticlePublishStatus.vue b/apps/admin-web/src/components/ArticlePublishStatus.vue
index 408a4c8..7ccbe1b 100644
--- a/apps/admin-web/src/components/ArticlePublishStatus.vue
+++ b/apps/admin-web/src/components/ArticlePublishStatus.vue
@@ -8,6 +8,7 @@ import { useI18n } from 'vue-i18n'
 import { articlesApi, mediaApi } from '@/lib/api'
 import { getPublishStatusMeta } from '@/lib/display'
 import { getPublishPlatformMeta, normalizePublishPlatformId } from '@/lib/publish-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 interface PublishPlatformEntry {
   key: string
@@ -42,6 +43,7 @@ const props = withDefaults(
 )
 
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 const popoverOpen = ref(false)
 const shouldLoadRecords = computed(() => Boolean(props.articleId) && props.status !== 'unpublished')
 const shouldLoadPlatforms = computed(() => props.showPlatforms && shouldLoadRecords.value)
@@ -54,8 +56,13 @@ const platformsQuery = useQuery({
 })
 
 const publishRecordsQuery = useQuery({
-  queryKey: computed(() => ['articles', 'publish-records', props.articleId]),
-  enabled: shouldLoadRecords,
+  queryKey: computed(() => [
+    'articles',
+    'publish-records',
+    companyStore.currentBrandId,
+    props.articleId,
+  ]),
+  enabled: computed(() => shouldLoadRecords.value && Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.publishRecords(props.articleId as number),
   staleTime: 30 * 1000,
 })
diff --git a/apps/admin-web/src/components/CustomArticleTab.vue b/apps/admin-web/src/components/CustomArticleTab.vue
index d1aa34d..c17e9a7 100644
--- a/apps/admin-web/src/components/CustomArticleTab.vue
+++ b/apps/admin-web/src/components/CustomArticleTab.vue
@@ -19,10 +19,12 @@ import { useArticleRegenerateAction } from '@/lib/article-regenerate-action'
 import { getGenerateStatusMeta, getPublishStatusMeta } from '@/lib/display'
 import { formatError } from '@/lib/errors'
 import { formatPublishPlatformList } from '@/lib/publish-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 const queryClient = useQueryClient()
 const router = useRouter()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const page = ref(1)
 const pageSize = ref(20)
@@ -93,7 +95,14 @@ const articleParams = computed<ArticleListParams>(() => {
 })
 
 const listQuery = useQuery({
-  queryKey: computed(() => ['articles', 'list', 'custom_generation', articleParams.value]),
+  queryKey: computed(() => [
+    'articles',
+    'list',
+    companyStore.currentBrandId,
+    'custom_generation',
+    articleParams.value,
+  ]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.list(articleParams.value),
 })
 
diff --git a/apps/admin-web/src/components/GenerateTaskDrawer.vue b/apps/admin-web/src/components/GenerateTaskDrawer.vue
index 6a393e8..198c795 100644
--- a/apps/admin-web/src/components/GenerateTaskDrawer.vue
+++ b/apps/admin-web/src/components/GenerateTaskDrawer.vue
@@ -25,6 +25,7 @@ import {
   publishStatusShortLabel,
   type PublishAccountCard,
 } from '@/lib/publish-account-cards'
+import { useCompanyStore } from '@/stores/company'
 
 const props = defineProps<{
   open: boolean
@@ -38,6 +39,7 @@ const emit = defineEmits<{
 
 const queryClient = useQueryClient()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const promptDrawerOpen = ref(false)
 const coverPickerOpen = ref(false)
@@ -108,6 +110,7 @@ const selectedSchedulePublishPlatformIds = computed(() => {
 const scheduleCoverRequired = computed(() =>
   coverUploadRequired(selectedSchedulePublishPlatformIds.value),
 )
+const currentBrandId = computed(() => companyStore.currentBrandId)
 const effectiveScheduleCoverEnabled = computed(
   () => scheduleCoverRequired.value || form.coverEnabled,
 )
@@ -207,6 +210,7 @@ function buildSchedulePayload() {
   return {
     name: form.name.trim(),
     prompt_rule_id: form.promptRuleId!,
+    brand_id: currentBrandId.value,
     cron_expr: buildDailyCron(form.scheduleTime),
     auto_publish: form.autoPublish,
     publish_account_ids: form.autoPublish ? form.publishAccountIds : [],
@@ -220,6 +224,7 @@ function buildSchedulePayload() {
 function buildInstantPayload() {
   return {
     prompt_rule_id: form.promptRuleId!,
+    brand_id: currentBrandId.value ?? undefined,
     extra_params: {
       task_name: form.name.trim(),
       generation_mode: 'instant',
@@ -287,6 +292,11 @@ function handleScheduleCoverToggle(checked: boolean): void {
 }
 
 function validateForm(): boolean {
+  if (!currentBrandId.value) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return false
+  }
+
   if (!form.name.trim()) {
     message.warning(t('custom.messages.missingTaskName'))
     return false
diff --git a/apps/admin-web/src/components/InstantTaskTab.vue b/apps/admin-web/src/components/InstantTaskTab.vue
index 0013911..e782d49 100644
--- a/apps/admin-web/src/components/InstantTaskTab.vue
+++ b/apps/admin-web/src/components/InstantTaskTab.vue
@@ -11,8 +11,10 @@ import GeneratedArticleLinksDrawer from '@/components/GeneratedArticleLinksDrawe
 import { instantTasksApi, promptRulesApi } from '@/lib/api'
 import { formatDateTime, getGenerateStatusMeta } from '@/lib/display'
 import { formatPublishPlatformList } from '@/lib/publish-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const page = ref(1)
 const pageSize = ref(20)
@@ -72,7 +74,8 @@ const listParams = computed<InstantTaskListParams>(() => {
 })
 
 const listQuery = useQuery({
-  queryKey: computed(() => ['instantTasks', 'list', listParams.value]),
+  queryKey: computed(() => ['instantTasks', 'list', companyStore.currentBrandId, listParams.value]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () => instantTasksApi.list(listParams.value),
 })
 
diff --git a/apps/admin-web/src/components/PublishArticleModal.vue b/apps/admin-web/src/components/PublishArticleModal.vue
index 911c288..f251b04 100644
--- a/apps/admin-web/src/components/PublishArticleModal.vue
+++ b/apps/admin-web/src/components/PublishArticleModal.vue
@@ -41,6 +41,7 @@ import {
   publishStateLabel,
   type PublishAccountCard,
 } from '@/lib/publish-account-cards'
+import { useCompanyStore } from '@/stores/company'
 
 const props = defineProps<{
   open: boolean
@@ -54,6 +55,7 @@ const emit = defineEmits<{
 
 const { t } = useI18n()
 const queryClient = useQueryClient()
+const companyStore = useCompanyStore()
 
 const selectedAccountIds = ref<string[]>([])
 const coverEnabled = ref(false)
@@ -71,8 +73,16 @@ let publishAdmissionRunId = 0
 const ackInProgress = ref(false)
 
 const detailQuery = useQuery({
-  queryKey: computed(() => ['articles', 'detail', props.articleId, 'publish-modal']),
-  enabled: computed(() => props.open && Boolean(props.articleId)),
+  queryKey: computed(() => [
+    'articles',
+    'detail',
+    companyStore.currentBrandId,
+    props.articleId,
+    'publish-modal',
+  ]),
+  enabled: computed(
+    () => props.open && Boolean(props.articleId) && Boolean(companyStore.currentBrandId),
+  ),
   queryFn: () => articlesApi.detail(props.articleId as number),
 })
 
diff --git a/apps/admin-web/src/components/ScheduleTaskTab.vue b/apps/admin-web/src/components/ScheduleTaskTab.vue
index 2b92dc8..2b4a559 100644
--- a/apps/admin-web/src/components/ScheduleTaskTab.vue
+++ b/apps/admin-web/src/components/ScheduleTaskTab.vue
@@ -20,9 +20,11 @@ import { promptRulesApi, schedulesApi } from '@/lib/api'
 import { formatDateTime, getGenerateStatusMeta, hasActiveGenerationStatus } from '@/lib/display'
 import { formatError } from '@/lib/errors'
 import { formatPublishPlatformList } from '@/lib/publish-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 const queryClient = useQueryClient()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const modalOpen = ref(false)
 const editingTask = ref<ScheduleTask | null>(null)
@@ -81,7 +83,8 @@ const listParams = computed<ScheduleTaskListParams>(() => {
 })
 
 const listQuery = useQuery({
-  queryKey: computed(() => ['schedules', 'list', listParams.value]),
+  queryKey: computed(() => ['schedules', 'list', companyStore.currentBrandId, listParams.value]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () => schedulesApi.list(listParams.value),
 })
 
diff --git a/apps/admin-web/src/i18n/messages/en-US.ts b/apps/admin-web/src/i18n/messages/en-US.ts
index 900b75a..b7ce8a5 100644
--- a/apps/admin-web/src/i18n/messages/en-US.ts
+++ b/apps/admin-web/src/i18n/messages/en-US.ts
@@ -99,7 +99,7 @@ const enUS = {
     email: 'Email',
     loginIdentifier: 'Phone / Email',
     password: 'Password',
-    rememberAccount: 'Remember account',
+    rememberAccount: 'Remember account and password',
     forgotPassword: 'Forgot password',
   },
   membershipBlocked: {
@@ -137,6 +137,9 @@ const enUS = {
     userFallback: 'Admin',
     logout: 'Logout',
     planFallback: 'Free Plan',
+    currentCompany: 'Company',
+    currentCompanyPlaceholder: 'Select company',
+    createCompany: 'Create company',
     openNavigation: 'Open navigation',
     collapseNavigation: 'Collapse navigation',
     expandNavigation: 'Expand navigation',
@@ -169,6 +172,10 @@ const enUS = {
       title: 'Welcome back',
       description: 'Sign in with a real tenant account.',
     },
+    brandOnboarding: {
+      title: 'Choose a brand',
+      description: 'Create the first brand and initialize its keyword library.',
+    },
     workspace: {
       title: 'Workspace',
       description: 'Template shortcuts, overview data, and recent generations in one place.',
@@ -250,6 +257,47 @@ const enUS = {
       description: 'The link you opened might have moved or no longer exists.',
     },
   },
+  onboardingBrand: {
+    eyebrow: 'Brand Onboarding',
+    title: 'Choose a brand or company',
+    subtitle: 'You have access to multiple brands or companies. Choose one to start working.',
+    createBrand: 'Create new brand or company',
+    createHint: 'After creation, keyword initialization starts automatically.',
+    emptyDescription:
+      'New users need to create a brand or company before entering the workspace.',
+    noWebsite: 'No website yet',
+    form: {
+      title: 'Create brand or company',
+      name: 'Brand or company name',
+      namePlaceholder: 'Example: GEO Console / Acme Furniture',
+      website: 'Website (optional)',
+      websitePlaceholder: 'https://example.com',
+      description: 'Description',
+      descriptionPlaceholder: 'Briefly describe the business, products, service area, or core value.',
+    },
+    ai: {
+      title: 'Generating brand or company questions',
+      stages: {
+        fetch: 'Fetching website and business context...',
+        generate: 'Generating candidate search terms for monitoring...',
+        refine: 'Deduplicating and filtering savable questions...',
+      },
+    },
+    questions: {
+      title: 'Select brand or company questions',
+      subtitle:
+        'Choose up to {limit} questions to save to the keyword library. You can add or edit more later.',
+      confirm: 'Save and enter workspace',
+      skip: 'Skip and enter',
+      empty: 'No usable questions were generated. You can enter the workspace and add them manually.',
+      selectionLimit: 'Choose up to {limit} questions.',
+    },
+    messages: {
+      nameRequired: 'Enter a brand or company name.',
+      questionRequired: 'Select at least one question, or skip and add them manually later.',
+      aiCharged: 'This generation consumed {count} AI point.',
+    },
+  },
   notFound: {
     title: 'This page got lost',
     description:
@@ -723,7 +771,7 @@ const enUS = {
       sourceURL: 'Article URL',
       sourceTitle: 'Source title',
       language: 'Article language',
-      brandName: 'Brand / subject',
+      brandName: 'Current company',
       region: 'Region',
       keywords: 'Optimization keywords',
       preservePoints: 'Keep / emphasize',
@@ -738,17 +786,17 @@ const enUS = {
         'Selected groups are retrieved in the backend and passed to generation as reference context.',
       sourceURLPlaceholder: 'https://example.com/article',
       sourceTitlePlaceholder: 'Optional. Citation titles are prefilled automatically.',
-      brandNamePlaceholder: 'Required. Type the target subject, or choose from the brand library.',
+      brandNamePlaceholder: 'Select the current company in the top bar first.',
       regionPlaceholder: 'For example: Shanghai, East China, nationwide, North America',
       keywordsPlaceholder:
-        'Type optimization keywords and press Enter. Brand-library options appear after choosing a subject.',
+        'Type optimization keywords and press Enter. Search-term options appear after selecting the current company.',
       preservePointsPlaceholder: 'List facts, data, arguments, or examples that must be kept.',
       avoidPointsPlaceholder: 'List claims, competitors, compliance risks, or wording to avoid.',
       extraRequirementsPlaceholder:
         'Add channel, structure, title style, or industry-specific instructions.',
       queued: 'Rewrite task submitted and queued.',
       sourceURLRequired: 'Enter the source article URL first.',
-      brandNameRequired: 'Enter the brand / subject first.',
+      brandNameRequired: 'Select the current company in the top bar first.',
       submitError: 'Failed to submit rewrite task.',
       backToList: 'Back to rewrites',
     },
@@ -821,7 +869,7 @@ const enUS = {
       drawerTitle: 'Template generation',
       steps: {
         basic: 'Basic info',
-        basicDesc: 'Language, template fields, and brand context',
+        basicDesc: 'Language, template fields, and company context',
         structure: 'Structure',
         structureDesc: 'Title and outline',
         generate: 'Generate',
@@ -829,13 +877,13 @@ const enUS = {
       },
       sections: {
         templateFields: 'Template fields',
-        brandContext: 'Brand context',
+        brandContext: 'Company context',
         language: 'Language',
-        brandInfo: 'Brand',
-        brandLibrary: 'Brand library',
-        brandName: 'Company name',
+        brandInfo: 'Company',
+        brandLibrary: 'Company library',
+        brandName: 'Current company',
         website: 'Official website',
-        brandSummary: 'AI brand summary',
+        brandSummary: 'AI company summary',
         keywords: 'Keywords',
         brandQuestions: 'Keyword library (search terms)',
         primaryQuestion: 'Optimization keyword',
@@ -854,21 +902,21 @@ const enUS = {
         inputParams: 'Input params',
       },
       hints: {
-        brandContext: 'Optional. Selecting a brand pulls in keywords and competitor context.',
+        brandContext: 'The current company pulls in keywords and competitor context.',
         brandFlow:
-          'You can type a company name or choose one from the brand library. After you choose an optimization keyword, AI will prepare the summary, competitors, and title options.',
+          'Articles use the current company selected in the top bar. After you choose an optimization keyword, AI will prepare the summary, competitors, and title options.',
         brandSummaryPlaceholder:
-          'After analysis, AI will summarize the brand angle, positioning, and content opportunities here.',
+          'After analysis, AI will summarize the company angle, positioning, and content opportunities here.',
         keywords:
           'Type keywords directly or reuse brand-library keywords. AI results will be merged into this list.',
         brandQuestions:
           'The optimization keyword controls the article spine; supplemental keywords broaden nearby search intent.',
         supplementalQuestions:
           'Choose up to 3 so the article covers related intent without drifting.',
-        questionEmpty: 'No questions are available for this brand yet.',
-        selectBrandFirst: 'Choose a library brand from the company name dropdown first.',
+        questionEmpty: 'No questions are available for this company yet.',
+        selectBrandFirst: 'Select the current company in the top bar first.',
         competitors:
-          'Competitors stay editable. You can add rows manually; saving to the competitor library is only available after choosing a library brand.',
+          'Competitors stay editable. You can add rows manually; saving to the competitor library is available after selecting the current company.',
         competitorEmptyEditable:
           'No competitors yet. Add one manually or let AI fill the list first.',
         templateFields:
@@ -883,7 +931,7 @@ const enUS = {
         outlinePreview: 'The panel on the right updates from the current outline in real time.',
         outlineEmpty: 'Generate the outline first to edit the article structure here.',
         review: 'Check the final setup before creating the generation task.',
-        competitorEmpty: 'No competitors are available under this brand yet.',
+        competitorEmpty: 'No competitors are available under this company yet.',
         customTitle: 'Use this field if you want to override the title manually.',
         keyPoints: 'Add any key messages, angles, or style notes here.',
         async:
@@ -904,7 +952,7 @@ const enUS = {
       review: {
         templateName: 'Template',
         articleTitle: 'Article title',
-        brandContext: 'Brand context',
+        brandContext: 'Company context',
         outline: 'Outline',
         currentTemplate: 'Current template',
         promptVisibility: 'Prompt visibility',
@@ -922,8 +970,8 @@ const enUS = {
         actions: 'Actions',
       },
       placeholders: {
-        brandLibrary: 'Choose an existing brand from the library',
-        brandName: 'Enter a company name, or choose from the brand library',
+        brandLibrary: 'Choose the current company',
+        brandName: 'Current company from the top bar',
         website: 'Official website, optional',
         keywords: 'Type keywords and press Enter',
         primaryQuestion: 'Choose one optimization keyword',
@@ -975,18 +1023,18 @@ const enUS = {
       },
       messages: {
         requiredField: 'Please fill in {field} first.',
-        missingBrand: 'Enter or choose a company name first.',
+        missingBrand: 'Select the current company in the top bar first.',
         selectBrandBeforeQuestion:
-          'Choose a library brand from the company name dropdown before selecting a question.',
+          'Select the current company in the top bar before continuing.',
         missingPrimaryQuestion: 'Choose one primary brand question.',
         missingTitle: 'Please choose or enter an article title.',
         missingOutline: 'Please select at least one outline section.',
         missingGeneratedOutline: 'Please generate and confirm the article outline first.',
         customOutlineTooLong: 'Custom sections cannot exceed {count} characters.',
         selectBrandBeforeCompetitors:
-          'Choose a library brand from the company name dropdown before managing competitors.',
+          'Select the current company in the top bar before managing competitors.',
         selectBrandBeforeFavorite:
-          'Choose a library brand from the company name dropdown before saving competitors.',
+          'Select the current company in the top bar before saving competitors.',
         missingCompetitorName: 'Enter a competitor name before saving it to the library.',
         savedCompetitor: 'Competitor saved to the brand library.',
         unsavedCompetitor: 'Competitor removed from the brand library.',
diff --git a/apps/admin-web/src/i18n/messages/zh-CN.ts b/apps/admin-web/src/i18n/messages/zh-CN.ts
index d25e8dd..e08c133 100644
--- a/apps/admin-web/src/i18n/messages/zh-CN.ts
+++ b/apps/admin-web/src/i18n/messages/zh-CN.ts
@@ -101,7 +101,7 @@ const zhCN = {
     email: "邮箱",
     loginIdentifier: "手机号 / 邮箱",
     password: "密码",
-    rememberAccount: "记住账号",
+    rememberAccount: "记住账号和密码",
     forgotPassword: "忘记密码",
   },
   membershipBlocked: {
@@ -134,6 +134,9 @@ const zhCN = {
     userFallback: "管理员",
     logout: "退出",
     planFallback: "免费版",
+    currentCompany: "当前公司",
+    currentCompanyPlaceholder: "选择公司",
+    createCompany: "创建公司",
     openNavigation: "打开导航",
     collapseNavigation: "收起导航",
     expandNavigation: "展开导航",
@@ -165,6 +168,10 @@ const zhCN = {
       title: "欢迎回来",
       description: "登录省心推，开启品牌内容创作之旅",
     },
+    brandOnboarding: {
+      title: "选择进入的品牌",
+      description: "首次进入前创建品牌，并初始化品牌关键词库。",
+    },
     workspace: {
       title: "工作台",
       description: "模板入口、数据总览和最近生成都集中在这里。",
@@ -238,6 +245,45 @@ const zhCN = {
       description: "你访问的链接可能已经失效或被移动。",
     },
   },
+  onboardingBrand: {
+    eyebrow: "Brand Onboarding",
+    title: "选择进入的品牌或公司",
+    subtitle: "你拥有多个品牌或公司的访问权限，请选择一个开始工作",
+    createBrand: "创建新品牌或公司",
+    createHint: "添加品牌或公司后会自动进入关键词初始化。",
+    emptyDescription: "新用户需要先创建品牌或公司，再进入工作台开始创作。",
+    noWebsite: "暂未填写官网",
+    form: {
+      title: "新建品牌或公司",
+      name: "品牌或公司名",
+      namePlaceholder: "例如：省心推 / 海翔家具",
+      website: "官网（选填）",
+      websitePlaceholder: "https://example.com",
+      description: "简介",
+      descriptionPlaceholder: "简单介绍公司的业务、产品、服务区域或核心卖点",
+    },
+    ai: {
+      title: "正在生成品牌或公司问题",
+      stages: {
+        fetch: "正在获取官网信息和业务上下文…",
+        generate: "正在生成适合监测的候选搜索词…",
+        refine: "正在去重并筛选可保存的问题…",
+      },
+    },
+    questions: {
+      title: "选择品牌或公司问题",
+      subtitle: "请选择最多 {limit} 个问题保存到关键词库，后续可继续添加或调整。",
+      confirm: "保存并进入工作台",
+      skip: "跳过，直接进入",
+      empty: "暂时没有生成可用的问题，可以先进入工作台后手动添加。",
+      selectionLimit: "最多选择 {limit} 个问题",
+    },
+    messages: {
+      nameRequired: "请输入品牌或公司名",
+      questionRequired: "请至少选择 1 个问题，或跳过后手动添加",
+      aiCharged: "本次生成已消耗 {count} 个 AI 点",
+    },
+  },
   notFound: {
     title: "页面走丢了",
     description: "我们没有找到这个地址对应的内容，可能链接拼写有误，或者页面已经下线。",
@@ -691,7 +737,7 @@ const zhCN = {
       sourceURL: "文章 URL",
       sourceTitle: "来源标题",
       language: "文章语言",
-      brandName: "品牌/主体",
+      brandName: "当前公司",
       region: "地域",
       keywords: "优化关键词",
       preservePoints: "必须保留/强调",
@@ -704,15 +750,15 @@ const zhCN = {
       knowledgeBaseHint: "选择后，后台会检索相关知识片段并作为生成参考，未选择则只基于来源文章和当前设置生成。",
       sourceURLPlaceholder: "https://example.com/article",
       sourceTitlePlaceholder: "可选，引用来源标题会自动带入",
-      brandNamePlaceholder: "必填，可输入目标达成词，或从品牌库选择",
+      brandNamePlaceholder: "请先在顶部选择当前公司",
       regionPlaceholder: "例如：上海、华东、全国、北美市场",
-      keywordsPlaceholder: "输入优化关键词后回车，可多选；选择品牌库主体后会显示搜索词候选",
+      keywordsPlaceholder: "输入优化关键词后回车，可多选；选择当前公司后会显示搜索词候选",
       preservePointsPlaceholder: "列出必须保留的事实、数据、观点或案例",
       avoidPointsPlaceholder: "列出不能出现的说法、竞品、合规禁区或表达方式",
       extraRequirementsPlaceholder: "补充行业、渠道、结构、标题风格等自由要求",
       queued: "仿写任务已提交，正在排队生成",
       sourceURLRequired: "请先填写来源文章 URL",
-      brandNameRequired: "请先填写品牌/主体",
+      brandNameRequired: "请先在顶部选择当前公司",
       submitError: "仿写任务提交失败",
       backToList: "返回仿写列表",
     },
@@ -785,7 +831,7 @@ const zhCN = {
       drawerTitle: "模版生成",
       steps: {
         basic: "基本信息",
-        basicDesc: "语言、模版字段与品牌上下文",
+        basicDesc: "语言、模版字段与公司上下文",
         structure: "文章结构",
         structureDesc: "标题方案与结构段落",
         generate: "生成文章",
@@ -793,13 +839,13 @@ const zhCN = {
       },
       sections: {
         templateFields: "模版字段",
-        brandContext: "品牌上下文",
+        brandContext: "公司上下文",
         language: "文章语言",
-        brandInfo: "品牌信息",
-        brandLibrary: "品牌库",
-        brandName: "公司名称",
+        brandInfo: "公司信息",
+        brandLibrary: "公司库",
+        brandName: "当前公司",
         website: "官网地址",
-        brandSummary: "AI 品牌摘要",
+        brandSummary: "AI 公司摘要",
         keywords: "关键词",
         brandQuestions: "关键词库（搜索词）",
         primaryQuestion: "优化关键词",
@@ -819,15 +865,15 @@ const zhCN = {
         inputParams: "输入参数",
       },
       hints: {
-        brandContext: "可选。选择后会自动带出关键词与竞品信息。",
-        brandFlow: "公司名称可直接输入，也可以从品牌库选择。选择优化关键词后，AI 会补充品牌摘要、竞品和标题建议。",
-        brandSummaryPlaceholder: "AI 分析后会在这里补充品牌简介、差异点和适合切入的内容角度。",
+        brandContext: "当前公司会自动带出关键词与竞品信息。",
+        brandFlow: "使用顶部选择的当前公司生成文章。选择优化关键词后，AI 会补充公司摘要、竞品和标题建议。",
+        brandSummaryPlaceholder: "AI 分析后会在这里补充公司简介、差异点和适合切入的内容角度。",
         keywords: "支持直接输入，也支持复用品牌词库里的关键词。AI 分析结果会自动补充到这里。",
         brandQuestions: "优化关键词决定文章主线，补充关键词只用于扩展相关搜索意图。",
         supplementalQuestions: "最多选择 3 个，用于覆盖相邻搜索问题，避免文章主题发散。",
-        questionEmpty: "当前品牌还没有可选问题",
-        selectBrandFirst: "请先从公司名称下拉选择品牌库对象",
-        competitors: "竞品支持手动编辑、追加；只有从品牌库选择品牌后，才可以收藏到品牌词库。AI 分析会尽量补齐候选竞品。",
+        questionEmpty: "当前公司还没有可选问题",
+        selectBrandFirst: "请先在顶部选择当前公司",
+        competitors: "竞品支持手动编辑、追加；选择当前公司后，可以收藏到公司词库。AI 分析会尽量补齐候选竞品。",
         competitorEmptyEditable: "还没有竞品，先手动添加一条或点击分析让 AI 自动补齐。",
         templateFields: "这里保留当前模板自己的补充字段，用来约束 AI 生成角度。",
         titleSelection: "下一步前会由 AI 给出 5 个更合适的标题候选，你可以在这里挑选或改写。",
@@ -839,7 +885,7 @@ const zhCN = {
         outlinePreview: "右侧会根据当前大纲实时预览最终文章框架。",
         outlineEmpty: "生成大纲后，这里会显示可编辑的文章结构。",
         review: "确认无误后提交，文章会进入生成队列。",
-        competitorEmpty: "当前品牌下暂无竞品数据",
+        competitorEmpty: "当前公司下暂无竞品数据",
         customTitle: "如需手动改写，可在这里输入最终标题",
         keyPoints: "补充希望文章强调的卖点、观点或风格要求",
         async: "后端会立即创建文章和任务记录，再异步完成正文生成。提交成功后，列表会自动刷新。",
@@ -859,7 +905,7 @@ const zhCN = {
       review: {
         templateName: "模版名称",
         articleTitle: "文章标题",
-        brandContext: "品牌上下文",
+        brandContext: "公司上下文",
         outline: "结构段落",
         currentTemplate: "当前模版",
         promptVisibility: "Prompt 可见性",
@@ -877,8 +923,8 @@ const zhCN = {
         actions: "操作",
       },
       placeholders: {
-        brandLibrary: "从品牌库选择已有品牌",
-        brandName: "输入公司名称，或从品牌库选择",
+        brandLibrary: "选择当前公司",
+        brandName: "顶部选择的当前公司",
         website: "输入官网地址，选填",
         keywords: "输入关键词后回车，可多选",
         primaryQuestion: "选择一个优化关键词",
@@ -927,16 +973,16 @@ const zhCN = {
       },
       messages: {
         requiredField: "请先填写 {field}",
-        missingBrand: "请先输入或选择公司名称",
-        selectBrandBeforeQuestion: "请先从公司名称下拉选择品牌库对象后再选择优化关键词",
+        missingBrand: "请先在顶部选择当前公司",
+        selectBrandBeforeQuestion: "请先在顶部选择当前公司后再继续",
         missingPrimaryQuestion: "请选择一个优化关键词",
         missingTitle: "请先选择或输入文章标题",
         missingReviewIntroHook: "请先选择一个评测引言钩子",
         missingOutline: "请至少选择一个文章结构段落",
         missingGeneratedOutline: "请先生成并确认文章大纲",
         customOutlineTooLong: "自定义结构不能超过 {count} 个字",
-        selectBrandBeforeCompetitors: "请先从公司名称下拉选择品牌库对象后再管理竞品",
-        selectBrandBeforeFavorite: "请先从公司名称下拉选择品牌库对象后再收藏竞品",
+        selectBrandBeforeCompetitors: "请先在顶部选择当前公司后再管理竞品",
+        selectBrandBeforeFavorite: "请先在顶部选择当前公司后再收藏竞品",
         missingCompetitorName: "至少需要填写竞品名称后才能收藏",
         savedCompetitor: "竞品已收藏到品牌词库",
         unsavedCompetitor: "已取消收藏该竞品",
diff --git a/apps/admin-web/src/layouts/AppShell.vue b/apps/admin-web/src/layouts/AppShell.vue
index 1c3a980..2d390b6 100644
--- a/apps/admin-web/src/layouts/AppShell.vue
+++ b/apps/admin-web/src/layouts/AppShell.vue
@@ -13,25 +13,35 @@ import {
   MenuFoldOutlined,
   MenuUnfoldOutlined,
   PictureOutlined,
+  PlusOutlined,
+  SearchOutlined,
   SendOutlined,
   ShopOutlined,
   SolutionOutlined,
   TagsOutlined,
+  TeamOutlined,
   ThunderboltOutlined,
   UserOutlined,
   WalletOutlined,
 } from '@ant-design/icons-vue'
-import { useQuery } from '@tanstack/vue-query'
-import { computed, onBeforeUnmount, onMounted, ref, type Component, watch } from 'vue'
+import type { BrandLibrarySummary } from '@geo/shared-types'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, onBeforeUnmount, onMounted, reactive, ref, type Component, watch } from 'vue'
+import { message } from 'ant-design-vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 
-import { workspaceApi } from '@/lib/api'
+import { brandsApi, workspaceApi } from '@/lib/api'
+import { formatDateTime } from '@/lib/display'
+import { formatError } from '@/lib/errors'
 import { useAuthStore } from '@/stores/auth'
+import { useCompanyStore } from '@/stores/company'
 
 const route = useRoute()
 const router = useRouter()
+const queryClient = useQueryClient()
 const authStore = useAuthStore()
+const companyStore = useCompanyStore()
 const { locale, t } = useI18n()
 
 const MOBILE_BREAKPOINT = '(max-width: 991px)'
@@ -53,6 +63,12 @@ const quotaQuery = useQuery({
   enabled: computed(() => !isMembershipBlocked.value),
 })
 
+const brandLibrarySummaryQuery = useQuery({
+  queryKey: ['brands', 'library-summary'],
+  queryFn: () => brandsApi.getLibrarySummary(),
+  enabled: computed(() => !isMembershipBlocked.value),
+})
+
 const userDisplayName = computed(() => {
   return (
     authStore.user?.name ||
@@ -66,6 +82,127 @@ const userSecondaryIdentifier = computed(
 )
 const userInitial = computed(() => userDisplayName.value.slice(0, 1).toUpperCase() || 'A')
 const quotaSummary = computed(() => quotaQuery.data.value)
+const popoverVisible = ref(false)
+const searchQuery = ref('')
+const currentFilter = ref<'created' | 'joined'>('created')
+const brandModalOpen = ref(false)
+const brandForm = reactive({
+  name: '',
+  website: '',
+  description: '',
+})
+const brandLibrarySummary = computed<BrandLibrarySummary | null>(
+  () => brandLibrarySummaryQuery.data.value ?? null,
+)
+const brandLimitReached = computed(() => {
+  if (!brandLibrarySummary.value) {
+    return false
+  }
+  return brandLibrarySummary.value.remaining_brands <= 0
+})
+
+const currentBrandName = computed(() => {
+  return companyStore.currentBrand?.name || t('shell.currentCompanyPlaceholder')
+})
+
+const filteredBrands = computed(() => {
+  if (currentFilter.value === 'joined') {
+    return []
+  }
+
+  const query = searchQuery.value.trim().toLowerCase()
+  if (!query) {
+    return companyStore.brands
+  }
+
+  return companyStore.brands.filter((brand) => brand.name.toLowerCase().includes(query))
+})
+
+function getBrandInitials(name: string): string {
+  if (!name) return ''
+  return name.slice(0, 2)
+}
+
+function getAvatarBg(name: string): string {
+  const gradients = [
+    'linear-gradient(135deg, #ff758c 0%, #ff7eb3 100%)',
+    'linear-gradient(135deg, #667eea 0%, #764ba2 100%)',
+    'linear-gradient(135deg, #4facfe 0%, #00f2fe 100%)',
+    'linear-gradient(135deg, #f093fb 0%, #f5576c 100%)',
+    'linear-gradient(135deg, #43e97b 0%, #38f9d7 100%)',
+    'linear-gradient(135deg, #fa709a 0%, #fee140 100%)',
+  ]
+  let hash = 0
+  for (let i = 0; i < name.length; i++) {
+    hash = name.charCodeAt(i) + ((hash << 5) - hash)
+  }
+  const index = Math.abs(hash) % gradients.length
+  return gradients[index]
+}
+
+async function refreshBrandScopedData(): Promise<void> {
+  await Promise.all([
+    queryClient.invalidateQueries({ queryKey: ['workspace'] }),
+    queryClient.invalidateQueries({ queryKey: ['articles'] }),
+    queryClient.invalidateQueries({ queryKey: ['tracking'] }),
+    queryClient.invalidateQueries({ queryKey: ['schedules'] }),
+    queryClient.invalidateQueries({ queryKey: ['instantTasks'] }),
+  ])
+}
+
+function selectBrand(brandId: number): void {
+  if (!Number.isFinite(brandId) || brandId <= 0) {
+    return
+  }
+
+  companyStore.setCurrentBrand(brandId)
+  popoverVisible.value = false
+  searchQuery.value = ''
+  currentFilter.value = 'created'
+  void refreshBrandScopedData()
+}
+
+function handleCreateBrand(): void {
+  if (brandLimitReached.value) {
+    message.warning(
+      t('brands.messages.brandLimitReached', {
+        limit: brandLibrarySummary.value?.max_brands ?? 0,
+      }),
+    )
+    return
+  }
+
+  popoverVisible.value = false
+  brandForm.name = ''
+  brandForm.website = ''
+  brandForm.description = ''
+  brandModalOpen.value = true
+}
+
+const createBrandMutation = useMutation({
+  mutationFn: () =>
+    brandsApi.create({
+      name: brandForm.name.trim(),
+      website: brandForm.website.trim() || null,
+      description: brandForm.description.trim() || null,
+    }),
+  onSuccess: async (brand) => {
+    message.success(t('brands.messages.createBrand'))
+    brandModalOpen.value = false
+    await queryClient.invalidateQueries({ queryKey: ['brands'] })
+    await companyStore.refreshBrands()
+    companyStore.setCurrentBrand(brand.id)
+    await refreshBrandScopedData()
+  },
+  onError: (error) => message.error(formatError(error)),
+})
+
+async function submitBrand(): Promise<void> {
+  if (!brandForm.name.trim()) {
+    return
+  }
+  await createBrandMutation.mutateAsync()
+}
 const membershipExpiryText = computed(() => {
   const value = authStore.membership?.end_at
   if (!value) {
@@ -262,6 +399,7 @@ function syncMobileState(event?: MediaQueryListEvent | MediaQueryList): void {
 
 async function handleLogout(): Promise<void> {
   await authStore.logout()
+  companyStore.reset()
   await router.replace('/login')
 }
 
@@ -276,6 +414,10 @@ onMounted(() => {
   mobileMediaQuery = window.matchMedia(MOBILE_BREAKPOINT)
   syncMobileState(mobileMediaQuery)
   mobileMediaQuery.addEventListener('change', syncMobileState)
+
+  if (!isMembershipBlocked.value) {
+    void companyStore.refreshBrands()
+  }
 })
 
 onBeforeUnmount(() => {
@@ -376,6 +518,120 @@ onBeforeUnmount(() => {
         </nav>
 
         <div class="admin-header-actions">
+          <div v-if="!isMembershipBlocked" class="current-brand-control">
+            <a-popover
+              v-if="companyStore.hasBrands"
+              v-model:open="popoverVisible"
+              trigger="click"
+              placement="bottomLeft"
+              overlay-class-name="brand-popover-overlay"
+              :arrow="false"
+            >
+              <div class="current-brand-trigger">
+                <span class="current-brand-trigger__name">{{ currentBrandName }}</span>
+                <DownOutlined class="current-brand-trigger__arrow" :class="{ 'current-brand-trigger__arrow--open': popoverVisible }" />
+              </div>
+
+              <template #content>
+                <div class="brand-popover">
+                  <!-- Left Sidebar -->
+                  <div class="brand-popover__sidebar">
+                    <div class="brand-popover__section-title">品牌</div>
+                    <div class="brand-popover__menu">
+                      <div
+                        class="brand-popover__menu-item"
+                        :class="{ 'brand-popover__menu-item--active': currentFilter === 'created' }"
+                        @click="currentFilter = 'created'"
+                      >
+                        <span class="brand-popover__menu-icon">
+                          <TagsOutlined />
+                        </span>
+                        <span class="brand-popover__menu-text">我创建的</span>
+                        <span class="brand-popover__badge" :class="{ 'brand-popover__badge--active': currentFilter === 'created' }">
+                          {{ companyStore.brands.length }}
+                        </span>
+                      </div>
+
+                      <div
+                        class="brand-popover__menu-item"
+                        :class="{ 'brand-popover__menu-item--active': currentFilter === 'joined' }"
+                        @click="currentFilter = 'joined'"
+                      >
+                        <span class="brand-popover__menu-icon">
+                          <TeamOutlined />
+                        </span>
+                        <span class="brand-popover__menu-text">我加入的</span>
+                        <span class="brand-popover__badge brand-popover__badge--zero">0</span>
+                      </div>
+                    </div>
+
+                    <div class="brand-popover__footer">
+                      <div
+                        class="brand-popover__action"
+                        @pointerdown.prevent.stop="handleCreateBrand"
+                      >
+                        <PlusOutlined class="brand-popover__action-icon" />
+                        <span>创建品牌</span>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- Right Content Area -->
+                  <div class="brand-popover__content">
+                    <div class="brand-popover__search-wrapper">
+                      <a-input
+                        v-model:value="searchQuery"
+                        placeholder="搜索品牌"
+                        class="brand-popover__search-input"
+                        allow-clear
+                      >
+                        <template #suffix>
+                          <SearchOutlined style="color: #bfbfbf" />
+                        </template>
+                      </a-input>
+                    </div>
+
+                    <div class="brand-popover__list" v-if="filteredBrands.length > 0">
+                      <div
+                        v-for="brand in filteredBrands"
+                        :key="brand.id"
+                        class="brand-popover__item"
+                        :class="{ 'brand-popover__item--active': companyStore.currentBrandId === brand.id }"
+                        @pointerdown.prevent.stop="selectBrand(brand.id)"
+                      >
+                        <div
+                          class="brand-popover__avatar"
+                          :style="{ background: getAvatarBg(brand.name) }"
+                        >
+                          {{ getBrandInitials(brand.name) }}
+                        </div>
+                        <div class="brand-popover__info">
+                          <div class="brand-popover__name">{{ brand.name }}</div>
+                          <div class="brand-popover__date">
+                            创建于 {{ formatDateTime(brand.created_at, 'YYYY-MM-DD HH:mm:ss') }}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div v-else class="brand-popover__empty">
+                      <a-empty :description="t('common.noData') || '暂无品牌'" />
+                    </div>
+                  </div>
+                </div>
+              </template>
+            </a-popover>
+            <a-button
+              v-else
+              size="small"
+              type="link"
+              class="current-brand-control__create"
+              :loading="companyStore.loading"
+              @click="handleCreateBrand"
+            >
+              {{ t('shell.createCompany') }}
+            </a-button>
+          </div>
+
           <!-- Quota Indicator -->
           <div v-if="!isMembershipBlocked" class="quota-pill">
             <a-tag color="blue" :bordered="false" class="quota-pill-tag">
@@ -480,6 +736,26 @@ onBeforeUnmount(() => {
         </template>
       </a-menu>
     </a-drawer>
+
+    <a-modal
+      v-model:open="brandModalOpen"
+      :title="t('brands.newBrand')"
+      centered
+      :confirm-loading="createBrandMutation.isPending.value"
+      @ok="submitBrand"
+    >
+      <a-form layout="vertical">
+        <a-form-item :label="t('brands.form.brandName')">
+          <a-input v-model:value="brandForm.name" />
+        </a-form-item>
+        <a-form-item :label="t('brands.form.brandWebsite')">
+          <a-input v-model:value="brandForm.website" />
+        </a-form-item>
+        <a-form-item :label="t('brands.form.brandDescription')">
+          <a-textarea v-model:value="brandForm.description" :rows="4" />
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </a-layout>
 </template>
 
@@ -666,10 +942,308 @@ onBeforeUnmount(() => {
   flex-shrink: 0;
   display: flex;
   align-items: center;
-  gap: 20px;
+  gap: 16px;
   margin-left: auto;
 }
 
+.current-brand-control {
+  display: inline-flex;
+  align-items: center;
+  min-width: 0;
+}
+
+.current-brand-trigger {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  cursor: pointer;
+  padding: 6px 10px;
+  border-radius: 6px;
+  transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
+  user-select: none;
+}
+
+.current-brand-trigger:hover {
+  background: rgba(0, 0, 0, 0.04);
+}
+
+.current-brand-trigger__name {
+  font-size: 15px;
+  font-weight: 600;
+  color: #1f2937;
+  line-height: 22px;
+}
+
+.current-brand-trigger__arrow {
+  font-size: 10px;
+  color: #8c8c8c;
+  transition: transform 0.2s ease;
+}
+
+.current-brand-trigger__arrow--open {
+  transform: rotate(180deg);
+}
+
+.current-brand-control__create {
+  height: 28px;
+  padding: 0 8px;
+  font-size: 13px;
+  font-weight: 600;
+}
+
+/* Custom Popover Container Style */
+:deep(.brand-popover-overlay .ant-popover-inner) {
+  padding: 0;
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 12px 36px rgba(0, 0, 0, 0.09);
+  border: 1px solid #f0f0f0;
+}
+
+:deep(.brand-popover-overlay .ant-popover-inner-content) {
+  padding: 0;
+}
+
+.brand-popover {
+  display: flex;
+  width: 500px;
+  height: 360px;
+  background: #ffffff;
+}
+
+/* Left Sidebar */
+.brand-popover__sidebar {
+  width: 165px;
+  background: #f8fafc;
+  border-right: 1px solid #f1f5f9;
+  padding: 16px 8px 12px;
+  display: flex;
+  flex-direction: column;
+}
+
+.brand-popover__section-title {
+  font-size: 11px;
+  color: #94a3b8;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  margin-bottom: 8px;
+  padding-left: 8px;
+}
+
+.brand-popover__menu {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.brand-popover__menu-item {
+  padding: 8px 10px;
+  border-radius: 6px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  color: #475569;
+  font-size: 13px;
+  font-weight: 500;
+}
+
+.brand-popover__menu-item:hover {
+  background: #f1f5f9;
+  color: #0f172a;
+}
+
+.brand-popover__menu-item--active {
+  background: #e0f2fe;
+  color: #0284c7;
+}
+
+.brand-popover__menu-icon {
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+}
+
+.brand-popover__menu-text {
+  flex: 1;
+}
+
+.brand-popover__badge {
+  background: #e2e8f0;
+  color: #64748b;
+  border-radius: 999px;
+  padding: 1px 6px;
+  font-size: 10px;
+  font-weight: 600;
+  line-height: 12px;
+  min-width: 18px;
+  text-align: center;
+}
+
+.brand-popover__badge--active {
+  background: #0284c7;
+  color: #ffffff;
+}
+
+.brand-popover__badge--zero {
+  background: #f1f5f9;
+  color: #cbd5e1;
+}
+
+.brand-popover__footer {
+  margin-top: auto;
+  padding: 12px 0 0;
+  border-top: 1px solid #e2e8f0;
+}
+
+.brand-popover__action {
+  min-height: 40px;
+  padding: 9px 10px;
+  border-radius: 6px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  cursor: pointer;
+  color: #0284c7;
+  font-weight: 600;
+  font-size: 13px;
+  transition: all 0.2s ease;
+}
+
+.brand-popover__action:hover {
+  background: #f0f9ff;
+}
+
+.brand-popover__action-icon {
+  font-size: 12px;
+}
+
+/* Right Content Area */
+.brand-popover__content {
+  flex: 1;
+  padding: 14px;
+  display: flex;
+  flex-direction: column;
+  background: #ffffff;
+  min-width: 0;
+}
+
+.brand-popover__search-wrapper {
+  margin-bottom: 10px;
+}
+
+:deep(.brand-popover__search-input.ant-input-affine-wrapper) {
+  border-radius: 6px;
+  border-color: #cbd5e1;
+  padding: 4px 10px;
+}
+
+:deep(.brand-popover__search-input.ant-input-affine-wrapper:focus),
+:deep(.brand-popover__search-input.ant-input-affine-wrapper-focused) {
+  border-color: #0284c7;
+  box-shadow: 0 0 0 2px rgba(2, 132, 199, 0.1);
+}
+
+.brand-popover__list {
+  flex: 1;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding-right: 4px;
+}
+
+.brand-popover__list::-webkit-scrollbar {
+  width: 4px;
+}
+
+.brand-popover__list::-webkit-scrollbar-thumb {
+  background: #cbd5e1;
+  border-radius: 2px;
+}
+
+.brand-popover__list::-webkit-scrollbar-thumb:hover {
+  background: #94a3b8;
+}
+
+.brand-popover__item {
+  padding: 8px 10px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  cursor: pointer;
+  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  border: 1px solid transparent;
+}
+
+.brand-popover__item:hover {
+  background: #f8fafc;
+  transform: translateY(-0.5px);
+  border-color: #f1f5f9;
+}
+
+.brand-popover__item--active {
+  background: #f0f9ff;
+  border-color: #bae6fd;
+}
+
+.brand-popover__avatar {
+  width: 38px;
+  height: 38px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  font-weight: 700;
+  font-size: 13px;
+  flex-shrink: 0;
+  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.05);
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.brand-popover__info {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  flex: 1;
+}
+
+.brand-popover__name {
+  font-size: 13.5px;
+  font-weight: 600;
+  color: #1e293b;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  line-height: 1.4;
+  transition: color 0.2s ease;
+}
+
+.brand-popover__item:hover .brand-popover__name {
+  color: #0284c7;
+}
+
+.brand-popover__item--active .brand-popover__name {
+  color: #0284c7;
+}
+
+.brand-popover__date {
+  font-size: 11px;
+  color: #64748b;
+  margin-top: 1px;
+}
+
+.brand-popover__empty {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .quota-pill {
   display: flex;
   align-items: center;
@@ -847,6 +1421,18 @@ onBeforeUnmount(() => {
     margin-left: 0;
   }
 
+  .current-brand-control {
+    max-width: 150px;
+  }
+
+  .current-brand-trigger__name {
+    font-size: 14px;
+    max-width: 110px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
   .quota-pill {
     display: none;
   }
@@ -882,5 +1468,9 @@ onBeforeUnmount(() => {
   .user-dropdown-trigger {
     padding: 4px;
   }
+
+  .current-brand-control {
+    display: none;
+  }
 }
 </style>
diff --git a/apps/admin-web/src/lib/api.ts b/apps/admin-web/src/lib/api.ts
index aa67547..8468ad0 100644
--- a/apps/admin-web/src/lib/api.ts
+++ b/apps/admin-web/src/lib/api.ts
@@ -148,6 +148,7 @@ import {
   readStoredSession,
   setStoredTokens,
 } from './session'
+import { readStoredCurrentBrandId } from './current-brand'
 
 const rawBaseURL = import.meta.env.VITE_API_BASE_URL ?? ''
 const baseURL = normalizeApiBaseURL(rawBaseURL)
@@ -312,6 +313,64 @@ export const apiClient = createApiClient({
   },
 })
 
+const currentBrandScopedPathPatterns = [
+  /^\/api\/tenant\/workspace\/(?:overview|recent-articles)(?:\/|$)/,
+  /^\/api\/tenant\/articles(?:\/|$)/,
+  /^\/api\/tenant\/templates\/[^/]+\/(?:drafts|generate)(?:\/|$)/,
+  /^\/api\/tenant\/kol\/subscription-prompts\/[^/]+\/generate(?:\/|$)/,
+  /^\/api\/tenant\/schedules(?:\/|$)/,
+  /^\/api\/tenant\/instant-tasks(?:\/|$)/,
+  /^\/api\/tenant\/publish-jobs(?:\/|$)/,
+  /^\/api\/tenant\/publish-tasks\/[^/]+\/retry(?:\/|$)/,
+]
+
+function shouldAttachCurrentBrandHeader(url: unknown): boolean {
+  if (typeof url !== 'string') {
+    return false
+  }
+  const pathname = normalizeRequestPath(url)
+  return currentBrandScopedPathPatterns.some((pattern) => pattern.test(pathname))
+}
+
+function normalizeRequestPath(url: string): string {
+  if (/^https?:\/\//i.test(url)) {
+    try {
+      return new URL(url).pathname
+    } catch {
+      return url
+    }
+  }
+  return url.split('?')[0] || url
+}
+
+function buildCurrentBrandHeaders(path: string): Headers | undefined {
+  if (!shouldAttachCurrentBrandHeader(path)) {
+    return undefined
+  }
+  const brandId = readStoredCurrentBrandId()
+  if (!brandId) {
+    return undefined
+  }
+  const headers = new Headers()
+  headers.set('X-Brand-ID', String(brandId))
+  return headers
+}
+
+apiClient.raw.interceptors.request.use((config) => {
+  if (!shouldAttachCurrentBrandHeader(config.url)) {
+    return config
+  }
+
+  const brandId = readStoredCurrentBrandId()
+  if (!brandId) {
+    return config
+  }
+
+  config.headers = config.headers ?? {}
+  ;(config.headers as Record<string, string>)['X-Brand-ID'] = String(brandId)
+  return config
+})
+
 const membershipBlockedErrors = new Set([
   'user_disabled',
   'trial_plan_expired',
@@ -910,6 +969,8 @@ async function subscribeSSE<TEvent extends SSEEventShape>(
   const requestHeaders = new Headers(init.headers)
   requestHeaders.set('Accept', 'text/event-stream')
   requestHeaders.set('Authorization', `Bearer ${await getFreshStoredAccessToken()}`)
+  const currentBrandHeaders = buildCurrentBrandHeaders(path)
+  currentBrandHeaders?.forEach((value, key) => requestHeaders.set(key, value))
 
   let response = await fetch(`${baseURL}${path}`, {
     ...init,
diff --git a/apps/admin-web/src/lib/current-brand.ts b/apps/admin-web/src/lib/current-brand.ts
new file mode 100644
index 0000000..51831b5
--- /dev/null
+++ b/apps/admin-web/src/lib/current-brand.ts
@@ -0,0 +1,25 @@
+const CURRENT_BRAND_STORAGE_KEY = 'geo-rankly.current-brand-id'
+
+export function readStoredCurrentBrandId(): number | null {
+  if (typeof window === 'undefined') {
+    return null
+  }
+
+  const raw = window.localStorage.getItem(CURRENT_BRAND_STORAGE_KEY)
+  const value = Number(raw)
+  return Number.isFinite(value) && value > 0 ? value : null
+}
+
+export function writeStoredCurrentBrandId(brandId: number): void {
+  if (typeof window === 'undefined') {
+    return
+  }
+  window.localStorage.setItem(CURRENT_BRAND_STORAGE_KEY, String(brandId))
+}
+
+export function clearStoredCurrentBrandId(): void {
+  if (typeof window === 'undefined') {
+    return
+  }
+  window.localStorage.removeItem(CURRENT_BRAND_STORAGE_KEY)
+}
diff --git a/apps/admin-web/src/main.ts b/apps/admin-web/src/main.ts
index 522623d..eea283d 100644
--- a/apps/admin-web/src/main.ts
+++ b/apps/admin-web/src/main.ts
@@ -108,7 +108,6 @@ const IconFont = createFromIconfontCN({
 })
 app.component('IconFont', IconFont)
 
-app.component('ATextarea', Input.TextArea)
 ;[
   Alert,
   AntApp,
diff --git a/apps/admin-web/src/router/index.ts b/apps/admin-web/src/router/index.ts
index b6649c7..df5e987 100644
--- a/apps/admin-web/src/router/index.ts
+++ b/apps/admin-web/src/router/index.ts
@@ -2,8 +2,31 @@ import { createRouter, createWebHistory } from 'vue-router'
 
 import { isChunkLoadError, reloadForStaleChunk } from '@/lib/chunk-reload'
 import { useAuthStore } from '@/stores/auth'
+import { useCompanyStore } from '@/stores/company'
 import { pinia } from '@/stores/pinia'
 
+let brandRefreshPromise: Promise<unknown> | null = null
+
+async function ensureBrandsInitialized(): Promise<boolean> {
+  const companyStore = useCompanyStore(pinia)
+  if (companyStore.initialized) {
+    return true
+  }
+
+  if (!brandRefreshPromise) {
+    brandRefreshPromise = companyStore.refreshBrands().finally(() => {
+      brandRefreshPromise = null
+    })
+  }
+
+  try {
+    await brandRefreshPromise
+    return true
+  } catch {
+    return false
+  }
+}
+
 const router = createRouter({
   history: createWebHistory(),
   routes: [
@@ -24,6 +47,17 @@ const router = createRouter({
         requiresAuth: true,
       },
     },
+    {
+      path: '/onboarding/brand',
+      name: 'brand-onboarding',
+      component: () => import('@/views/BrandOnboardingView.vue'),
+      meta: {
+        requiresAuth: true,
+        onboarding: true,
+        titleKey: 'route.brandOnboarding.title',
+        descriptionKey: 'route.brandOnboarding.description',
+      },
+    },
     {
       path: '/',
       component: () => import('@/layouts/AppShell.vue'),
@@ -279,6 +313,7 @@ const router = createRouter({
 
 router.beforeEach(async (to) => {
   const authStore = useAuthStore(pinia)
+  const companyStore = useCompanyStore(pinia)
 
   if (!authStore.initialized) {
     await authStore.bootstrap()
@@ -292,11 +327,23 @@ router.beforeEach(async (to) => {
     }
   }
 
-  if (to.meta.requiresKol && !authStore.isActiveKol) {
+  if (to.name === 'login' && authStore.isAuthenticated) {
     return { name: 'workspace' }
   }
 
-  if (to.name === 'login' && authStore.isAuthenticated) {
+  if (requiresAuth && authStore.isAuthenticated && !authStore.isMembershipBlocked) {
+    const brandsInitialized = await ensureBrandsInitialized()
+
+    if (brandsInitialized && !companyStore.hasBrands && !to.meta.onboarding) {
+      return { name: 'brand-onboarding' }
+    }
+
+    if (brandsInitialized && companyStore.hasBrands && to.meta.onboarding) {
+      return { name: 'workspace' }
+    }
+  }
+
+  if (to.meta.requiresKol && !authStore.isActiveKol) {
     return { name: 'workspace' }
   }
 
diff --git a/apps/admin-web/src/router/meta.d.ts b/apps/admin-web/src/router/meta.d.ts
index e067875..a1c16cc 100644
--- a/apps/admin-web/src/router/meta.d.ts
+++ b/apps/admin-web/src/router/meta.d.ts
@@ -8,6 +8,7 @@ declare module 'vue-router' {
     descriptionKey?: string
     requiresAuth?: boolean
     requiresKol?: boolean
+    onboarding?: boolean
     navKey?: string | null
   }
 }
diff --git a/apps/admin-web/src/stores/company.ts b/apps/admin-web/src/stores/company.ts
new file mode 100644
index 0000000..926c24e
--- /dev/null
+++ b/apps/admin-web/src/stores/company.ts
@@ -0,0 +1,92 @@
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
+import type { Brand } from '@geo/shared-types'
+
+import { brandsApi } from '@/lib/api'
+import {
+  clearStoredCurrentBrandId,
+  readStoredCurrentBrandId,
+  writeStoredCurrentBrandId,
+} from '@/lib/current-brand'
+
+export const useCompanyStore = defineStore('company', () => {
+  const brands = ref<Brand[]>([])
+  const currentBrandId = ref<number | null>(readStoredCurrentBrandId())
+  const loading = ref(false)
+  const initialized = ref(false)
+
+  const currentBrand = computed(
+    () => brands.value.find((brand) => brand.id === currentBrandId.value) ?? null,
+  )
+  const hasBrands = computed(() => brands.value.length > 0)
+
+  function setCurrentBrand(brandId: number | null): void {
+    if (!brandId) {
+      currentBrandId.value = null
+      clearStoredCurrentBrandId()
+      return
+    }
+
+    currentBrandId.value = brandId
+    writeStoredCurrentBrandId(brandId)
+  }
+
+  function normalizeBrandList(value: Brand[] | null | undefined): Brand[] {
+    return Array.isArray(value) ? value : []
+  }
+
+  function syncCurrentBrand(value: Brand[] | null | undefined): void {
+    const nextBrands = normalizeBrandList(value)
+    const storedId = readStoredCurrentBrandId()
+    const preferredId = currentBrandId.value ?? storedId
+    const matched = preferredId
+      ? nextBrands.find((brand) => brand.id === preferredId)
+      : undefined
+
+    if (matched) {
+      setCurrentBrand(matched.id)
+      return
+    }
+
+    if (nextBrands.length > 0) {
+      setCurrentBrand(nextBrands[0].id)
+      return
+    }
+
+    setCurrentBrand(null)
+  }
+
+  async function refreshBrands(): Promise<Brand[]> {
+    loading.value = true
+    try {
+      const nextBrands = normalizeBrandList(await brandsApi.list())
+      brands.value = nextBrands
+      syncCurrentBrand(nextBrands)
+      initialized.value = true
+      return nextBrands
+    } finally {
+      loading.value = false
+    }
+  }
+
+  function reset(): void {
+    brands.value = []
+    currentBrandId.value = null
+    initialized.value = false
+    loading.value = false
+    clearStoredCurrentBrandId()
+  }
+
+  return {
+    brands,
+    currentBrandId,
+    currentBrand,
+    hasBrands,
+    loading,
+    initialized,
+    refreshBrands,
+    setCurrentBrand,
+    reset,
+  }
+})
diff --git a/apps/admin-web/src/views/ArticleEditorView.vue b/apps/admin-web/src/views/ArticleEditorView.vue
index 5c5db72..236b362 100644
--- a/apps/admin-web/src/views/ArticleEditorView.vue
+++ b/apps/admin-web/src/views/ArticleEditorView.vue
@@ -16,6 +16,7 @@ import ArticleEditorCanvas from '@/components/ArticleEditorCanvas.vue'
 import PublishArticleModal from '@/components/PublishArticleModal.vue'
 import { articlesApi, complianceApi } from '@/lib/api'
 import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
 
 type EditorCanvasPublic = InstanceType<typeof ArticleEditorCanvas> & {
   scrollToText?: (text: string) => boolean
@@ -25,6 +26,7 @@ const route = useRoute()
 const router = useRouter()
 const queryClient = useQueryClient()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const articleId = computed(() => Number(route.params.id))
 const title = ref('')
@@ -38,8 +40,10 @@ const editorComplianceResult = ref<ComplianceCheckResult | null>(null)
 const editorCanvasRef = ref<EditorCanvasPublic | null>(null)
 
 const detailQuery = useQuery({
-  queryKey: computed(() => ['articles', 'detail', articleId.value]),
-  enabled: computed(() => Number.isInteger(articleId.value) && articleId.value > 0),
+  queryKey: computed(() => ['articles', 'detail', companyStore.currentBrandId, articleId.value]),
+  enabled: computed(
+    () => Boolean(companyStore.currentBrandId) && Number.isInteger(articleId.value) && articleId.value > 0,
+  ),
   queryFn: () => articlesApi.detail(articleId.value),
 })
 
diff --git a/apps/admin-web/src/views/BrandOnboardingView.vue b/apps/admin-web/src/views/BrandOnboardingView.vue
new file mode 100644
index 0000000..e8f4ba0
--- /dev/null
+++ b/apps/admin-web/src/views/BrandOnboardingView.vue
@@ -0,0 +1,1107 @@
+<script setup lang="ts">
+import {
+  ArrowRightOutlined,
+  CheckCircleOutlined,
+  GlobalOutlined,
+  PlusOutlined,
+  ShopOutlined,
+  TagsOutlined,
+} from '@ant-design/icons-vue'
+import { ApiClientError } from '@geo/http-client'
+import type {
+  Brand,
+  BrandLibrarySummary,
+  BrandRequest,
+  QuestionCandidate,
+} from '@geo/shared-types'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { message } from 'ant-design-vue'
+import { computed, onBeforeUnmount, reactive, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useRouter } from 'vue-router'
+
+import AiWaitingModal from '@/components/AiWaitingModal.vue'
+import { brandsApi } from '@/lib/api'
+import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
+
+const DEFAULT_SELECTED_QUESTION_COUNT = 5
+
+interface CandidateRow extends QuestionCandidate {
+  id: string
+  selected: boolean
+}
+
+const router = useRouter()
+const queryClient = useQueryClient()
+const companyStore = useCompanyStore()
+const { t } = useI18n()
+
+const brandModalOpen = ref(false)
+const questionModalOpen = ref(false)
+const createdBrand = ref<Brand | null>(null)
+const candidateRows = ref<CandidateRow[]>([])
+const questionNotice = ref('')
+const aiWaitingOpen = ref(false)
+const aiProgress = ref(12)
+const aiStageIndex = ref(0)
+
+let aiProgressTimer: number | null = null
+let aiCloseTimer: number | null = null
+
+const brandForm = reactive({
+  name: '',
+  website: '',
+  description: '',
+})
+
+const brandLibrarySummaryQuery = useQuery({
+  queryKey: ['brands', 'library-summary'],
+  queryFn: () => brandsApi.getLibrarySummary(),
+})
+
+const brandLibrarySummary = computed<BrandLibrarySummary | null>(
+  () => brandLibrarySummaryQuery.data.value ?? null,
+)
+
+const brandLimitReached = computed(() => {
+  if (!brandLibrarySummary.value) {
+    return false
+  }
+  return brandLibrarySummary.value.remaining_brands <= 0
+})
+
+const selectableQuestionLimit = computed(() => {
+  const summary = brandLibrarySummary.value
+  if (!summary) {
+    return Number.POSITIVE_INFINITY
+  }
+  if (typeof summary.remaining_questions === 'number') {
+    return Math.max(0, summary.remaining_questions)
+  }
+  if (typeof summary.max_questions === 'number' && typeof summary.used_questions === 'number') {
+    return Math.max(0, summary.max_questions - summary.used_questions)
+  }
+  if (typeof summary.max_questions === 'number') {
+    return Math.max(0, summary.max_questions)
+  }
+  return Number.POSITIVE_INFINITY
+})
+
+const selectableQuestionLimitText = computed(() => {
+  if (Number.isFinite(selectableQuestionLimit.value)) {
+    return String(selectableQuestionLimit.value)
+  }
+  return '--'
+})
+
+const selectedCandidates = computed(() => candidateRows.value.filter((item) => item.selected))
+
+const hasExistingBrands = computed(() => companyStore.brands.length > 0)
+
+const createBrandMutation = useMutation({
+  mutationFn: (payload: BrandRequest) => brandsApi.create(payload),
+})
+
+const questionGenerationMutation = useMutation({
+  mutationFn: (payload: { brandId: number; seedTopic: string }) =>
+    brandsApi.distillQuestions(payload.brandId, {
+      seed_topic: payload.seedTopic,
+    }),
+})
+
+const materializeQuestionsMutation = useMutation({
+  mutationFn: (payload: { brandId: number; questions: string[] }) =>
+    brandsApi.materializeQuestions(payload.brandId, {
+      source: 'ai_distill',
+      questions: payload.questions.map((text) => ({ text })),
+    }),
+})
+
+const aiStages = computed(() => [
+  t('onboardingBrand.ai.stages.fetch'),
+  t('onboardingBrand.ai.stages.generate'),
+  t('onboardingBrand.ai.stages.refine'),
+])
+
+function openBrandModal(): void {
+  if (brandLimitReached.value) {
+    message.warning(
+      t('brands.messages.brandLimitReached', {
+        limit: brandLibrarySummary.value?.max_brands ?? 0,
+      }),
+    )
+    return
+  }
+
+  brandForm.name = ''
+  brandForm.website = ''
+  brandForm.description = ''
+  brandModalOpen.value = true
+}
+
+function clearAiTimers(): void {
+  if (aiProgressTimer !== null) {
+    window.clearInterval(aiProgressTimer)
+    aiProgressTimer = null
+  }
+  if (aiCloseTimer !== null) {
+    window.clearTimeout(aiCloseTimer)
+    aiCloseTimer = null
+  }
+}
+
+function beginAiTask(): void {
+  clearAiTimers()
+  aiWaitingOpen.value = true
+  aiProgress.value = 12
+  aiStageIndex.value = 0
+  aiProgressTimer = window.setInterval(() => {
+    const nextProgress = Math.min(92, aiProgress.value + 8)
+    aiProgress.value = nextProgress
+    aiStageIndex.value = nextProgress >= 66 ? 2 : nextProgress >= 38 ? 1 : 0
+  }, 700)
+}
+
+function finishAiTask(): void {
+  clearAiTimers()
+  aiProgress.value = 100
+  aiStageIndex.value = aiStages.value.length - 1
+  aiCloseTimer = window.setTimeout(() => {
+    aiWaitingOpen.value = false
+    aiCloseTimer = null
+  }, 180)
+}
+
+onBeforeUnmount(clearAiTimers)
+
+function buildSeedTopic(brand: Brand): string {
+  return [
+    brand.name,
+    brand.website ?? brandForm.website.trim(),
+    brand.description ?? brandForm.description.trim(),
+  ]
+    .filter(Boolean)
+    .join(' ')
+}
+
+function normalizeQuestionText(value: string): string {
+  return value.trim().replace(/\s+/g, '')
+}
+
+function normalizeQuestionKey(value: string): string {
+  return normalizeQuestionText(value)
+    .replace(/[\p{P}]/gu, '')
+    .toLowerCase()
+}
+
+function toCandidateRows(candidates: QuestionCandidate[]): CandidateRow[] {
+  const rows: CandidateRow[] = []
+  const seen = new Set<string>()
+
+  for (const candidate of candidates) {
+    const text = normalizeQuestionText(candidate.text)
+    const key = normalizeQuestionKey(text)
+    if (!text || !key || seen.has(key)) {
+      continue
+    }
+    seen.add(key)
+    rows.push({
+      ...candidate,
+      text,
+      id: `${Date.now()}-${rows.length}-${key}`,
+      selected: false,
+    })
+  }
+
+  return rows
+}
+
+function applyDefaultSelection(rows: CandidateRow[]): void {
+  const limit = Number.isFinite(selectableQuestionLimit.value)
+    ? Math.min(DEFAULT_SELECTED_QUESTION_COUNT, selectableQuestionLimit.value)
+    : DEFAULT_SELECTED_QUESTION_COUNT
+  if (limit <= 0) {
+    return
+  }
+
+  let selected = 0
+  const preferredRows = rows.filter(
+    (row) => !row.suggest_skip && !row.too_short && !row.duplicate,
+  )
+  const orderedRows = [...preferredRows, ...rows.filter((row) => !preferredRows.includes(row))]
+
+  for (const row of orderedRows) {
+    if (selected >= limit) {
+      break
+    }
+    row.selected = true
+    selected += 1
+  }
+}
+
+async function refreshAppData(): Promise<void> {
+  await Promise.all([
+    queryClient.invalidateQueries({ queryKey: ['brands'] }),
+    queryClient.invalidateQueries({ queryKey: ['workspace'] }),
+    queryClient.invalidateQueries({ queryKey: ['articles'] }),
+    queryClient.invalidateQueries({ queryKey: ['tracking'] }),
+    queryClient.invalidateQueries({ queryKey: ['schedules'] }),
+    queryClient.invalidateQueries({ queryKey: ['instantTasks'] }),
+  ])
+}
+
+async function enterWorkspace(brand: Brand | null = createdBrand.value): Promise<void> {
+  if (brand) {
+    companyStore.setCurrentBrand(brand.id)
+  }
+  await refreshAppData()
+  if (brand) {
+    await companyStore.refreshBrands()
+    companyStore.setCurrentBrand(brand.id)
+  }
+  await router.replace({ name: 'workspace' })
+}
+
+async function enterExistingBrand(brand: Brand): Promise<void> {
+  await enterWorkspace(brand)
+}
+
+function toggleCandidate(row: CandidateRow): void {
+  if (row.selected) {
+    row.selected = false
+    return
+  }
+
+  if (
+    Number.isFinite(selectableQuestionLimit.value) &&
+    selectedCandidates.value.length >= selectableQuestionLimit.value
+  ) {
+    message.warning(
+      t('onboardingBrand.questions.selectionLimit', {
+        limit: selectableQuestionLimitText.value,
+      }),
+    )
+    return
+  }
+
+  row.selected = true
+}
+
+async function submitBrand(): Promise<void> {
+  const name = brandForm.name.trim()
+  const website = brandForm.website.trim()
+  const description = brandForm.description.trim()
+
+  if (!name) {
+    message.warning(t('onboardingBrand.messages.nameRequired'))
+    return
+  }
+  if (brandLimitReached.value) {
+    message.warning(
+      t('brands.messages.brandLimitReached', {
+        limit: brandLibrarySummary.value?.max_brands ?? 0,
+      }),
+    )
+    return
+  }
+
+  try {
+    const brand = await createBrandMutation.mutateAsync({
+      name,
+      website: website || null,
+      description: description || null,
+    })
+    createdBrand.value = brand
+    brandModalOpen.value = false
+    message.success(t('brands.messages.createBrand'))
+    await queryClient.invalidateQueries({ queryKey: ['brands'] })
+    await companyStore.refreshBrands()
+    companyStore.setCurrentBrand(brand.id)
+
+    beginAiTask()
+    try {
+      const result = await questionGenerationMutation.mutateAsync({
+        brandId: brand.id,
+        seedTopic: buildSeedTopic(brand),
+      })
+      const rows = toCandidateRows(result.candidates)
+      applyDefaultSelection(rows)
+      candidateRows.value = rows
+      questionNotice.value = rows.length ? '' : t('onboardingBrand.questions.empty')
+      if (result.ai_points_charged) {
+        message.success(
+          t('onboardingBrand.messages.aiCharged', {
+            count: result.ai_points_charged,
+          }),
+        )
+      }
+    } catch (error) {
+      candidateRows.value = []
+      questionNotice.value = formatError(error)
+    } finally {
+      finishAiTask()
+      questionModalOpen.value = true
+    }
+  } catch (error) {
+    if (error instanceof ApiClientError && error.message === 'brand_limit_reached') {
+      message.warning(
+        t('brands.messages.brandLimitReached', {
+          limit: brandLibrarySummary.value?.max_brands ?? 0,
+        }),
+      )
+      return
+    }
+    message.error(formatError(error))
+  }
+}
+
+async function saveSelectedQuestions(): Promise<void> {
+  const brand = createdBrand.value
+  if (!brand) {
+    return
+  }
+  if (!selectedCandidates.value.length) {
+    message.warning(t('onboardingBrand.messages.questionRequired'))
+    return
+  }
+
+  try {
+    const result = await materializeQuestionsMutation.mutateAsync({
+      brandId: brand.id,
+      questions: selectedCandidates.value.map((item) => item.text.trim()).filter(Boolean),
+    })
+    if (result.created_questions <= 0) {
+      message.warning(t('brands.questions.errors.noValidQuestions'))
+      return
+    }
+    message.success(
+      t('brands.questions.messages.partialSaved', {
+        created: result.created_questions,
+        skipped: result.skipped_questions.length,
+      }),
+    )
+    questionModalOpen.value = false
+    await enterWorkspace(brand)
+  } catch (error) {
+    if (error instanceof ApiClientError && error.message === 'no_valid_questions') {
+      message.warning(t('brands.questions.errors.noValidQuestions'))
+      return
+    }
+    message.error(formatError(error))
+  }
+}
+</script>
+
+<template>
+  <div class="brand-onboarding">
+    <div class="glow-orb glow-orb--1"></div>
+    <div class="glow-orb glow-orb--2"></div>
+
+    <main class="onboarding-panel">
+      <section class="onboarding-panel__intro">
+        <div class="brand-mark">
+          <ShopOutlined />
+        </div>
+        <h1>{{ t('onboardingBrand.title') }}</h1>
+        <p class="intro-copy">{{ t('onboardingBrand.subtitle') }}</p>
+      </section>
+
+      <section class="brand-entry">
+        <div v-if="companyStore.loading && !companyStore.initialized" class="brand-entry__loading">
+          <a-skeleton active :paragraph="{ rows: 4 }" />
+        </div>
+
+        <template v-else>
+          <div v-if="hasExistingBrands" class="brand-entry__grid">
+            <button
+              v-for="brand in companyStore.brands"
+              :key="brand.id"
+              type="button"
+              class="brand-choice"
+              @click="enterExistingBrand(brand)"
+            >
+              <span class="brand-choice__icon"><TagsOutlined /></span>
+              <strong>{{ brand.name }}</strong>
+              <span>{{ brand.website || t('onboardingBrand.noWebsite') }}</span>
+              <ArrowRightOutlined class="brand-choice__arrow" />
+            </button>
+
+            <button type="button" class="brand-choice brand-choice--create" @click="openBrandModal">
+              <span class="brand-choice__icon"><PlusOutlined /></span>
+              <strong>{{ t('onboardingBrand.createBrand') }}</strong>
+              <span>{{ t('onboardingBrand.createHint') }}</span>
+            </button>
+          </div>
+
+          <div v-else class="empty-brand-state">
+            <button type="button" class="create-brand-card" @click="openBrandModal">
+              <span class="create-brand-card__icon"><PlusOutlined /></span>
+              <strong>{{ t('onboardingBrand.createBrand') }}</strong>
+              <span>{{ t('onboardingBrand.emptyDescription') }}</span>
+            </button>
+          </div>
+        </template>
+      </section>
+    </main>
+
+    <a-modal
+      v-model:open="brandModalOpen"
+      :title="t('onboardingBrand.form.title')"
+      centered
+      :footer="null"
+      :width="560"
+      :mask-closable="false"
+    >
+      <a-form layout="vertical" class="brand-create-form" @submit.prevent="submitBrand">
+        <a-form-item :label="t('onboardingBrand.form.name')" required>
+          <a-input
+            v-model:value="brandForm.name"
+            size="large"
+            :placeholder="t('onboardingBrand.form.namePlaceholder')"
+          />
+        </a-form-item>
+        <a-form-item :label="t('onboardingBrand.form.website')">
+          <a-input
+            v-model:value="brandForm.website"
+            size="large"
+            :placeholder="t('onboardingBrand.form.websitePlaceholder')"
+          >
+            <template #prefix><GlobalOutlined /></template>
+          </a-input>
+        </a-form-item>
+        <a-form-item :label="t('onboardingBrand.form.description')">
+          <a-textarea
+            v-model:value="brandForm.description"
+            :rows="4"
+            :placeholder="t('onboardingBrand.form.descriptionPlaceholder')"
+          />
+        </a-form-item>
+        <div class="modal-actions">
+          <a-button size="large" @click="brandModalOpen = false">
+            {{ t('common.cancel') }}
+          </a-button>
+          <a-button
+            size="large"
+            type="primary"
+            html-type="submit"
+            :loading="createBrandMutation.isPending.value"
+          >
+            {{ t('common.next') }}
+            <template #icon><ArrowRightOutlined /></template>
+          </a-button>
+        </div>
+      </a-form>
+    </a-modal>
+
+    <a-modal
+      v-model:open="questionModalOpen"
+      centered
+      :footer="null"
+      :width="760"
+      :closable="false"
+      :mask-closable="false"
+    >
+      <section class="question-picker">
+        <div class="question-picker__header">
+          <div>
+            <p class="eyebrow">{{ createdBrand?.name }}</p>
+            <h2>{{ t('onboardingBrand.questions.title') }}</h2>
+            <p>
+              {{
+                t('onboardingBrand.questions.subtitle', {
+                  limit: selectableQuestionLimitText,
+                })
+              }}
+            </p>
+          </div>
+          <div class="question-picker__count">
+            <strong>{{ selectedCandidates.length }}</strong>
+            <span>/ {{ selectableQuestionLimitText }}</span>
+          </div>
+        </div>
+
+        <a-alert
+          v-if="questionNotice"
+          class="question-picker__notice"
+          type="warning"
+          show-icon
+          :message="questionNotice"
+        />
+
+        <div v-if="candidateRows.length" class="candidate-grid">
+          <button
+            v-for="row in candidateRows"
+            :key="row.id"
+            type="button"
+            class="candidate-chip"
+            :class="{ 'candidate-chip--selected': row.selected }"
+            @click="toggleCandidate(row)"
+          >
+            <CheckCircleOutlined v-if="row.selected" />
+            <PlusOutlined v-else />
+            <span>{{ row.text }}</span>
+          </button>
+        </div>
+
+        <a-empty v-else :description="t('onboardingBrand.questions.empty')" />
+
+        <footer class="question-picker__footer">
+          <a-button size="large" @click="enterWorkspace()">
+            {{ t('onboardingBrand.questions.skip') }}
+          </a-button>
+          <a-button
+            size="large"
+            type="primary"
+            :disabled="!selectedCandidates.length"
+            :loading="materializeQuestionsMutation.isPending.value"
+            @click="saveSelectedQuestions"
+          >
+            {{ t('onboardingBrand.questions.confirm') }}
+          </a-button>
+        </footer>
+      </section>
+    </a-modal>
+
+    <AiWaitingModal
+      :open="aiWaitingOpen"
+      :title="t('onboardingBrand.ai.title')"
+      :progress="aiProgress"
+      :stage="aiStages[aiStageIndex]"
+    />
+  </div>
+</template>
+
+<style scoped>
+.brand-onboarding {
+  position: relative;
+  display: flex;
+  flex: 1;
+  width: 100%;
+  min-height: 100vh;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  padding: 40px 24px;
+  color: #0f172a;
+  background-color: #f8fafc;
+  background-image: 
+    radial-gradient(circle at 10% 20%, rgba(22, 119, 255, 0.05) 0%, transparent 40%),
+    radial-gradient(circle at 90% 80%, rgba(99, 102, 241, 0.06) 0%, transparent 50%),
+    radial-gradient(circle at 50% 0%, rgba(6, 182, 212, 0.04) 0%, transparent 35%),
+    radial-gradient(rgba(148, 163, 184, 0.1) 1px, transparent 1px);
+  background-size: 100% 100%, 100% 100%, 100% 100%, 24px 24px;
+}
+
+.glow-orb {
+  position: absolute;
+  border-radius: 50%;
+  filter: blur(120px);
+  opacity: 0.55;
+  pointer-events: none;
+  z-index: 0;
+  animation: float-slow 15s ease-in-out infinite alternate;
+}
+
+.glow-orb--1 {
+  top: -10%;
+  left: 15%;
+  width: 500px;
+  height: 500px;
+  background: radial-gradient(circle, rgba(22, 119, 255, 0.15) 0%, rgba(99, 102, 241, 0.05) 100%);
+}
+
+.glow-orb--2 {
+  bottom: -10%;
+  right: 10%;
+  width: 600px;
+  height: 600px;
+  background: radial-gradient(circle, rgba(6, 182, 212, 0.12) 0%, rgba(22, 119, 255, 0.04) 100%);
+  animation-delay: -5s;
+}
+
+@keyframes float-slow {
+  0% {
+    transform: translate(0, 0) scale(1);
+  }
+  100% {
+    transform: translate(30px, -30px) scale(1.05);
+  }
+}
+
+.onboarding-panel {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  flex-direction: column;
+  width: min(520px, 100%);
+  padding: 48px;
+  background: rgba(255, 255, 255, 0.8);
+  backdrop-filter: blur(24px);
+  -webkit-backdrop-filter: blur(24px);
+  border: 1px solid rgba(255, 255, 255, 0.7);
+  border-radius: 24px;
+  box-shadow: 
+    0 1px 2px rgba(0, 0, 0, 0.02),
+    0 4px 12px rgba(0, 0, 0, 0.02),
+    0 16px 36px rgba(22, 119, 255, 0.04),
+    0 32px 80px rgba(15, 23, 42, 0.05);
+}
+
+.onboarding-panel__intro {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  margin-bottom: 36px;
+}
+
+.brand-mark {
+  display: flex;
+  width: 52px;
+  height: 52px;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(135deg, rgba(22, 119, 255, 0.08) 0%, rgba(99, 102, 241, 0.08) 100%);
+  border: 1px solid rgba(22, 119, 255, 0.15);
+  border-radius: 14px;
+  color: #1677ff;
+  font-size: 22px;
+  margin-bottom: 20px;
+  box-shadow: 0 4px 12px rgba(22, 119, 255, 0.04);
+}
+
+.eyebrow {
+  display: inline-block;
+  font-size: 11px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.08em;
+  color: #1677ff;
+  margin: 0 0 10px;
+  background: rgba(22, 119, 255, 0.06);
+  padding: 4px 12px;
+  border-radius: 12px;
+  border: 1px solid rgba(22, 119, 255, 0.1);
+}
+
+.onboarding-panel h1 {
+  margin: 0;
+  color: #0f172a;
+  font-size: 26px;
+  font-weight: 700;
+  line-height: 1.25;
+  letter-spacing: -0.02em;
+}
+
+.intro-copy {
+  margin: 12px 0 0;
+  color: #475569;
+  font-size: 15px;
+  line-height: 1.6;
+}
+
+.brand-entry {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.brand-entry__loading,
+.brand-entry__grid,
+.empty-brand-state {
+  width: 100%;
+}
+
+.brand-entry__grid {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.brand-choice {
+  display: grid;
+  grid-template-columns: auto 1fr auto;
+  grid-template-rows: auto auto;
+  align-items: center;
+  column-gap: 16px;
+  width: 100%;
+  padding: 16px 20px;
+  background: rgba(255, 255, 255, 0.6);
+  border: 1px solid rgba(226, 232, 240, 0.8);
+  border-radius: 16px;
+  cursor: pointer;
+  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  text-align: left;
+}
+
+.brand-choice:hover {
+  background: #ffffff;
+  border-color: rgba(22, 119, 255, 0.4);
+  box-shadow: 
+    0 10px 25px -5px rgba(22, 119, 255, 0.08),
+    0 4px 12px -5px rgba(22, 119, 255, 0.05);
+  transform: translateY(-2px);
+}
+
+.brand-choice__icon {
+  grid-column: 1;
+  grid-row: 1 / span 2;
+  display: flex;
+  width: 44px;
+  height: 44px;
+  align-items: center;
+  justify-content: center;
+  color: #1677ff;
+  font-size: 18px;
+  background: rgba(22, 119, 255, 0.06);
+  border: 1px solid rgba(22, 119, 255, 0.1);
+  border-radius: 12px;
+  transition: all 0.2s ease;
+}
+
+.brand-choice:hover .brand-choice__icon {
+  background: rgba(22, 119, 255, 0.15);
+  border-color: rgba(22, 119, 255, 0.25);
+  color: #1677ff;
+}
+
+.brand-choice strong {
+  grid-column: 2;
+  grid-row: 1;
+  margin: 0;
+  color: #0f172a;
+  font-size: 15px;
+  font-weight: 600;
+  line-height: 1.4;
+}
+
+.brand-choice span:not(.brand-choice__icon) {
+  grid-column: 2;
+  grid-row: 2;
+  color: #64748b;
+  font-size: 13px;
+  line-height: 1.4;
+  margin-top: 2px;
+}
+
+.brand-choice__arrow {
+  grid-column: 3;
+  grid-row: 1 / span 2;
+  color: #94a3b8;
+  font-size: 14px;
+  transition: all 0.2s ease;
+}
+
+.brand-choice:hover .brand-choice__arrow {
+  color: #1677ff;
+  transform: translateX(4px);
+}
+
+.brand-choice--create {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  border: 1px dashed rgba(22, 119, 255, 0.3);
+  background: rgba(22, 119, 255, 0.02);
+  min-height: auto;
+  padding: 16px;
+  border-radius: 16px;
+  cursor: pointer;
+  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.brand-choice--create:hover {
+  background: rgba(22, 119, 255, 0.06);
+  border-color: #1677ff;
+  transform: translateY(-2px);
+  box-shadow: 0 10px 25px -5px rgba(22, 119, 255, 0.05);
+}
+
+.brand-choice--create .brand-choice__icon {
+  width: auto;
+  height: auto;
+  background: transparent;
+  color: #1677ff;
+  font-size: 16px;
+}
+
+.brand-choice--create strong {
+  margin: 0;
+  font-size: 15px;
+  font-weight: 600;
+  color: #1677ff;
+}
+
+.brand-choice--create span:not(.brand-choice__icon) {
+  display: none;
+}
+
+.empty-brand-state {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}
+
+.create-brand-card {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 16px;
+  width: 100%;
+  padding: 40px 24px;
+  background: rgba(255, 255, 255, 0.4);
+  border: 1px dashed rgba(22, 119, 255, 0.25);
+  border-radius: 20px;
+  cursor: pointer;
+  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.create-brand-card:hover {
+  background: rgba(255, 255, 255, 0.9);
+  border-color: #1677ff;
+  box-shadow: 
+    0 12px 30px -5px rgba(22, 119, 255, 0.08),
+    0 4px 12px -5px rgba(22, 119, 255, 0.04);
+  transform: translateY(-2px);
+}
+
+.create-brand-card__icon {
+  font-size: 24px;
+  color: #1677ff;
+  background: rgba(22, 119, 255, 0.06);
+  border: 1px solid rgba(22, 119, 255, 0.1);
+  width: 56px;
+  height: 56px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 16px;
+  transition: all 0.2s ease;
+}
+
+.create-brand-card:hover .create-brand-card__icon {
+  background: rgba(22, 119, 255, 0.15);
+  border-color: rgba(22, 119, 255, 0.25);
+  color: #1677ff;
+  transform: scale(1.05);
+}
+
+.create-brand-card strong {
+  color: #0f172a;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.create-brand-card span:not(.create-brand-card__icon) {
+  color: #64748b;
+  font-size: 13px;
+  text-align: center;
+  max-width: 280px;
+  line-height: 1.5;
+}
+
+.brand-create-form {
+  padding-top: 12px;
+}
+
+.brand-create-form :deep(.ant-form-item-label > label) {
+  font-weight: 600;
+  color: #334155;
+}
+
+.brand-create-form :deep(.ant-input),
+.brand-create-form :deep(.ant-input-affix-wrapper) {
+  border-radius: 10px;
+}
+
+.brand-create-form :deep(.ant-input-affix-wrapper) {
+  padding: 8px 12px;
+}
+
+.modal-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  margin-top: 28px;
+}
+
+.modal-actions :deep(.ant-btn) {
+  border-radius: 10px;
+  height: 44px;
+  padding: 0 24px;
+  font-weight: 600;
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.modal-actions :deep(.ant-btn-primary) {
+  background: #1677ff;
+  border-color: #1677ff;
+  box-shadow: 0 4px 12px rgba(22, 119, 255, 0.15);
+}
+
+.modal-actions :deep(.ant-btn-primary:hover) {
+  background: #4096ff;
+  border-color: #4096ff;
+  box-shadow: 0 6px 16px rgba(22, 119, 255, 0.25);
+}
+
+.question-picker {
+  padding: 12px 8px;
+}
+
+.question-picker__header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 20px;
+  border-bottom: 1px solid rgba(226, 232, 240, 0.6);
+  padding-bottom: 20px;
+  margin-bottom: 20px;
+}
+
+.question-picker__header h2 {
+  margin: 0;
+  color: #0f172a;
+  font-size: 22px;
+  font-weight: 700;
+  letter-spacing: -0.02em;
+}
+
+.question-picker__header p:not(.eyebrow) {
+  margin: 6px 0 0;
+  color: #64748b;
+  font-size: 14px;
+  line-height: 1.5;
+}
+
+.question-picker__header .eyebrow {
+  display: inline-block;
+  font-size: 11px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: #64748b;
+  margin-bottom: 6px;
+  background: #f1f5f9;
+  padding: 2px 8px;
+  border-radius: 6px;
+  border: 1px solid #e2e8f0;
+}
+
+.question-picker__count {
+  min-width: auto;
+  padding: 6px 14px;
+  color: #1677ff;
+  text-align: center;
+  background: rgba(22, 119, 255, 0.08);
+  border: 1px solid rgba(22, 119, 255, 0.15);
+  border-radius: 10px;
+  display: flex;
+  align-items: baseline;
+  gap: 4px;
+}
+
+.question-picker__count strong {
+  font-size: 20px;
+  line-height: 1;
+  font-weight: 700;
+}
+
+.question-picker__count span {
+  color: rgba(22, 119, 255, 0.6);
+  font-size: 13px;
+  font-weight: 600;
+}
+
+.question-picker__notice {
+  margin-top: 16px;
+}
+
+.candidate-grid {
+  display: flex;
+  flex-wrap: wrap;
+  max-height: min(46vh, 420px);
+  gap: 10px;
+  margin-top: 16px;
+  overflow-y: auto;
+  padding: 4px;
+  scrollbar-width: thin;
+}
+
+.candidate-chip {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 16px;
+  color: #334155;
+  text-align: left;
+  background: rgba(241, 245, 249, 0.8);
+  border: 1px solid rgba(226, 232, 240, 0.8);
+  border-radius: 20px;
+  cursor: pointer;
+  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  min-height: 38px;
+}
+
+.candidate-chip:hover {
+  background: #e2e8f0;
+  border-color: #cbd5e1;
+  transform: translateY(-1px);
+}
+
+.candidate-chip svg {
+  flex: 0 0 auto;
+  font-size: 13px;
+  color: #64748b;
+}
+
+.candidate-chip span {
+  min-width: 0;
+  overflow-wrap: anywhere;
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.4;
+}
+
+.candidate-chip--selected {
+  color: #1677ff;
+  background: rgba(22, 119, 255, 0.08);
+  border-color: rgba(22, 119, 255, 0.3);
+}
+
+.candidate-chip--selected:hover {
+  background: rgba(22, 119, 255, 0.12);
+  border-color: rgba(22, 119, 255, 0.4);
+}
+
+.candidate-chip--selected svg {
+  color: #1677ff;
+}
+
+.question-picker__footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  margin-top: 24px;
+  border-top: 1px solid rgba(226, 232, 240, 0.6);
+  padding-top: 20px;
+}
+
+.question-picker__footer :deep(.ant-btn) {
+  border-radius: 10px;
+  height: 40px;
+  padding: 0 20px;
+  font-weight: 600;
+}
+
+@media (max-width: 640px) {
+  .onboarding-panel {
+    padding: 32px 24px;
+  }
+}
+</style>
diff --git a/apps/admin-web/src/views/BrandsView.vue b/apps/admin-web/src/views/BrandsView.vue
index db54925..ea31a9b 100644
--- a/apps/admin-web/src/views/BrandsView.vue
+++ b/apps/admin-web/src/views/BrandsView.vue
@@ -22,14 +22,19 @@ import { useRoute, useRouter } from 'vue-router'
 import { brandsApi } from '@/lib/api'
 import { formatDateTime } from '@/lib/display'
 import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
 
 const queryClient = useQueryClient()
 const { t } = useI18n()
 const route = useRoute()
 const router = useRouter()
+const companyStore = useCompanyStore()
 
 const activeTab = ref<'questions' | 'competitors'>('questions')
-const selectedBrandId = ref<number | null>(null)
+const selectedBrandId = computed<number | null>({
+  get: () => companyStore.currentBrandId,
+  set: (brandId) => companyStore.setCurrentBrand(brandId),
+})
 
 const brandModalOpen = ref(false)
 const editingBrandId = ref<number | null>(null)
@@ -148,6 +153,7 @@ const brandMutations = {
       message.success(t('brands.messages.createBrand'))
       brandModalOpen.value = false
       selectedBrandId.value = brand.id
+      companyStore.setCurrentBrand(brand.id)
       await invalidateBrandQueries()
     },
     onError: (error) => message.error(formatError(error)),
@@ -320,6 +326,14 @@ function openBrandModal(brand?: Brand): void {
   brandModalOpen.value = true
 }
 
+function selectBrand(brandId: number): void {
+  if (!Number.isFinite(brandId) || brandId <= 0) {
+    return
+  }
+  selectedBrandId.value = brandId
+  void queryClient.invalidateQueries({ queryKey: ['brands'] })
+}
+
 function ensureQuestionCreatable(): boolean {
   if (!selectedBrandId.value) {
     message.warning(t('brands.messages.chooseBrand'))
@@ -414,6 +428,7 @@ async function invalidateBrandQueries(): Promise<void> {
     queryClient.invalidateQueries({ queryKey: ['brands'] }),
     queryClient.invalidateQueries({ queryKey: ['workspace'] }),
   ])
+  await companyStore.refreshBrands()
 }
 </script>
 
@@ -440,7 +455,7 @@ async function invalidateBrandQueries(): Promise<void> {
           :key="brand.id"
           class="brand-card"
           :class="{ 'brand-card--active': brand.id === selectedBrandId }"
-          @click="selectedBrandId = brand.id"
+          @click="selectBrand(brand.id)"
         >
           <div class="brand-card__top">
             <div>
diff --git a/apps/admin-web/src/views/FreeCreateView.vue b/apps/admin-web/src/views/FreeCreateView.vue
index 8e7be62..9b099ea 100644
--- a/apps/admin-web/src/views/FreeCreateView.vue
+++ b/apps/admin-web/src/views/FreeCreateView.vue
@@ -20,10 +20,12 @@ import { useArticleRegenerateAction } from '@/lib/article-regenerate-action'
 import { copyTextToClipboard } from '@/lib/clipboard'
 import { getPublishStatusMeta } from '@/lib/display'
 import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
 
 const queryClient = useQueryClient()
 const router = useRouter()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const publishModalOpen = ref(false)
 const selectedPublishArticleId = ref<number | null>(null)
@@ -75,7 +77,8 @@ const articleParams = computed<ArticleListParams>(() => {
 })
 
 const articleListQuery = useQuery({
-  queryKey: computed(() => ['articles', 'list', articleParams.value]),
+  queryKey: computed(() => ['articles', 'list', companyStore.currentBrandId, articleParams.value]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.list(articleParams.value),
 })
 
@@ -179,6 +182,10 @@ async function handleDelete(articleId: number): Promise<void> {
 }
 
 function handleCreate(): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   createMutation.mutate()
 }
 
@@ -209,7 +216,12 @@ async function copyArticle(articleId: number): Promise<void> {
           <p>{{ t('route.freeCreate.description') }}</p>
         </div>
         <div class="free-create-view__header-actions">
-          <a-button type="primary" :loading="createMutation.isPending.value" @click="handleCreate">
+          <a-button
+            type="primary"
+            :disabled="!companyStore.currentBrandId"
+            :loading="createMutation.isPending.value"
+            @click="handleCreate"
+          >
             <template #icon><PlusOutlined /></template>
             {{ t('freeCreate.actions.create') }}
           </a-button>
diff --git a/apps/admin-web/src/views/ImitationGenerateView.vue b/apps/admin-web/src/views/ImitationGenerateView.vue
index ec7c090..352363a 100644
--- a/apps/admin-web/src/views/ImitationGenerateView.vue
+++ b/apps/admin-web/src/views/ImitationGenerateView.vue
@@ -9,17 +9,18 @@ import { useRoute, useRouter } from 'vue-router'
 import KnowledgeGroupSelect from '@/components/KnowledgeGroupSelect.vue'
 import { articlesApi, brandsApi } from '@/lib/api'
 import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
 
 const route = useRoute()
 const router = useRouter()
 const queryClient = useQueryClient()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const form = reactive({
   source_url: '',
   source_title: '',
   locale: 'zh-CN',
-  brand_name: '',
   region: '',
   keywords: [] as string[],
   preserve_points: '',
@@ -29,26 +30,14 @@ const form = reactive({
   knowledge_group_ids: [] as number[],
 })
 
-const brandsQuery = useQuery({
-  queryKey: ['brands'],
-  queryFn: () => brandsApi.list(),
-})
-
-const brandNameOptions = computed(() =>
-  (brandsQuery.data.value ?? []).map((item) => ({
-    label: item.name,
-    value: item.name,
-  })),
-)
-
-const selectedBrand = computed(
-  () => brandsQuery.data.value?.find((item) => item.name === form.brand_name.trim()) ?? null,
-)
+const selectedBrand = computed(() => companyStore.currentBrand)
+const selectedBrandId = computed(() => selectedBrand.value?.id ?? null)
+const currentBrandName = computed(() => selectedBrand.value?.name?.trim() || '')
 
 const questionsQuery = useQuery({
-  queryKey: computed(() => ['brands', selectedBrand.value?.id, 'questions', 'imitation']),
-  enabled: computed(() => Boolean(selectedBrand.value?.id)),
-  queryFn: () => brandsApi.listQuestions(selectedBrand.value?.id as number),
+  queryKey: computed(() => ['brands', selectedBrandId.value, 'questions', 'imitation']),
+  enabled: computed(() => Boolean(selectedBrandId.value)),
+  queryFn: () => brandsApi.listQuestions(selectedBrandId.value as number),
 })
 
 const keywordOptions = computed(() =>
@@ -61,7 +50,7 @@ const keywordOptions = computed(() =>
 const canSubmit = computed(
   () =>
     form.source_url.trim().length > 0 &&
-    form.brand_name.trim().length > 0 &&
+    currentBrandName.value.length > 0 &&
     !generateMutation.isPending.value,
 )
 
@@ -71,7 +60,7 @@ const generateMutation = useMutation({
       source_url: form.source_url.trim(),
       source_title: form.source_title.trim(),
       locale: form.locale,
-      brand_name: form.brand_name.trim(),
+      brand_name: currentBrandName.value,
       region: form.region.trim(),
       keywords: form.keywords.map((item) => item.trim()).filter(Boolean),
       preserve_points: form.preserve_points.trim(),
@@ -117,7 +106,7 @@ function submit(): void {
     message.warning(t('imitation.create.sourceURLRequired'))
     return
   }
-  if (!form.brand_name.trim()) {
+  if (!currentBrandName.value) {
     message.warning(t('imitation.create.brandNameRequired'))
     return
   }
@@ -231,12 +220,10 @@ function submit(): void {
         <div class="imitation-generate-page__field-grid">
           <div class="imitation-generate-page__field">
             <label class="required-asterisk">{{ t('imitation.create.brandName') }}</label>
-            <a-auto-complete
-              v-model:value="form.brand_name"
-              allow-clear
-              :options="brandNameOptions"
-              :placeholder="t('imitation.create.brandNamePlaceholder')"
-            />
+            <div class="current-brand-field">
+              <strong>{{ currentBrandName || t('shell.currentCompanyPlaceholder') }}</strong>
+              <span v-if="selectedBrand?.website">{{ selectedBrand.website }}</span>
+            </div>
           </div>
 
           <div class="imitation-generate-page__field">
@@ -508,6 +495,37 @@ function submit(): void {
   content: '：';
 }
 
+.current-brand-field {
+  display: flex;
+  min-height: 32px;
+  flex-direction: column;
+  justify-content: center;
+  gap: 2px;
+  padding: 5px 11px;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  background: #fafcff;
+}
+
+.current-brand-field strong {
+  overflow: hidden;
+  color: #111827;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 20px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.current-brand-field span {
+  overflow: hidden;
+  color: #667085;
+  font-size: 12px;
+  line-height: 16px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .required-asterisk::before {
   margin-right: 4px;
   color: #ff4d4f;
diff --git a/apps/admin-web/src/views/ImitationView.vue b/apps/admin-web/src/views/ImitationView.vue
index ebac4f4..6a605bf 100644
--- a/apps/admin-web/src/views/ImitationView.vue
+++ b/apps/admin-web/src/views/ImitationView.vue
@@ -20,10 +20,12 @@ import { buildArticleClipboardContent, resolveArticleActionState } from '@/lib/a
 import { useArticleRegenerateAction } from '@/lib/article-regenerate-action'
 import { getGenerateStatusMeta, getPublishStatusMeta, hasActiveGenerationStatus } from '@/lib/display'
 import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
 
 const queryClient = useQueryClient()
 const router = useRouter()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const publishModalOpen = ref(false)
 const selectedPublishArticleId = ref<number | null>(null)
@@ -80,7 +82,8 @@ const articleParams = computed<ArticleListParams>(() => {
 })
 
 const articleListQuery = useQuery({
-  queryKey: computed(() => ['articles', 'list', articleParams.value]),
+  queryKey: computed(() => ['articles', 'list', companyStore.currentBrandId, articleParams.value]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.list(articleParams.value),
 })
 
@@ -205,6 +208,10 @@ function resetFilters(): void {
 }
 
 function openCreate(): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   void router.push({ name: 'article-imitation-create' })
 }
 
@@ -278,7 +285,7 @@ async function copyArticle(articleId: number): Promise<void> {
           <p>{{ t('route.imitation.description') }}</p>
         </div>
         <div class="imitation-view__header-actions">
-          <a-button type="primary" @click="openCreate">
+          <a-button type="primary" :disabled="!companyStore.currentBrandId" @click="openCreate">
             <template #icon><PlusOutlined /></template>
             {{ t('imitation.actions.create') }}
           </a-button>
diff --git a/apps/admin-web/src/views/KolGenerateView.vue b/apps/admin-web/src/views/KolGenerateView.vue
index de87545..030d71a 100644
--- a/apps/admin-web/src/views/KolGenerateView.vue
+++ b/apps/admin-web/src/views/KolGenerateView.vue
@@ -9,6 +9,7 @@ import {
   isKolVariableValueEmpty,
   normalizeKolVariableDefinition,
 } from '@/lib/kol-placeholders'
+import { useCompanyStore } from '@/stores/company'
 import { LeftOutlined } from '@ant-design/icons-vue'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { message } from 'ant-design-vue'
@@ -20,6 +21,7 @@ const route = useRoute()
 const router = useRouter()
 const queryClient = useQueryClient()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const subscriptionPromptId = computed(() => String(route.params.subscriptionPromptId))
 const sourcePage = computed<'workspace' | 'templates' | null>(() => {
@@ -106,6 +108,10 @@ function handleBack() {
 function handleSubmit() {
   const schemaValue = schemaQuery.data.value
   if (!schemaValue?.schema_json?.variables) return
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
 
   const missingLabels: string[] = []
   schemaValue.schema_json.variables.forEach((v) => {
diff --git a/apps/admin-web/src/views/LoginView.vue b/apps/admin-web/src/views/LoginView.vue
index 6cc4224..a980ad7 100644
--- a/apps/admin-web/src/views/LoginView.vue
+++ b/apps/admin-web/src/views/LoginView.vue
@@ -97,10 +97,12 @@ import { useRoute, useRouter } from 'vue-router'
 import AnimatedCharacters from '@/components/login-animation/AnimatedCharacters.vue'
 import { formatError } from '@/lib/errors'
 import { useAuthStore } from '@/stores/auth'
+import { useCompanyStore } from '@/stores/company'
 
 const REMEMBER_STORAGE_KEY = 'geo:admin:login:remember'
 
 const authStore = useAuthStore()
+const companyStore = useCompanyStore()
 const router = useRouter()
 const route = useRoute()
 const { t } = useI18n()
@@ -131,6 +133,9 @@ onMounted(() => {
       formState.identifier = parsed.identifier
       remember.value = true
     }
+    if (parsed && typeof parsed.password === 'string') {
+      formState.password = parsed.password
+    }
   } catch {
     window.localStorage.removeItem(REMEMBER_STORAGE_KEY)
   }
@@ -143,7 +148,10 @@ function persistRememberedCredentials(): void {
   if (remember.value) {
     window.localStorage.setItem(
       REMEMBER_STORAGE_KEY,
-      JSON.stringify({ identifier: formState.identifier }),
+      JSON.stringify({
+        identifier: formState.identifier,
+        password: formState.password,
+      }),
     )
   } else {
     window.localStorage.removeItem(REMEMBER_STORAGE_KEY)
@@ -159,6 +167,7 @@ async function handleSubmit(): Promise<void> {
 
   try {
     await authStore.login(formState)
+    companyStore.reset()
     persistRememberedCredentials()
     const redirect = typeof route.query.redirect === 'string' ? route.query.redirect : '/workspace'
     await router.replace(redirect)
diff --git a/apps/admin-web/src/views/PublishManagementView.vue b/apps/admin-web/src/views/PublishManagementView.vue
index a6d8c9a..e32b9a2 100644
--- a/apps/admin-web/src/views/PublishManagementView.vue
+++ b/apps/admin-web/src/views/PublishManagementView.vue
@@ -20,6 +20,7 @@ import { formatDateTime } from '@/lib/display'
 import { formatError } from '@/lib/errors'
 import { resolvePlatformLogoUrl } from '@/lib/publish-account-cards'
 import { getPublishPlatformMeta, normalizePublishPlatformId } from '@/lib/publish-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 const PAGE_SIZE = 10
 const INLINE_ERROR_HEAD_CHARS = 52
@@ -307,6 +308,7 @@ function buildDesktopWorkbenchUrl(record: {
 
 const { t } = useI18n()
 const queryClient = useQueryClient()
+const companyStore = useCompanyStore()
 const page = ref(1)
 const searchTitle = ref('')
 const appliedTitle = ref('')
@@ -321,8 +323,10 @@ const tasksQuery = useQuery({
   queryKey: computed(() => [
     'tenant',
     'publish-tasks',
+    companyStore.currentBrandId,
     { page: page.value, page_size: PAGE_SIZE, title: appliedTitle.value },
   ]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () =>
     publishTasksApi.list({
       page: page.value,
diff --git a/apps/admin-web/src/views/TemplateWizardView.vue b/apps/admin-web/src/views/TemplateWizardView.vue
index 6160dbe..4d4c90e 100644
--- a/apps/admin-web/src/views/TemplateWizardView.vue
+++ b/apps/admin-web/src/views/TemplateWizardView.vue
@@ -26,6 +26,7 @@ import KnowledgeGroupSelect from '@/components/KnowledgeGroupSelect.vue'
 import { articlesApi, brandsApi, normalizeInputParams, templatesApi } from '@/lib/api'
 import { getTemplateMeta } from '@/lib/display'
 import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
 
 interface DraftCompetitor {
   key: string
@@ -151,6 +152,7 @@ const queryClient = useQueryClient()
 const { locale: uiLocale, t } = useI18n()
 const route = useRoute()
 const router = useRouter()
+const companyStore = useCompanyStore()
 
 let competitorKeySeed = 0
 let outlineNodeSeed = 0
@@ -167,8 +169,6 @@ const savingDraft = ref(false)
 const leaveConfirmOpen = ref(false)
 const leaveConfirmBusy = ref(false)
 
-const selectedBrandId = ref<number | null>(null)
-const brandName = ref('')
 const officialWebsite = ref('')
 const brandSummary = ref('')
 
@@ -209,11 +209,9 @@ const templateDetailQuery = useQuery({
   queryFn: () => templatesApi.detail(templateId.value),
 })
 
-const brandsQuery = useQuery({
-  queryKey: ['brands', 'wizard-context'],
-  enabled,
-  queryFn: () => brandsApi.list(),
-})
+const selectedBrand = computed(() => companyStore.currentBrand)
+const selectedBrandId = computed(() => selectedBrand.value?.id ?? null)
+const normalizedBrandName = computed(() => selectedBrand.value?.name?.trim() || '')
 
 const draftArticleQuery = useQuery({
   queryKey: computed(() => ['articles', 'detail', draftArticleId.value]),
@@ -283,15 +281,6 @@ const templateMeta = computed(() => {
     helper: templateCardConfig.value.hero?.helper || fallback.helper,
   }
 })
-const selectedBrand = computed(
-  () => brandsQuery.data.value?.find((brand) => brand.id === selectedBrandId.value) ?? null,
-)
-const brandNameOptions = computed(() =>
-  (brandsQuery.data.value ?? []).map((item) => ({
-    label: item.name,
-    value: item.name,
-  })),
-)
 
 function findQuestionById(id: number | null): Question | null {
   if (!id) {
@@ -323,9 +312,6 @@ const selectedQuestionTexts = computed(() =>
   dedupeStrings([primaryQuestionText.value, ...supplementalQuestionTexts.value]),
 )
 
-const normalizedBrandName = computed(
-  () => brandName.value.trim() || selectedBrand.value?.name || '',
-)
 const finalTitle = computed(() => customTitle.value.trim() || selectedTitle.value.trim())
 const primaryKeyword = computed(() => primaryQuestionText.value)
 const showCompetitorsCard = computed(
@@ -455,7 +441,6 @@ const isPageLoading = computed(
 const hasWizardDraftContent = computed(
   () =>
     Boolean(selectedBrandId.value) ||
-    Boolean(brandName.value.trim()) ||
     Boolean(officialWebsite.value.trim()) ||
     Boolean(brandSummary.value.trim()) ||
     Boolean(primaryQuestionId.value) ||
@@ -504,10 +489,7 @@ function resetWizardState(detail: NonNullable<typeof templateDetail.value>): voi
   currentArticleId.value = draftArticleId.value
   currentStep.value = 0
   articleLocale.value = 'zh-CN'
-  selectedBrandId.value = null
-  brandName.value = ''
-  officialWebsite.value = ''
-  brandSummary.value = ''
+  hydrateBrandContextFromCurrentBrand()
   primaryQuestionId.value = null
   supplementalQuestionIds.value = []
   competitorDrafts.value = []
@@ -526,9 +508,9 @@ function resetWizardState(detail: NonNullable<typeof templateDetail.value>): voi
     detail.template_key,
     buildTemplateRenderContext({
       locale: 'zh-CN',
-      brandName: '',
-      officialWebsite: '',
-      brandSummary: '',
+    brandName: normalizedBrandName.value,
+    officialWebsite: officialWebsite.value,
+    brandSummary: brandSummary.value,
       primaryQuestion: '',
       supplementalQuestions: [],
       inputParams: {},
@@ -542,9 +524,9 @@ function resetWizardState(detail: NonNullable<typeof templateDetail.value>): voi
     detail.template_key,
     buildTemplateRenderContext({
       locale: 'zh-CN',
-      brandName: '',
-      officialWebsite: '',
-      brandSummary: '',
+    brandName: normalizedBrandName.value,
+    officialWebsite: officialWebsite.value,
+    brandSummary: brandSummary.value,
       primaryQuestion: '',
       supplementalQuestions: [],
       inputParams: {},
@@ -565,10 +547,9 @@ function applyDraftArticleState(detail: ArticleDetail): void {
 
   currentStep.value = clampStep(numberFromUnknown(draftState.current_step))
   articleLocale.value = stringFromUnknown(draftState.locale) || articleLocale.value
-  selectedBrandId.value = numberFromUnknown(draftState.selected_brand_id) ?? null
-  brandName.value = stringFromUnknown(draftState.brand_name) || ''
-  officialWebsite.value = stringFromUnknown(draftState.official_website) || ''
-  brandSummary.value = stringFromUnknown(draftState.brand_summary) || ''
+  hydrateBrandContextFromCurrentBrand()
+  officialWebsite.value = stringFromUnknown(draftState.official_website) || officialWebsite.value
+  brandSummary.value = stringFromUnknown(draftState.brand_summary) || brandSummary.value
   primaryQuestionId.value = numberFromUnknown(draftState.primary_question_id) ?? null
   supplementalQuestionIds.value =
     numberListFromUnknown(draftState.supplemental_question_ids)?.slice(0, 3) ?? []
@@ -604,6 +585,14 @@ watch(
   { immediate: true },
 )
 
+watch(
+  () => selectedBrand.value,
+  () => {
+    hydrateBrandContextFromCurrentBrand()
+  },
+  { immediate: true },
+)
+
 watch(
   baseOutlineOptions,
   (options) => {
@@ -660,23 +649,6 @@ watch(supplementalQuestionIds, (ids) => {
   }
 })
 
-function handleBrandNameInput(value: string): void {
-  brandName.value = value
-  const matchedBrand = brandsQuery.data.value?.find((item) => item.name === value)
-  selectedBrandId.value = matchedBrand?.id ?? null
-}
-
-function handleBrandNameSelect(value: string): void {
-  const brand = brandsQuery.data.value?.find((item) => item.name === value)
-  if (!brand) {
-    selectedBrandId.value = null
-    brandName.value = value
-    return
-  }
-  selectedBrandId.value = brand.id
-  brandName.value = brand.name
-}
-
 watch(selectedBrandId, async (brandId) => {
   if (restoringDraft.value) {
     return
@@ -690,10 +662,7 @@ watch(selectedBrandId, async (brandId) => {
     return
   }
 
-  const brand = brandsQuery.data.value?.find((item) => item.id === brandId)
-  if (brand && !brandName.value.trim()) {
-    brandName.value = brand.name
-  }
+  const brand = selectedBrand.value
   if (brand?.website && !officialWebsite.value.trim()) {
     officialWebsite.value = brand.website
   }
@@ -719,7 +688,13 @@ watch(selectedBrandId, async (brandId) => {
     description: item.description ?? '',
     saved: true,
   }))
-})
+}, { immediate: true })
+
+function hydrateBrandContextFromCurrentBrand(): void {
+  const brand = selectedBrand.value
+  officialWebsite.value = brand?.website ?? ''
+  brandSummary.value = brand?.description ?? ''
+}
 
 onBeforeRouteLeave(async () => {
   if (!shouldConfirmBeforeLeavingWizard()) {
@@ -1310,7 +1285,7 @@ function buildDraftState(): Record<string, JsonValue> {
     current_step: currentStep.value,
     locale: articleLocale.value,
     selected_brand_id: selectedBrandId.value,
-    brand_name: brandName.value.trim(),
+    brand_name: normalizedBrandName.value,
     official_website: officialWebsite.value.trim(),
     brand_summary: brandSummary.value.trim(),
     primary_question_id: primaryQuestionId.value,
@@ -2420,14 +2395,10 @@ function onStructureDragEnd(): void {
                 <label class="required-asterisk">
                   {{ t('templates.wizard.sections.brandName') }}
                 </label>
-                <a-auto-complete
-                  v-model:value="brandName"
-                  allow-clear
-                  :options="brandNameOptions"
-                  :placeholder="t('templates.wizard.placeholders.brandName')"
-                  @change="handleBrandNameInput"
-                  @select="handleBrandNameSelect"
-                />
+                <div class="current-brand-field">
+                  <strong>{{ normalizedBrandName || t('shell.currentCompanyPlaceholder') }}</strong>
+                  <span v-if="selectedBrand?.website">{{ selectedBrand.website }}</span>
+                </div>
               </div>
 
               <div class="field-item">
@@ -3201,6 +3172,37 @@ function onStructureDragEnd(): void {
   content: '：';
 }
 
+.current-brand-field {
+  display: flex;
+  min-height: 32px;
+  flex-direction: column;
+  justify-content: center;
+  gap: 2px;
+  padding: 5px 11px;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  background: #fafcff;
+}
+
+.current-brand-field strong {
+  overflow: hidden;
+  color: #111827;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 20px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.current-brand-field span {
+  overflow: hidden;
+  color: #667085;
+  font-size: 12px;
+  line-height: 16px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .optional-field-label {
   display: flex;
   align-items: center;
diff --git a/apps/admin-web/src/views/TemplatesView.vue b/apps/admin-web/src/views/TemplatesView.vue
index 3aeee4b..5d89ae5 100644
--- a/apps/admin-web/src/views/TemplatesView.vue
+++ b/apps/admin-web/src/views/TemplatesView.vue
@@ -42,10 +42,12 @@ import {
   getTemplateMeta,
 } from '@/lib/display'
 import { formatError } from '@/lib/errors'
+import { useCompanyStore } from '@/stores/company'
 
 const queryClient = useQueryClient()
 const router = useRouter()
 const { t } = useI18n()
+const companyStore = useCompanyStore()
 
 const pickerOpen = ref(false)
 const pickerMode = ref<'general' | 'refined' | null>(null)
@@ -90,7 +92,8 @@ const kolCardsQuery = useQuery({
 })
 
 const recentArticlesQuery = useQuery({
-  queryKey: ['workspace', 'recent-articles', 'templates'],
+  queryKey: computed(() => ['workspace', 'recent-articles', 'templates', companyStore.currentBrandId]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () => workspaceApi.recentArticles(),
 })
 
@@ -131,7 +134,8 @@ const articleParams = computed<ArticleListParams>(() => {
 })
 
 const articleListQuery = useQuery({
-  queryKey: computed(() => ['articles', 'list', articleParams.value]),
+  queryKey: computed(() => ['articles', 'list', companyStore.currentBrandId, articleParams.value]),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
   queryFn: () => articlesApi.list(articleParams.value),
 })
 
@@ -330,6 +334,10 @@ function resetFilters(): void {
 }
 
 function openTemplatePicker(): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   pickerOpen.value = true
   pickerMode.value = 'general'
 }
@@ -339,12 +347,20 @@ function choosePickerMode(mode: 'general' | 'refined'): void {
 }
 
 function startTemplate(template: TemplateListItem): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   pickerOpen.value = false
   pickerMode.value = null
   void router.push({ path: '/articles/wizard', query: { template_id: String(template.id) } })
 }
 
 function openRefinedTemplate(card: KolWorkspaceCard): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   pickerOpen.value = false
   pickerMode.value = null
   void router.push({
@@ -471,7 +487,12 @@ function refreshRecords(): void {
           <p>{{ t('route.templates.description') }}</p>
         </div>
         <div class="templates-view__header-actions">
-          <a-button type="primary" class="templates-view__create-btn" @click="openTemplatePicker">
+          <a-button
+            type="primary"
+            class="templates-view__create-btn"
+            :disabled="!companyStore.currentBrandId"
+            @click="openTemplatePicker"
+          >
             <template #icon><PlusOutlined /></template>
             {{ t('templates.actions.chooseTemplate') }}
           </a-button>
diff --git a/apps/admin-web/src/views/TrackingQuestionDetailView.vue b/apps/admin-web/src/views/TrackingQuestionDetailView.vue
index 781afee..8ead025 100644
--- a/apps/admin-web/src/views/TrackingQuestionDetailView.vue
+++ b/apps/admin-web/src/views/TrackingQuestionDetailView.vue
@@ -17,15 +17,18 @@ import { monitoringApi } from '@/lib/api'
 import { formatDateTime } from '@/lib/display'
 import { formatError } from '@/lib/errors'
 import { isMonitoringPlatformId, normalizeMonitoringPlatformId } from '@/lib/monitoring-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 const { t } = useI18n()
 const route = useRoute()
 const router = useRouter()
+const companyStore = useCompanyStore()
 
 const trackingMaxHistoryDays = 30
 const trackingToday = dayjs().format('YYYY-MM-DD')
 
-const brandId = computed(() => parsePositiveNumber(route.params.brandId))
+const routeBrandId = computed(() => parsePositiveNumber(route.params.brandId))
+const brandId = computed(() => companyStore.currentBrandId ?? routeBrandId.value)
 const questionId = computed(() => parsePositiveNumber(route.params.questionId))
 const questionHash = computed(() => normalizeQueryValue(route.query.question_hash))
 const questionTitleFallback = computed(() => normalizeQueryValue(route.query.question_text))
diff --git a/apps/admin-web/src/views/TrackingView.vue b/apps/admin-web/src/views/TrackingView.vue
index b1d90c6..9b053b4 100644
--- a/apps/admin-web/src/views/TrackingView.vue
+++ b/apps/admin-web/src/views/TrackingView.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ReloadOutlined } from '@ant-design/icons-vue'
 import type {
-  Brand,
   DesktopAccountInfo,
   MonitoringHotQuestion,
   MonitoringPlatformAuthorizationStatus,
@@ -25,10 +24,12 @@ import {
   normalizeMonitoringPlatformFilter,
   normalizeMonitoringPlatformId,
 } from '@/lib/monitoring-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 const { t } = useI18n()
 const route = useRoute()
 const router = useRouter()
+const companyStore = useCompanyStore()
 
 const trackingMaxHistoryDays = 30
 const trackingBusinessTimeZone = 'Asia/Shanghai'
@@ -98,7 +99,6 @@ const trackingPlatformOptions = [
 ] as const
 const allQuestionOptionValue = 'all'
 
-const selectedBrandId = useStorage<number | null>('tracking_selected_brand', null)
 const selectedQuestionId = useStorage<number | null>('tracking_selected_question', null)
 const selectedPlatformId = useStorage<string>('tracking_selected_ai_platform_id', 'all')
 const selectedBusinessDate = useStorage<string>('tracking_selected_business_date', trackingToday)
@@ -117,32 +117,8 @@ const selectedQuestionSetOptionValue = computed<string | number>({
   },
 })
 
-const brandsQuery = useQuery({
-  queryKey: ['tracking', 'brands'],
-  queryFn: () => brandsApi.list(),
-})
-
-watch(
-  () => brandsQuery.data.value,
-  (brands) => {
-    if (!brands?.length) {
-      return
-    }
-
-    const requestedBrandId = parseNumericQuery(route.query.brand_id)
-    if (requestedBrandId && brands.some((item) => item.id === requestedBrandId)) {
-      selectedBrandId.value = requestedBrandId
-      return
-    }
-
-    if (selectedBrandId.value && brands.some((item) => item.id === selectedBrandId.value)) {
-      return
-    }
-
-    selectedBrandId.value = brands[0].id
-  },
-  { immediate: true },
-)
+const selectedBrandId = computed(() => companyStore.currentBrandId)
+const selectedBrand = computed(() => companyStore.currentBrand)
 
 const questionsQuery = useQuery({
   queryKey: computed(() => ['tracking', 'questions', selectedBrandId.value]),
@@ -325,10 +301,6 @@ const collectNowMutation = useMutation({
   },
 })
 
-const selectedBrand = computed<Brand | null>(() => {
-  return brandsQuery.data.value?.find((item) => item.id === selectedBrandId.value) ?? null
-})
-
 const currentUserClientOnline = computed(() => {
   return dashboardQuery.data.value?.runtime.current_user_client_online === true
 })
@@ -850,17 +822,6 @@ function disableTrackingDate(current: dayjs.Dayjs): boolean {
               :options="trackingPlatformOptions"
             />
           </div>
-          <div class="tracking-action-item">
-            <span class="tracking-action-label">品牌</span>
-            <a-select
-              v-model:value="selectedBrandId"
-              class="tracking-select"
-              :placeholder="t('tracking.brandPlaceholder')"
-              :options="
-                (brandsQuery.data.value ?? []).map((item) => ({ label: item.name, value: item.id }))
-              "
-            />
-          </div>
           <div class="tracking-action-item">
             <span class="tracking-action-label">关键词库（搜索词）</span>
             <a-select
diff --git a/apps/admin-web/src/views/WorkspaceView.vue b/apps/admin-web/src/views/WorkspaceView.vue
index 1bd93f0..7003aca 100644
--- a/apps/admin-web/src/views/WorkspaceView.vue
+++ b/apps/admin-web/src/views/WorkspaceView.vue
@@ -32,9 +32,11 @@ import { useArticleRegenerateAction } from '@/lib/article-regenerate-action'
 import { formatDateTime, getTemplateMeta, hasActiveGenerationStatus } from '@/lib/display'
 import { formatError } from '@/lib/errors'
 import { isMediaPublishAccount } from '@/lib/publish-platforms'
+import { useCompanyStore } from '@/stores/company'
 
 const queryClient = useQueryClient()
 const router = useRouter()
+const companyStore = useCompanyStore()
 const { t } = useI18n()
 const selectedArticleId = ref<number | null>(null)
 const articleDrawerOpen = ref(false)
@@ -43,16 +45,18 @@ const publishModalOpen = ref(false)
 let recentArticlesPollingTimer: number | null = null
 
 const overviewQuery = useQuery({
-  queryKey: ['workspace', 'overview'],
+  queryKey: computed(() => ['workspace', 'overview', companyStore.currentBrandId]),
   queryFn: () => workspaceApi.overview(),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
 })
 const accountsQuery = useQuery({
   queryKey: ['tenant', 'desktop-accounts', 'workspace-overview'],
   queryFn: () => tenantAccountsApi.list(),
 })
 const recentArticlesQuery = useQuery({
-  queryKey: ['workspace', 'recent-articles'],
+  queryKey: computed(() => ['workspace', 'recent-articles', companyStore.currentBrandId]),
   queryFn: () => workspaceApi.recentArticles(),
+  enabled: computed(() => Boolean(companyStore.currentBrandId)),
 })
 const templateCardsQuery = useQuery({
   queryKey: ['workspace', 'template-cards'],
@@ -177,6 +181,10 @@ function resolveTemplateIcon(template: TemplateCard): unknown {
 }
 
 function openTemplate(template: TemplateCard): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   void router.push({
     path: '/articles/wizard',
     query: { template_id: String(template.id), from: 'workspace' },
@@ -184,6 +192,10 @@ function openTemplate(template: TemplateCard): void {
 }
 
 function openRefinedTemplate(card: KolWorkspaceCard): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   void router.push({
     name: 'kol-generate',
     params: { subscriptionPromptId: String(card.subscription_prompt_id) },
@@ -192,16 +204,28 @@ function openRefinedTemplate(card: KolWorkspaceCard): void {
 }
 
 function openArticle(articleId: number): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   selectedArticleId.value = articleId
   articleDrawerOpen.value = true
 }
 
 function openPublish(articleId: number): void {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   selectedPublishArticleId.value = articleId
   publishModalOpen.value = true
 }
 
 async function openEditor(article: RecentArticle): Promise<void> {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   try {
     const detail = await articlesApi.detail(article.id)
 
@@ -228,6 +252,10 @@ async function openEditor(article: RecentArticle): Promise<void> {
 }
 
 async function copyArticle(articleId: number): Promise<void> {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   try {
     const detail = await articlesApi.detail(articleId)
     const content = buildArticleClipboardContent(detail)
@@ -245,17 +273,23 @@ async function copyArticle(articleId: number): Promise<void> {
 }
 
 async function handleDelete(articleId: number): Promise<void> {
+  if (!companyStore.currentBrandId) {
+    message.warning(t('templates.wizard.messages.selectBrandBeforeQuestion'))
+    return
+  }
   await deleteMutation.mutateAsync(articleId)
 }
 
 function refreshDashboard(): void {
-  void Promise.all([
-    overviewQuery.refetch(),
+  const refreshes: Promise<unknown>[] = [
     accountsQuery.refetch(),
-    recentArticlesQuery.refetch(),
     templateCardsQuery.refetch(),
     kolCardsQuery.refetch(),
-  ])
+  ]
+  if (companyStore.currentBrandId) {
+    refreshes.push(overviewQuery.refetch(), recentArticlesQuery.refetch())
+  }
+  void Promise.all(refreshes)
 }
 
 watch(
@@ -285,7 +319,13 @@ function startRecentArticlesPolling(): void {
   }
 
   recentArticlesPollingTimer = window.setInterval(() => {
-    void queryClient.invalidateQueries({ queryKey: ['workspace', 'recent-articles'] })
+    if (!companyStore.currentBrandId) {
+      stopRecentArticlesPolling()
+      return
+    }
+    void queryClient.invalidateQueries({
+      queryKey: ['workspace', 'recent-articles', companyStore.currentBrandId],
+    })
     void queryClient.invalidateQueries({ queryKey: ['articles'] })
     void recentArticlesQuery.refetch()
   }, 3000)
diff --git a/packages/shared-types/src/index.ts b/packages/shared-types/src/index.ts
index e065b76..8ca9942 100644
--- a/packages/shared-types/src/index.ts
+++ b/packages/shared-types/src/index.ts
@@ -357,6 +357,7 @@ export interface WorkspaceOverview {
 
 export interface RecentArticle {
   id: number
+  brand_id?: number | null
   title: string | null
   template_name: string | null
   generate_status: string
@@ -574,6 +575,7 @@ export interface ArticleListParams {
 
 export interface ArticleListItem {
   id: number
+  brand_id?: number | null
   source_type: string
   template_id: number | null
   kol_prompt_id: number | null
@@ -602,6 +604,7 @@ export interface ArticleListResponse {
 
 export interface ArticleDetail {
   id: number
+  brand_id?: number | null
   source_type: string
   template_id: number | null
   current_version_id: number | null
diff --git a/server/cmd/dev-seed/main.go b/server/cmd/dev-seed/main.go
index 6507080..5b918a3 100644
--- a/server/cmd/dev-seed/main.go
+++ b/server/cmd/dev-seed/main.go
@@ -236,7 +236,7 @@ func seedBusinessData(ctx context.Context, pool *pgxpool.Pool, membershipCfg con
 		return nil, err
 	}
 
-	state.ArticleID, err = ensureArticle(ctx, tx, state.TenantID)
+	state.ArticleID, err = ensureArticle(ctx, tx, state.TenantID, state.BrandID)
 	if err != nil {
 		return nil, err
 	}
@@ -563,17 +563,18 @@ func ensureCompetitor(ctx context.Context, tx pgx.Tx, tenantID, brandID int64) e
 	return wrapSeedErr("insert competitor", err)
 }
 
-func ensureArticle(ctx context.Context, tx pgx.Tx, tenantID int64) (int64, error) {
+func ensureArticle(ctx context.Context, tx pgx.Tx, tenantID, brandID int64) (int64, error) {
 	var articleID int64
 	err := tx.QueryRow(ctx, `
 		SELECT a.id
 		FROM articles a
 		JOIN article_versions av ON av.id = a.current_version_id
 		WHERE a.tenant_id = $1
+		  AND a.brand_id = $2
 		  AND av.title = '北京口腔医院全面测评'
 		  AND a.deleted_at IS NULL
 		LIMIT 1
-	`, tenantID).Scan(&articleID)
+	`, tenantID, brandID).Scan(&articleID)
 	if err == nil {
 		return articleID, nil
 	}
@@ -582,10 +583,10 @@ func ensureArticle(ctx context.Context, tx pgx.Tx, tenantID int64) (int64, error
 	}
 
 	err = tx.QueryRow(ctx, `
-		INSERT INTO articles (tenant_id, source_type, generate_status, publish_status)
-		VALUES ($1, 'free_create', 'completed', 'published')
+		INSERT INTO articles (tenant_id, brand_id, source_type, generate_status, publish_status)
+		VALUES ($1, $2, 'free_create', 'completed', 'published')
 		RETURNING id
-	`, tenantID).Scan(&articleID)
+	`, tenantID, brandID).Scan(&articleID)
 	if err != nil {
 		return 0, wrapSeedErr("insert article", err)
 	}
diff --git a/server/cmd/scheduler/main.go b/server/cmd/scheduler/main.go
index d5ab43d..47de276 100644
--- a/server/cmd/scheduler/main.go
+++ b/server/cmd/scheduler/main.go
@@ -110,9 +110,6 @@ func main() {
 				if jobCtx.Job != nil && jobCtx.Job.TimeoutSeconds > 0 {
 					timeout = time.Duration(jobCtx.Job.TimeoutSeconds) * time.Second
 				}
-				if timeout <= 0 {
-					timeout = 45 * time.Second
-				}
 				taskCtx, cancel := context.WithTimeout(runCtx, timeout)
 				defer cancel()
 				return monitoringDailyTaskWorker.RunOnce(taskCtx, monitoringDailyRunOptions(jobCtx))
diff --git a/server/internal/shared/auth/context.go b/server/internal/shared/auth/context.go
index 4529e4d..69e432a 100644
--- a/server/internal/shared/auth/context.go
+++ b/server/internal/shared/auth/context.go
@@ -11,6 +11,7 @@ type Actor struct {
 
 type actorKey struct{}
 type currentWorkspaceIDKey struct{}
+type currentBrandIDKey struct{}
 
 func WithActor(ctx context.Context, actor Actor) context.Context {
 	return context.WithValue(ctx, actorKey{}, actor)
@@ -51,3 +52,22 @@ func CurrentWorkspaceID(ctx context.Context) int64 {
 	}
 	return actor.PrimaryWorkspaceID
 }
+
+func WithCurrentBrandID(ctx context.Context, brandID int64) context.Context {
+	return context.WithValue(ctx, currentBrandIDKey{}, brandID)
+}
+
+func CurrentBrandIDFromCtx(ctx context.Context) (int64, bool) {
+	brandID, ok := ctx.Value(currentBrandIDKey{}).(int64)
+	if !ok || brandID <= 0 {
+		return 0, false
+	}
+	return brandID, true
+}
+
+func CurrentBrandID(ctx context.Context) int64 {
+	if brandID, ok := CurrentBrandIDFromCtx(ctx); ok {
+		return brandID
+	}
+	return 0
+}
diff --git a/server/internal/shared/middleware/brand_scope.go b/server/internal/shared/middleware/brand_scope.go
new file mode 100644
index 0000000..c43976c
--- /dev/null
+++ b/server/internal/shared/middleware/brand_scope.go
@@ -0,0 +1,153 @@
+package middleware
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/geo-platform/tenant-api/internal/shared/auth"
+	"github.com/geo-platform/tenant-api/internal/shared/response"
+)
+
+const BrandIDHeader = "X-Brand-ID"
+
+func BrandScope(pool *pgxpool.Pool) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		actor, ok := auth.ActorFromCtx(c.Request.Context())
+		if !ok || actor.TenantID == 0 || actor.UserID == 0 {
+			response.Error(c, response.ErrUnauthorized(40100, "not_authenticated", "not authenticated"))
+			c.Abort()
+			return
+		}
+
+		brandID, hasHeader, err := requestedBrandID(c.GetHeader(BrandIDHeader))
+		if err != nil {
+			response.Error(c, response.ErrBadRequest(40033, "invalid_brand_id", "brand id must be a positive number"))
+			c.Abort()
+			return
+		}
+		if !hasHeader {
+			c.Next()
+			return
+		}
+
+		if pool == nil {
+			response.Error(c, response.ErrInternal(50012, "brand_scope_unavailable", "brand scope validation is unavailable"))
+			c.Abort()
+			return
+		}
+		if err := validateBrandScope(c.Request.Context(), pool, actor.TenantID, brandID); err != nil {
+			if errors.Is(err, pgx.ErrNoRows) {
+				response.Error(c, response.ErrForbidden(40313, "brand_forbidden", "brand is not available for current tenant"))
+			} else {
+				response.Error(c, response.ErrInternal(50012, "brand_scope_lookup_failed", "failed to validate brand scope"))
+			}
+			c.Abort()
+			return
+		}
+
+		c.Request = c.Request.WithContext(auth.WithCurrentBrandID(c.Request.Context(), brandID))
+		c.Next()
+	}
+}
+
+func RequireCurrentBrand() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if _, ok := auth.CurrentBrandIDFromCtx(c.Request.Context()); !ok {
+			response.Error(c, response.ErrBadRequest(40033, "brand_context_required", "current brand is required"))
+			c.Abort()
+			return
+		}
+		c.Next()
+	}
+}
+
+func ArticleBrandScope(pool *pgxpool.Pool) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		rawArticleID := strings.TrimSpace(c.Param("id"))
+		if rawArticleID == "" {
+			c.Next()
+			return
+		}
+
+		articleID, err := strconv.ParseInt(rawArticleID, 10, 64)
+		if err != nil || articleID <= 0 {
+			c.Next()
+			return
+		}
+
+		actor, ok := auth.ActorFromCtx(c.Request.Context())
+		if !ok || actor.TenantID == 0 {
+			response.Error(c, response.ErrUnauthorized(40100, "not_authenticated", "not authenticated"))
+			c.Abort()
+			return
+		}
+		brandID, ok := auth.CurrentBrandIDFromCtx(c.Request.Context())
+		if !ok {
+			response.Error(c, response.ErrBadRequest(40033, "brand_context_required", "current brand is required"))
+			c.Abort()
+			return
+		}
+		if pool == nil {
+			response.Error(c, response.ErrInternal(50012, "brand_scope_unavailable", "brand scope validation is unavailable"))
+			c.Abort()
+			return
+		}
+
+		var exists bool
+		if err := pool.QueryRow(c.Request.Context(), `
+			SELECT EXISTS (
+				SELECT 1
+				FROM articles
+				WHERE id = $1
+				  AND tenant_id = $2
+				  AND brand_id = $3
+				  AND deleted_at IS NULL
+			)
+		`, articleID, actor.TenantID, brandID).Scan(&exists); err != nil {
+			response.Error(c, response.ErrInternal(50012, "brand_scope_lookup_failed", "failed to validate article brand scope"))
+			c.Abort()
+			return
+		}
+		if !exists {
+			response.Error(c, response.ErrNotFound(40411, "article_not_found", "article not found"))
+			c.Abort()
+			return
+		}
+
+		c.Next()
+	}
+}
+
+func requestedBrandID(raw string) (int64, bool, error) {
+	trimmed := strings.TrimSpace(raw)
+	if trimmed == "" {
+		return 0, false, nil
+	}
+	brandID, err := strconv.ParseInt(trimmed, 10, 64)
+	if err != nil {
+		return 0, true, err
+	}
+	if brandID <= 0 {
+		return 0, true, fmt.Errorf("brand id must be positive")
+	}
+	return brandID, true, nil
+}
+
+func validateBrandScope(ctx context.Context, pool *pgxpool.Pool, tenantID, brandID int64) error {
+	var exists int
+	return pool.QueryRow(ctx, `
+		SELECT 1
+		FROM brands
+		WHERE tenant_id = $1
+		  AND id = $2
+		  AND deleted_at IS NULL
+		LIMIT 1
+	`, tenantID, brandID).Scan(&exists)
+}
diff --git a/server/internal/tenant/app/article_imitation_service.go b/server/internal/tenant/app/article_imitation_service.go
index bd4c8f1..0aa022a 100644
--- a/server/internal/tenant/app/article_imitation_service.go
+++ b/server/internal/tenant/app/article_imitation_service.go
@@ -122,6 +122,10 @@ func (s *ArticleImitationService) runtimeConfig() generationRuntimeConfig {
 
 func (s *ArticleImitationService) Generate(ctx context.Context, req GenerateImitationRequest) (*GenerateImitationResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 	if err := s.llm.Validate(); err != nil {
 		return nil, response.ErrServiceUnavailable(50311, "llm_unavailable", err.Error())
 	}
@@ -141,6 +145,7 @@ func (s *ArticleImitationService) Generate(ctx context.Context, req GenerateImit
 	}
 
 	inputParams := buildImitationInputParams(sourceURL, req)
+	inputParams["brand_id"] = brandID
 	inputJSON, _ := json.Marshal(inputParams)
 	initialTitle := buildImitationInitialTitle(req.SourceTitle)
 	wizardStateJSON, _ := json.Marshal(map[string]interface{}{
@@ -192,10 +197,10 @@ func (s *ArticleImitationService) Generate(ctx context.Context, req GenerateImit
 
 	var articleID int64
 	err = tx.QueryRow(ctx, `
-		INSERT INTO articles (tenant_id, source_type, generate_status, publish_status, wizard_state_json)
-		VALUES ($1, $2, 'generating', 'unpublished', $3)
+		INSERT INTO articles (tenant_id, brand_id, source_type, generate_status, publish_status, wizard_state_json)
+		VALUES ($1, $2, $3, 'generating', 'unpublished', $4)
 		RETURNING id
-	`, actor.TenantID, articleImitationSourceType, wizardStateJSON).Scan(&articleID)
+	`, actor.TenantID, brandID, articleImitationSourceType, wizardStateJSON).Scan(&articleID)
 	if err != nil {
 		return nil, response.ErrInternal(50012, "create_failed", "failed to create imitation article")
 	}
diff --git a/server/internal/tenant/app/article_regeneration_service.go b/server/internal/tenant/app/article_regeneration_service.go
index c938642..17ea7c7 100644
--- a/server/internal/tenant/app/article_regeneration_service.go
+++ b/server/internal/tenant/app/article_regeneration_service.go
@@ -38,6 +38,10 @@ type articleRegenerationRecord struct {
 
 func (s *ArticleService) Regenerate(ctx context.Context, articleID int64) (*RegenerateArticleResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 	if s == nil || s.llm == nil || s.rabbitMQ == nil {
 		return nil, response.ErrServiceUnavailable(50310, "generation_queue_unavailable", "generation queue is not configured")
 	}
@@ -57,7 +61,7 @@ func (s *ArticleService) Regenerate(ctx context.Context, articleID int64) (*Rege
 	}
 	defer rollbackGenerationTx(tx)
 
-	record, err := loadArticleForRegeneration(ctx, tx, actor.TenantID, articleID)
+	record, err := loadArticleForRegeneration(ctx, tx, actor.TenantID, brandID, articleID)
 	if err != nil {
 		return nil, err
 	}
@@ -184,15 +188,15 @@ func (s *ArticleService) Regenerate(ctx context.Context, articleID int64) (*Rege
 	return &RegenerateArticleResponse{ArticleID: articleID, TaskID: taskID}, nil
 }
 
-func loadArticleForRegeneration(ctx context.Context, tx pgx.Tx, tenantID, articleID int64) (*articleRegenerationRecord, error) {
+func loadArticleForRegeneration(ctx context.Context, tx pgx.Tx, tenantID, brandID, articleID int64) (*articleRegenerationRecord, error) {
 	record := &articleRegenerationRecord{}
 	var templateID, kolPromptID, promptRuleID sql.NullInt64
 	err := tx.QueryRow(ctx, `
 		SELECT id, source_type, template_id, kol_prompt_id, prompt_rule_id, generate_status, wizard_state_json
 		FROM articles
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL
+		WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL
 		FOR UPDATE
-	`, articleID, tenantID).Scan(
+	`, articleID, tenantID, brandID).Scan(
 		&record.ArticleID,
 		&record.SourceType,
 		&templateID,
diff --git a/server/internal/tenant/app/article_selection_optimize_service.go b/server/internal/tenant/app/article_selection_optimize_service.go
index 64cb9d2..72f47cb 100644
--- a/server/internal/tenant/app/article_selection_optimize_service.go
+++ b/server/internal/tenant/app/article_selection_optimize_service.go
@@ -78,7 +78,11 @@ func (s *ArticleSelectionOptimizeService) ValidateRequest(
 	}
 
 	actor := auth.MustActor(ctx)
-	return s.ensureArticleEditable(ctx, articleID, actor.TenantID)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return err
+	}
+	return s.ensureArticleEditable(ctx, articleID, actor.TenantID, brandID)
 }
 
 func (s *ArticleSelectionOptimizeService) OptimizeSelection(
@@ -154,15 +158,17 @@ func (s *ArticleSelectionOptimizeService) ensureArticleEditable(
 	ctx context.Context,
 	articleID int64,
 	tenantID int64,
+	brandID int64,
 ) error {
 	var generateStatus string
 	err := s.pool.QueryRow(
 		ctx,
 		`SELECT generate_status
 		FROM articles
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL`,
+		WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL`,
 		articleID,
 		tenantID,
+		brandID,
 	).Scan(&generateStatus)
 	if err != nil {
 		if err == pgx.ErrNoRows {
diff --git a/server/internal/tenant/app/article_service.go b/server/internal/tenant/app/article_service.go
index 1bed4d4..3247c9c 100644
--- a/server/internal/tenant/app/article_service.go
+++ b/server/internal/tenant/app/article_service.go
@@ -134,6 +134,7 @@ const articleEffectivePublishStatusExpr = `CASE
 type ArticleListParams struct {
 	Page           int
 	PageSize       int
+	BrandID        int64
 	GenerateStatus *string
 	PublishStatus  *string
 	SourceType     *string
@@ -148,6 +149,7 @@ type ArticleListParams struct {
 
 type ArticleListItem struct {
 	ID                     int64     `json:"id"`
+	BrandID                *int64    `json:"brand_id"`
 	SourceType             string    `json:"source_type"`
 	TemplateID             *int64    `json:"template_id"`
 	KolPromptID            *int64    `json:"kol_prompt_id"`
@@ -176,14 +178,20 @@ type ArticleListResponse struct {
 
 func (s *ArticleService) List(ctx context.Context, params ArticleListParams) (*ArticleListResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	params.BrandID = brandID
 	version := articleCacheVersion(ctx, s.cache, actor.TenantID)
 	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, articleListCacheKey(actor.TenantID, version, params), defaultCacheTTL(), func(loadCtx context.Context) (*ArticleListResponse, error) {
-		return s.loadArticles(loadCtx, actor.TenantID, params)
+		return s.loadArticles(loadCtx, actor.TenantID, brandID, params)
 	})
 }
 
 type ArticleDetailResponse struct {
 	ID                     int64                  `json:"id"`
+	BrandID                *int64                 `json:"brand_id"`
 	SourceType             string                 `json:"source_type"`
 	TemplateID             *int64                 `json:"template_id"`
 	CurrentVersionID       *int64                 `json:"current_version_id"`
@@ -209,9 +217,13 @@ type ArticleDetailResponse struct {
 
 func (s *ArticleService) Detail(ctx context.Context, id int64) (*ArticleDetailResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 	version := articleCacheVersion(ctx, s.cache, actor.TenantID)
 	record, found, err := sharedcache.LoadJSONWithEmpty(ctx, s.cache, &s.cacheGroup, articleDetailCacheKey(actor.TenantID, id, version), defaultCacheTTL(), defaultCacheEmptyTTL(), func(loadCtx context.Context) (*ArticleDetailResponse, bool, error) {
-		return s.loadArticleDetail(loadCtx, actor.TenantID, id)
+		return s.loadArticleDetail(loadCtx, actor.TenantID, brandID, id)
 	})
 	if err != nil {
 		return nil, err
@@ -222,7 +234,7 @@ func (s *ArticleService) Detail(ctx context.Context, id int64) (*ArticleDetailRe
 	return record, nil
 }
 
-func (s *ArticleService) loadArticles(ctx context.Context, tenantID int64, params ArticleListParams) (*ArticleListResponse, error) {
+func (s *ArticleService) loadArticles(ctx context.Context, tenantID, brandID int64, params ArticleListParams) (*ArticleListResponse, error) {
 	sourceTypes := normalizeArticleSourceTypes(params.SourceType)
 
 	if params.Page < 1 {
@@ -234,7 +246,7 @@ func (s *ArticleService) loadArticles(ctx context.Context, tenantID int64, param
 	offset := (params.Page - 1) * params.PageSize
 
 	var total int64
-	countArgs := []interface{}{tenantID}
+	countArgs := []interface{}{tenantID, brandID}
 	countQuery := `SELECT COUNT(*) FROM articles a
 		LEFT JOIN article_versions av ON av.id = a.current_version_id
 		LEFT JOIN prompt_rules pr ON pr.id = a.prompt_rule_id
@@ -249,8 +261,8 @@ func (s *ArticleService) loadArticles(ctx context.Context, tenantID int64, param
 		countQuery += articlePublishStatusAggregateJoin
 	}
 	countQuery += `
-		WHERE a.tenant_id = $1 AND a.deleted_at IS NULL`
-	argIdx := 2
+		WHERE a.tenant_id = $1 AND a.brand_id = $2 AND a.deleted_at IS NULL`
+	argIdx := 3
 
 	if params.GenerateStatus != nil {
 		countQuery += ` AND a.generate_status = $` + strconv.Itoa(argIdx)
@@ -307,7 +319,7 @@ func (s *ArticleService) loadArticles(ctx context.Context, tenantID int64, param
 		return nil, response.ErrInternal(50010, "query_failed", "failed to count articles")
 	}
 
-	listQuery := `SELECT a.id, a.source_type, a.template_id, a.kol_prompt_id, a.prompt_rule_id, a.generate_status, ` + articleEffectivePublishStatusExpr + `, a.created_at,
+	listQuery := `SELECT a.id, a.brand_id, a.source_type, a.template_id, a.kol_prompt_id, a.prompt_rule_id, a.generate_status, ` + articleEffectivePublishStatusExpr + `, a.created_at,
 		COALESCE(av.title, NULLIF(a.wizard_state_json ->> 'title', ''), NULLIF(gt.input_params_json ->> 'title', '')), gt.error_message, COALESCE(av.word_count, 0), av.source_label,
 		COALESCE(t.template_name, NULLIF(gt.input_params_json ->> 'prompt_name', ''), NULLIF(gt.input_params_json ->> 'package_name', '')), pr.name, a.wizard_state_json, gt.input_params_json
 		FROM articles a
@@ -322,9 +334,9 @@ func (s *ArticleService) loadArticles(ctx context.Context, tenantID int64, param
 			LIMIT 1
 		) gt ON true
 		` + articlePublishStatusAggregateJoin + `
-		WHERE a.tenant_id = $1 AND a.deleted_at IS NULL`
-	listArgs := []interface{}{tenantID}
-	listIdx := 2
+		WHERE a.tenant_id = $1 AND a.brand_id = $2 AND a.deleted_at IS NULL`
+	listArgs := []interface{}{tenantID, brandID}
+	listIdx := 3
 
 	if params.GenerateStatus != nil {
 		listQuery += ` AND a.generate_status = $` + strconv.Itoa(listIdx)
@@ -392,7 +404,7 @@ func (s *ArticleService) loadArticles(ctx context.Context, tenantID int64, param
 		var dbSourceType string
 		var wizardStateJSON []byte
 		var inputParamsJSON []byte
-		if err := rows.Scan(&item.ID, &dbSourceType, &item.TemplateID, &item.KolPromptID, &item.PromptRuleID, &item.GenerateStatus, &item.PublishStatus, &item.CreatedAt,
+		if err := rows.Scan(&item.ID, &item.BrandID, &dbSourceType, &item.TemplateID, &item.KolPromptID, &item.PromptRuleID, &item.GenerateStatus, &item.PublishStatus, &item.CreatedAt,
 			&item.Title, &item.GenerationErrorMessage, &item.WordCount, &item.SourceLabel, &item.TemplateName, &item.PromptRuleName, &wizardStateJSON, &inputParamsJSON); err != nil {
 			return nil, response.ErrInternal(50010, "scan_failed", err.Error())
 		}
@@ -409,14 +421,14 @@ func (s *ArticleService) loadArticles(ctx context.Context, tenantID int64, param
 	return &ArticleListResponse{Items: items, Total: total, Page: params.Page, PageSize: params.PageSize}, nil
 }
 
-func (s *ArticleService) loadArticleDetail(ctx context.Context, tenantID, articleID int64) (*ArticleDetailResponse, bool, error) {
+func (s *ArticleService) loadArticleDetail(ctx context.Context, tenantID, brandID, articleID int64) (*ArticleDetailResponse, bool, error) {
 	var item ArticleDetailResponse
 	var dbSourceType string
 	var currentVersionID *int64
 	var wizardStateJSON []byte
 	var inputParamsJSON []byte
 	err := s.pool.QueryRow(ctx, `
-		SELECT a.id, a.source_type, a.template_id, a.current_version_id, a.generate_status, `+articleEffectivePublishStatusExpr+`, a.created_at,
+		SELECT a.id, a.brand_id, a.source_type, a.template_id, a.current_version_id, a.generate_status, `+articleEffectivePublishStatusExpr+`, a.created_at,
 		       COALESCE(av.title, NULLIF(a.wizard_state_json ->> 'title', ''), NULLIF(gt.input_params_json ->> 'title', '')), COALESCE(av.word_count, 0), av.source_label, av.version_no,
 		       t.template_name, gt.error_message, a.wizard_state_json, gt.input_params_json
 		FROM articles a
@@ -430,8 +442,8 @@ func (s *ArticleService) loadArticleDetail(ctx context.Context, tenantID, articl
 			LIMIT 1
 		) gt ON true
 		`+articlePublishStatusAggregateJoin+`
-		WHERE a.id = $1 AND a.tenant_id = $2 AND a.deleted_at IS NULL
-	`, articleID, tenantID).Scan(&item.ID, &dbSourceType, &item.TemplateID, &currentVersionID, &item.GenerateStatus, &item.PublishStatus, &item.CreatedAt,
+		WHERE a.id = $1 AND a.tenant_id = $2 AND a.brand_id = $3 AND a.deleted_at IS NULL
+	`, articleID, tenantID, brandID).Scan(&item.ID, &item.BrandID, &dbSourceType, &item.TemplateID, &currentVersionID, &item.GenerateStatus, &item.PublishStatus, &item.CreatedAt,
 		&item.Title, &item.WordCount, &item.SourceLabel, &item.VersionNo, &item.TemplateName, &item.GenerationErrorMessage, &wizardStateJSON, &inputParamsJSON)
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
@@ -496,6 +508,10 @@ type CreateArticleRequest struct {
 
 func (s *ArticleService) Create(ctx context.Context, req CreateArticleRequest) (*ArticleDetailResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	title := strings.TrimSpace(req.Title)
 
@@ -507,10 +523,10 @@ func (s *ArticleService) Create(ctx context.Context, req CreateArticleRequest) (
 
 	var articleID int64
 	if err := tx.QueryRow(ctx, `
-		INSERT INTO articles (tenant_id, source_type, template_id, generate_status, publish_status)
-		VALUES ($1, 'free_create', NULL, 'completed', 'unpublished')
+		INSERT INTO articles (tenant_id, brand_id, source_type, template_id, generate_status, publish_status)
+		VALUES ($1, $2, 'free_create', NULL, 'completed', 'unpublished')
 		RETURNING id
-	`, actor.TenantID).Scan(&articleID); err != nil {
+	`, actor.TenantID, brandID).Scan(&articleID); err != nil {
 		return nil, response.ErrInternal(50014, "create_failed", "failed to create article")
 	}
 
@@ -561,6 +577,10 @@ type ArticleImageUploadResponse struct {
 
 func (s *ArticleService) Update(ctx context.Context, id int64, req UpdateArticleRequest) (*ArticleDetailResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	title := strings.TrimSpace(req.Title)
 	if title == "" {
@@ -585,9 +605,9 @@ func (s *ArticleService) Update(ctx context.Context, id int64, req UpdateArticle
 	err = tx.QueryRow(ctx, `
 		SELECT generate_status, wizard_state_json
 		FROM articles
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL
+		WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL
 		FOR UPDATE
-	`, id, actor.TenantID).Scan(&generateStatus, &wizardStateJSON)
+	`, id, actor.TenantID, brandID).Scan(&generateStatus, &wizardStateJSON)
 	if err != nil {
 		return nil, response.ErrNotFound(40411, "article_not_found", "article not found")
 	}
@@ -656,8 +676,8 @@ func (s *ArticleService) Update(ctx context.Context, id int64, req UpdateArticle
 		    publish_status = 'unpublished',
 		    wizard_state_json = $4,
 		    updated_at = NOW()
-		WHERE id = $2 AND tenant_id = $3 AND deleted_at IS NULL
-	`, versionID, id, actor.TenantID, nextWizardStateJSON)
+		WHERE id = $2 AND tenant_id = $3 AND brand_id = $5 AND deleted_at IS NULL
+	`, versionID, id, actor.TenantID, nextWizardStateJSON, brandID)
 	if err != nil {
 		return nil, response.ErrInternal(50012, "update_failed", "failed to update article")
 	}
@@ -700,6 +720,10 @@ func (s *ArticleService) UploadImage(
 	content []byte,
 ) (*ArticleImageUploadResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	if err := s.objectStorage.Validate(); err != nil {
 		return nil, response.ErrServiceUnavailable(50303, "object_storage_unavailable", "object storage is not configured")
@@ -730,7 +754,7 @@ func (s *ArticleService) UploadImage(
 		return nil, response.ErrBadRequest(40018, "article_image_dimensions_too_large", "image pixel count exceeds the maximum allowed")
 	}
 
-	generateStatus, err := s.getEditableArticleStatus(ctx, articleID, actor.TenantID)
+	generateStatus, err := s.getEditableArticleStatus(ctx, articleID, actor.TenantID, brandID)
 	if err != nil {
 		return nil, err
 	}
@@ -782,11 +806,15 @@ type VersionItem struct {
 
 func (s *ArticleService) Versions(ctx context.Context, articleID int64) ([]VersionItem, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	// Verify ownership
 	var exists bool
-	_ = s.pool.QueryRow(ctx, `SELECT EXISTS(SELECT 1 FROM articles WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL)`,
-		articleID, actor.TenantID).Scan(&exists)
+	_ = s.pool.QueryRow(ctx, `SELECT EXISTS(SELECT 1 FROM articles WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL)`,
+		articleID, actor.TenantID, brandID).Scan(&exists)
 	if !exists {
 		return nil, response.ErrNotFound(40411, "article_not_found", "article not found")
 	}
@@ -816,11 +844,15 @@ func (s *ArticleService) Versions(ctx context.Context, articleID int64) ([]Versi
 
 func (s *ArticleService) Delete(ctx context.Context, id int64) error {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return err
+	}
 
 	// Read before_json for audit
 	var beforeJSON []byte
-	_ = s.pool.QueryRow(ctx, `SELECT row_to_json(a) FROM articles a WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL`,
-		id, actor.TenantID).Scan(&beforeJSON)
+	_ = s.pool.QueryRow(ctx, `SELECT row_to_json(a) FROM articles a WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL`,
+		id, actor.TenantID, brandID).Scan(&beforeJSON)
 
 	tx, err := s.pool.Begin(ctx)
 	if err != nil {
@@ -830,8 +862,8 @@ func (s *ArticleService) Delete(ctx context.Context, id int64) error {
 
 	tag, err := tx.Exec(ctx, `
 		UPDATE articles SET deleted_at = NOW(), updated_at = NOW()
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL
-	`, id, actor.TenantID)
+		WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL
+	`, id, actor.TenantID, brandID)
 	if err != nil || tag.RowsAffected() == 0 {
 		return response.ErrNotFound(40411, "article_not_found", "article not found")
 	}
@@ -1054,13 +1086,13 @@ WHERE tenant_id = $1
 	return validIDs, nil
 }
 
-func (s *ArticleService) getEditableArticleStatus(ctx context.Context, articleID int64, tenantID int64) (string, error) {
+func (s *ArticleService) getEditableArticleStatus(ctx context.Context, articleID int64, tenantID int64, brandID int64) (string, error) {
 	var generateStatus string
 	if err := s.pool.QueryRow(ctx, `
 		SELECT generate_status
 		FROM articles
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL
-	`, articleID, tenantID).Scan(&generateStatus); err != nil {
+		WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL
+	`, articleID, tenantID, brandID).Scan(&generateStatus); err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
 			return "", response.ErrNotFound(40411, "article_not_found", "article not found")
 		}
diff --git a/server/internal/tenant/app/brand_service.go b/server/internal/tenant/app/brand_service.go
index a53b3b5..acb973c 100644
--- a/server/internal/tenant/app/brand_service.go
+++ b/server/internal/tenant/app/brand_service.go
@@ -98,9 +98,16 @@ type BrandLibrarySummaryResponse struct {
 
 func (s *BrandService) List(ctx context.Context) ([]BrandResponse, error) {
 	actor := auth.MustActor(ctx)
-	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, brandListCacheKey(actor.TenantID), defaultCacheTTL(), func(loadCtx context.Context) ([]BrandResponse, error) {
+	brands, err := sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, brandListCacheKey(actor.TenantID), defaultCacheTTL(), func(loadCtx context.Context) ([]BrandResponse, error) {
 		return s.loadBrands(loadCtx, actor.TenantID)
 	})
+	if err != nil {
+		return nil, err
+	}
+	if brands == nil {
+		return []BrandResponse{}, nil
+	}
+	return brands, nil
 }
 
 func (s *BrandService) Summary(ctx context.Context) (*BrandLibrarySummaryResponse, error) {
diff --git a/server/internal/tenant/app/cache_support.go b/server/internal/tenant/app/cache_support.go
index e317112..1cd74c4 100644
--- a/server/internal/tenant/app/cache_support.go
+++ b/server/internal/tenant/app/cache_support.go
@@ -52,12 +52,20 @@ func deleteCachePrefix(ctx context.Context, c sharedcache.Cache, prefix string)
 	_ = c.DeletePrefix(ctx, prefix)
 }
 
-func workspaceOverviewCacheKey(tenantID int64) string {
-	return fmt.Sprintf("workspace:overview:%d", tenantID)
+func workspaceOverviewCachePrefix(tenantID int64) string {
+	return fmt.Sprintf("workspace:overview:%d:", tenantID)
 }
 
-func workspaceRecentArticlesCacheKey(tenantID int64) string {
-	return fmt.Sprintf("workspace:recent_articles:%d", tenantID)
+func workspaceOverviewCacheKey(tenantID, brandID int64) string {
+	return fmt.Sprintf("%s%d", workspaceOverviewCachePrefix(tenantID), brandID)
+}
+
+func workspaceRecentArticlesCachePrefix(tenantID int64) string {
+	return fmt.Sprintf("workspace:recent_articles:%d:", tenantID)
+}
+
+func workspaceRecentArticlesCacheKey(tenantID, brandID int64) string {
+	return fmt.Sprintf("%s%d", workspaceRecentArticlesCachePrefix(tenantID), brandID)
 }
 
 func workspaceQuotaSummaryCacheKey(tenantID int64) string {
@@ -73,8 +81,8 @@ func workspaceKolCardsCacheKey(tenantID int64) string {
 }
 
 func invalidateWorkspaceCaches(ctx context.Context, c sharedcache.Cache, tenantID int64) {
-	deleteCacheKey(ctx, c, workspaceOverviewCacheKey(tenantID))
-	deleteCacheKey(ctx, c, workspaceRecentArticlesCacheKey(tenantID))
+	deleteCachePrefix(ctx, c, workspaceOverviewCachePrefix(tenantID))
+	deleteCachePrefix(ctx, c, workspaceRecentArticlesCachePrefix(tenantID))
 	deleteCacheKey(ctx, c, workspaceQuotaSummaryCacheKey(tenantID))
 	deleteCacheKey(ctx, c, workspaceTemplateCardsCacheKey(tenantID))
 	deleteCacheKey(ctx, c, workspaceKolCardsCacheKey(tenantID))
@@ -186,21 +194,17 @@ func invalidatePromptRuleCaches(ctx context.Context, c sharedcache.Cache, tenant
 	deleteCachePrefix(ctx, c, articleListCachePrefix(tenantID))
 }
 
-func scheduleTaskDetailCacheKey(tenantID, taskID int64) string {
-	return fmt.Sprintf("%s%d", scheduleTaskDetailCachePrefix(tenantID), taskID)
+func scheduleTaskDetailCacheKey(tenantID, brandID, taskID int64) string {
+	return fmt.Sprintf("%s%d:%d", scheduleTaskDetailCachePrefix(tenantID), brandID, taskID)
 }
 
-func scheduleTaskListCacheKey(tenantID int64, params interface{}) string {
-	return scheduleTaskListCachePrefix(tenantID) + digestCacheKey(params)
+func scheduleTaskListCacheKey(tenantID, brandID int64, params interface{}) string {
+	return fmt.Sprintf("%s%d:%s", scheduleTaskListCachePrefix(tenantID), brandID, digestCacheKey(params))
 }
 
 func invalidateScheduleTaskCaches(ctx context.Context, c sharedcache.Cache, tenantID int64, taskID *int64) {
 	deleteCachePrefix(ctx, c, scheduleTaskListCachePrefix(tenantID))
-	if taskID != nil && *taskID > 0 {
-		deleteCacheKey(ctx, c, scheduleTaskDetailCacheKey(tenantID, *taskID))
-	} else {
-		deleteCachePrefix(ctx, c, scheduleTaskDetailCachePrefix(tenantID))
-	}
+	deleteCachePrefix(ctx, c, scheduleTaskDetailCachePrefix(tenantID))
 }
 
 func InvalidateScheduleTaskCaches(ctx context.Context, c sharedcache.Cache, tenantID int64, taskID *int64) {
diff --git a/server/internal/tenant/app/current_brand.go b/server/internal/tenant/app/current_brand.go
new file mode 100644
index 0000000..84f2d13
--- /dev/null
+++ b/server/internal/tenant/app/current_brand.go
@@ -0,0 +1,15 @@
+package app
+
+import (
+	"context"
+
+	"github.com/geo-platform/tenant-api/internal/shared/auth"
+	"github.com/geo-platform/tenant-api/internal/shared/response"
+)
+
+func requireCurrentBrandID(ctx context.Context) (int64, error) {
+	if brandID, ok := auth.CurrentBrandIDFromCtx(ctx); ok {
+		return brandID, nil
+	}
+	return 0, response.ErrBadRequest(40033, "brand_context_required", "current brand is required")
+}
diff --git a/server/internal/tenant/app/desktop_content_service.go b/server/internal/tenant/app/desktop_content_service.go
index ae55ea4..239c621 100644
--- a/server/internal/tenant/app/desktop_content_service.go
+++ b/server/internal/tenant/app/desktop_content_service.go
@@ -2,12 +2,14 @@ package app
 
 import (
 	"context"
+	"errors"
 
 	"github.com/geo-platform/tenant-api/internal/shared/auditlog"
 	sharedcache "github.com/geo-platform/tenant-api/internal/shared/cache"
 	"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"
+	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
@@ -43,7 +45,11 @@ func (s *DesktopContentService) Article(
 		return nil, response.ErrUnauthorized(40108, "desktop_client_missing", "desktop client context is required")
 	}
 
-	detail, found, err := s.articles.loadArticleDetail(ctx, client.TenantID, articleID)
+	brandID, err := s.articleBrandID(ctx, client.TenantID, articleID)
+	if err != nil {
+		return nil, err
+	}
+	detail, found, err := s.articles.loadArticleDetail(ctx, client.TenantID, brandID, articleID)
 	if err != nil {
 		return nil, err
 	}
@@ -64,3 +70,23 @@ func (s *DesktopContentService) Article(
 		CoverAssetURL:   detail.CoverAssetURL,
 	}, nil
 }
+
+func (s *DesktopContentService) articleBrandID(ctx context.Context, tenantID, articleID int64) (int64, error) {
+	if s == nil || s.articles == nil || s.articles.pool == nil {
+		return 0, response.ErrInternal(50012, "article_lookup_unavailable", "article lookup is unavailable")
+	}
+	var brandID int64
+	if err := s.articles.pool.QueryRow(ctx, `
+		SELECT brand_id
+		FROM articles
+		WHERE id = $1
+		  AND tenant_id = $2
+		  AND deleted_at IS NULL
+	`, articleID, tenantID).Scan(&brandID); err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return 0, response.ErrNotFound(40411, "article_not_found", "article not found")
+		}
+		return 0, response.ErrInternal(50010, "query_failed", "failed to load article")
+	}
+	return brandID, nil
+}
diff --git a/server/internal/tenant/app/instant_task_service.go b/server/internal/tenant/app/instant_task_service.go
index f85e7de..c55d8a5 100644
--- a/server/internal/tenant/app/instant_task_service.go
+++ b/server/internal/tenant/app/instant_task_service.go
@@ -59,6 +59,10 @@ type InstantTaskListResponse struct {
 
 func (s *InstantTaskService) List(ctx context.Context, params InstantTaskListParams) (*InstantTaskListResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 	if params.Page < 1 {
 		params.Page = 1
 	}
@@ -90,12 +94,13 @@ func (s *InstantTaskService) List(ctx context.Context, params InstantTaskListPar
 			LEFT JOIN article_versions av ON av.id = a.current_version_id
 			LEFT JOIN prompt_rules pr ON pr.id = COALESCE(a.prompt_rule_id, NULLIF(gt.input_params_json ->> 'prompt_rule_id', '')::bigint)
 			WHERE gt.tenant_id = $1
+			  AND COALESCE(a.brand_id, NULLIF(gt.input_params_json ->> 'brand_id', '')::bigint) = $2
 			  AND gt.task_type = 'custom_generation'
 			  AND COALESCE(NULLIF(gt.input_params_json ->> 'generation_mode', ''), 'instant') = 'instant'
-			  AND ($2::bigint IS NULL OR pr.id = $2)
-			  AND ($4::text IS NULL OR COALESCE(NULLIF(gt.input_params_json ->> 'task_name', ''), pr.name, '') ILIKE '%' || $4 || '%')
-			  AND ($5::timestamptz IS NULL OR gt.created_at >= $5)
-			  AND ($6::timestamptz IS NULL OR gt.created_at <= $6)
+			  AND ($3::bigint IS NULL OR pr.id = $3)
+			  AND ($5::text IS NULL OR COALESCE(NULLIF(gt.input_params_json ->> 'task_name', ''), pr.name, '') ILIKE '%' || $5 || '%')
+			  AND ($6::timestamptz IS NULL OR gt.created_at >= $6)
+			  AND ($7::timestamptz IS NULL OR gt.created_at <= $7)
 		),
 		keyed AS (
 			SELECT *,
@@ -150,11 +155,11 @@ func (s *InstantTaskService) List(ctx context.Context, params InstantTaskListPar
 		)`
 
 	var total int64
-	err := s.pool.QueryRow(ctx, instantTaskBatchCTE+`
+	err = s.pool.QueryRow(ctx, instantTaskBatchCTE+`
 		SELECT COUNT(*)
 		FROM aggregated
-		WHERE ($3::text IS NULL OR status = $3)
-	`, actor.TenantID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo).Scan(&total)
+		WHERE ($4::text IS NULL OR status = $4)
+	`, actor.TenantID, brandID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo).Scan(&total)
 	if err != nil {
 		return nil, response.ErrInternal(50010, "count_failed", "failed to count instant tasks")
 	}
@@ -163,10 +168,10 @@ func (s *InstantTaskService) List(ctx context.Context, params InstantTaskListPar
 		SELECT id, article_id, task_batch_id, prompt_rule_id, prompt_rule_name, task_name,
 		       status, execution_time, input_params_json, generate_count, articles, created_at
 		FROM aggregated
-		WHERE ($3::text IS NULL OR status = $3)
+		WHERE ($4::text IS NULL OR status = $4)
 		ORDER BY created_at DESC, id DESC
-		LIMIT $7 OFFSET $8
-	`, actor.TenantID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo, params.PageSize, offset)
+		LIMIT $8 OFFSET $9
+	`, actor.TenantID, brandID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo, params.PageSize, offset)
 	if err != nil {
 		return nil, response.ErrInternal(50010, "query_failed", "failed to list instant tasks")
 	}
diff --git a/server/internal/tenant/app/kol_generation_service.go b/server/internal/tenant/app/kol_generation_service.go
index 0879af3..485a120 100644
--- a/server/internal/tenant/app/kol_generation_service.go
+++ b/server/internal/tenant/app/kol_generation_service.go
@@ -134,6 +134,11 @@ func (s *KolGenerationService) GetSchema(ctx context.Context, actor auth.Actor,
 }
 
 func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, subPromptID int64, req KolGenerationSubmitRequest) (*KolGenerationSubmitResponse, error) {
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	row, prompt, err := s.loadAuthorizedPrompt(ctx, actor, subPromptID)
 	if err != nil {
 		return nil, err
@@ -253,6 +258,7 @@ func (s *KolGenerationService) Submit(ctx context.Context, actor auth.Actor, sub
 
 	articleID, err := articleTx.CreateArticle(ctx, repository.CreateArticleInput{
 		TenantID:    actor.TenantID,
+		BrandID:     brandID,
 		SourceType:  kolGenerationTaskType,
 		KolPromptID: &row.PromptID,
 	})
diff --git a/server/internal/tenant/app/media_service.go b/server/internal/tenant/app/media_service.go
index 1919e6e..1a56d6d 100644
--- a/server/internal/tenant/app/media_service.go
+++ b/server/internal/tenant/app/media_service.go
@@ -88,10 +88,14 @@ func (s *MediaService) ListPlatforms(ctx context.Context) ([]MediaPlatformRespon
 
 func (s *MediaService) ListArticlePublishRecords(ctx context.Context, articleID int64) ([]PublishRecordResponse, error) {
 	actor := auth.MustActor(ctx)
-	return s.listArticlePublishRecords(ctx, actor.TenantID, articleID)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return s.listArticlePublishRecords(ctx, actor.TenantID, brandID, articleID)
 }
 
-func (s *MediaService) listArticlePublishRecords(ctx context.Context, tenantID, articleID int64) ([]PublishRecordResponse, error) {
+func (s *MediaService) listArticlePublishRecords(ctx context.Context, tenantID, brandID, articleID int64) ([]PublishRecordResponse, error) {
 	rows, err := s.pool.Query(ctx, `
 		SELECT pr.id, pr.publish_batch_id, pr.article_id, pr.platform_account_id, pr.platform_id,
 		       mp.name, pa.nickname, pr.status, pr.external_article_id, pr.external_article_url,
@@ -99,9 +103,10 @@ func (s *MediaService) listArticlePublishRecords(ctx context.Context, tenantID,
 		FROM publish_records pr
 		JOIN media_platforms mp ON mp.platform_id = pr.platform_id
 		JOIN platform_accounts pa ON pa.id = pr.platform_account_id
-		WHERE pr.tenant_id = $1 AND pr.article_id = $2
+		JOIN articles a ON a.id = pr.article_id AND a.tenant_id = pr.tenant_id
+		WHERE pr.tenant_id = $1 AND pr.article_id = $2 AND a.brand_id = $3 AND a.deleted_at IS NULL
 		ORDER BY pr.created_at DESC, pr.id DESC
-	`, tenantID, articleID)
+	`, tenantID, articleID, brandID)
 	if err != nil {
 		return nil, response.ErrInternal(50043, "publish_record_query_failed", "failed to list publish records")
 	}
diff --git a/server/internal/tenant/app/prompt_generate_service.go b/server/internal/tenant/app/prompt_generate_service.go
index 462853a..ff291a6 100644
--- a/server/internal/tenant/app/prompt_generate_service.go
+++ b/server/internal/tenant/app/prompt_generate_service.go
@@ -167,6 +167,11 @@ func (s *PromptRuleGenerationService) runtimeConfig() generationRuntimeConfig {
 
 func (s *PromptRuleGenerationService) GenerateFromRule(ctx context.Context, req GenerateFromRuleRequest) (*GenerateFromRuleResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	req.BrandID = &brandID
 	extra := clonePromptRuleExtraParams(req.ExtraParams)
 	if strings.TrimSpace(extractString(extra, "generation_mode")) == "" {
 		extra["generation_mode"] = "instant"
@@ -258,6 +263,9 @@ func (s *PromptRuleGenerationService) enqueuePromptRuleGeneration(ctx context.Co
 	if err := s.llm.Validate(); err != nil {
 		return nil, response.ErrServiceUnavailable(50311, "llm_unavailable", err.Error())
 	}
+	if input.BrandID == nil || *input.BrandID <= 0 {
+		return nil, response.ErrBadRequest(40033, "brand_context_required", "current brand is required")
+	}
 
 	rule, err := s.loadPromptRule(ctx, input.TenantID, input.PromptRuleID)
 	if err != nil {
@@ -408,10 +416,10 @@ func (s *PromptRuleGenerationService) enqueuePromptRuleGeneration(ctx context.Co
 
 	var articleID int64
 	err = tx.QueryRow(ctx, `
-		INSERT INTO articles (tenant_id, source_type, prompt_rule_id, generate_status, publish_status, wizard_state_json)
-		VALUES ($1, 'custom_generation', $2, 'generating', 'unpublished', $3)
+		INSERT INTO articles (tenant_id, brand_id, source_type, prompt_rule_id, generate_status, publish_status, wizard_state_json)
+		VALUES ($1, $2, 'custom_generation', $3, 'generating', 'unpublished', $4)
 		RETURNING id
-	`, input.TenantID, input.PromptRuleID, wizardStateJSON).Scan(&articleID)
+	`, input.TenantID, *input.BrandID, input.PromptRuleID, wizardStateJSON).Scan(&articleID)
 	if err != nil {
 		return nil, response.ErrInternal(50012, "create_failed", "failed to create prompt rule article")
 	}
@@ -666,7 +674,13 @@ func (s *PromptRuleGenerationService) enqueueScheduleAutoPublish(ctx context.Con
 		publishTitle = "定时生成文章"
 	}
 
-	if _, err := s.publishJobs.Create(ctx, auth.Actor{
+	brandID := int64(extractInt(job.InputParams, "brand_id"))
+	publishCtx := ctx
+	if brandID > 0 {
+		publishCtx = auth.WithCurrentBrandID(ctx, brandID)
+	}
+
+	if _, err := s.publishJobs.Create(publishCtx, auth.Actor{
 		TenantID:           job.TenantID,
 		UserID:             job.OperatorID,
 		PrimaryWorkspaceID: workspaceID,
diff --git a/server/internal/tenant/app/publish_job_service.go b/server/internal/tenant/app/publish_job_service.go
index d269c39..f8683dd 100644
--- a/server/internal/tenant/app/publish_job_service.go
+++ b/server/internal/tenant/app/publish_job_service.go
@@ -87,6 +87,10 @@ func (s *PublishJobService) Create(ctx context.Context, actor auth.Actor, req Cr
 	if actor.TenantID == 0 || actor.PrimaryWorkspaceID == 0 || actor.UserID == 0 {
 		return nil, response.ErrUnauthorized(40132, "workspace_scope_missing", "workspace context is required")
 	}
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	if s.pool == nil {
 		return nil, response.ErrServiceUnavailable(50342, "desktop_publish_job_store_unavailable", "desktop publish job store is unavailable")
@@ -119,7 +123,7 @@ func (s *PublishJobService) Create(ctx context.Context, actor auth.Actor, req Cr
 
 	accountRepo := repository.NewDesktopAccountRepository(tx)
 	taskRepo := repository.NewDesktopTaskRepository(tx)
-	articleMeta, err := loadPublishableArticleMeta(ctx, tx, actor.TenantID, articleID)
+	articleMeta, err := loadPublishableArticleMeta(ctx, tx, actor.TenantID, brandID, articleID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/server/internal/tenant/app/publish_record_support.go b/server/internal/tenant/app/publish_record_support.go
index 2794d0e..7c39999 100644
--- a/server/internal/tenant/app/publish_record_support.go
+++ b/server/internal/tenant/app/publish_record_support.go
@@ -45,14 +45,14 @@ type monitoringArticleAliasInput struct {
 	ExternalManageURL  *string
 }
 
-func loadPublishableArticleMeta(ctx context.Context, tx pgx.Tx, tenantID, articleID int64) (*publishableArticleMeta, error) {
+func loadPublishableArticleMeta(ctx context.Context, tx pgx.Tx, tenantID, brandID, articleID int64) (*publishableArticleMeta, error) {
 	var generateStatus string
 	var wizardStateJSON []byte
 	if err := tx.QueryRow(ctx, `
 		SELECT generate_status, wizard_state_json
 		FROM articles
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL
-	`, articleID, tenantID).Scan(&generateStatus, &wizardStateJSON); err != nil {
+		WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL
+	`, articleID, tenantID, brandID).Scan(&generateStatus, &wizardStateJSON); err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
 			return nil, response.ErrNotFound(40411, "article_not_found", "article not found")
 		}
diff --git a/server/internal/tenant/app/schedule_task_service.go b/server/internal/tenant/app/schedule_task_service.go
index e472b4a..73aa0f5 100644
--- a/server/internal/tenant/app/schedule_task_service.go
+++ b/server/internal/tenant/app/schedule_task_service.go
@@ -101,15 +101,23 @@ type ScheduleTaskStatusRequest struct {
 
 func (s *ScheduleTaskService) List(ctx context.Context, params ScheduleTaskListParams) (*ScheduleTaskListResponse, error) {
 	actor := auth.MustActor(ctx)
-	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, scheduleTaskListCacheKey(actor.TenantID, params), defaultCacheTTL(), func(loadCtx context.Context) (*ScheduleTaskListResponse, error) {
-		return s.loadScheduleTasks(loadCtx, actor.TenantID, params)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, scheduleTaskListCacheKey(actor.TenantID, brandID, params), defaultCacheTTL(), func(loadCtx context.Context) (*ScheduleTaskListResponse, error) {
+		return s.loadScheduleTasks(loadCtx, actor.TenantID, brandID, params)
 	})
 }
 
 func (s *ScheduleTaskService) Detail(ctx context.Context, id int64) (*ScheduleTaskResponse, error) {
 	actor := auth.MustActor(ctx)
-	record, found, err := sharedcache.LoadJSONWithEmpty(ctx, s.cache, &s.cacheGroup, scheduleTaskDetailCacheKey(actor.TenantID, id), defaultCacheTTL(), defaultCacheEmptyTTL(), func(loadCtx context.Context) (*ScheduleTaskResponse, bool, error) {
-		return s.loadScheduleTaskDetail(loadCtx, actor.TenantID, id)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	record, found, err := sharedcache.LoadJSONWithEmpty(ctx, s.cache, &s.cacheGroup, scheduleTaskDetailCacheKey(actor.TenantID, brandID, id), defaultCacheTTL(), defaultCacheEmptyTTL(), func(loadCtx context.Context) (*ScheduleTaskResponse, bool, error) {
+		return s.loadScheduleTaskDetail(loadCtx, actor.TenantID, brandID, id)
 	})
 	if err != nil {
 		return nil, err
@@ -122,6 +130,11 @@ func (s *ScheduleTaskService) Detail(ctx context.Context, id int64) (*ScheduleTa
 
 func (s *ScheduleTaskService) Create(ctx context.Context, req ScheduleTaskRequest) (*ScheduleTaskResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	req.BrandID = &brandID
 
 	if err := validateScheduleCronExpr(req.CronExpr); err != nil {
 		return nil, err
@@ -220,6 +233,12 @@ func (s *ScheduleTaskService) Create(ctx context.Context, req ScheduleTaskReques
 
 func (s *ScheduleTaskService) Update(ctx context.Context, id int64, req ScheduleTaskRequest) error {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return err
+	}
+	req.BrandID = &brandID
+
 	if err := validateScheduleCronExpr(req.CronExpr); err != nil {
 		return err
 	}
@@ -247,13 +266,13 @@ func (s *ScheduleTaskService) Update(ctx context.Context, id int64, req Schedule
 	var endAt pgtype.Timestamptz
 	err = tx.QueryRow(ctx, `
 		UPDATE schedule_tasks SET prompt_rule_id = $1, brand_id = $2, name = $3,
-		       cron_expr = $4, enable_web_search = $5, generate_count = $6,
-		       workspace_id = $7, auto_publish = $8, publish_account_ids = $9::jsonb,
-		       cover_asset_url = $10, cover_image_asset_id = $11,
-		       start_at = $12::timestamptz, end_at = $13::timestamptz, operator_id = $14, updated_at = NOW()
-		WHERE id = $15 AND tenant_id = $16 AND deleted_at IS NULL
+	       cron_expr = $4, enable_web_search = $5, generate_count = $6,
+	       workspace_id = $7, auto_publish = $8, publish_account_ids = $9::jsonb,
+	       cover_asset_url = $10, cover_image_asset_id = $11,
+	       start_at = $12::timestamptz, end_at = $13::timestamptz, operator_id = $14, updated_at = NOW()
+		WHERE id = $15 AND tenant_id = $16 AND brand_id = $17 AND deleted_at IS NULL
 		RETURNING status, start_at, end_at
-	`, req.PromptRuleID, req.BrandID, req.Name, req.CronExpr, enableWebSearch, generateCount, actor.PrimaryWorkspaceID, publishConfig.AutoPublish, publishConfig.AccountIDsJSON, publishConfig.CoverAssetURL, publishConfig.CoverImageAssetID, req.StartAt, req.EndAt, actor.UserID, id, actor.TenantID).
+	`, req.PromptRuleID, req.BrandID, req.Name, req.CronExpr, enableWebSearch, generateCount, actor.PrimaryWorkspaceID, publishConfig.AutoPublish, publishConfig.AccountIDsJSON, publishConfig.CoverAssetURL, publishConfig.CoverImageAssetID, req.StartAt, req.EndAt, actor.UserID, id, actor.TenantID, brandID).
 		Scan(&status, &startAt, &endAt)
 	if err != nil {
 		return response.ErrNotFound(40432, "schedule_not_found", "schedule task not found")
@@ -282,10 +301,14 @@ func (s *ScheduleTaskService) Update(ctx context.Context, id int64, req Schedule
 
 func (s *ScheduleTaskService) Delete(ctx context.Context, id int64) error {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return err
+	}
 	tag, err := s.pool.Exec(ctx, `
 		UPDATE schedule_tasks SET deleted_at = NOW(), updated_at = NOW()
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL
-	`, id, actor.TenantID)
+		WHERE id = $1 AND tenant_id = $2 AND brand_id = $3 AND deleted_at IS NULL
+	`, id, actor.TenantID, brandID)
 	if err != nil || tag.RowsAffected() == 0 {
 		return response.ErrNotFound(40432, "schedule_not_found", "schedule task not found")
 	}
@@ -311,6 +334,10 @@ func (s *ScheduleTaskService) Delete(ctx context.Context, id int64) error {
 
 func (s *ScheduleTaskService) ToggleStatus(ctx context.Context, id int64, req ScheduleTaskStatusRequest) error {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return err
+	}
 	tx, err := s.pool.Begin(ctx)
 	if err != nil {
 		return response.ErrInternal(50010, "update_failed", "failed to begin schedule task transaction")
@@ -323,9 +350,9 @@ func (s *ScheduleTaskService) ToggleStatus(ctx context.Context, id int64, req Sc
 	var endAt pgtype.Timestamptz
 	err = tx.QueryRow(ctx, `
 		UPDATE schedule_tasks SET status = $1, operator_id = $2, updated_at = NOW()
-		WHERE id = $3 AND tenant_id = $4 AND deleted_at IS NULL
+		WHERE id = $3 AND tenant_id = $4 AND brand_id = $5 AND deleted_at IS NULL
 		RETURNING cron_expr, status, start_at, end_at
-	`, req.Status, actor.UserID, id, actor.TenantID).
+	`, req.Status, actor.UserID, id, actor.TenantID, brandID).
 		Scan(&cronExpr, &status, &startAt, &endAt)
 	if err != nil {
 		return response.ErrNotFound(40432, "schedule_not_found", "schedule task not found")
@@ -352,7 +379,7 @@ func (s *ScheduleTaskService) ToggleStatus(ctx context.Context, id int64, req Sc
 	return nil
 }
 
-func (s *ScheduleTaskService) loadScheduleTasks(ctx context.Context, tenantID int64, params ScheduleTaskListParams) (*ScheduleTaskListResponse, error) {
+func (s *ScheduleTaskService) loadScheduleTasks(ctx context.Context, tenantID, brandID int64, params ScheduleTaskListParams) (*ScheduleTaskListResponse, error) {
 	if params.Page < 1 {
 		params.Page = 1
 	}
@@ -364,13 +391,13 @@ func (s *ScheduleTaskService) loadScheduleTasks(ctx context.Context, tenantID in
 	var total int64
 	if err := s.pool.QueryRow(ctx, `
 		SELECT COUNT(*) FROM schedule_tasks
-		WHERE tenant_id = $1 AND deleted_at IS NULL
-		  AND ($2::bigint IS NULL OR prompt_rule_id = $2)
-		  AND ($3::text IS NULL OR status = $3)
-		  AND ($4::text IS NULL OR name ILIKE '%' || $4 || '%')
-		  AND ($5::timestamptz IS NULL OR created_at >= $5)
-		  AND ($6::timestamptz IS NULL OR created_at <= $6)
-	`, tenantID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo).Scan(&total); err != nil {
+		WHERE tenant_id = $1 AND brand_id = $2 AND deleted_at IS NULL
+		  AND ($3::bigint IS NULL OR prompt_rule_id = $3)
+		  AND ($4::text IS NULL OR status = $4)
+		  AND ($5::text IS NULL OR name ILIKE '%' || $5 || '%')
+		  AND ($6::timestamptz IS NULL OR created_at >= $6)
+		  AND ($7::timestamptz IS NULL OR created_at <= $7)
+	`, tenantID, brandID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo).Scan(&total); err != nil {
 		return nil, response.ErrInternal(50010, "count_failed", "failed to count schedule tasks")
 	}
 
@@ -384,15 +411,15 @@ func (s *ScheduleTaskService) loadScheduleTasks(ctx context.Context, tenantID in
 		FROM schedule_tasks st
 		LEFT JOIN prompt_rules pr ON pr.id = st.prompt_rule_id
 		LEFT JOIN brands b ON b.id = st.brand_id
-		WHERE st.tenant_id = $1 AND st.deleted_at IS NULL
-		  AND ($2::bigint IS NULL OR st.prompt_rule_id = $2)
-		  AND ($3::text IS NULL OR st.status = $3)
-		  AND ($4::text IS NULL OR st.name ILIKE '%' || $4 || '%')
-		  AND ($5::timestamptz IS NULL OR st.created_at >= $5)
-		  AND ($6::timestamptz IS NULL OR st.created_at <= $6)
+		WHERE st.tenant_id = $1 AND st.brand_id = $2 AND st.deleted_at IS NULL
+		  AND ($3::bigint IS NULL OR st.prompt_rule_id = $3)
+		  AND ($4::text IS NULL OR st.status = $4)
+		  AND ($5::text IS NULL OR st.name ILIKE '%' || $5 || '%')
+		  AND ($6::timestamptz IS NULL OR st.created_at >= $6)
+		  AND ($7::timestamptz IS NULL OR st.created_at <= $7)
 		ORDER BY st.created_at DESC
-		LIMIT $7 OFFSET $8
-	`, tenantID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo, params.PageSize, offset)
+		LIMIT $8 OFFSET $9
+	`, tenantID, brandID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo, params.PageSize, offset)
 	if err != nil {
 		return nil, response.ErrInternal(50010, "query_failed", "failed to list schedule tasks")
 	}
@@ -415,7 +442,7 @@ func (s *ScheduleTaskService) loadScheduleTasks(ctx context.Context, tenantID in
 	return &ScheduleTaskListResponse{Items: items, Total: total}, nil
 }
 
-func (s *ScheduleTaskService) loadScheduleTaskDetail(ctx context.Context, tenantID, taskID int64) (*ScheduleTaskResponse, bool, error) {
+func (s *ScheduleTaskService) loadScheduleTaskDetail(ctx context.Context, tenantID, brandID, taskID int64) (*ScheduleTaskResponse, bool, error) {
 	row := s.pool.QueryRow(ctx, `
 		SELECT st.id, st.workspace_id, st.prompt_rule_id, st.brand_id, st.name,
 		       st.cron_expr, st.auto_publish, st.publish_account_ids, st.cover_asset_url,
@@ -426,8 +453,8 @@ func (s *ScheduleTaskService) loadScheduleTaskDetail(ctx context.Context, tenant
 		FROM schedule_tasks st
 		LEFT JOIN prompt_rules pr ON pr.id = st.prompt_rule_id
 		LEFT JOIN brands b ON b.id = st.brand_id
-		WHERE st.id = $1 AND st.tenant_id = $2 AND st.deleted_at IS NULL
-	`, taskID, tenantID)
+		WHERE st.id = $1 AND st.tenant_id = $2 AND st.brand_id = $3 AND st.deleted_at IS NULL
+	`, taskID, tenantID, brandID)
 	item, err := scanScheduleTaskResponse(row)
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
diff --git a/server/internal/tenant/app/template_service.go b/server/internal/tenant/app/template_service.go
index 3317a21..27e98ed 100644
--- a/server/internal/tenant/app/template_service.go
+++ b/server/internal/tenant/app/template_service.go
@@ -221,6 +221,10 @@ type SaveDraftResponse struct {
 
 func (s *TemplateService) SaveDraft(ctx context.Context, templateID int64, req SaveDraftRequest) (*SaveDraftResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	if _, err := s.templates.GetTemplateByID(ctx, templateID, actor.TenantID); err != nil {
 		return nil, mapTemplateLookupError(err)
@@ -234,10 +238,10 @@ func (s *TemplateService) SaveDraft(ctx context.Context, templateID int64, req S
 	if req.ArticleID == nil {
 		var articleID int64
 		err = s.pool.QueryRow(ctx, `
-			INSERT INTO articles (tenant_id, source_type, template_id, generate_status, publish_status, wizard_state_json)
-			VALUES ($1, 'template', $2, 'draft', 'unpublished', $3)
+			INSERT INTO articles (tenant_id, brand_id, source_type, template_id, generate_status, publish_status, wizard_state_json)
+			VALUES ($1, $2, 'template', $3, 'draft', 'unpublished', $4)
 			RETURNING id
-		`, actor.TenantID, templateID, stateJSON).Scan(&articleID)
+		`, actor.TenantID, brandID, templateID, stateJSON).Scan(&articleID)
 		if err != nil {
 			return nil, response.ErrInternal(50012, "draft_create_failed", "failed to create article draft")
 		}
@@ -254,12 +258,13 @@ func (s *TemplateService) SaveDraft(ctx context.Context, templateID int64, req S
 		    updated_at = NOW()
 		WHERE id = $2
 		  AND tenant_id = $3
-		  AND template_id = $4
+		  AND brand_id = $4
+		  AND template_id = $5
 		  AND source_type = 'template'
 		  AND deleted_at IS NULL
 		  AND generate_status = 'draft'
 		RETURNING id
-	`, stateJSON, *req.ArticleID, actor.TenantID, templateID).Scan(&articleID)
+	`, stateJSON, *req.ArticleID, actor.TenantID, brandID, templateID).Scan(&articleID)
 	if err != nil {
 		return nil, response.ErrConflict(40913, "draft_not_editable", "draft is not editable")
 	}
@@ -270,6 +275,10 @@ func (s *TemplateService) SaveDraft(ctx context.Context, templateID int64, req S
 
 func (s *TemplateService) Generate(ctx context.Context, templateID int64, req GenerateRequest) (*GenerateResponse, error) {
 	actor := auth.MustActor(ctx)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	templateRecord, err := s.templates.GetTemplateByID(ctx, templateID, actor.TenantID)
 	if err != nil {
@@ -346,12 +355,13 @@ func (s *TemplateService) Generate(ctx context.Context, templateID int64, req Ge
 			FROM articles
 			WHERE id = $1
 			  AND tenant_id = $2
-			  AND template_id = $3
+			  AND brand_id = $3
+			  AND template_id = $4
 			  AND source_type = 'template'
 			  AND deleted_at IS NULL
 			  AND generate_status IN ('draft', 'failed')
 			FOR UPDATE
-		`, *req.ArticleID, actor.TenantID, templateID).Scan(&articleID)
+		`, *req.ArticleID, actor.TenantID, brandID, templateID).Scan(&articleID)
 		if err != nil {
 			return nil, response.ErrConflict(40913, "article_not_regeneratable", "article cannot be regenerated in its current state")
 		}
@@ -361,6 +371,7 @@ func (s *TemplateService) Generate(ctx context.Context, templateID int64, req Ge
 	} else {
 		articleID, err = articleTx.CreateArticle(ctx, repository.CreateArticleInput{
 			TenantID:   actor.TenantID,
+			BrandID:    brandID,
 			SourceType: "template",
 			TemplateID: &templateID,
 		})
diff --git a/server/internal/tenant/app/workspace_service.go b/server/internal/tenant/app/workspace_service.go
index 3007f81..e336c9d 100644
--- a/server/internal/tenant/app/workspace_service.go
+++ b/server/internal/tenant/app/workspace_service.go
@@ -46,12 +46,16 @@ func (s *WorkspaceService) WithCache(c sharedcache.Cache) *WorkspaceService {
 
 func (s *WorkspaceService) Overview(ctx context.Context) (*domain.WorkspaceOverview, error) {
 	actor := auth.MustActor(ctx)
-	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, workspaceOverviewCacheKey(actor.TenantID), defaultCacheTTL(), func(loadCtx context.Context) (*domain.WorkspaceOverview, error) {
-		articleCount, err := s.repo.CountArticlesByTenant(loadCtx, actor.TenantID)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, workspaceOverviewCacheKey(actor.TenantID, brandID), defaultCacheTTL(), func(loadCtx context.Context) (*domain.WorkspaceOverview, error) {
+		articleCount, err := s.repo.CountArticlesByTenantAndBrand(loadCtx, actor.TenantID, brandID)
 		if err != nil {
 			return nil, response.ErrInternal(50010, "query_failed", "failed to count articles")
 		}
-		publishedCount, err := s.repo.CountPublishedArticlesByTenant(loadCtx, actor.TenantID)
+		publishedCount, err := s.repo.CountPublishedArticlesByTenantAndBrand(loadCtx, actor.TenantID, brandID)
 		if err != nil {
 			return nil, response.ErrInternal(50010, "query_failed", "failed to count published articles")
 		}
@@ -69,8 +73,12 @@ func (s *WorkspaceService) Overview(ctx context.Context) (*domain.WorkspaceOverv
 
 func (s *WorkspaceService) RecentArticles(ctx context.Context) ([]domain.RecentArticle, error) {
 	actor := auth.MustActor(ctx)
-	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, workspaceRecentArticlesCacheKey(actor.TenantID), defaultCacheTTL(), func(loadCtx context.Context) ([]domain.RecentArticle, error) {
-		rows, err := s.repo.GetRecentArticles(loadCtx, actor.TenantID)
+	brandID, err := requireCurrentBrandID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return sharedcache.LoadJSON(ctx, s.cache, &s.cacheGroup, workspaceRecentArticlesCacheKey(actor.TenantID, brandID), defaultCacheTTL(), func(loadCtx context.Context) ([]domain.RecentArticle, error) {
+		rows, err := s.repo.GetRecentArticlesByBrand(loadCtx, actor.TenantID, brandID)
 		if err != nil {
 			return nil, response.ErrInternal(50010, "query_failed", "failed to fetch recent articles")
 		}
@@ -79,6 +87,7 @@ func (s *WorkspaceService) RecentArticles(ctx context.Context) ([]domain.RecentA
 		for _, row := range rows {
 			articles = append(articles, domain.RecentArticle{
 				ID:             row.ID,
+				BrandID:        row.BrandID,
 				GenerateStatus: row.GenerateStatus,
 				PublishStatus:  row.PublishStatus,
 				SourceType:     row.SourceType,
diff --git a/server/internal/tenant/compliance/service.go b/server/internal/tenant/compliance/service.go
index 8ef67b4..33f76e6 100644
--- a/server/internal/tenant/compliance/service.go
+++ b/server/internal/tenant/compliance/service.go
@@ -21,6 +21,7 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 	"go.uber.org/zap"
 
+	"github.com/geo-platform/tenant-api/internal/shared/auth"
 	sharedcompliance "github.com/geo-platform/tenant-api/internal/shared/compliance"
 	"github.com/geo-platform/tenant-api/internal/shared/config"
 	sharedllm "github.com/geo-platform/tenant-api/internal/shared/llm"
@@ -406,6 +407,7 @@ func (s *Service) GateForPublish(ctx context.Context, req GateForPublishRequest)
 }
 
 func (s *Service) ResolvePublishableVersion(ctx context.Context, tenantID, articleID int64, requested *int64) (int64, error) {
+	brandID := auth.CurrentBrandID(ctx)
 	if requested != nil && *requested > 0 {
 		var id int64
 		err := s.pool.QueryRow(ctx, `
@@ -415,8 +417,9 @@ func (s *Service) ResolvePublishableVersion(ctx context.Context, tenantID, artic
 			WHERE av.id = $1
 			  AND av.article_id = $2
 			  AND a.tenant_id = $3
+			  AND ($4::BIGINT IS NULL OR a.brand_id = $4)
 			  AND a.deleted_at IS NULL
-		`, *requested, articleID, tenantID).Scan(&id)
+		`, *requested, articleID, tenantID, nullablePositiveInt64(brandID)).Scan(&id)
 		if err != nil {
 			if errors.Is(err, pgx.ErrNoRows) {
 				return 0, response.ErrBadRequest(41005, "invalid_article_version", "article_version_id does not belong to this article")
@@ -429,8 +432,11 @@ func (s *Service) ResolvePublishableVersion(ctx context.Context, tenantID, artic
 	err := s.pool.QueryRow(ctx, `
 		SELECT current_version_id
 		FROM articles
-		WHERE id = $1 AND tenant_id = $2 AND deleted_at IS NULL
-	`, articleID, tenantID).Scan(&versionValue)
+		WHERE id = $1
+		  AND tenant_id = $2
+		  AND ($3::BIGINT IS NULL OR brand_id = $3)
+		  AND deleted_at IS NULL
+	`, articleID, tenantID, nullablePositiveInt64(brandID)).Scan(&versionValue)
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
 			return 0, response.ErrNotFound(40411, "article_not_found", "article not found")
@@ -811,14 +817,19 @@ func (s *Service) validateAckForPublish(ctx context.Context, req GateForPublishR
 }
 
 func (s *Service) LatestCheck(ctx context.Context, tenantID, articleID int64) (*sharedcompliance.CheckResult, error) {
+	brandID := auth.CurrentBrandID(ctx)
 	var recordID int64
 	err := s.pool.QueryRow(ctx, `
-		SELECT id
-		FROM compliance_check_records
-		WHERE tenant_id = $1 AND article_id = $2
-		ORDER BY checked_at DESC, id DESC
+		SELECT cr.id
+		FROM compliance_check_records cr
+		JOIN articles a ON a.id = cr.article_id AND a.tenant_id = cr.tenant_id
+		WHERE cr.tenant_id = $1
+		  AND cr.article_id = $2
+		  AND ($3::BIGINT IS NULL OR a.brand_id = $3)
+		  AND a.deleted_at IS NULL
+		ORDER BY cr.checked_at DESC, cr.id DESC
 		LIMIT 1
-	`, tenantID, articleID).Scan(&recordID)
+	`, tenantID, articleID, nullablePositiveInt64(brandID)).Scan(&recordID)
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
 			return nil, response.ErrNotFound(40461, "compliance_check_not_found", "no compliance check record found")
@@ -2546,6 +2557,13 @@ func nullableString(value string) *string {
 	return &value
 }
 
+func nullablePositiveInt64(value int64) *int64 {
+	if value <= 0 {
+		return nil
+	}
+	return &value
+}
+
 func int64PtrAny(value *int64) any {
 	if value == nil {
 		return nil
diff --git a/server/internal/tenant/domain/article.go b/server/internal/tenant/domain/article.go
index d343913..0404153 100644
--- a/server/internal/tenant/domain/article.go
+++ b/server/internal/tenant/domain/article.go
@@ -5,6 +5,7 @@ import "time"
 type Article struct {
 	ID               int64
 	TenantID         int64
+	BrandID          *int64
 	SourceType       string
 	TemplateID       *int64
 	CurrentVersionID *int64
diff --git a/server/internal/tenant/domain/workspace.go b/server/internal/tenant/domain/workspace.go
index ccf9bfa..859b8b3 100644
--- a/server/internal/tenant/domain/workspace.go
+++ b/server/internal/tenant/domain/workspace.go
@@ -3,13 +3,14 @@ package domain
 import "time"
 
 type WorkspaceOverview struct {
-	ArticleCount           int64 `json:"article_count"`
-	PublishedCount         int64 `json:"published_count"`
-	BrandCount             int64 `json:"brand_count"`
+	ArticleCount   int64 `json:"article_count"`
+	PublishedCount int64 `json:"published_count"`
+	BrandCount     int64 `json:"brand_count"`
 }
 
 type RecentArticle struct {
 	ID             int64     `json:"id"`
+	BrandID        *int64    `json:"brand_id"`
 	Title          *string   `json:"title"`
 	TemplateName   *string   `json:"template_name"`
 	GenerateStatus string    `json:"generate_status"`
diff --git a/server/internal/tenant/repository/article_repo.go b/server/internal/tenant/repository/article_repo.go
index bada471..3621d14 100644
--- a/server/internal/tenant/repository/article_repo.go
+++ b/server/internal/tenant/repository/article_repo.go
@@ -11,6 +11,7 @@ import (
 
 type CreateArticleInput struct {
 	TenantID    int64
+	BrandID     int64
 	SourceType  string
 	TemplateID  *int64
 	KolPromptID *int64
@@ -45,6 +46,7 @@ func NewArticleRepository(db generated.DBTX) ArticleRepository {
 func (r *articleRepository) CreateArticle(ctx context.Context, input CreateArticleInput) (int64, error) {
 	return r.q.CreateArticle(ctx, generated.CreateArticleParams{
 		TenantID:    input.TenantID,
+		BrandID:     input.BrandID,
 		SourceType:  input.SourceType,
 		TemplateID:  pgInt8(input.TemplateID),
 		KolPromptID: pgInt8(input.KolPromptID),
diff --git a/server/internal/tenant/repository/generated/article.sql.go b/server/internal/tenant/repository/generated/article.sql.go
index 269caac..88d2edf 100644
--- a/server/internal/tenant/repository/generated/article.sql.go
+++ b/server/internal/tenant/repository/generated/article.sql.go
@@ -48,13 +48,14 @@ func (q *Queries) CountArticles(ctx context.Context, arg CountArticlesParams) (i
 }
 
 const createArticle = `-- name: CreateArticle :one
-INSERT INTO articles (tenant_id, source_type, template_id, kol_prompt_id, generate_status, publish_status)
-VALUES ($1, $2, $3, $4, 'pending', 'unpublished')
+INSERT INTO articles (tenant_id, brand_id, source_type, template_id, kol_prompt_id, generate_status, publish_status)
+VALUES ($1, $2, $3, $4, $5, 'pending', 'unpublished')
 RETURNING id
 `
 
 type CreateArticleParams struct {
 	TenantID    int64       `json:"tenant_id"`
+	BrandID     int64       `json:"brand_id"`
 	SourceType  string      `json:"source_type"`
 	TemplateID  pgtype.Int8 `json:"template_id"`
 	KolPromptID pgtype.Int8 `json:"kol_prompt_id"`
@@ -63,6 +64,7 @@ type CreateArticleParams struct {
 func (q *Queries) CreateArticle(ctx context.Context, arg CreateArticleParams) (int64, error) {
 	row := q.db.QueryRow(ctx, createArticle,
 		arg.TenantID,
+		arg.BrandID,
 		arg.SourceType,
 		arg.TemplateID,
 		arg.KolPromptID,
diff --git a/server/internal/tenant/repository/generated/models.go b/server/internal/tenant/repository/generated/models.go
index bfeb1f9..d452e5d 100644
--- a/server/internal/tenant/repository/generated/models.go
+++ b/server/internal/tenant/repository/generated/models.go
@@ -56,6 +56,7 @@ type Article struct {
 	DeletedAt        pgtype.Timestamptz `json:"deleted_at"`
 	WizardStateJson  []byte             `json:"wizard_state_json"`
 	KolPromptID      pgtype.Int8        `json:"kol_prompt_id"`
+	BrandID          int64              `json:"brand_id"`
 }
 
 type ArticleTemplate struct {
@@ -435,6 +436,21 @@ type KnowledgeChunksMetum struct {
 	UpdatedAt       pgtype.Timestamptz `json:"updated_at"`
 }
 
+type KnowledgeDeletedCleanupEvent struct {
+	ID              int64              `json:"id"`
+	TenantID        int64              `json:"tenant_id"`
+	KnowledgeItemID int64              `json:"knowledge_item_id"`
+	Status          string             `json:"status"`
+	AttemptCount    int32              `json:"attempt_count"`
+	AvailableAt     pgtype.Timestamptz `json:"available_at"`
+	LockedBy        pgtype.Text        `json:"locked_by"`
+	LockedAt        pgtype.Timestamptz `json:"locked_at"`
+	LastError       pgtype.Text        `json:"last_error"`
+	CompletedAt     pgtype.Timestamptz `json:"completed_at"`
+	CreatedAt       pgtype.Timestamptz `json:"created_at"`
+	UpdatedAt       pgtype.Timestamptz `json:"updated_at"`
+}
+
 type KnowledgeGroup struct {
 	ID        int64              `json:"id"`
 	TenantID  int64              `json:"tenant_id"`
diff --git a/server/internal/tenant/repository/generated/querier.go b/server/internal/tenant/repository/generated/querier.go
index d9d349d..2cd5bbb 100644
--- a/server/internal/tenant/repository/generated/querier.go
+++ b/server/internal/tenant/repository/generated/querier.go
@@ -19,13 +19,13 @@ type Querier interface {
 	ConfirmReservation(ctx context.Context, arg ConfirmReservationParams) error
 	CountActiveImagesInFolder(ctx context.Context, arg CountActiveImagesInFolderParams) (int32, error)
 	CountArticles(ctx context.Context, arg CountArticlesParams) (int64, error)
-	CountArticlesByTenant(ctx context.Context, tenantID int64) (int64, error)
+	CountArticlesByTenantAndBrand(ctx context.Context, arg CountArticlesByTenantAndBrandParams) (int64, error)
 	CountBrandsByTenant(ctx context.Context, tenantID int64) (int64, error)
 	CountImageAssets(ctx context.Context, arg CountImageAssetsParams) (int32, error)
 	CountImageReferences(ctx context.Context, arg CountImageReferencesParams) (int32, error)
 	CountPromptRules(ctx context.Context, arg CountPromptRulesParams) (int64, error)
 	CountPromptRulesUngrouped(ctx context.Context, tenantID int64) (int64, error)
-	CountPublishedArticlesByTenant(ctx context.Context, tenantID int64) (int64, error)
+	CountPublishedArticlesByTenantAndBrand(ctx context.Context, arg CountPublishedArticlesByTenantAndBrandParams) (int64, error)
 	CountScheduleTasks(ctx context.Context, arg CountScheduleTasksParams) (int64, error)
 	CountUncategorizedImages(ctx context.Context, tenantID int64) (int32, error)
 	CreateArticle(ctx context.Context, arg CreateArticleParams) (int64, error)
@@ -86,7 +86,7 @@ type Querier interface {
 	GetPromptRuleByID(ctx context.Context, arg GetPromptRuleByIDParams) (GetPromptRuleByIDRow, error)
 	GetPublishedKolPackage(ctx context.Context, id int64) (GetPublishedKolPackageRow, error)
 	GetQuotaSummary(ctx context.Context, tenantID int64) (int32, error)
-	GetRecentArticles(ctx context.Context, tenantID int64) ([]GetRecentArticlesRow, error)
+	GetRecentArticlesByBrand(ctx context.Context, arg GetRecentArticlesByBrandParams) ([]GetRecentArticlesByBrandRow, error)
 	GetScheduleTaskByID(ctx context.Context, arg GetScheduleTaskByIDParams) (GetScheduleTaskByIDRow, error)
 	GetSubscriptionPromptByID(ctx context.Context, arg GetSubscriptionPromptByIDParams) (GetSubscriptionPromptByIDRow, error)
 	GetTemplateByID(ctx context.Context, arg GetTemplateByIDParams) (GetTemplateByIDRow, error)
diff --git a/server/internal/tenant/repository/generated/workspace.sql.go b/server/internal/tenant/repository/generated/workspace.sql.go
index 7139a66..6b203b3 100644
--- a/server/internal/tenant/repository/generated/workspace.sql.go
+++ b/server/internal/tenant/repository/generated/workspace.sql.go
@@ -11,13 +11,18 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
-const countArticlesByTenant = `-- name: CountArticlesByTenant :one
+const countArticlesByTenantAndBrand = `-- name: CountArticlesByTenantAndBrand :one
 SELECT COUNT(*) FROM articles
-WHERE tenant_id = $1 AND deleted_at IS NULL
+WHERE tenant_id = $1 AND brand_id = $2 AND deleted_at IS NULL
 `
 
-func (q *Queries) CountArticlesByTenant(ctx context.Context, tenantID int64) (int64, error) {
-	row := q.db.QueryRow(ctx, countArticlesByTenant, tenantID)
+type CountArticlesByTenantAndBrandParams struct {
+	TenantID int64 `json:"tenant_id"`
+	BrandID  int64 `json:"brand_id"`
+}
+
+func (q *Queries) CountArticlesByTenantAndBrand(ctx context.Context, arg CountArticlesByTenantAndBrandParams) (int64, error) {
+	row := q.db.QueryRow(ctx, countArticlesByTenantAndBrand, arg.TenantID, arg.BrandID)
 	var count int64
 	err := row.Scan(&count)
 	return count, err
@@ -35,13 +40,18 @@ func (q *Queries) CountBrandsByTenant(ctx context.Context, tenantID int64) (int6
 	return count, err
 }
 
-const countPublishedArticlesByTenant = `-- name: CountPublishedArticlesByTenant :one
+const countPublishedArticlesByTenantAndBrand = `-- name: CountPublishedArticlesByTenantAndBrand :one
 SELECT COUNT(*) FROM articles
-WHERE tenant_id = $1 AND publish_status = 'success' AND deleted_at IS NULL
+WHERE tenant_id = $1 AND brand_id = $2 AND publish_status = 'success' AND deleted_at IS NULL
 `
 
-func (q *Queries) CountPublishedArticlesByTenant(ctx context.Context, tenantID int64) (int64, error) {
-	row := q.db.QueryRow(ctx, countPublishedArticlesByTenant, tenantID)
+type CountPublishedArticlesByTenantAndBrandParams struct {
+	TenantID int64 `json:"tenant_id"`
+	BrandID  int64 `json:"brand_id"`
+}
+
+func (q *Queries) CountPublishedArticlesByTenantAndBrand(ctx context.Context, arg CountPublishedArticlesByTenantAndBrandParams) (int64, error) {
+	row := q.db.QueryRow(ctx, countPublishedArticlesByTenantAndBrand, arg.TenantID, arg.BrandID)
 	var count int64
 	err := row.Scan(&count)
 	return count, err
@@ -93,8 +103,8 @@ func (q *Queries) GetQuotaSummary(ctx context.Context, tenantID int64) (int32, e
 	return balance, err
 }
 
-const getRecentArticles = `-- name: GetRecentArticles :many
-SELECT a.id, a.generate_status, a.publish_status, a.source_type, a.created_at,
+const getRecentArticlesByBrand = `-- name: GetRecentArticlesByBrand :many
+SELECT a.id, a.brand_id, a.generate_status, a.publish_status, a.source_type, a.created_at,
        av.title, av.markdown_content, av.word_count, av.source_label,
        t.template_name,
        COALESCE(
@@ -111,13 +121,19 @@ LEFT JOIN LATERAL (
     ORDER BY created_at DESC
     LIMIT 1
 ) gt ON true
-WHERE a.tenant_id = $1 AND a.deleted_at IS NULL
+WHERE a.tenant_id = $1 AND a.brand_id = $2 AND a.deleted_at IS NULL
 ORDER BY a.created_at DESC
 LIMIT 10
 `
 
-type GetRecentArticlesRow struct {
+type GetRecentArticlesByBrandParams struct {
+	TenantID int64 `json:"tenant_id"`
+	BrandID  int64 `json:"brand_id"`
+}
+
+type GetRecentArticlesByBrandRow struct {
 	ID              int64              `json:"id"`
+	BrandID         int64              `json:"brand_id"`
 	GenerateStatus  string             `json:"generate_status"`
 	PublishStatus   string             `json:"publish_status"`
 	SourceType      string             `json:"source_type"`
@@ -130,17 +146,18 @@ type GetRecentArticlesRow struct {
 	GenerationMode  interface{}        `json:"generation_mode"`
 }
 
-func (q *Queries) GetRecentArticles(ctx context.Context, tenantID int64) ([]GetRecentArticlesRow, error) {
-	rows, err := q.db.Query(ctx, getRecentArticles, tenantID)
+func (q *Queries) GetRecentArticlesByBrand(ctx context.Context, arg GetRecentArticlesByBrandParams) ([]GetRecentArticlesByBrandRow, error) {
+	rows, err := q.db.Query(ctx, getRecentArticlesByBrand, arg.TenantID, arg.BrandID)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []GetRecentArticlesRow
+	var items []GetRecentArticlesByBrandRow
 	for rows.Next() {
-		var i GetRecentArticlesRow
+		var i GetRecentArticlesByBrandRow
 		if err := rows.Scan(
 			&i.ID,
+			&i.BrandID,
 			&i.GenerateStatus,
 			&i.PublishStatus,
 			&i.SourceType,
diff --git a/server/internal/tenant/repository/queries/article.sql b/server/internal/tenant/repository/queries/article.sql
index 1dcc385..ba22ca6 100644
--- a/server/internal/tenant/repository/queries/article.sql
+++ b/server/internal/tenant/repository/queries/article.sql
@@ -45,8 +45,8 @@ WHERE article_id = sqlc.arg(article_id)
 ORDER BY version_no DESC;
 
 -- name: CreateArticle :one
-INSERT INTO articles (tenant_id, source_type, template_id, kol_prompt_id, generate_status, publish_status)
-VALUES (sqlc.arg(tenant_id), sqlc.arg(source_type), sqlc.arg(template_id), sqlc.arg(kol_prompt_id), 'pending', 'unpublished')
+INSERT INTO articles (tenant_id, brand_id, source_type, template_id, kol_prompt_id, generate_status, publish_status)
+VALUES (sqlc.arg(tenant_id), sqlc.arg(brand_id), sqlc.arg(source_type), sqlc.arg(template_id), sqlc.arg(kol_prompt_id), 'pending', 'unpublished')
 RETURNING id;
 
 -- name: CreateArticleVersion :one
diff --git a/server/internal/tenant/repository/queries/workspace.sql b/server/internal/tenant/repository/queries/workspace.sql
index 94eed1d..9f88a54 100644
--- a/server/internal/tenant/repository/queries/workspace.sql
+++ b/server/internal/tenant/repository/queries/workspace.sql
@@ -1,17 +1,17 @@
--- name: CountArticlesByTenant :one
+-- name: CountArticlesByTenantAndBrand :one
 SELECT COUNT(*) FROM articles
-WHERE tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
+WHERE tenant_id = sqlc.arg(tenant_id) AND brand_id = sqlc.arg(brand_id) AND deleted_at IS NULL;
 
--- name: CountPublishedArticlesByTenant :one
+-- name: CountPublishedArticlesByTenantAndBrand :one
 SELECT COUNT(*) FROM articles
-WHERE tenant_id = sqlc.arg(tenant_id) AND publish_status = 'success' AND deleted_at IS NULL;
+WHERE tenant_id = sqlc.arg(tenant_id) AND brand_id = sqlc.arg(brand_id) AND publish_status = 'success' AND deleted_at IS NULL;
 
 -- name: CountBrandsByTenant :one
 SELECT COUNT(*) FROM brands
 WHERE tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
 
--- name: GetRecentArticles :many
-SELECT a.id, a.generate_status, a.publish_status, a.source_type, a.created_at,
+-- name: GetRecentArticlesByBrand :many
+SELECT a.id, a.brand_id, a.generate_status, a.publish_status, a.source_type, a.created_at,
        av.title, av.markdown_content, av.word_count, av.source_label,
        t.template_name,
        COALESCE(
@@ -28,7 +28,7 @@ LEFT JOIN LATERAL (
     ORDER BY created_at DESC
     LIMIT 1
 ) gt ON true
-WHERE a.tenant_id = sqlc.arg(tenant_id) AND a.deleted_at IS NULL
+WHERE a.tenant_id = sqlc.arg(tenant_id) AND a.brand_id = sqlc.arg(brand_id) AND a.deleted_at IS NULL
 ORDER BY a.created_at DESC
 LIMIT 10;
 
diff --git a/server/internal/tenant/repository/workspace_repo.go b/server/internal/tenant/repository/workspace_repo.go
index 788f0c2..27be0b2 100644
--- a/server/internal/tenant/repository/workspace_repo.go
+++ b/server/internal/tenant/repository/workspace_repo.go
@@ -9,6 +9,7 @@ import (
 
 type WorkspaceRecentArticle struct {
 	ID             int64
+	BrandID        *int64
 	GenerateStatus string
 	PublishStatus  string
 	SourceType     string
@@ -40,10 +41,10 @@ type WorkspaceKolCard struct {
 }
 
 type WorkspaceRepository interface {
-	CountArticlesByTenant(ctx context.Context, tenantID int64) (int64, error)
-	CountPublishedArticlesByTenant(ctx context.Context, tenantID int64) (int64, error)
+	CountArticlesByTenantAndBrand(ctx context.Context, tenantID, brandID int64) (int64, error)
+	CountPublishedArticlesByTenantAndBrand(ctx context.Context, tenantID, brandID int64) (int64, error)
 	CountBrandsByTenant(ctx context.Context, tenantID int64) (int64, error)
-	GetRecentArticles(ctx context.Context, tenantID int64) ([]WorkspaceRecentArticle, error)
+	GetRecentArticlesByBrand(ctx context.Context, tenantID, brandID int64) ([]WorkspaceRecentArticle, error)
 	GetQuotaSummary(ctx context.Context, tenantID int64) (int, error)
 	GetActivePlanForTenant(ctx context.Context, tenantID int64) (*WorkspacePlan, error)
 	ListKolCards(ctx context.Context, tenantID int64) ([]WorkspaceKolCard, error)
@@ -57,28 +58,39 @@ func NewWorkspaceRepository(db generated.DBTX) WorkspaceRepository {
 	return &workspaceRepository{q: newQuerier(db)}
 }
 
-func (r *workspaceRepository) CountArticlesByTenant(ctx context.Context, tenantID int64) (int64, error) {
-	return r.q.CountArticlesByTenant(ctx, tenantID)
+func (r *workspaceRepository) CountArticlesByTenantAndBrand(ctx context.Context, tenantID, brandID int64) (int64, error) {
+	return r.q.CountArticlesByTenantAndBrand(ctx, generated.CountArticlesByTenantAndBrandParams{
+		TenantID: tenantID,
+		BrandID:  brandID,
+	})
 }
 
-func (r *workspaceRepository) CountPublishedArticlesByTenant(ctx context.Context, tenantID int64) (int64, error) {
-	return r.q.CountPublishedArticlesByTenant(ctx, tenantID)
+func (r *workspaceRepository) CountPublishedArticlesByTenantAndBrand(ctx context.Context, tenantID, brandID int64) (int64, error) {
+	return r.q.CountPublishedArticlesByTenantAndBrand(ctx, generated.CountPublishedArticlesByTenantAndBrandParams{
+		TenantID: tenantID,
+		BrandID:  brandID,
+	})
 }
 
 func (r *workspaceRepository) CountBrandsByTenant(ctx context.Context, tenantID int64) (int64, error) {
 	return r.q.CountBrandsByTenant(ctx, tenantID)
 }
 
-func (r *workspaceRepository) GetRecentArticles(ctx context.Context, tenantID int64) ([]WorkspaceRecentArticle, error) {
-	rows, err := r.q.GetRecentArticles(ctx, tenantID)
+func (r *workspaceRepository) GetRecentArticlesByBrand(ctx context.Context, tenantID, brandID int64) ([]WorkspaceRecentArticle, error) {
+	rows, err := r.q.GetRecentArticlesByBrand(ctx, generated.GetRecentArticlesByBrandParams{
+		TenantID: tenantID,
+		BrandID:  brandID,
+	})
 	if err != nil {
 		return nil, err
 	}
 
 	articles := make([]WorkspaceRecentArticle, 0, len(rows))
 	for _, row := range rows {
+		brandID := row.BrandID
 		articles = append(articles, WorkspaceRecentArticle{
 			ID:             row.ID,
+			BrandID:        &brandID,
 			GenerateStatus: row.GenerateStatus,
 			PublishStatus:  row.PublishStatus,
 			SourceType:     row.SourceType,
diff --git a/server/internal/tenant/transport/router.go b/server/internal/tenant/transport/router.go
index 1f2c3ae..156f420 100644
--- a/server/internal/tenant/transport/router.go
+++ b/server/internal/tenant/transport/router.go
@@ -26,6 +26,7 @@ func RegisterRoutes(app *bootstrap.App) {
 	protected.Use(auth.Middleware(app.JWT, app.Sessions))
 	protected.Use(middleware.TenantScope())
 	protected.Use(middleware.WorkspaceScope(app.DB))
+	protected.Use(middleware.BrandScope(app.DB))
 
 	protected.GET("/auth/me", authHandler.Me)
 	protected.POST("/auth/logout", authHandler.Logout)
@@ -76,8 +77,8 @@ func RegisterRoutes(app *bootstrap.App) {
 	tenantProtected.POST("/tasks/:id/reconcile", desktopTaskHandler.Reconcile)
 	tenantProtected.POST("/tasks/:id/cancel", desktopTaskHandler.TenantCancel)
 	tenantProtected.GET("/publish-tasks", desktopTaskHandler.TenantListPublish)
-	tenantProtected.POST("/publish-tasks/:id/retry", desktopTaskHandler.TenantRetryPublish)
-	tenantProtected.POST("/publish-jobs", publishJobHandler.Create)
+	tenantProtected.POST("/publish-tasks/:id/retry", middleware.RequireCurrentBrand(), desktopTaskHandler.TenantRetryPublish)
+	tenantProtected.POST("/publish-jobs", middleware.RequireCurrentBrand(), publishJobHandler.Create)
 
 	complianceHandler := NewComplianceHandler(app)
 	compliance := tenantProtected.Group("/compliance")
@@ -90,8 +91,8 @@ func RegisterRoutes(app *bootstrap.App) {
 
 	workspace := tenantProtected.Group("/workspace")
 	wsHandler := NewWorkspaceHandler(app)
-	workspace.GET("/overview", wsHandler.Overview)
-	workspace.GET("/recent-articles", wsHandler.RecentArticles)
+	workspace.GET("/overview", middleware.RequireCurrentBrand(), wsHandler.Overview)
+	workspace.GET("/recent-articles", middleware.RequireCurrentBrand(), wsHandler.RecentArticles)
 	workspace.GET("/quota-summary", wsHandler.QuotaSummary)
 	workspace.GET("/ai-point-usage", wsHandler.AIPointUsageLogs)
 	workspace.GET("/template-cards", wsHandler.TemplateCards)
@@ -101,14 +102,14 @@ func RegisterRoutes(app *bootstrap.App) {
 	tplHandler := NewTemplateHandler(app)
 	templates.GET("", tplHandler.List)
 	templates.GET("/:id", tplHandler.Detail)
-	templates.POST("/:id/drafts", tplHandler.SaveDraft)
+	templates.POST("/:id/drafts", middleware.RequireCurrentBrand(), tplHandler.SaveDraft)
 	templates.POST("/:id/analyze-tasks", tplHandler.CreateAnalyzeTask)
 	templates.GET("/:id/analyze_task_result", tplHandler.GetAnalyzeTaskResult)
 	templates.POST("/:id/title-tasks", tplHandler.CreateTitleTask)
 	templates.GET("/:id/gen_title_task_result", tplHandler.GetTitleTaskResult)
 	templates.POST("/:id/outline-tasks", tplHandler.CreateOutlineTask)
 	templates.GET("/:id/gen_outline_task_result", tplHandler.GetOutlineTaskResult)
-	templates.POST("/:id/generate", tplHandler.Generate)
+	templates.POST("/:id/generate", middleware.RequireCurrentBrand(), tplHandler.Generate)
 
 	kolManage := tenantProtected.Group("/kol/manage")
 	kolManageHandler := NewKolManageHandler(app, publicAssets)
@@ -152,28 +153,31 @@ func RegisterRoutes(app *bootstrap.App) {
 	kolSubscriptions.GET("/subscriptions", kolMarketplaceHandler.ListSubscriptions)
 	kolSubscriptions.GET("/subscription-prompts", kolMarketplaceHandler.ListSubscriptionPrompts)
 	kolSubscriptions.GET("/subscription-prompts/:id/schema", kolMarketplaceHandler.SubscriptionPromptSchema)
-	kolSubscriptions.POST("/subscription-prompts/:id/generate", kolMarketplaceHandler.Generate)
+	kolSubscriptions.POST("/subscription-prompts/:id/generate", middleware.RequireCurrentBrand(), kolMarketplaceHandler.Generate)
 
 	articles := tenantProtected.Group("/articles")
 	artHandler := NewArticleHandler(app)
+	articles.Use(middleware.RequireCurrentBrand())
 	articles.GET("", artHandler.List)
 	articles.POST("", artHandler.Create)
 	articles.POST("/generate-from-rule", artHandler.GenerateFromRule)
 	articles.POST("/imitations/generate", artHandler.GenerateImitation)
-	articles.POST("/:id/regenerate", artHandler.Regenerate)
-	articles.POST("/:id/images", artHandler.UploadImage)
-	articles.POST("/:id/selection-optimize/stream", artHandler.OptimizeSelectionStream)
-	articles.GET("/:id", artHandler.Detail)
-	articles.PUT("/:id", artHandler.Update)
-	articles.GET("/:id/stream", artHandler.Stream)
-	articles.GET("/:id/versions", artHandler.Versions)
-	articles.POST("/:id/compliance/check", complianceHandler.CheckArticle)
-	articles.GET("/:id/compliance/latest", complianceHandler.LatestCheck)
-	articles.POST("/:id/compliance/manual-reviews", complianceHandler.SubmitManualReview)
-	articles.GET("/:id/compliance/manual-reviews/latest", complianceHandler.LatestManualReview)
-	articles.POST("/:id/compliance/manual-reviews/:review_id/cancel", complianceHandler.CancelManualReview)
-	articles.GET("/:id/publish-records", mediaHandler.ListPublishRecords)
-	articles.DELETE("/:id", artHandler.Delete)
+	articleRecords := articles.Group("/:id")
+	articleRecords.Use(middleware.ArticleBrandScope(app.DB))
+	articleRecords.POST("/regenerate", artHandler.Regenerate)
+	articleRecords.POST("/images", artHandler.UploadImage)
+	articleRecords.POST("/selection-optimize/stream", artHandler.OptimizeSelectionStream)
+	articleRecords.GET("", artHandler.Detail)
+	articleRecords.PUT("", artHandler.Update)
+	articleRecords.GET("/stream", artHandler.Stream)
+	articleRecords.GET("/versions", artHandler.Versions)
+	articleRecords.POST("/compliance/check", complianceHandler.CheckArticle)
+	articleRecords.GET("/compliance/latest", complianceHandler.LatestCheck)
+	articleRecords.POST("/compliance/manual-reviews", complianceHandler.SubmitManualReview)
+	articleRecords.GET("/compliance/manual-reviews/latest", complianceHandler.LatestManualReview)
+	articleRecords.POST("/compliance/manual-reviews/:review_id/cancel", complianceHandler.CancelManualReview)
+	articleRecords.GET("/publish-records", mediaHandler.ListPublishRecords)
+	articleRecords.DELETE("", artHandler.Delete)
 
 	brands := tenantProtected.Group("/brands")
 	brandHandler := NewBrandHandler(app)
@@ -242,6 +246,7 @@ func RegisterRoutes(app *bootstrap.App) {
 	// Schedule Tasks
 	schedules := tenantProtected.Group("/schedules")
 	schHandler := NewScheduleTaskHandler(app)
+	schedules.Use(middleware.RequireCurrentBrand())
 	schedules.GET("", schHandler.List)
 	schedules.POST("", schHandler.Create)
 	schedules.GET("/:id", schHandler.Detail)
@@ -251,7 +256,7 @@ func RegisterRoutes(app *bootstrap.App) {
 
 	instantTasks := tenantProtected.Group("/instant-tasks")
 	instHandler := NewInstantTaskHandler(app)
-	instantTasks.GET("", instHandler.List)
+	instantTasks.GET("", middleware.RequireCurrentBrand(), instHandler.List)
 
 	images := tenantProtected.Group("/images")
 	imgHandler := NewImageHandler(app)
diff --git a/server/migrations/20260520142000_add_brand_id_to_articles.down.sql b/server/migrations/20260520142000_add_brand_id_to_articles.down.sql
new file mode 100644
index 0000000..039d69f
--- /dev/null
+++ b/server/migrations/20260520142000_add_brand_id_to_articles.down.sql
@@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS idx_article_tenant_brand_status_created;
+DROP INDEX IF EXISTS idx_article_tenant_brand_created;
+
+ALTER TABLE articles
+    DROP COLUMN IF EXISTS brand_id;
diff --git a/server/migrations/20260520142000_add_brand_id_to_articles.up.sql b/server/migrations/20260520142000_add_brand_id_to_articles.up.sql
new file mode 100644
index 0000000..f654d8e
--- /dev/null
+++ b/server/migrations/20260520142000_add_brand_id_to_articles.up.sql
@@ -0,0 +1,100 @@
+ALTER TABLE articles
+    ADD COLUMN IF NOT EXISTS brand_id BIGINT REFERENCES brands(id);
+
+WITH task_brand AS (
+    SELECT DISTINCT ON (gt.article_id)
+           gt.article_id,
+           CASE
+               WHEN gt.input_params_json ->> 'brand_id' ~ '^[0-9]+$'
+                   THEN (gt.input_params_json ->> 'brand_id')::BIGINT
+               ELSE NULL
+           END AS brand_id
+    FROM generation_tasks gt
+    WHERE gt.article_id IS NOT NULL
+    ORDER BY gt.article_id, gt.created_at DESC, gt.id DESC
+)
+UPDATE articles a
+SET brand_id = tb.brand_id
+FROM task_brand tb
+JOIN brands b
+  ON b.id = tb.brand_id
+ AND b.deleted_at IS NULL
+WHERE a.id = tb.article_id
+  AND b.tenant_id = a.tenant_id
+  AND a.brand_id IS NULL
+  AND tb.brand_id IS NOT NULL;
+
+WITH task_brand_name AS (
+    SELECT DISTINCT ON (gt.article_id)
+           gt.article_id,
+           NULLIF(BTRIM(gt.input_params_json ->> 'brand_name'), '') AS brand_name
+    FROM generation_tasks gt
+    WHERE gt.article_id IS NOT NULL
+    ORDER BY gt.article_id, gt.created_at DESC, gt.id DESC
+)
+UPDATE articles a
+SET brand_id = b.id
+FROM task_brand_name tbn
+JOIN brands b
+  ON b.name = tbn.brand_name
+ AND b.deleted_at IS NULL
+WHERE a.id = tbn.article_id
+  AND b.tenant_id = a.tenant_id
+  AND a.brand_id IS NULL
+  AND tbn.brand_name IS NOT NULL;
+
+UPDATE articles a
+SET brand_id = b.id
+FROM brands b
+WHERE b.tenant_id = a.tenant_id
+  AND b.deleted_at IS NULL
+  AND a.brand_id IS NULL
+  AND a.wizard_state_json ->> 'selected_brand_id' ~ '^[0-9]+$'
+  AND b.id = (a.wizard_state_json ->> 'selected_brand_id')::BIGINT;
+
+UPDATE articles a
+SET brand_id = b.id
+FROM brands b
+WHERE b.tenant_id = a.tenant_id
+  AND b.deleted_at IS NULL
+  AND a.brand_id IS NULL
+  AND a.wizard_state_json ->> 'brand_id' ~ '^[0-9]+$'
+  AND b.id = (a.wizard_state_json ->> 'brand_id')::BIGINT;
+
+UPDATE articles a
+SET brand_id = b.id
+FROM brands b
+WHERE b.tenant_id = a.tenant_id
+  AND b.deleted_at IS NULL
+  AND a.brand_id IS NULL
+  AND b.name = NULLIF(BTRIM(a.wizard_state_json ->> 'brand_name'), '');
+
+INSERT INTO brands (tenant_id, name, description, status)
+SELECT DISTINCT a.tenant_id, '未归属', '系统迁移生成，用于存放无法自动推断公司的历史文章。', 'active'
+FROM articles a
+WHERE a.brand_id IS NULL
+  AND a.deleted_at IS NULL
+  AND NOT EXISTS (
+      SELECT 1
+      FROM brands b
+      WHERE b.tenant_id = a.tenant_id
+        AND b.name = '未归属'
+        AND b.deleted_at IS NULL
+  );
+
+UPDATE articles a
+SET brand_id = b.id
+FROM brands b
+WHERE b.tenant_id = a.tenant_id
+  AND b.name = '未归属'
+  AND b.deleted_at IS NULL
+  AND a.brand_id IS NULL
+  AND a.deleted_at IS NULL;
+
+CREATE INDEX IF NOT EXISTS idx_article_tenant_brand_created
+    ON articles(tenant_id, brand_id, created_at DESC)
+    WHERE deleted_at IS NULL;
+
+CREATE INDEX IF NOT EXISTS idx_article_tenant_brand_status_created
+    ON articles(tenant_id, brand_id, generate_status, publish_status, created_at DESC)
+    WHERE deleted_at IS NULL;
diff --git a/server/migrations/20260520143000_backfill_schedule_task_brand_id.down.sql b/server/migrations/20260520143000_backfill_schedule_task_brand_id.down.sql
new file mode 100644
index 0000000..15d3a00
--- /dev/null
+++ b/server/migrations/20260520143000_backfill_schedule_task_brand_id.down.sql
@@ -0,0 +1,2 @@
+DROP INDEX IF EXISTS idx_schedule_task_tenant_brand_next_run;
+DROP INDEX IF EXISTS idx_schedule_task_tenant_brand_created;
diff --git a/server/migrations/20260520143000_backfill_schedule_task_brand_id.up.sql b/server/migrations/20260520143000_backfill_schedule_task_brand_id.up.sql
new file mode 100644
index 0000000..2fb6b86
--- /dev/null
+++ b/server/migrations/20260520143000_backfill_schedule_task_brand_id.up.sql
@@ -0,0 +1,51 @@
+WITH task_brand AS (
+    SELECT DISTINCT ON (NULLIF(gt.input_params_json ->> 'schedule_task_id', '')::BIGINT)
+           NULLIF(gt.input_params_json ->> 'schedule_task_id', '')::BIGINT AS schedule_task_id,
+           (gt.input_params_json ->> 'brand_id')::BIGINT AS brand_id
+    FROM generation_tasks gt
+    WHERE gt.input_params_json ->> 'schedule_task_id' ~ '^[0-9]+$'
+      AND gt.input_params_json ->> 'brand_id' ~ '^[0-9]+$'
+    ORDER BY NULLIF(gt.input_params_json ->> 'schedule_task_id', '')::BIGINT, gt.created_at DESC, gt.id DESC
+)
+UPDATE schedule_tasks st
+SET brand_id = tb.brand_id,
+    updated_at = NOW()
+FROM task_brand tb
+JOIN brands b
+  ON b.id = tb.brand_id
+ AND b.deleted_at IS NULL
+WHERE st.id = tb.schedule_task_id
+  AND st.tenant_id = b.tenant_id
+  AND st.brand_id IS NULL
+  AND tb.brand_id IS NOT NULL;
+
+INSERT INTO brands (tenant_id, name, description, status)
+SELECT DISTINCT st.tenant_id, '未归属', '系统迁移生成，用于存放无法自动推断公司的历史定时任务。', 'active'
+FROM schedule_tasks st
+WHERE st.brand_id IS NULL
+  AND st.deleted_at IS NULL
+  AND NOT EXISTS (
+      SELECT 1
+      FROM brands b
+      WHERE b.tenant_id = st.tenant_id
+        AND b.name = '未归属'
+        AND b.deleted_at IS NULL
+  );
+
+UPDATE schedule_tasks st
+SET brand_id = b.id,
+    updated_at = NOW()
+FROM brands b
+WHERE b.tenant_id = st.tenant_id
+  AND b.name = '未归属'
+  AND b.deleted_at IS NULL
+  AND st.brand_id IS NULL
+  AND st.deleted_at IS NULL;
+
+CREATE INDEX IF NOT EXISTS idx_schedule_task_tenant_brand_created
+    ON schedule_tasks(tenant_id, brand_id, created_at DESC)
+    WHERE deleted_at IS NULL;
+
+CREATE INDEX IF NOT EXISTS idx_schedule_task_tenant_brand_next_run
+    ON schedule_tasks(tenant_id, brand_id, status, next_run_at, id)
+    WHERE deleted_at IS NULL;
diff --git a/server/migrations/20260520145000_enforce_articles_brand_id_not_null.down.sql b/server/migrations/20260520145000_enforce_articles_brand_id_not_null.down.sql
new file mode 100644
index 0000000..4e61645
--- /dev/null
+++ b/server/migrations/20260520145000_enforce_articles_brand_id_not_null.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE articles
+    ALTER COLUMN brand_id DROP NOT NULL;
diff --git a/server/migrations/20260520145000_enforce_articles_brand_id_not_null.up.sql b/server/migrations/20260520145000_enforce_articles_brand_id_not_null.up.sql
new file mode 100644
index 0000000..8da3e06
--- /dev/null
+++ b/server/migrations/20260520145000_enforce_articles_brand_id_not_null.up.sql
@@ -0,0 +1,22 @@
+INSERT INTO brands (tenant_id, name, description, status)
+SELECT DISTINCT a.tenant_id, '未归属', '系统迁移生成，用于存放无法自动推断公司的历史文章。', 'active'
+FROM articles a
+WHERE a.brand_id IS NULL
+  AND NOT EXISTS (
+      SELECT 1
+      FROM brands b
+      WHERE b.tenant_id = a.tenant_id
+        AND b.name = '未归属'
+        AND b.deleted_at IS NULL
+  );
+
+UPDATE articles a
+SET brand_id = b.id
+FROM brands b
+WHERE b.tenant_id = a.tenant_id
+  AND b.name = '未归属'
+  AND b.deleted_at IS NULL
+  AND a.brand_id IS NULL;
+
+ALTER TABLE articles
+    ALTER COLUMN brand_id SET NOT NULL;
diff --git a/server/migrations_ops/20260520144000_drop_scheduler_job_runs_auto_started_index.down.sql b/server/migrations_ops/20260520144000_drop_scheduler_job_runs_auto_started_index.down.sql
new file mode 100644
index 0000000..9b88f76
--- /dev/null
+++ b/server/migrations_ops/20260520144000_drop_scheduler_job_runs_auto_started_index.down.sql
@@ -0,0 +1,3 @@
+CREATE INDEX IF NOT EXISTS idx_scheduler_job_runs_auto_started
+    ON ops.scheduler_job_runs (job_key, started_at DESC, id DESC)
+    WHERE trigger_type = 'auto';
diff --git a/server/migrations_ops/20260520144000_drop_scheduler_job_runs_auto_started_index.up.sql b/server/migrations_ops/20260520144000_drop_scheduler_job_runs_auto_started_index.up.sql
new file mode 100644
index 0000000..6b083ed
--- /dev/null
+++ b/server/migrations_ops/20260520144000_drop_scheduler_job_runs_auto_started_index.up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS ops.idx_scheduler_job_runs_auto_started;