@vibe-forge/client 2.0.0 → 2.0.1

package/src/components/chat/NewSessionGuide.tsx

@@ -1,134 +1,63 @@
 import './NewSessionGuide.scss'
 
-import { App } from 'antd'
 import { useAtom } from 'jotai'
-import { useTranslation } from 'react-i18next'
-import useSWR from 'swr'
 
-import type { EntitySummary, SpecSummary } from '#~/api.js'
-import { useResponsiveLayout } from '#~/hooks/use-responsive-layout'
+import type { ConversationStarterConfig } from '@vibe-forge/types'
+
+import { MarkdownContent } from '#~/components/MarkdownContent'
 import { showAnnouncementsAtom } from '#~/store/index.js'
-import { NewSessionGuideCompactPanel } from './NewSessionGuideCompactPanel'
-import { NewSessionGuideGrid } from './NewSessionGuideGrid'
 
-export function NewSessionGuide() {
-  const { t } = useTranslation()
-  const { message } = App.useApp()
-  const { isCompactLayout } = useResponsiveLayout()
+import { NewSessionGuideStarterList } from './NewSessionGuideStarterList'
+
+export function NewSessionGuide({
+  announcements,
+  startupPresets,
+  builtinActions,
+  onApplyStarter
+}: {
+  announcements: string[]
+  startupPresets: ConversationStarterConfig[]
+  builtinActions: ConversationStarterConfig[]
+  onApplyStarter: (starter: ConversationStarterConfig) => void
+}) {
   const [showAnnouncements, setShowAnnouncements] = useAtom(showAnnouncementsAtom)
+  const visibleAnnouncements = showAnnouncements ? announcements : []
+  const hasGuideContent = visibleAnnouncements.length > 0 || startupPresets.length > 0 || builtinActions.length > 0
 
-  const { data: specsRes } = useSWR<{ specs: SpecSummary[] }>('/api/ai/specs')
-  const { data: entitiesRes } = useSWR<{ entities: EntitySummary[] }>('/api/ai/entities')
-  const { data: configRes } = useSWR<{
-    sources: {
-      merged: {
-        general?: {
-          announcements: string[]
-        }
-      }
-    }
-  }>(
-    '/api/config'
-  )
-
-  const specs = specsRes?.specs ?? []
-  const alwaysSpecs = specs.filter(spec => spec.always)
-  const entities = entitiesRes?.entities ?? []
-  const isSpecsReady = specsRes != null
-  const isEntitiesReady = entitiesRes != null
-  const { announcements = [] } = configRes?.sources.merged?.general ?? {}
-
-  const helpItems = [
-    t('chat.newSessionGuide.help.item1'),
-    t('chat.newSessionGuide.help.item2'),
-    t('chat.newSessionGuide.help.item3')
-  ]
-  const visibleAnnouncements = isCompactLayout ? announcements.slice(0, 1) : announcements
-  const visibleSpecs = isCompactLayout ? alwaysSpecs.slice(0, 1) : alwaysSpecs
-  const visibleEntities = isCompactLayout ? entities.slice(0, 1) : entities
-  const visibleHelpItems = isCompactLayout ? helpItems.slice(0, 1) : helpItems
-  const hiddenAnnouncementCount = Math.max(announcements.length - visibleAnnouncements.length, 0)
-  const hiddenSpecCount = Math.max(alwaysSpecs.length - visibleSpecs.length, 0)
-  const hiddenEntityCount = Math.max(entities.length - visibleEntities.length, 0)
-  const hiddenHelpCount = Math.max(helpItems.length - visibleHelpItems.length, 0)
-
-  const renderMoreCount = (count: number) =>
-    count > 0
-      ? <div className='new-session-guide__more'>{t('chat.newSessionGuide.moreCount', { count })}</div>
-      : null
-
-  const handleCreateSpec = () => {
-    message.info(t('chat.newSessionGuide.specs.createToast'))
-  }
-
-  const handleCreateEntity = () => {
-    message.info(t('chat.newSessionGuide.entities.createToast'))
+  if (!hasGuideContent) {
+    return null
   }
 
   return (
-    <div className={`new-session-guide ${isCompactLayout ? 'new-session-guide--compact' : ''}`}>
-      {showAnnouncements && announcements.length > 0 && (
+    <div className='new-session-guide'>
+      {visibleAnnouncements.length > 0 && (
         <div className='new-session-guide__announcements'>
-          <div className='new-session-guide__announcements-header'>
-            <div className='new-session-guide__announcements-title'>
-              <span className='material-symbols-rounded new-session-guide__announcements-icon'>campaign</span>
-              <span>{t('chat.newSessionGuide.announcements.title')}</span>
-            </div>
-            <button
-              type='button'
-              className='new-session-guide__announcements-close'
-              onClick={() => setShowAnnouncements(false)}
-            >
-              <span className='material-symbols-rounded'>close</span>
-            </button>
-          </div>
           <div className='new-session-guide__announcements-list'>
             {visibleAnnouncements.map((item, index) => (
               <div key={`${item}-${index}`} className='new-session-guide__announcements-item'>
-                <span>{item}</span>
+                <span className='material-symbols-rounded new-session-guide__announcements-icon'>campaign</span>
+                <div className='new-session-guide__announcements-copy'>
+                  <MarkdownContent content={item} />
+                </div>
               </div>
             ))}
-            {renderMoreCount(hiddenAnnouncementCount)}
           </div>
+          <button
+            type='button'
+            className='new-session-guide__announcements-close'
+            onClick={() => setShowAnnouncements(false)}
+          >
+            <span className='material-symbols-rounded'>close</span>
+          </button>
         </div>
       )}
-
-      {isCompactLayout
-        ? (
-          <NewSessionGuideCompactPanel
-            alwaysSpecs={alwaysSpecs}
-            entities={entities}
-            helpItems={helpItems}
-            hiddenEntityCount={hiddenEntityCount}
-            hiddenHelpCount={hiddenHelpCount}
-            hiddenSpecCount={hiddenSpecCount}
-            isEntitiesReady={isEntitiesReady}
-            isSpecsReady={isSpecsReady}
-            onCreateEntity={handleCreateEntity}
-            onCreateSpec={handleCreateSpec}
-            renderMoreCount={renderMoreCount}
-            visibleEntities={visibleEntities}
-            visibleHelpItems={visibleHelpItems}
-            visibleSpecs={visibleSpecs}
-          />
-        )
-        : (
-          <NewSessionGuideGrid
-            alwaysSpecs={alwaysSpecs}
-            entities={entities}
-            hiddenEntityCount={hiddenEntityCount}
-            hiddenHelpCount={hiddenHelpCount}
-            hiddenSpecCount={hiddenSpecCount}
-            isEntitiesReady={isEntitiesReady}
-            isSpecsReady={isSpecsReady}
-            onCreateEntity={handleCreateEntity}
-            onCreateSpec={handleCreateSpec}
-            renderMoreCount={renderMoreCount}
-            visibleEntities={visibleEntities}
-            visibleHelpItems={visibleHelpItems}
-            visibleSpecs={visibleSpecs}
-          />
-        )}
+      <div className='new-session-guide__main'>
+        <NewSessionGuideStarterList
+          startupPresets={startupPresets}
+          builtinActions={builtinActions}
+          onApplyStarter={onApplyStarter}
+        />
+      </div>
     </div>
   )
 }

package/src/components/chat/NewSessionGuideStarterList.tsx

@@ -0,0 +1,187 @@
+import type { ConversationStarterConfig } from '@vibe-forge/types'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { NewSessionGuideStarterSection } from './NewSessionGuideStarterSection'
+import { buildConversationStarterListItems, partitionConversationStarterListItems } from './new-session-guide-config'
+const FAVORITE_STARTER_STORAGE_KEY = 'vf_new_session_guide_favorites'
+const RECENT_STARTER_STORAGE_KEY = 'vf_new_session_guide_recent'
+const DEFAULT_VISIBLE_STARTER_COUNT = 8
+const MAX_RECENT_STARTER_COUNT = 3
+
+const readStoredStarterKeys = (storageKey: string) => {
+  try {
+    const raw = localStorage.getItem(storageKey)
+    if (raw == null) return []
+    const parsed = JSON.parse(raw) as unknown
+    return Array.isArray(parsed)
+      ? parsed.filter((item): item is string => typeof item === 'string')
+      : []
+  } catch {
+    return []
+  }
+}
+
+const areListsEqual = (left: string[], right: string[]) => (
+  left.length === right.length && left.every((value, index) => value === right[index])
+)
+
+export function NewSessionGuideStarterList({
+  startupPresets,
+  builtinActions,
+  onApplyStarter
+}: {
+  startupPresets: ConversationStarterConfig[]
+  builtinActions: ConversationStarterConfig[]
+  onApplyStarter: (starter: ConversationStarterConfig) => void
+}) {
+  const { t } = useTranslation()
+  const [searchQuery, setSearchQuery] = useState('')
+  const [showAllRemaining, setShowAllRemaining] = useState(false)
+  const [searchPinnedHeight, setSearchPinnedHeight] = useState<number | null>(null)
+  const [favoriteKeys, setFavoriteKeys] = useState<string[]>(() => readStoredStarterKeys(FAVORITE_STARTER_STORAGE_KEY))
+  const [recentKeys, setRecentKeys] = useState<string[]>(() => readStoredStarterKeys(RECENT_STARTER_STORAGE_KEY))
+  const sectionsRef = useRef<HTMLDivElement | null>(null)
+  const starterItems = useMemo(
+    () => buildConversationStarterListItems(startupPresets, builtinActions),
+    [builtinActions, startupPresets]
+  )
+  const visibleStarterState = useMemo(
+    () =>
+      partitionConversationStarterListItems({
+        items: starterItems,
+        favoriteKeys,
+        recentKeys,
+        query: searchQuery,
+        remainingLimit: showAllRemaining ? starterItems.length : DEFAULT_VISIBLE_STARTER_COUNT
+      }),
+    [favoriteKeys, recentKeys, searchQuery, showAllRemaining, starterItems]
+  )
+
+  useEffect(() => {
+    try {
+      localStorage.setItem(FAVORITE_STARTER_STORAGE_KEY, JSON.stringify(favoriteKeys))
+      localStorage.setItem(RECENT_STARTER_STORAGE_KEY, JSON.stringify(recentKeys))
+    } catch {}
+  }, [favoriteKeys, recentKeys])
+
+  useEffect(() => {
+    const validKeySet = new Set(starterItems.map(item => item.key))
+    setFavoriteKeys((prev) => {
+      const next = prev.filter(key => validKeySet.has(key))
+      return areListsEqual(prev, next) ? prev : next
+    })
+    setRecentKeys((prev) => {
+      const next = prev.filter(key => validKeySet.has(key)).slice(0, MAX_RECENT_STARTER_COUNT)
+      return areListsEqual(prev, next) ? prev : next
+    })
+  }, [starterItems])
+
+  useEffect(() => {
+    setShowAllRemaining(false)
+  }, [searchQuery])
+
+  useEffect(() => {
+    if (!visibleStarterState.isSearchMode && searchPinnedHeight != null) {
+      setSearchPinnedHeight(null)
+    }
+  }, [searchPinnedHeight, visibleStarterState.isSearchMode])
+
+  if (starterItems.length === 0) return null
+
+  const handleToggleFavorite = (key: string) => {
+    setFavoriteKeys(prev => prev.includes(key) ? prev.filter(item => item !== key) : [...prev, key])
+  }
+
+  const handleApplyListItem = (item: typeof starterItems[number]) => {
+    setRecentKeys(prev => [item.key, ...prev.filter(key => key !== item.key)].slice(0, MAX_RECENT_STARTER_COUNT))
+    onApplyStarter(item.starter)
+  }
+  const isExpanded = showAllRemaining && !visibleStarterState.isSearchMode
+  const shouldShowExpand = !visibleStarterState.isSearchMode && visibleStarterState.hiddenRemainingCount > 0
+  const shouldShowCollapse = !visibleStarterState.isSearchMode &&
+    showAllRemaining &&
+    visibleStarterState.totalRemainingCount > DEFAULT_VISIBLE_STARTER_COUNT
+  const shouldShowFooter = shouldShowExpand || shouldShowCollapse
+  const sectionsStyle = visibleStarterState.isSearchMode && searchPinnedHeight != null
+    ? { minHeight: `${searchPinnedHeight}px` }
+    : undefined
+
+  const handleSearchChange = (nextQuery: string) => {
+    if (searchQuery.length === 0 && nextQuery.length > 0) {
+      const nextHeight = sectionsRef.current?.getBoundingClientRect().height
+      if (nextHeight != null && Number.isFinite(nextHeight)) {
+        setSearchPinnedHeight(Math.round(nextHeight))
+      }
+    }
+    if (nextQuery.length === 0) {
+      setSearchPinnedHeight(null)
+    }
+    setSearchQuery(nextQuery)
+  }
+
+  return (
+    <div
+      ref={sectionsRef}
+      style={sectionsStyle}
+      className={['new-session-guide__sections', isExpanded ? 'is-expanded' : ''].filter(Boolean).join(' ')}
+    >
+      <div
+        className={['new-session-guide__sections-header', isExpanded ? 'is-expanded' : ''].filter(Boolean).join(' ')}
+      >
+        <label className='new-session-guide__search'>
+          <span className='material-symbols-rounded new-session-guide__search-icon'>search</span>
+          <input
+            type='search'
+            className='new-session-guide__search-input'
+            value={searchQuery}
+            placeholder={t('chat.newSessionGuide.searchPlaceholder')}
+            onChange={event => handleSearchChange(event.target.value)}
+          />
+        </label>
+      </div>
+      <div className={['new-session-guide__sections-body', isExpanded ? 'is-expanded' : ''].filter(Boolean).join(' ')}>
+        {!visibleStarterState.isSearchMode && (
+          <NewSessionGuideStarterSection
+            items={visibleStarterState.favorites}
+            label={t('chat.newSessionGuide.favoriteTitle')}
+            favoriteKeys={favoriteKeys}
+            recentKeys={visibleStarterState.recentKeys}
+            onToggleFavorite={handleToggleFavorite}
+            onApplyStarter={handleApplyListItem}
+          />
+        )}
+        {visibleStarterState.visibleRemaining.length > 0 && (
+          <NewSessionGuideStarterSection
+            items={visibleStarterState.visibleRemaining}
+            favoriteKeys={favoriteKeys}
+            recentKeys={visibleStarterState.recentKeys}
+            showRecentBadge={!visibleStarterState.isSearchMode}
+            onToggleFavorite={handleToggleFavorite}
+            onApplyStarter={handleApplyListItem}
+          />
+        )}
+        {visibleStarterState.isSearchMode && visibleStarterState.visibleRemaining.length === 0 && (
+          <div className='new-session-guide__empty-search'>{t('chat.newSessionGuide.emptySearch')}</div>
+        )}
+      </div>
+      {shouldShowFooter && (
+        <div className='new-session-guide__sections-footer'>
+          {shouldShowExpand && (
+            <button type='button' className='new-session-guide__more-button' onClick={() => setShowAllRemaining(true)}>
+              {t('chat.newSessionGuide.showMore', { count: visibleStarterState.hiddenRemainingCount })}
+            </button>
+          )}
+          {shouldShowCollapse && (
+            <button
+              type='button'
+              className='new-session-guide__more-button is-secondary'
+              onClick={() => setShowAllRemaining(false)}
+            >
+              {t('chat.newSessionGuide.showLess')}
+            </button>
+          )}
+        </div>
+      )}
+    </div>
+  )
+}

package/src/components/chat/NewSessionGuideStarterSection.tsx

@@ -0,0 +1,120 @@
+import type { ConversationStarterConfig } from '@vibe-forge/types'
+import { Tooltip } from 'antd'
+import { useTranslation } from 'react-i18next'
+
+import type { ConversationStarterListItem } from './new-session-guide-config'
+import { normalizeConversationStarterMode } from './new-session-guide-config'
+
+const trimText = (value: string | undefined) => value?.trim() ?? ''
+
+const resolveStarterIcon = (starter: ConversationStarterConfig) => {
+  const customIcon = trimText(starter.icon)
+  if (customIcon !== '') return customIcon
+
+  switch (normalizeConversationStarterMode(starter.mode)) {
+    case 'workspace':
+      return 'workspaces'
+    case 'entity':
+      return 'group_work'
+    case 'spec':
+      return 'account_tree'
+    default:
+      return 'bolt'
+  }
+}
+
+const buildFallbackTitle = (
+  item: ConversationStarterListItem,
+  presetPrefix: string,
+  actionPrefix: string
+) => {
+  const title = trimText(item.starter.title)
+  if (title !== '') return title
+  return `${item.source === 'builtinActions' ? actionPrefix : presetPrefix} #${item.sourceIndex + 1}`
+}
+
+export function NewSessionGuideStarterSection({
+  items,
+  label,
+  favoriteKeys,
+  recentKeys,
+  showRecentBadge = true,
+  onToggleFavorite,
+  onApplyStarter
+}: {
+  items: ConversationStarterListItem[]
+  label?: string
+  favoriteKeys: string[]
+  recentKeys: string[]
+  showRecentBadge?: boolean
+  onToggleFavorite: (key: string) => void
+  onApplyStarter: (item: ConversationStarterListItem) => void
+}) {
+  const { t } = useTranslation()
+
+  if (items.length === 0) return null
+
+  return (
+    <section className='new-session-guide__section'>
+      {label != null && label !== '' && <div className='new-session-guide__section-title'>{label}</div>}
+      <div className='new-session-guide__list' role='list'>
+        {items.map((item) => {
+          const isFavorite = favoriteKeys.includes(item.key)
+          const isRecent = recentKeys.includes(item.key)
+          const description = trimText(item.starter.description)
+
+          return (
+            <div key={item.key} className='new-session-guide__list-row' role='listitem'>
+              <Tooltip
+                title={description !== '' ? description : undefined}
+                placement='topLeft'
+                mouseEnterDelay={2}
+              >
+                <button
+                  type='button'
+                  className='new-session-guide__list-item'
+                  onClick={() => onApplyStarter(item)}
+                >
+                  <span className='material-symbols-rounded new-session-guide__list-item-icon'>
+                    {resolveStarterIcon(item.starter)}
+                  </span>
+                  <span className='new-session-guide__list-item-copy'>
+                    <span className='new-session-guide__list-item-title-row'>
+                      <span className='new-session-guide__list-item-title'>
+                        {buildFallbackTitle(
+                          item,
+                          t('chat.newSessionGuide.fallbackPresetPrefix'),
+                          t('chat.newSessionGuide.fallbackActionPrefix')
+                        )}
+                      </span>
+                      {showRecentBadge && isRecent && (
+                        <span className='new-session-guide__status-badge'>
+                          {t('chat.newSessionGuide.recentTitle')}
+                        </span>
+                      )}
+                    </span>
+                  </span>
+                </button>
+              </Tooltip>
+              <button
+                type='button'
+                className={['new-session-guide__favorite-button', isFavorite ? 'is-active' : ''].filter(Boolean).join(
+                  ' '
+                )}
+                aria-label={t(
+                  isFavorite ? 'chat.newSessionGuide.unfavoriteAction' : 'chat.newSessionGuide.favoriteAction'
+                )}
+                title={t(
+                  isFavorite ? 'chat.newSessionGuide.unfavoriteAction' : 'chat.newSessionGuide.favoriteAction'
+                )}
+                onClick={() => onToggleFavorite(item.key)}
+              >
+                <span className='material-symbols-rounded'>{isFavorite ? 'star' : 'star_outline'}</span>
+              </button>
+            </div>
+          )
+        })}
+      </div>
+    </section>
+  )
+}

package/src/components/chat/bottom-dock-constants.ts

@@ -0,0 +1,4 @@
+export const CHAT_BOTTOM_DOCK_DEFAULT_HEIGHT = 320
+export const CHAT_BOTTOM_DOCK_HEIGHT_STORAGE_KEY = 'chatBottomDockHeight'
+export const CHAT_BOTTOM_DOCK_MAX_HEIGHT = 620
+export const CHAT_BOTTOM_DOCK_MIN_HEIGHT = 220

package/src/components/chat/conversation-starter-apply.ts

@@ -0,0 +1,181 @@
+import type { ChatMessageContent } from '@vibe-forge/core'
+import type { ConversationStarterConfig } from '@vibe-forge/types'
+
+import { DEFAULT_CHAT_SESSION_TARGET_DRAFT } from '#~/hooks/chat/chat-session-target'
+import type { ChatSessionTargetDraft } from '#~/hooks/chat/chat-session-target'
+import type { ChatSessionWorkspaceDraft } from '#~/hooks/chat/chat-session-workspace-draft'
+
+const trimText = (value: string | undefined) => value?.trim() ?? ''
+
+const getFileName = (path: string) => path.split(/[\\/]/).filter(Boolean).at(-1) ?? path
+
+const toUniqueList = (values: string[]) => Array.from(new Set(values))
+
+const isExplicitFilePath = (value: string) => (
+  value.startsWith('.') ||
+  value.startsWith('/') ||
+  value.includes('\\') ||
+  value.includes('.ai/') ||
+  value.includes('node_modules/') ||
+  /\.[a-z0-9]+$/i.test(value)
+)
+
+const resolveRuleReference = (value: string) => {
+  const trimmed = trimText(value)
+  if (trimmed === '') {
+    return undefined
+  }
+
+  if (isExplicitFilePath(trimmed)) {
+    return { attachmentPath: trimmed }
+  }
+
+  if (trimmed.includes('/')) {
+    return { mention: `规则：${trimmed}` }
+  }
+
+  return { attachmentPath: `.ai/rules/${trimmed}.md` }
+}
+
+const resolveSkillReference = (value: string) => {
+  const trimmed = trimText(value)
+  if (trimmed === '') {
+    return undefined
+  }
+
+  if (isExplicitFilePath(trimmed)) {
+    return { attachmentPath: trimmed }
+  }
+
+  if (trimmed.includes('/')) {
+    return { mention: `技能：${trimmed}` }
+  }
+
+  return { attachmentPath: `.ai/skills/${trimmed}/SKILL.md` }
+}
+
+export const normalizeConversationStarterMode = (
+  mode?: ConversationStarterConfig['mode']
+): ChatSessionTargetDraft['type'] => {
+  if (mode === 'agent') {
+    return 'entity'
+  }
+
+  return mode ?? 'default'
+}
+
+export const buildConversationStarterTargetDraft = (
+  starter: ConversationStarterConfig
+): ChatSessionTargetDraft => {
+  const type = normalizeConversationStarterMode(starter.mode)
+  if (type === 'default') {
+    return { ...DEFAULT_CHAT_SESSION_TARGET_DRAFT }
+  }
+
+  const target = trimText(starter.target)
+  const targetLabel = trimText(starter.targetLabel)
+  const targetDescription = trimText(starter.targetDescription)
+
+  return {
+    type,
+    ...(target !== '' ? { name: target } : {}),
+    ...(targetLabel !== '' ? { label: targetLabel } : target !== '' ? { label: target } : {}),
+    ...(targetDescription !== '' ? { description: targetDescription } : {})
+  }
+}
+
+export const buildConversationStarterWorkspacePatch = (
+  starter: ConversationStarterConfig
+): Partial<ChatSessionWorkspaceDraft> | undefined => {
+  const worktree = starter.worktree
+  if (worktree == null) {
+    return undefined
+  }
+
+  const patch: Partial<ChatSessionWorkspaceDraft> = {}
+
+  if (typeof worktree.create === 'boolean') {
+    patch.createWorktree = worktree.create
+  }
+
+  if (worktree.environment !== undefined) {
+    const environment = trimText(worktree.environment)
+    patch.worktreeEnvironment = environment === '' ? undefined : environment
+  }
+
+  if (worktree.branch != null) {
+    const branchName = trimText(worktree.branch.name)
+    patch.branch = branchName === ''
+      ? undefined
+      : {
+        name: branchName,
+        kind: worktree.branch.kind,
+        mode: worktree.branch.mode ?? 'checkout'
+      }
+  }
+
+  return Object.keys(patch).length > 0 ? patch : undefined
+}
+
+export const buildConversationStarterInitialContent = (
+  starter: ConversationStarterConfig
+): ChatMessageContent[] | undefined => {
+  const attachmentPaths: string[] = []
+  const mentions: string[] = []
+
+  for (const path of starter.files ?? []) {
+    const trimmed = trimText(path)
+    if (trimmed !== '') {
+      attachmentPaths.push(trimmed)
+    }
+  }
+
+  for (const rule of starter.rules ?? []) {
+    const resolved = resolveRuleReference(rule)
+    if (resolved?.attachmentPath != null) {
+      attachmentPaths.push(resolved.attachmentPath)
+    }
+    if (resolved?.mention != null) {
+      mentions.push(resolved.mention)
+    }
+  }
+
+  for (const skill of starter.skills ?? []) {
+    const resolved = resolveSkillReference(skill)
+    if (resolved?.attachmentPath != null) {
+      attachmentPaths.push(resolved.attachmentPath)
+    }
+    if (resolved?.mention != null) {
+      mentions.push(resolved.mention)
+    }
+  }
+
+  const promptBlocks: string[] = []
+  const prompt = trimText(starter.prompt)
+  if (prompt !== '') {
+    promptBlocks.push(prompt)
+  }
+
+  if (mentions.length > 0) {
+    promptBlocks.push([
+      '请优先结合以下规则与技能：',
+      ...mentions.map(item => `- ${item}`)
+    ].join('\n'))
+  }
+
+  const content: ChatMessageContent[] = []
+  const mergedPrompt = promptBlocks.join('\n\n').trim()
+  if (mergedPrompt !== '') {
+    content.push({ type: 'text', text: mergedPrompt })
+  }
+
+  for (const path of toUniqueList(attachmentPaths)) {
+    content.push({
+      type: 'file',
+      path,
+      name: getFileName(path)
+    })
+  }
+
+  return content.length > 0 ? content : undefined
+}