diff --git a/src/main/presenter/agentRuntimePresenter/contextBuilder.ts b/src/main/presenter/agentRuntimePresenter/contextBuilder.ts
index 579cd08f5..6e48f7d27 100644
--- a/src/main/presenter/agentRuntimePresenter/contextBuilder.ts
+++ b/src/main/presenter/agentRuntimePresenter/contextBuilder.ts
@@ -177,12 +177,14 @@ export function normalizeUserInput(input: string | SendMessageInput): SendMessag
         )
       )
     : []
+  const inlineItems = Array.isArray(input.inlineItems) ? input.inlineItems : []
   return {
     text: typeof input.text === 'string' ? input.text : '',
     files: Array.isArray(input.files)
       ? (input.files.filter((file): file is MessageFile => Boolean(file)) as MessageFile[])
       : [],
-    ...(activeSkills.length > 0 ? { activeSkills } : {})
+    ...(activeSkills.length > 0 ? { activeSkills } : {}),
+    ...(inlineItems.length > 0 ? { inlineItems } : {})
   }
 }
 
@@ -402,13 +404,45 @@ function buildImageMetadataContext(files: MessageFile[]): string {
     .join('\n\n')
 }
 
+function buildInlineDisplayText(input: SendMessageInput): string {
+  const text = input.text ?? ''
+  const inlineItems = Array.isArray(input.inlineItems) ? input.inlineItems : []
+  if (inlineItems.length === 0) {
+    return text
+  }
+
+  const validItems = inlineItems
+    .map((item, index) => ({ item, index }))
+    .filter(
+      ({ item }) => Number.isInteger(item.offset) && item.offset >= 0 && item.offset <= text.length
+    )
+    .sort((left, right) => left.item.offset - right.item.offset || left.index - right.index)
+  if (validItems.length === 0) {
+    return text
+  }
+
+  const parts: string[] = []
+  let cursor = 0
+  for (const { item } of validItems) {
+    if (item.offset > cursor) {
+      parts.push(text.slice(cursor, item.offset))
+    }
+    parts.push(item.type === 'skill' ? `[Skill: ${item.skillName}]` : `[File: ${item.fileName}]`)
+    cursor = item.offset
+  }
+  if (cursor < text.length) {
+    parts.push(text.slice(cursor))
+  }
+  return parts.join('')
+}
+
 export function buildUserMessageContent(
   input: SendMessageInput,
   supportsVision: boolean,
   supportsAudioInput: boolean = false,
   options: UserMessageContentBuildOptions = {}
 ): ChatMessage['content'] {
-  const text = input.text ?? ''
+  const text = buildInlineDisplayText(input)
   const files = Array.isArray(input.files) ? input.files : []
   const includeImageData = options.includeImageData !== false
   const includeAudioData = options.includeAudioData !== false
diff --git a/src/main/presenter/agentRuntimePresenter/dispatch.ts b/src/main/presenter/agentRuntimePresenter/dispatch.ts
index 942e07cd6..988def569 100644
--- a/src/main/presenter/agentRuntimePresenter/dispatch.ts
+++ b/src/main/presenter/agentRuntimePresenter/dispatch.ts
@@ -1191,7 +1191,9 @@ async function runToolCall(params: {
         onProgress: applyProgressUpdate,
         signal: io.abortSignal,
         permissionMode: toolPermissionMode,
-        activeSkillNames: hooks?.getActiveSkillNames?.()
+        activeSkillNames: hooks?.getActiveSkillNames?.(),
+        enabledSkillNames: hooks?.getEnabledSkillNames?.(),
+        enabledPluginIds: hooks?.getEnabledPluginIds?.()
       })
 
     let toolCallResult = await callTool()
diff --git a/src/main/presenter/agentRuntimePresenter/index.ts b/src/main/presenter/agentRuntimePresenter/index.ts
index 43a33af9b..a6f73e175 100644
--- a/src/main/presenter/agentRuntimePresenter/index.ts
+++ b/src/main/presenter/agentRuntimePresenter/index.ts
@@ -1330,7 +1330,8 @@ export class AgentRuntimePresenter implements IAgentImplementation {
         think: false,
         ...(normalizedInput.activeSkills?.length
           ? { activeSkills: normalizedInput.activeSkills }
-          : {})
+          : {}),
+        ...(normalizedInput.inlineItems?.length ? { inlineItems: normalizedInput.inlineItems } : {})
       }
 
       let compactionIntent: CompactionIntent | null = null
@@ -3447,6 +3448,7 @@ export class AgentRuntimePresenter implements IAgentImplementation {
 
     const streamSessionActiveSkillNames =
       await this.resolveActiveSkillNamesForToolProfile(sessionId)
+    const streamExtensionPolicy = await this.resolveAgentExtensionPolicy(sessionId)
     const getEffectiveRuntimeSkillNames = (baseSkillNames = streamSessionActiveSkillNames) =>
       this.resolveEffectiveActiveSkillNames(baseSkillNames, sessionId)
     const tools =
@@ -3853,6 +3855,10 @@ export class AgentRuntimePresenter implements IAgentImplementation {
           Boolean(this.pendingInputCoordinator.getNextSteerInput(sessionId)),
         hooks: {
           getActiveSkillNames: () => getEffectiveRuntimeSkillNames(),
+          getEnabledSkillNames: () =>
+            this.normalizeNullablePolicyList(streamExtensionPolicy.enabledSkillNames),
+          getEnabledPluginIds: () =>
+            this.normalizeNullablePolicyList(streamExtensionPolicy.enabledPluginIds),
           activateSkill: async (skillName) => {
             const policy = await this.resolveAgentExtensionPolicy(sessionId)
             if (this.filterSkillNamesByPolicy([skillName], policy).length === 0) {
@@ -5851,10 +5857,18 @@ export class AgentRuntimePresenter implements IAgentImplementation {
           ? ((parsed as { activeSkills?: unknown }).activeSkills as string[])
           : []
       )
+      const inlineItems: NonNullable<SendMessageInput['inlineItems']> = Array.isArray(
+        (parsed as { inlineItems?: unknown }).inlineItems
+      )
+        ? ((parsed as { inlineItems?: unknown }).inlineItems as NonNullable<
+            SendMessageInput['inlineItems']
+          >)
+        : []
       return {
         text,
         files,
-        ...(activeSkills.length > 0 ? { activeSkills } : {})
+        ...(activeSkills.length > 0 ? { activeSkills } : {}),
+        ...(inlineItems.length > 0 ? { inlineItems } : {})
       }
     } catch {
       return { text: content, files: [] }
@@ -5875,10 +5889,12 @@ export class AgentRuntimePresenter implements IAgentImplementation {
     const activeSkills = this.normalizeSkillNames(
       Array.isArray(input.activeSkills) ? input.activeSkills : []
     )
+    const inlineItems = Array.isArray(input.inlineItems) ? input.inlineItems : []
     return {
       text,
       files,
-      ...(activeSkills.length > 0 ? { activeSkills } : {})
+      ...(activeSkills.length > 0 ? { activeSkills } : {}),
+      ...(inlineItems.length > 0 ? { inlineItems } : {})
     }
   }
 
@@ -5928,6 +5944,7 @@ export class AgentRuntimePresenter implements IAgentImplementation {
       }
 
       const next = { ...parsed, text } as Record<string, unknown>
+      delete next.inlineItems
 
       if (!Array.isArray(next.files)) {
         next.files = []
@@ -5964,6 +5981,10 @@ export class AgentRuntimePresenter implements IAgentImplementation {
         next.content = mapped
       }
 
+      if (Array.isArray(next.inlineItems)) {
+        delete next.inlineItems
+      }
+
       return JSON.stringify(next)
     } catch {
       return JSON.stringify(fallback)
@@ -6497,6 +6518,7 @@ export class AgentRuntimePresenter implements IAgentImplementation {
       const extensionPolicy = await this.resolveAgentExtensionPolicy(sessionId)
       const result = await this.toolPresenter.callTool(request, {
         agentId: this.getSessionAgentId(sessionId) ?? 'deepchat',
+        enabledSkillNames: extensionPolicy.enabledSkillNames ?? undefined,
         enabledPluginIds: extensionPolicy.enabledPluginIds ?? undefined,
         onProgress: (update) => {
           if (
diff --git a/src/main/presenter/agentRuntimePresenter/messageStore.ts b/src/main/presenter/agentRuntimePresenter/messageStore.ts
index 78cea62b6..b2b6d7756 100644
--- a/src/main/presenter/agentRuntimePresenter/messageStore.ts
+++ b/src/main/presenter/agentRuntimePresenter/messageStore.ts
@@ -742,13 +742,15 @@ export class DeepChatMessageStore {
 
       const rawUserContent = this.parseUserContent(row.content)
       const activeSkills = rawUserContent?.activeSkills ?? []
+      const inlineItems = rawUserContent?.inlineItems ?? []
       return JSON.stringify({
         text: userRow.text,
         files: fileRows.map((fileRow) => this.toMessageFile(fileRow)),
         links: linkRows.map((linkRow) => linkRow.url),
         search: userRow.search_enabled === 1,
         think: userRow.think_enabled === 1,
-        ...(activeSkills.length > 0 ? { activeSkills } : {})
+        ...(activeSkills.length > 0 ? { activeSkills } : {}),
+        ...(inlineItems.length > 0 ? { inlineItems } : {})
       } satisfies UserMessageContent)
     }
 
@@ -786,7 +788,8 @@ export class DeepChatMessageStore {
           : [],
         search: parsed.search === true,
         think: parsed.think === true,
-        activeSkills: this.normalizeActiveSkills(parsed.activeSkills)
+        activeSkills: this.normalizeActiveSkills(parsed.activeSkills),
+        inlineItems: Array.isArray(parsed.inlineItems) ? parsed.inlineItems : []
       }
     } catch {
       return null
diff --git a/src/main/presenter/agentRuntimePresenter/pendingInputCoordinator.ts b/src/main/presenter/agentRuntimePresenter/pendingInputCoordinator.ts
index b33575ae3..94bf19923 100644
--- a/src/main/presenter/agentRuntimePresenter/pendingInputCoordinator.ts
+++ b/src/main/presenter/agentRuntimePresenter/pendingInputCoordinator.ts
@@ -23,10 +23,12 @@ function normalizeInput(input: string | SendMessageInput): SendMessageInput {
       )
     : []
 
+  const inlineItems = Array.isArray(input?.inlineItems) ? input.inlineItems : []
   return {
     text: typeof input?.text === 'string' ? input.text : '',
     files: Array.isArray(input?.files) ? input.files.filter(Boolean) : [],
-    ...(activeSkills.length > 0 ? { activeSkills } : {})
+    ...(activeSkills.length > 0 ? { activeSkills } : {}),
+    ...(inlineItems.length > 0 ? { inlineItems } : {})
   }
 }
 
diff --git a/src/main/presenter/agentRuntimePresenter/pendingInputStore.ts b/src/main/presenter/agentRuntimePresenter/pendingInputStore.ts
index 893e09392..2744eaddb 100644
--- a/src/main/presenter/agentRuntimePresenter/pendingInputStore.ts
+++ b/src/main/presenter/agentRuntimePresenter/pendingInputStore.ts
@@ -7,6 +7,8 @@ import type {
 import type { SQLitePresenter } from '../sqlitePresenter'
 import type { DeepChatPendingInputRow } from '../sqlitePresenter/tables/deepchatPendingInputs'
 
+type InlineItem = NonNullable<SendMessageInput['inlineItems']>[number]
+
 function normalizeInput(input: string | SendMessageInput): SendMessageInput {
   if (typeof input === 'string') {
     return { text: input, files: [] }
@@ -22,13 +24,29 @@ function normalizeInput(input: string | SendMessageInput): SendMessageInput {
       )
     : []
 
+  const inlineItems = Array.isArray(input?.inlineItems) ? input.inlineItems : []
   return {
     text: typeof input?.text === 'string' ? input.text : '',
     files: Array.isArray(input?.files) ? input.files.filter(Boolean) : [],
-    ...(activeSkills.length > 0 ? { activeSkills } : {})
+    ...(activeSkills.length > 0 ? { activeSkills } : {}),
+    ...(inlineItems.length > 0 ? { inlineItems } : {})
   }
 }
 
+function shiftInlineItems(
+  inlineItems: SendMessageInput['inlineItems'],
+  offset: number
+): InlineItem[] {
+  if (!Array.isArray(inlineItems) || inlineItems.length === 0) {
+    return []
+  }
+
+  return inlineItems.map((item) => ({
+    ...item,
+    offset: Math.max(0, item.offset + offset)
+  }))
+}
+
 export class DeepChatPendingInputStore {
   private readonly sqlitePresenter: SQLitePresenter
 
@@ -117,16 +135,25 @@ export class DeepChatPendingInputStore {
 
     const existing = this.parsePayload(row.payload_json)
     const next = normalizeInput(input)
-    const text = [existing.text.trim(), next.text.trim()].filter(Boolean).join('\n\n')
+    const existingText = existing.text.trim()
+    const nextText = next.text.trim()
+    const separator = existingText && nextText ? '\n\n' : ''
+    const text = [existingText, nextText].filter(Boolean).join(separator)
+    const nextOffset = existingText.length + separator.length
     const files = [...(existing.files ?? []), ...(next.files ?? [])].filter(Boolean)
     const activeSkills = Array.from(
       new Set([...(existing.activeSkills ?? []), ...(next.activeSkills ?? [])])
     )
+    const inlineItems = [
+      ...(existing.inlineItems ?? []),
+      ...shiftInlineItems(next.inlineItems, nextOffset)
+    ]
     this.sqlitePresenter.deepchatPendingInputsTable.update(itemId, {
       payload_json: JSON.stringify({
         text,
         files,
-        ...(activeSkills.length > 0 ? { activeSkills } : {})
+        ...(activeSkills.length > 0 ? { activeSkills } : {}),
+        ...(inlineItems.length > 0 ? { inlineItems } : {})
       })
     })
     return this.toRecord(this.requireRow(itemId, row.session_id))
diff --git a/src/main/presenter/agentRuntimePresenter/types.ts b/src/main/presenter/agentRuntimePresenter/types.ts
index 25825088a..ce52b2d17 100644
--- a/src/main/presenter/agentRuntimePresenter/types.ts
+++ b/src/main/presenter/agentRuntimePresenter/types.ts
@@ -108,6 +108,8 @@ export interface ProcessHooks {
     commitDecision: (granted: boolean) => void
   ) => void
   getActiveSkillNames?: () => string[]
+  getEnabledSkillNames?: () => string[] | null | undefined
+  getEnabledPluginIds?: () => string[] | null | undefined
   activateSkill?: (skillName: string) => Promise<string[]>
   normalizeToolResult?: (tool: {
     sessionId: string
diff --git a/src/main/presenter/agentSessionPresenter/index.ts b/src/main/presenter/agentSessionPresenter/index.ts
index 9f27c2331..862ad61bb 100644
--- a/src/main/presenter/agentSessionPresenter/index.ts
+++ b/src/main/presenter/agentSessionPresenter/index.ts
@@ -4126,10 +4126,12 @@ export class AgentSessionPresenter {
       ? content.files.filter((file): file is MessageFile => Boolean(file))
       : []
     const activeSkills = this.normalizeActiveSkills(content.activeSkills)
+    const inlineItems = Array.isArray(content.inlineItems) ? content.inlineItems : []
     return {
       text,
       files,
-      ...(activeSkills.length > 0 ? { activeSkills } : {})
+      ...(activeSkills.length > 0 ? { activeSkills } : {}),
+      ...(inlineItems.length > 0 ? { inlineItems } : {})
     }
   }
 
@@ -4138,7 +4140,15 @@ export class AgentSessionPresenter {
     const files = Array.isArray(input.files)
       ? input.files.filter((file): file is MessageFile => Boolean(file))
       : []
-    return this.withInitialMessageActiveSkills({ text, files }, input.activeSkills)
+    const inlineItems = Array.isArray(input.inlineItems) ? input.inlineItems : []
+    return this.withInitialMessageActiveSkills(
+      {
+        text,
+        files,
+        ...(inlineItems.length > 0 ? { inlineItems } : {})
+      },
+      input.activeSkills
+    )
   }
 
   private withInitialMessageActiveSkills(
diff --git a/src/main/presenter/skillPresenter/skillTools.ts b/src/main/presenter/skillPresenter/skillTools.ts
index 95e143e6f..b082818ef 100644
--- a/src/main/presenter/skillPresenter/skillTools.ts
+++ b/src/main/presenter/skillPresenter/skillTools.ts
@@ -11,7 +11,9 @@ export class SkillTools {
 
   async handleSkillList(
     conversationId?: string,
-    allowedSkillNames?: string[]
+    allowedSkillNames?: string[] | null,
+    activeSkillNames?: string[],
+    allowedPluginIds?: string[] | null
   ): Promise<{
     skills: SkillListItem[]
     pinnedCount: number
@@ -21,15 +23,27 @@ export class SkillTools {
     const allowedSkillSet = Array.isArray(allowedSkillNames)
       ? new Set(allowedSkillNames.map((skillName) => skillName.trim()).filter(Boolean))
       : undefined
-    const allSkills = (await this.skillPresenter.getMetadataList()).filter(
-      (skill) => !allowedSkillSet || allowedSkillSet.has(skill.name)
-    )
+    const allowedPluginSet = Array.isArray(allowedPluginIds)
+      ? new Set(allowedPluginIds.map((pluginId) => pluginId.trim()).filter(Boolean))
+      : undefined
+    const allSkills = (await this.skillPresenter.getMetadataList()).filter((skill) => {
+      if (allowedSkillSet && !allowedSkillSet.has(skill.name)) {
+        return false
+      }
+      const ownerPluginId = skill.ownerPluginId?.trim()
+      return !ownerPluginId || !allowedPluginSet || allowedPluginSet.has(ownerPluginId)
+    })
+    const listedSkillNames = new Set(allSkills.map((skill) => skill.name))
     const pinnedSkills = conversationId
-      ? (await this.skillPresenter.getActiveSkills(conversationId)).filter(
-          (skillName) => !allowedSkillSet || allowedSkillSet.has(skillName)
+      ? (await this.skillPresenter.getActiveSkills(conversationId)).filter((skillName) =>
+          listedSkillNames.has(skillName)
         )
       : []
+    const activeSkills = (Array.isArray(activeSkillNames) ? activeSkillNames : pinnedSkills).filter(
+      (skillName) => listedSkillNames.has(skillName)
+    )
     const pinnedSet = new Set(pinnedSkills)
+    const activeSet = new Set(activeSkills)
 
     const skillList = allSkills.map((skill) => ({
       name: skill.name,
@@ -38,13 +52,13 @@ export class SkillTools {
       platforms: skill.platforms,
       metadata: skill.metadata,
       isPinned: pinnedSet.has(skill.name),
-      active: pinnedSet.has(skill.name)
+      active: activeSet.has(skill.name)
     }))
 
     return {
       skills: skillList,
       pinnedCount: pinnedSkills.length,
-      activeCount: pinnedSkills.length,
+      activeCount: activeSkills.length,
       totalCount: allSkills.length
     }
   }
@@ -52,7 +66,8 @@ export class SkillTools {
   async handleSkillView(
     conversationId: string | undefined,
     input: { name: string; file_path?: string },
-    allowedSkillNames?: string[]
+    allowedSkillNames?: string[] | null,
+    allowedPluginIds?: string[] | null
   ): Promise<SkillViewResult> {
     const requestedSkillName = input.name.trim()
     const allowedSkillSet = Array.isArray(allowedSkillNames)
@@ -66,6 +81,23 @@ export class SkillTools {
       }
     }
 
+    if (Array.isArray(allowedPluginIds)) {
+      const allowedPluginSet = new Set(
+        allowedPluginIds.map((pluginId) => pluginId.trim()).filter(Boolean)
+      )
+      const metadata = (await this.skillPresenter.getMetadataList()).find(
+        (skill) => skill.name === requestedSkillName
+      )
+      const ownerPluginId = metadata?.ownerPluginId?.trim()
+      if (ownerPluginId && !allowedPluginSet.has(ownerPluginId)) {
+        return {
+          success: false,
+          name: requestedSkillName,
+          error: `Skill '${requestedSkillName}' is not enabled for this agent`
+        }
+      }
+    }
+
     return await this.skillPresenter.viewSkill(requestedSkillName, {
       filePath: input.file_path,
       conversationId
diff --git a/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts b/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts
index 0d4c9fa97..30b77d86d 100644
--- a/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts
+++ b/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts
@@ -105,6 +105,8 @@ interface AgentToolExecutionOptions {
   signal?: AbortSignal
   allowExternalFileAccess?: boolean
   activeSkillNames?: string[]
+  enabledSkillNames?: string[] | null
+  enabledPluginIds?: string[] | null
 }
 
 interface AgentToolPermissionCheckOptions {
@@ -2135,11 +2137,21 @@ export class AgentToolManager {
       return undefined
     }
 
+    return this.normalizeSkillNameList(activeSkillNames)
+  }
+
+  private normalizeNullableSkillOption(skillNames?: string[] | null): string[] | null | undefined {
+    if (skillNames === null || skillNames === undefined) {
+      return skillNames
+    }
+
+    return this.normalizeSkillNameList(skillNames)
+  }
+
+  private normalizeSkillNameList(skillNames: string[]): string[] {
     return Array.from(
       new Set(
-        activeSkillNames
-          .map((skillName) => skillName.trim())
-          .filter((skillName) => skillName.length > 0)
+        skillNames.map((skillName) => skillName.trim()).filter((skillName) => skillName.length > 0)
       )
     )
   }
@@ -2161,9 +2173,16 @@ export class AgentToolManager {
 
     const skillTools = this.getSkillTools()
     const effectiveActiveSkills = this.normalizeActiveSkillOption(options?.activeSkillNames)
+    const enabledSkillNames = this.normalizeNullableSkillOption(options?.enabledSkillNames)
+    const enabledPluginIds = this.normalizeNullableSkillOption(options?.enabledPluginIds)
 
     if (toolName === 'skill_list') {
-      const result = await skillTools.handleSkillList(conversationId, effectiveActiveSkills)
+      const result = await skillTools.handleSkillList(
+        conversationId,
+        enabledSkillNames,
+        effectiveActiveSkills,
+        enabledPluginIds
+      )
       return { content: JSON.stringify(result) }
     }
 
@@ -2181,7 +2200,8 @@ export class AgentToolManager {
       const result = await skillTools.handleSkillView(
         conversationId,
         validationResult.data,
-        effectiveActiveSkills
+        enabledSkillNames,
+        enabledPluginIds
       )
       const normalizedViewedSkill = result.name?.trim() || validationResult.data.name.trim()
       const activeSkillNamesForResult = effectiveActiveSkills ?? []
diff --git a/src/main/presenter/toolPresenter/index.ts b/src/main/presenter/toolPresenter/index.ts
index 60ed275d9..5b4c61eb3 100644
--- a/src/main/presenter/toolPresenter/index.ts
+++ b/src/main/presenter/toolPresenter/index.ts
@@ -79,9 +79,10 @@ export interface IToolPresenter {
       signal?: AbortSignal
       permissionMode?: PermissionMode
       activeSkillNames?: string[]
+      enabledSkillNames?: string[] | null
       agentId?: string
       enabledMcpServerIds?: string[]
-      enabledPluginIds?: string[]
+      enabledPluginIds?: string[] | null
     }
   ): Promise<{ content: unknown; rawData: MCPToolResponse }>
   preCheckToolPermission?(
@@ -302,9 +303,10 @@ export class ToolPresenter implements IToolPresenter {
       signal?: AbortSignal
       permissionMode?: PermissionMode
       activeSkillNames?: string[]
+      enabledSkillNames?: string[] | null
       agentId?: string
       enabledMcpServerIds?: string[]
-      enabledPluginIds?: string[]
+      enabledPluginIds?: string[] | null
     }
   ): Promise<{ content: unknown; rawData: MCPToolResponse }> {
     const toolName = request.function.name
@@ -346,7 +348,9 @@ export class ToolPresenter implements IToolPresenter {
           onProgress: options?.onProgress,
           signal: options?.signal,
           allowExternalFileAccess: allowsExternalFileAccess(options?.permissionMode),
-          activeSkillNames: options?.activeSkillNames
+          activeSkillNames: options?.activeSkillNames,
+          enabledSkillNames: options?.enabledSkillNames,
+          enabledPluginIds: options?.enabledPluginIds
         }
       )
       const resolvedResponse = this.resolveAgentToolResponse(response)
diff --git a/src/renderer/src/components/chat/ChatInputBox.vue b/src/renderer/src/components/chat/ChatInputBox.vue
index 026459b03..e3a44e039 100644
--- a/src/renderer/src/components/chat/ChatInputBox.vue
+++ b/src/renderer/src/components/chat/ChatInputBox.vue
@@ -10,37 +10,6 @@
   >
     <input ref="fileInput" type="file" class="hidden" multiple @change="files.handleFileSelect" />
 
-    <div v-if="activeSkillNames.length > 0" class="flex flex-wrap gap-2 px-4 pt-3">
-      <div
-        v-for="skillName in activeSkillNames"
-        :key="skillName"
-        class="inline-flex items-center gap-1.5 rounded-md border border-primary/30 bg-primary/10 px-2 py-1 text-xs text-primary"
-      >
-        <Icon icon="lucide:sparkles" class="h-3 w-3 shrink-0" />
-        <span class="truncate max-w-[160px]">{{ skillName }}</span>
-        <button
-          type="button"
-          class="inline-flex h-4 w-4 items-center justify-center rounded-sm hover:bg-primary/20"
-          @click="removeSkill(skillName)"
-        >
-          <Icon icon="lucide:x" class="h-3 w-3" />
-        </button>
-      </div>
-    </div>
-
-    <div
-      v-if="files.selectedFiles.value.length > 0"
-      :class="['flex flex-wrap gap-2 px-4', activeSkillNames.length > 0 ? 'pt-2' : 'pt-3']"
-    >
-      <ChatAttachmentItem
-        v-for="(file, index) in files.selectedFiles.value"
-        :key="file.path || `${file.name}-${index}`"
-        :file="file"
-        removable
-        @remove="files.deleteFile(index)"
-      />
-    </div>
-
     <div
       data-testid="chat-input-editor"
       class="chat-input-editor px-4 pt-4 pb-2 text-sm"
@@ -56,22 +25,11 @@
     </div>
 
     <slot name="toolbar" />
-
-    <CommandInputDialog
-      v-if="dialogState"
-      :open="Boolean(dialogState)"
-      :title="dialogState?.title || ''"
-      :description="dialogState?.description"
-      :confirm-text="dialogState?.confirmText"
-      :fields="dialogState?.fields || []"
-      @update:open="onDialogOpenChange"
-      @submit="mentions.submitDialog"
-    />
   </div>
 </template>
 
 <script setup lang="ts">
-import { watch, ref, computed, onUnmounted } from 'vue'
+import { watch, ref, computed, onUnmounted, provide, nextTick } from 'vue'
 import { Editor as VueEditor, EditorContent } from '@tiptap/vue-3'
 import type { Editor } from '@tiptap/core'
 import Mention from '@tiptap/extension-mention'
@@ -82,8 +40,7 @@ import Placeholder from '@tiptap/extension-placeholder'
 import HardBreak from '@tiptap/extension-hard-break'
 import History from '@tiptap/extension-history'
 import { TextSelection } from '@tiptap/pm/state'
-import { Icon } from '@iconify/vue'
-import type { MessageFile } from '@shared/types/agent-interface'
+import type { MessageFile, UserMessageInlineItem } from '@shared/types/agent-interface'
 import { useI18n } from 'vue-i18n'
 import {
   buildChatInputWorkspaceReferenceText,
@@ -93,8 +50,10 @@ import { extractPlainUrlFromClipboard } from '@/lib/clipboardUrlPaste'
 import { useChatInputMentions } from './composables/useChatInputMentions'
 import { useChatInputFiles } from './composables/useChatInputFiles'
 import { useSkillsData } from '@/components/chat-input/composables/useSkillsData'
-import CommandInputDialog from './mentions/CommandInputDialog.vue'
-import ChatAttachmentItem from './ChatAttachmentItem.vue'
+import { SkillChip } from './nodes/skillChip'
+import { FileAttachment } from './nodes/fileAttachment'
+import { CommandForm } from './nodes/commandForm'
+import { INPUT_NODE_ACTIONS, type InputNodeActions } from './nodes/symbols'
 
 const SlashMention = Mention.extend({
   name: 'slashMention'
@@ -161,7 +120,7 @@ const mentions = useChatInputMentions({
     await skillsData.activateSkill(skillName)
   }
 })
-const dialogState = mentions.dialogState
+
 const files = useChatInputFiles(
   fileInput,
   (_event, nextFiles) => {
@@ -170,6 +129,35 @@ const files = useChatInputFiles(
   t
 )
 
+// ── Inline Node action wiring ──────────────────────────────────
+let isSyncingNodes = false
+let isSubmittingCommandForm = false
+
+const actions: InputNodeActions = {
+  prepareCommandFormSubmit: () => {
+    isSubmittingCommandForm = true
+  },
+  removeSkill: (skillName) => {
+    void skillsData.deactivateSkill(skillName)
+  },
+  removeFile: (filePath) => {
+    const idx = files.selectedFiles.value.findIndex((f) => (f.path || f.name) === filePath)
+    if (idx >= 0) {
+      files.deleteFile(idx)
+    }
+  },
+  submitCommandForm: (values) => {
+    mentions.submitDialog(values)
+  },
+  cancelCommandForm: () => {
+    mentions.closeDialog()
+  }
+}
+
+provide(INPUT_NODE_ACTIONS, actions)
+
+// ── Editor helpers ─────────────────────────────────────────────
+
 const sameFiles = (a: MessageFile[], b: MessageFile[]) => {
   if (a.length !== b.length) return false
   for (let i = 0; i < a.length; i += 1) {
@@ -202,6 +190,180 @@ const setCaretToEnd = (editor: Editor) => {
   editor.view.dispatch(editor.state.tr.setSelection(end))
 }
 
+type InlineNodeRange = { pos: number; size: number }
+const CHAT_INPUT_SYNC_META = 'chatInputSync'
+
+function syncEditorContent(applyChange: () => void) {
+  isSyncingNodes = true
+  try {
+    applyChange()
+  } finally {
+    isSyncingNodes = false
+  }
+}
+
+function deleteInlineNodes(ranges: InlineNodeRange[]) {
+  if (ranges.length === 0) return
+
+  let tr = editor.state.tr
+  ranges
+    .sort((a, b) => b.pos - a.pos)
+    .forEach(({ pos, size }) => {
+      tr = tr.delete(pos, pos + size)
+    })
+
+  editor.view.dispatch(tr.setMeta(CHAT_INPUT_SYNC_META, true).setMeta('addToHistory', false))
+}
+
+function getEditorSkillNames(): string[] {
+  const names: string[] = []
+  editor.state.doc.descendants((node) => {
+    if (node.type.name === 'skillChip') {
+      names.push(node.attrs.skillName as string)
+    }
+  })
+  return names
+}
+
+function getEditorFilePaths(): string[] {
+  const paths: string[] = []
+  editor.state.doc.descendants((node) => {
+    if (node.type.name === 'fileAttachment') {
+      paths.push(node.attrs.filePath as string)
+    }
+  })
+  return paths
+}
+
+function hasCommandFormNode(): boolean {
+  let hasForm = false
+  editor.state.doc.descendants((node) => {
+    if (node.type.name === 'commandForm') {
+      hasForm = true
+      return false
+    }
+    return true
+  })
+  return hasForm
+}
+
+function reconcileEditorNodes() {
+  if (isSyncingNodes) return
+
+  const editorSkillNames = new Set(getEditorSkillNames())
+  activeSkillNames.value
+    .filter((name) => !editorSkillNames.has(name))
+    .forEach((name) => {
+      void skillsData.deactivateSkill(name)
+    })
+
+  const editorFilePaths = new Set(getEditorFilePaths())
+  for (let i = files.selectedFiles.value.length - 1; i >= 0; i -= 1) {
+    const file = files.selectedFiles.value[i]
+    if (!editorFilePaths.has(file.path || file.name)) {
+      files.deleteFile(i)
+    }
+  }
+
+  if (!hasCommandFormNode() && !isSubmittingCommandForm) {
+    mentions.closeDialog()
+  }
+}
+
+/** Ensure editor SkillChip nodes mirror skillsData.activeSkills */
+function syncSkillNodes() {
+  if (isSyncingNodes) return
+
+  syncEditorContent(() => {
+    const active = activeSkillNames.value
+    const existing = new Map<string, InlineNodeRange>()
+
+    editor.state.doc.descendants((node, pos) => {
+      if (node.type.name === 'skillChip') {
+        existing.set(node.attrs.skillName as string, { pos, size: node.nodeSize })
+      }
+    })
+
+    deleteInlineNodes(
+      Array.from(existing.entries())
+        .filter(([name]) => !active.includes(name))
+        .map(([, range]) => range)
+    )
+
+    const newSkillNodes = active
+      .filter((name) => !existing.has(name))
+      .map((name) => ({
+        type: 'skillChip',
+        attrs: { skillName: name }
+      }))
+
+    if (newSkillNodes.length > 0) {
+      editor
+        .chain()
+        .insertContentAt(editor.state.selection.from, newSkillNodes, { updateSelection: false })
+        .run()
+    }
+  })
+}
+
+/** Ensure editor FileAttachment nodes mirror files.selectedFiles */
+function syncFileNodes() {
+  if (isSyncingNodes) return
+
+  syncEditorContent(() => {
+    const currentFiles = files.selectedFiles.value
+    const existing = new Map<string, InlineNodeRange>()
+
+    editor.state.doc.descendants((node, pos) => {
+      if (node.type.name === 'fileAttachment') {
+        const path = node.attrs.filePath as string
+        existing.set(path, { pos, size: node.nodeSize })
+      }
+    })
+
+    const currentPaths = new Set(currentFiles.map((f) => f.path || f.name))
+
+    deleteInlineNodes(
+      Array.from(existing.entries())
+        .filter(([path]) => !currentPaths.has(path))
+        .map(([, range]) => range)
+    )
+
+    const newFileNodes = currentFiles
+      .filter((file) => !existing.has(file.path || file.name))
+      .map((file) => {
+        const path = file.path || file.name
+        return {
+          type: 'fileAttachment',
+          attrs: {
+            fileName: file.name || 'file',
+            filePath: path,
+            mimeType: file.mimeType || ''
+          }
+        }
+      })
+
+    if (newFileNodes.length > 0) {
+      editor
+        .chain()
+        .insertContentAt(findFileInsertPos(), newFileNodes, { updateSelection: false })
+        .run()
+    }
+  })
+}
+
+function findFileInsertPos(): number {
+  let maxEnd = 1
+  editor.state.doc.descendants((node, pos) => {
+    if (node.type.name === 'fileAttachment') {
+      maxEnd = pos + node.nodeSize
+    }
+  })
+  return maxEnd
+}
+
+// ── Editor setup ───────────────────────────────────────────────
+
 const editor = new VueEditor({
   editorProps: {
     attributes: {
@@ -214,6 +376,9 @@ const editor = new VueEditor({
     Paragraph,
     Text,
     History,
+    SkillChip,
+    FileAttachment,
+    CommandForm,
     Mention.configure({
       suggestion: mentions.atSuggestion as any,
       deleteTriggerWithBackspace: true
@@ -234,7 +399,12 @@ const editor = new VueEditor({
     })
   ],
   content: toEditorDoc(props.modelValue || ''),
-  onUpdate: ({ editor }) => {
+  onUpdate: ({ editor, transaction }) => {
+    if (!transaction.getMeta(CHAT_INPUT_SYNC_META)) {
+      reconcileEditorNodes()
+    }
+    isSubmittingCommandForm = false
+
     const text = getEditorText(editor)
     if (text !== (props.modelValue || '')) {
       emit('update:modelValue', text)
@@ -244,31 +414,55 @@ const editor = new VueEditor({
 
 editorInstance = editor
 
+// ── Watchers ───────────────────────────────────────────────────
+
 watch(
   () => props.modelValue,
   (value) => {
     const next = value || ''
     const current = getEditorText(editor)
-    if (next === current) {
-      return
-    }
+    if (next === current) return
+
+    syncEditorContent(() => {
+      editor.commands.setContent(toEditorDoc(next), false)
+      setCaretToEnd(editor)
+    })
 
-    editor.commands.setContent(toEditorDoc(next), false)
-    setCaretToEnd(editor)
+    // Re-sync chips after content replacement
+    void nextTick(() => {
+      syncSkillNodes()
+      syncFileNodes()
+    })
   }
 )
 
 watch(
   () => props.files ?? [],
   (nextFiles) => {
-    if (sameFiles(nextFiles, files.selectedFiles.value)) {
-      return
-    }
+    if (sameFiles(nextFiles, files.selectedFiles.value)) return
     files.selectedFiles.value = [...nextFiles]
   },
   { deep: true, immediate: true }
 )
 
+// Sync files → editor nodes
+watch(
+  () => [...files.selectedFiles.value],
+  () => {
+    syncFileNodes()
+  },
+  { deep: true, immediate: true }
+)
+
+// Sync skills → editor nodes
+watch(
+  () => [...activeSkillNames.value],
+  () => {
+    syncSkillNodes()
+  },
+  { deep: true, immediate: true }
+)
+
 watch(resolvedPlaceholder, () => {
   editor.view.updateState(editor.state)
 })
@@ -295,9 +489,7 @@ onUnmounted(() => {
   editor.destroy()
 })
 
-function removeSkill(skillName: string) {
-  void skillsData.deactivateSkill(skillName)
-}
+// ── Event handlers ─────────────────────────────────────────────
 
 function onCompositionStart() {
   isComposing.value = true
@@ -347,12 +539,6 @@ function handleKeydown(e: KeyboardEvent) {
   emit('submit')
 }
 
-function onDialogOpenChange(open: boolean) {
-  if (!open) {
-    mentions.closeDialog()
-  }
-}
-
 function onPaste(event: ClipboardEvent) {
   void files.handlePaste(event, true)
 
@@ -427,6 +613,50 @@ function insertRecognizedText(text: string) {
   editor.chain().focus().insertContent(normalizedText).run()
 }
 
+function getInlineItemsSnapshot(): UserMessageInlineItem[] {
+  const inlineItems: UserMessageInlineItem[] = []
+  let offset = 0
+
+  editor.state.doc.forEach((block, _blockOffset, blockIndex) => {
+    if (blockIndex > 0) {
+      offset += 1
+    }
+
+    block.forEach((node) => {
+      if (node.type.name === 'text') {
+        offset += node.text?.length ?? 0
+        return
+      }
+
+      if (node.type.name === 'hardBreak') {
+        offset += 1
+        return
+      }
+
+      if (node.type.name === 'skillChip') {
+        inlineItems.push({
+          type: 'skill',
+          offset,
+          skillName: node.attrs.skillName as string
+        })
+        return
+      }
+
+      if (node.type.name === 'fileAttachment') {
+        inlineItems.push({
+          type: 'file',
+          offset,
+          fileName: node.attrs.fileName as string,
+          filePath: node.attrs.filePath as string,
+          mimeType: node.attrs.mimeType as string
+        })
+      }
+    })
+  })
+
+  return inlineItems
+}
+
 function getPendingSkillsSnapshot(): string[] {
   return Array.from(new Set(skillsData.pendingSkills.value))
 }
@@ -448,6 +678,7 @@ defineExpose({
   triggerAttach,
   insertRecognizedText,
   insertWorkspaceReference,
+  getInlineItemsSnapshot,
   getPendingSkillsSnapshot,
   consumePendingSkills,
   clearPendingSkills,
diff --git a/src/renderer/src/components/chat/composables/useChatInputMentions.ts b/src/renderer/src/components/chat/composables/useChatInputMentions.ts
index f514634f8..155350b89 100644
--- a/src/renderer/src/components/chat/composables/useChatInputMentions.ts
+++ b/src/renderer/src/components/chat/composables/useChatInputMentions.ts
@@ -25,20 +25,6 @@ import {
   type SlashSuggestionItem
 } from '../mentions/utils'
 
-export interface MentionDialogState {
-  mode: 'command' | 'prompt'
-  title: string
-  description?: string
-  fields: Array<{
-    name: string
-    label: string
-    description?: string
-    placeholder?: string
-    required?: boolean
-  }>
-  confirmText?: string
-}
-
 export interface UseChatInputMentionsOptions {
   getEditor: () => Editor | null
   workspacePath: Ref<string | null>
@@ -103,9 +89,12 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
   const registeredWorkspacePath = ref<string | null>(null)
   let unsubscribeAcpCommandsReady: (() => void) | null = null
 
-  const dialogState = ref<MentionDialogState | null>(null)
-  const pendingCommand = ref<AcpSessionCommand | null>(null)
-  const pendingPrompt = ref<PromptListEntry | null>(null)
+  // Stores the pending command/prompt context for the inline CommandForm
+  const pendingFormData = ref<{
+    type: 'command' | 'prompt'
+    command?: AcpSessionCommand
+    prompt?: PromptListEntry
+  } | null>(null)
 
   const shouldSuppressSubmit = () => Date.now() < suppressSubmitUntil.value
   const markSuggestionSelected = () => {
@@ -113,9 +102,7 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
   }
 
   const closeDialog = () => {
-    dialogState.value = null
-    pendingCommand.value = null
-    pendingPrompt.value = null
+    pendingFormData.value = null
   }
 
   const notifyPendingSkills = () => {
@@ -309,6 +296,20 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
     }
   }
 
+  /** Insert a CommandForm block node at the given range */
+  function insertCommandFormNode(editor: Editor, range: Range, attrs: Record<string, unknown>) {
+    // Clear the trigger text first, then insert the form node at the same position
+    editor
+      .chain()
+      .focus()
+      .insertContentAt(range, '')
+      .insertContentAt(range.from, {
+        type: 'commandForm',
+        attrs
+      })
+      .run()
+  }
+
   const handleSlashSelection = async (editor: Editor, range: Range, item: SlashSuggestionItem) => {
     const action = resolveSlashSelectionAction(item)
 
@@ -319,13 +320,13 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
     }
 
     if (action.kind === 'request-command-input') {
-      editor.chain().focus().insertContentAt(range, '').run()
-      pendingCommand.value = action.command
-      dialogState.value = {
+      pendingFormData.value = { type: 'command', command: action.command }
+      insertCommandFormNode(editor, range, {
         mode: 'command',
-        title: `/${action.command.name}`,
+        commandName: action.command.name,
         description: action.command.description || action.command.input?.hint || '',
-        fields: [
+        confirmText: 'Send',
+        fields: JSON.stringify([
           {
             name: 'input',
             label: 'Input',
@@ -333,14 +334,14 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
             placeholder: action.command.input?.hint,
             required: true
           }
-        ],
-        confirmText: 'Send'
-      }
+        ])
+      })
       return
     }
 
     if (action.kind === 'activate-skill') {
       editor.chain().focus().insertContentAt(range, '').run()
+
       if (options.onActivateSkill) {
         await options.onActivateSkill(action.skillName)
         return
@@ -355,21 +356,22 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
     }
 
     if (action.kind === 'request-prompt-args') {
-      editor.chain().focus().insertContentAt(range, '').run()
-      pendingPrompt.value = action.prompt
-      dialogState.value = {
+      pendingFormData.value = { type: 'prompt', prompt: action.prompt }
+      insertCommandFormNode(editor, range, {
         mode: 'prompt',
-        title: `/${action.prompt.name}`,
+        commandName: action.prompt.name,
         description: action.prompt.description || 'Fill prompt arguments before insertion.',
-        fields: (action.prompt.arguments ?? []).map((arg) => ({
-          name: arg.name,
-          label: arg.name,
-          description: arg.description,
-          placeholder: arg.description,
-          required: Boolean(arg.required)
-        })),
-        confirmText: 'Insert'
-      }
+        confirmText: 'Insert',
+        fields: JSON.stringify(
+          (action.prompt.arguments ?? []).map((arg) => ({
+            name: arg.name,
+            label: arg.name,
+            description: arg.description,
+            placeholder: arg.description,
+            required: Boolean(arg.required)
+          }))
+        )
+      })
       return
     }
 
@@ -378,18 +380,17 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
   }
 
   const submitDialog = async (values: Record<string, string>) => {
-    if (!dialogState.value) {
-      return
-    }
+    const data = pendingFormData.value
+    if (!data) return
 
-    if (dialogState.value.mode === 'command' && pendingCommand.value) {
+    if (data.type === 'command' && data.command) {
       const input = values.input ?? ''
-      options.onCommandSubmit(buildCommandText(pendingCommand.value.name, input))
+      options.onCommandSubmit(buildCommandText(data.command.name, input))
       closeDialog()
       return
     }
 
-    if (dialogState.value.mode === 'prompt' && pendingPrompt.value) {
+    if (data.type === 'prompt' && data.prompt) {
       const args: Record<string, string> = {}
       for (const [key, value] of Object.entries(values)) {
         const normalized = value.trim()
@@ -397,7 +398,7 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
           args[key] = normalized
         }
       }
-      await insertPromptText(pendingPrompt.value, args)
+      await insertPromptText(data.prompt, args)
       closeDialog()
       return
     }
@@ -572,7 +573,6 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
     isSuggestionMenuOpen,
     shouldSuppressSubmit,
     pendingSkills,
-    dialogState,
     submitDialog,
     closeDialog
   }
diff --git a/src/renderer/src/components/chat/mentions/CommandInputDialog.vue b/src/renderer/src/components/chat/mentions/CommandInputDialog.vue
deleted file mode 100644
index fd4ac1f2e..000000000
--- a/src/renderer/src/components/chat/mentions/CommandInputDialog.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <Dialog :open="open" @update:open="$emit('update:open', $event)">
-    <DialogContent class="sm:max-w-[460px]">
-      <DialogHeader>
-        <DialogTitle>{{ title }}</DialogTitle>
-        <DialogDescription v-if="description">{{ description }}</DialogDescription>
-      </DialogHeader>
-
-      <div class="max-h-[55vh] overflow-y-auto pr-1">
-        <div class="space-y-3 py-2">
-          <div v-for="field in fields" :key="field.name" class="space-y-1">
-            <Label :for="field.name" class="text-sm font-medium">
-              {{ field.label || field.name }}
-              <span v-if="field.required" class="text-destructive">*</span>
-            </Label>
-            <Input
-              :id="field.name"
-              v-model="values[field.name]"
-              :placeholder="field.placeholder || field.description || ''"
-              :class="errors[field.name] ? 'border-destructive' : ''"
-              @keydown.enter="onEnter(field.name)"
-            />
-            <p v-if="field.description" class="text-xs text-muted-foreground">
-              {{ field.description }}
-            </p>
-            <p v-if="errors[field.name]" class="text-xs text-destructive">
-              {{ errors[field.name] }}
-            </p>
-          </div>
-        </div>
-      </div>
-
-      <DialogFooter>
-        <Button variant="outline" @click="$emit('update:open', false)">Cancel</Button>
-        <Button @click="submit">{{ confirmText || 'Confirm' }}</Button>
-      </DialogFooter>
-    </DialogContent>
-  </Dialog>
-</template>
-
-<script setup lang="ts">
-import { reactive, watch } from 'vue'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle
-} from '@shadcn/components/ui/dialog'
-import { Button } from '@shadcn/components/ui/button'
-import { Input } from '@shadcn/components/ui/input'
-import { Label } from '@shadcn/components/ui/label'
-
-export interface CommandInputField {
-  name: string
-  label: string
-  description?: string
-  placeholder?: string
-  required?: boolean
-}
-
-const props = defineProps<{
-  open: boolean
-  title: string
-  description?: string
-  confirmText?: string
-  fields: CommandInputField[]
-}>()
-
-const emit = defineEmits<{
-  'update:open': [open: boolean]
-  submit: [values: Record<string, string>]
-}>()
-
-const values = reactive<Record<string, string>>({})
-const errors = reactive<Record<string, string>>({})
-
-const resetForm = () => {
-  Object.keys(values).forEach((key) => {
-    delete values[key]
-  })
-  Object.keys(errors).forEach((key) => {
-    delete errors[key]
-  })
-
-  for (const field of props.fields) {
-    values[field.name] = ''
-  }
-}
-
-watch(
-  () => [props.open, props.fields],
-  ([open]) => {
-    if (open) {
-      resetForm()
-    }
-  },
-  { immediate: true }
-)
-
-const validate = () => {
-  Object.keys(errors).forEach((key) => {
-    delete errors[key]
-  })
-
-  for (const field of props.fields) {
-    if (!field.required) continue
-    if (!values[field.name]?.trim()) {
-      errors[field.name] = 'This field is required.'
-    }
-  }
-
-  return Object.keys(errors).length === 0
-}
-
-const submit = () => {
-  if (!validate()) return
-  emit('submit', { ...values })
-}
-
-const onEnter = (fieldName: string) => {
-  const index = props.fields.findIndex((field) => field.name === fieldName)
-  if (index === props.fields.length - 1) {
-    submit()
-  }
-}
-</script>
diff --git a/src/renderer/src/components/chat/messageListItems.ts b/src/renderer/src/components/chat/messageListItems.ts
index c1dd03d43..223263007 100644
--- a/src/renderer/src/components/chat/messageListItems.ts
+++ b/src/renderer/src/components/chat/messageListItems.ts
@@ -1,4 +1,4 @@
-import type { MessageFile } from '@shared/types/agent-interface'
+import type { MessageFile, UserMessageInlineItem } from '@shared/types/agent-interface'
 import type { AgentPlanDisplayItem, AgentPlanTerminalReason } from '@shared/types/agent-plan'
 import type { ToolCallImagePreview } from '@shared/types/core/mcp'
 
@@ -32,6 +32,25 @@ export type DisplayUserMessageMentionBlock = {
   category: string
 }
 
+export type DisplayUserMessageSkillBlock = {
+  type: 'skill'
+  skillName: string
+}
+
+export type DisplayUserMessageFileBlock = {
+  type: 'file'
+  fileName: string
+  filePath: string
+  mimeType?: string
+}
+
+export type DisplayUserMessageInlineBlock =
+  | DisplayUserMessageTextBlock
+  | DisplayUserMessageMentionBlock
+  | DisplayUserMessageCodeBlock
+  | DisplayUserMessageSkillBlock
+  | DisplayUserMessageFileBlock
+
 export type DisplayUserMessageContent = {
   continue?: boolean
   files: MessageFile[]
@@ -42,6 +61,7 @@ export type DisplayUserMessageContent = {
   search: boolean
   activeSkills?: string[]
   text: string
+  inlineItems?: UserMessageInlineItem[]
   content?: (
     | DisplayUserMessageTextBlock
     | DisplayUserMessageMentionBlock
diff --git a/src/renderer/src/components/chat/nodes/CommandFormView.vue b/src/renderer/src/components/chat/nodes/CommandFormView.vue
new file mode 100644
index 000000000..fc2ca2ff7
--- /dev/null
+++ b/src/renderer/src/components/chat/nodes/CommandFormView.vue
@@ -0,0 +1,129 @@
+<template>
+  <NodeViewWrapper
+    class="my-2 rounded-lg border border-border bg-card p-3 shadow-sm"
+    data-command-form
+    as="div"
+  >
+    <div class="mb-2 flex items-center justify-between gap-2">
+      <div class="min-w-0">
+        <div class="text-sm font-medium text-foreground">
+          <template v-if="mode === 'command'">/{{ commandName }}</template>
+          <template v-else>{{ commandName }}</template>
+        </div>
+        <p v-if="description" class="text-xs text-muted-foreground truncate mt-0.5">
+          {{ description }}
+        </p>
+      </div>
+      <button
+        type="button"
+        class="inline-flex h-5 w-5 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground"
+        @click="handleCancel"
+      >
+        <Icon icon="lucide:x" class="h-3.5 w-3.5" />
+      </button>
+    </div>
+
+    <div class="space-y-2">
+      <div v-for="(field, index) in parsedFields" :key="field.name" class="space-y-1">
+        <Label :for="field.name" class="text-xs font-medium text-muted-foreground">
+          {{ field.label || field.name }}
+          <span v-if="field.required" class="text-destructive">*</span>
+        </Label>
+        <Input
+          :id="field.name"
+          v-model="formValues[field.name]"
+          :placeholder="field.placeholder || field.description || ''"
+          class="h-8 text-xs"
+          @keydown.enter.prevent.stop="handleFieldEnter(index, $event)"
+        />
+      </div>
+    </div>
+
+    <div class="mt-3 flex items-center justify-end gap-2">
+      <Button variant="ghost" size="sm" class="h-7 rounded-full px-3 text-xs" @click="handleCancel">
+        {{ t('common.cancel') }}
+      </Button>
+      <Button
+        size="sm"
+        class="h-7 rounded-full px-3 text-xs"
+        :disabled="!canSubmit"
+        @click="handleSubmit"
+      >
+        {{ confirmText || t('common.confirm') }}
+      </Button>
+    </div>
+  </NodeViewWrapper>
+</template>
+
+<script setup lang="ts">
+import { computed, inject, reactive } from 'vue'
+import { Icon } from '@iconify/vue'
+import { NodeViewWrapper } from '@tiptap/vue-3'
+import type { NodeViewProps } from '@tiptap/vue-3'
+import { Button } from '@shadcn/components/ui/button'
+import { Input } from '@shadcn/components/ui/input'
+import { Label } from '@shadcn/components/ui/label'
+import { useI18n } from 'vue-i18n'
+import { INPUT_NODE_ACTIONS, type InputNodeActions } from './symbols'
+
+const props = defineProps<NodeViewProps>()
+const actions = inject<InputNodeActions>(INPUT_NODE_ACTIONS)
+const { t } = useI18n()
+
+const mode = computed(() => props.node.attrs.mode as string)
+const commandName = computed(() => props.node.attrs.commandName as string)
+const description = computed(() => props.node.attrs.description as string)
+const confirmText = computed(() => props.node.attrs.confirmText as string)
+
+const parsedFields = computed(() => {
+  try {
+    return JSON.parse(props.node.attrs.fields as string) as Array<{
+      name: string
+      label: string
+      description?: string
+      placeholder?: string
+      required?: boolean
+    }>
+  } catch {
+    return []
+  }
+})
+
+const formValues = reactive<Record<string, string>>({})
+
+const canSubmit = computed(() => {
+  return parsedFields.value.every((field) => {
+    if (field.required) {
+      return !!formValues[field.name]?.trim()
+    }
+    return true
+  })
+})
+
+function handleFieldEnter(index: number, event: KeyboardEvent) {
+  if (parsedFields.value.length === 1 || index === parsedFields.value.length - 1) {
+    handleSubmit()
+    return
+  }
+
+  const form = (event.currentTarget as HTMLInputElement | null)?.closest('[data-command-form]')
+  const nextInput = form?.querySelectorAll<HTMLInputElement>('input')[index + 1]
+  nextInput?.focus()
+}
+
+function handleSubmit() {
+  if (!canSubmit.value) return
+  actions?.prepareCommandFormSubmit()
+  props.deleteNode()
+  if (actions?.submitCommandForm) {
+    actions.submitCommandForm({ ...formValues })
+  }
+}
+
+function handleCancel() {
+  props.deleteNode()
+  if (actions?.cancelCommandForm) {
+    actions.cancelCommandForm()
+  }
+}
+</script>
diff --git a/src/renderer/src/components/chat/nodes/FileAttachmentView.vue b/src/renderer/src/components/chat/nodes/FileAttachmentView.vue
new file mode 100644
index 000000000..97d704986
--- /dev/null
+++ b/src/renderer/src/components/chat/nodes/FileAttachmentView.vue
@@ -0,0 +1,45 @@
+<template>
+  <NodeViewWrapper
+    class="file-chip inline-flex items-center gap-1 rounded-md border border-muted-foreground/25 bg-muted/25 px-1.5 py-0.5 text-xs text-muted-foreground select-none"
+    data-file-attachment
+    as="span"
+  >
+    <Icon :icon="fileIcon" class="h-3 w-3 shrink-0" />
+    <span class="truncate max-w-[120px]">{{ node.attrs.fileName }}</span>
+    <button
+      type="button"
+      class="inline-flex h-3.5 w-3.5 items-center justify-center rounded-sm hover:bg-muted-foreground/20"
+      :aria-label="`${t('common.delete')} ${node.attrs.fileName}`"
+      @mousedown.prevent="handleRemove"
+    >
+      <Icon icon="lucide:x" class="h-3 w-3" />
+    </button>
+  </NodeViewWrapper>
+</template>
+
+<script setup lang="ts">
+import { computed, inject } from 'vue'
+import { Icon } from '@iconify/vue'
+import { NodeViewWrapper } from '@tiptap/vue-3'
+import type { NodeViewProps } from '@tiptap/vue-3'
+import { useI18n } from 'vue-i18n'
+import { getMimeTypeIcon } from '@/lib/utils'
+import { INPUT_NODE_ACTIONS, type InputNodeActions } from './symbols'
+
+const props = defineProps<NodeViewProps>()
+const actions = inject<InputNodeActions>(INPUT_NODE_ACTIONS)
+const { t } = useI18n()
+
+const fileIcon = computed(() => {
+  const mimeType = (props.node.attrs.mimeType as string) || ''
+  return getMimeTypeIcon(mimeType)
+})
+
+function handleRemove() {
+  const filePath = props.node.attrs.filePath as string
+  props.deleteNode()
+  if (filePath && actions?.removeFile) {
+    actions.removeFile(filePath)
+  }
+}
+</script>
diff --git a/src/renderer/src/components/chat/nodes/SkillChipView.vue b/src/renderer/src/components/chat/nodes/SkillChipView.vue
new file mode 100644
index 000000000..3782708fa
--- /dev/null
+++ b/src/renderer/src/components/chat/nodes/SkillChipView.vue
@@ -0,0 +1,39 @@
+<template>
+  <NodeViewWrapper
+    class="inline-flex items-center gap-1 rounded-md border border-primary/30 bg-primary/10 px-1.5 py-0.5 text-xs text-primary select-none"
+    data-skill-chip
+    as="span"
+  >
+    <Icon icon="lucide:sparkles" class="h-3 w-3 shrink-0" />
+    <span class="truncate max-w-[160px]">{{ node.attrs.skillName }}</span>
+    <button
+      type="button"
+      class="inline-flex h-3.5 w-3.5 items-center justify-center rounded-sm hover:bg-primary/20"
+      :aria-label="`${t('common.delete')} ${node.attrs.skillName}`"
+      @mousedown.prevent="handleRemove"
+    >
+      <Icon icon="lucide:x" class="h-3 w-3" />
+    </button>
+  </NodeViewWrapper>
+</template>
+
+<script setup lang="ts">
+import { inject } from 'vue'
+import { Icon } from '@iconify/vue'
+import { NodeViewWrapper } from '@tiptap/vue-3'
+import type { NodeViewProps } from '@tiptap/vue-3'
+import { useI18n } from 'vue-i18n'
+import { INPUT_NODE_ACTIONS, type InputNodeActions } from './symbols'
+
+const props = defineProps<NodeViewProps>()
+const actions = inject<InputNodeActions>(INPUT_NODE_ACTIONS)
+const { t } = useI18n()
+
+function handleRemove() {
+  props.deleteNode()
+  const skillName = props.node.attrs.skillName as string
+  if (skillName && actions?.removeSkill) {
+    actions.removeSkill(skillName)
+  }
+}
+</script>
diff --git a/src/renderer/src/components/chat/nodes/commandForm.ts b/src/renderer/src/components/chat/nodes/commandForm.ts
new file mode 100644
index 000000000..fce398cab
--- /dev/null
+++ b/src/renderer/src/components/chat/nodes/commandForm.ts
@@ -0,0 +1,68 @@
+import { Node, mergeAttributes } from '@tiptap/core'
+import { VueNodeViewRenderer } from '@tiptap/vue-3'
+import CommandFormView from './CommandFormView.vue'
+
+export const CommandForm = Node.create({
+  name: 'commandForm',
+
+  group: 'block',
+
+  atom: true,
+
+  selectable: false,
+
+  draggable: false,
+
+  addAttributes() {
+    return {
+      mode: {
+        default: 'command'
+      },
+      commandName: {
+        default: ''
+      },
+      description: {
+        default: ''
+      },
+      confirmText: {
+        default: ''
+      },
+      fields: {
+        default: '[]'
+      },
+      pendingCommand: {
+        default: null
+      },
+      pendingPrompt: {
+        default: null
+      }
+    }
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: 'div[data-command-form]'
+      }
+    ]
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return [
+      'div',
+      mergeAttributes(HTMLAttributes, {
+        'data-command-form': '',
+        class: 'my-2 rounded-lg border border-border bg-card p-3 shadow-sm'
+      }),
+      ['div', { class: 'text-sm font-medium' }, 'Command Form']
+    ]
+  },
+
+  renderText() {
+    return ''
+  },
+
+  addNodeView() {
+    return VueNodeViewRenderer(CommandFormView)
+  }
+})
diff --git a/src/renderer/src/components/chat/nodes/fileAttachment.ts b/src/renderer/src/components/chat/nodes/fileAttachment.ts
new file mode 100644
index 000000000..30f9961b6
--- /dev/null
+++ b/src/renderer/src/components/chat/nodes/fileAttachment.ts
@@ -0,0 +1,70 @@
+import { Node, mergeAttributes } from '@tiptap/core'
+import { VueNodeViewRenderer } from '@tiptap/vue-3'
+import FileAttachmentView from './FileAttachmentView.vue'
+
+export const FileAttachment = Node.create({
+  name: 'fileAttachment',
+
+  group: 'inline',
+
+  inline: true,
+
+  atom: true,
+
+  selectable: true,
+
+  draggable: false,
+
+  addAttributes() {
+    return {
+      fileName: {
+        default: '',
+        parseHTML: (el) => el.getAttribute('data-file-name'),
+        renderHTML: (attrs) => ({
+          'data-file-name': attrs.fileName
+        })
+      },
+      filePath: {
+        default: '',
+        parseHTML: (el) => el.getAttribute('data-file-path'),
+        renderHTML: (attrs) => ({
+          'data-file-path': attrs.filePath
+        })
+      },
+      mimeType: {
+        default: '',
+        parseHTML: (el) => el.getAttribute('data-mime-type'),
+        renderHTML: (attrs) => ({
+          'data-mime-type': attrs.mimeType
+        })
+      }
+    }
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: 'span[data-file-attachment]'
+      }
+    ]
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return [
+      'span',
+      mergeAttributes(HTMLAttributes, {
+        'data-file-attachment': '',
+        class:
+          'inline-flex items-center gap-1 rounded-md border border-muted-foreground/30 bg-muted/20 px-1.5 py-0.5 text-xs text-muted-foreground'
+      })
+    ]
+  },
+
+  renderText() {
+    return ''
+  },
+
+  addNodeView() {
+    return VueNodeViewRenderer(FileAttachmentView)
+  }
+})
diff --git a/src/renderer/src/components/chat/nodes/skillChip.ts b/src/renderer/src/components/chat/nodes/skillChip.ts
new file mode 100644
index 000000000..0dd0bec6c
--- /dev/null
+++ b/src/renderer/src/components/chat/nodes/skillChip.ts
@@ -0,0 +1,56 @@
+import { Node, mergeAttributes } from '@tiptap/core'
+import { VueNodeViewRenderer } from '@tiptap/vue-3'
+import SkillChipView from './SkillChipView.vue'
+
+export const SkillChip = Node.create({
+  name: 'skillChip',
+
+  group: 'inline',
+
+  inline: true,
+
+  atom: true,
+
+  selectable: true,
+
+  draggable: false,
+
+  addAttributes() {
+    return {
+      skillName: {
+        default: null,
+        parseHTML: (el) => el.getAttribute('data-skill-name'),
+        renderHTML: (attrs) => ({
+          'data-skill-name': attrs.skillName
+        })
+      }
+    }
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: 'span[data-skill-chip]'
+      }
+    ]
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return [
+      'span',
+      mergeAttributes(HTMLAttributes, {
+        'data-skill-chip': '',
+        class:
+          'inline-flex items-center gap-1 rounded-md border border-primary/30 bg-primary/10 px-1.5 py-0.5 text-xs text-primary'
+      })
+    ]
+  },
+
+  renderText() {
+    return ''
+  },
+
+  addNodeView() {
+    return VueNodeViewRenderer(SkillChipView)
+  }
+})
diff --git a/src/renderer/src/components/chat/nodes/symbols.ts b/src/renderer/src/components/chat/nodes/symbols.ts
new file mode 100644
index 000000000..e4bf2d9da
--- /dev/null
+++ b/src/renderer/src/components/chat/nodes/symbols.ts
@@ -0,0 +1,11 @@
+import type { InjectionKey } from 'vue'
+
+export interface InputNodeActions {
+  prepareCommandFormSubmit: () => void
+  removeSkill: (skillName: string) => void
+  removeFile: (filePath: string) => void
+  submitCommandForm: (values: Record<string, string>) => void
+  cancelCommandForm: () => void
+}
+
+export const INPUT_NODE_ACTIONS: InjectionKey<InputNodeActions> = Symbol('input-node-actions')
diff --git a/src/renderer/src/components/message/MessageContent.vue b/src/renderer/src/components/message/MessageContent.vue
index 0c3014af0..1cf9edd9c 100644
--- a/src/renderer/src/components/message/MessageContent.vue
+++ b/src/renderer/src/components/message/MessageContent.vue
@@ -22,6 +22,26 @@
       >
         {{ block.content }}
       </code>
+
+      <!-- Skill chip -->
+      <span
+        v-else-if="block.type === 'skill'"
+        class="inline-flex items-center gap-1 rounded-md border border-primary/30 bg-primary/10 px-1.5 py-0.5 text-xs text-primary align-middle"
+        data-testid="user-message-inline-skill"
+      >
+        <Icon icon="lucide:sparkles" class="h-3 w-3 shrink-0" />
+        <span class="truncate max-w-[160px]">{{ block.skillName }}</span>
+      </span>
+
+      <!-- File chip -->
+      <span
+        v-else-if="block.type === 'file'"
+        class="inline-flex items-center gap-1 rounded-md border border-muted-foreground/25 bg-muted/25 px-1.5 py-0.5 text-xs text-muted-foreground align-middle"
+        data-testid="user-message-inline-file"
+      >
+        <Icon :icon="getFileIcon(block)" class="h-3 w-3 shrink-0" />
+        <span class="truncate max-w-[120px]">{{ block.fileName }}</span>
+      </span>
     </template>
   </div>
 </template>
@@ -31,10 +51,13 @@ import { computed } from 'vue'
 import { Icon } from '@iconify/vue'
 import type {
   DisplayUserMessageCodeBlock,
+  DisplayUserMessageFileBlock,
   DisplayUserMessageMentionBlock,
+  DisplayUserMessageSkillBlock,
   DisplayUserMessageTextBlock
 } from '@/components/chat/messageListItems'
 import { useLanguageStore } from '@/stores/language'
+import { getMimeTypeIcon } from '@/lib/utils'
 
 const MENTION_ICON_MAP: Record<string, string> = {
   context: 'lucide:quote',
@@ -54,6 +77,8 @@ type ContentBlock =
   | DisplayUserMessageTextBlock
   | DisplayUserMessageMentionBlock
   | DisplayUserMessageCodeBlock
+  | DisplayUserMessageSkillBlock
+  | DisplayUserMessageFileBlock
 
 const props = defineProps<{
   content: ContentBlock[]
@@ -94,4 +119,8 @@ const getMentionTitle = (block: DisplayUserMessageMentionBlock) => {
   }
   return block.content
 }
+
+const getFileIcon = (block: DisplayUserMessageFileBlock) => {
+  return getMimeTypeIcon(block.mimeType || 'application/octet-stream')
+}
 </script>
diff --git a/src/renderer/src/components/message/MessageItemUser.vue b/src/renderer/src/components/message/MessageItemUser.vue
index c24b28446..9db1066b3 100644
--- a/src/renderer/src/components/message/MessageItemUser.vue
+++ b/src/renderer/src/components/message/MessageItemUser.vue
@@ -19,12 +19,12 @@
         :timestamp="message.timestamp"
       />
       <div
-        v-if="message.content.activeSkills?.length"
+        v-if="standaloneActiveSkills.length"
         class="flex max-w-full flex-wrap justify-end gap-1.5 pr-1"
         data-testid="user-message-active-skills"
       >
         <span
-          v-for="skillName in message.content.activeSkills"
+          v-for="skillName in standaloneActiveSkills"
           :key="skillName"
           class="inline-flex h-5 items-center gap-1 rounded-full border border-border/60 bg-background/70 px-2 text-[11px] leading-none text-muted-foreground shadow-sm dark:bg-background/40"
           data-testid="user-message-active-skill"
@@ -38,9 +38,9 @@
         class="text-sm bg-muted dark:bg-muted rounded-lg p-2 border flex flex-col gap-1.5"
         data-message-content="true"
       >
-        <div v-show="message.content.files.length > 0" class="flex flex-wrap gap-1.5">
+        <div v-show="standaloneFiles.length > 0" class="flex flex-wrap gap-1.5">
           <ChatAttachmentItem
-            v-for="(file, index) in message.content.files"
+            v-for="(file, index) in standaloneFiles"
             :key="file.path || `${file.name}-${index}`"
             :file="file"
             @click="previewFile(file.path)"
@@ -70,7 +70,12 @@
               :class="{ 'user-message-content--clamped': shouldClampContent }"
             >
               <MessageContent
-                v-if="message.content.content && message.content.content.length > 0"
+                v-if="inlineContentBlocks.length > 0"
+                :content="inlineContentBlocks"
+                @mention-click="handleMentionClick"
+              />
+              <MessageContent
+                v-else-if="message.content.content && message.content.content.length > 0"
                 :content="message.content.content"
                 @mention-click="handleMentionClick"
               />
@@ -114,10 +119,11 @@
 
 <script setup lang="ts">
 import type {
-  DisplayUserMessageCodeBlock,
   DisplayUserMessage,
-  DisplayUserMessageTextBlock,
-  DisplayUserMessageMentionBlock
+  DisplayUserMessageFileBlock,
+  DisplayUserMessageInlineBlock,
+  DisplayUserMessageMentionBlock,
+  DisplayUserMessageSkillBlock
 } from '@/components/chat/messageListItems'
 import { Icon } from '@iconify/vue'
 import { useI18n } from 'vue-i18n'
@@ -133,10 +139,7 @@ import { computed, ref, watch, nextTick, onBeforeUnmount } from 'vue'
 const COLLAPSE_CHAR_THRESHOLD = 600
 const COLLAPSE_EXPLICIT_LINE_THRESHOLD = 8
 
-type DisplayUserMessageRichBlock =
-  | DisplayUserMessageTextBlock
-  | DisplayUserMessageMentionBlock
-  | DisplayUserMessageCodeBlock
+type DisplayUserMessageRichBlock = NonNullable<DisplayUserMessage['content']['content']>[number]
 
 const getVisibleMentionLabel = (block: DisplayUserMessageMentionBlock) => {
   if (block.category === 'prompts') {
@@ -157,10 +160,14 @@ const getVisibleBlockText = (block: DisplayUserMessageRichBlock) => {
 
 const getVisibleMessageText = (message: DisplayUserMessage) => {
   const blocks = message.content.content
-  if (blocks && blocks.length > 0) {
-    return blocks.map((block) => getVisibleBlockText(block)).join('')
-  }
-  return message.content.text || ''
+  const baseText =
+    blocks && blocks.length > 0
+      ? blocks.map((block) => getVisibleBlockText(block)).join('')
+      : message.content.text || ''
+  const inlineText = (message.content.inlineItems ?? [])
+    .map((item) => (item.type === 'skill' ? item.skillName : item.fileName))
+    .join('')
+  return `${baseText}${inlineText}`
 }
 
 const countExplicitLines = (value: string) => {
@@ -199,6 +206,100 @@ const editTextarea = ref<HTMLTextAreaElement | null>(null)
 const isExpanded = ref(true)
 const hasManualCollapsePreference = ref(false)
 const visibleMessageText = computed(() => getVisibleMessageText(props.message))
+
+const inlineBaseText = computed(() => {
+  const blocks = props.message.content.content
+  if (blocks && blocks.length > 0) {
+    return blocks.map((block) => getVisibleBlockText(block)).join('')
+  }
+
+  return props.message.content.text || ''
+})
+
+const canRenderInlineItems = computed(
+  () => !(props.message.content.content && props.message.content.content.length > 0)
+)
+
+const inlineItems = computed(() => {
+  if (!canRenderInlineItems.value) {
+    return []
+  }
+
+  const textLength = inlineBaseText.value.length
+  return (props.message.content.inlineItems ?? [])
+    .map((item, index) => ({ item, index }))
+    .filter(
+      ({ item }) => Number.isInteger(item.offset) && item.offset >= 0 && item.offset <= textLength
+    )
+    .sort((left, right) => left.item.offset - right.item.offset || left.index - right.index)
+})
+
+const inlineSkillNames = computed(
+  () =>
+    new Set(
+      inlineItems.value
+        .map(({ item }) => (item.type === 'skill' ? item.skillName : ''))
+        .filter(Boolean)
+    )
+)
+
+const inlineFileKeys = computed(
+  () =>
+    new Set(
+      inlineItems.value
+        .map(({ item }) => (item.type === 'file' ? item.filePath || item.fileName : ''))
+        .filter(Boolean)
+    )
+)
+
+const standaloneActiveSkills = computed(() =>
+  (props.message.content.activeSkills ?? []).filter(
+    (skillName) => !inlineSkillNames.value.has(skillName)
+  )
+)
+
+const standaloneFiles = computed(() =>
+  props.message.content.files.filter((file) => !inlineFileKeys.value.has(file.path || file.name))
+)
+
+const inlineContentBlocks = computed<DisplayUserMessageInlineBlock[]>(() => {
+  const text = inlineBaseText.value
+  if (inlineItems.value.length === 0) {
+    return []
+  }
+
+  const blocks: DisplayUserMessageInlineBlock[] = []
+  let cursor = 0
+
+  for (const { item } of inlineItems.value) {
+    if (item.offset > cursor) {
+      blocks.push({ type: 'text', content: text.slice(cursor, item.offset) })
+    }
+
+    if (item.type === 'skill') {
+      blocks.push({
+        type: 'skill',
+        skillName: item.skillName
+      } satisfies DisplayUserMessageSkillBlock)
+    } else {
+      blocks.push({
+        type: 'file',
+        fileName: item.fileName,
+        filePath: item.filePath,
+        mimeType: item.mimeType
+      } satisfies DisplayUserMessageFileBlock)
+    }
+
+    cursor = item.offset
+  }
+
+  if (cursor < text.length) {
+    blocks.push({ type: 'text', content: text.slice(cursor) })
+  }
+
+  return blocks
+})
+
 const explicitLineCount = computed(() => countExplicitLines(visibleMessageText.value))
 const isCollapsible = computed(
   () =>
diff --git a/src/renderer/src/pages/ChatPage.vue b/src/renderer/src/pages/ChatPage.vue
index eaf83fdfd..fafd18c4c 100644
--- a/src/renderer/src/pages/ChatPage.vue
+++ b/src/renderer/src/pages/ChatPage.vue
@@ -260,6 +260,7 @@ import type {
   ChatMessageRecord,
   AssistantMessageBlock,
   MessageFile,
+  UserMessageInlineItem,
   MessageMetadata,
   SendMessageInput,
   ToolInteractionResponse
@@ -1632,6 +1633,7 @@ const chatInputRef = ref<{
   triggerAttach: () => void
   insertRecognizedText?: (text: string) => void
   insertWorkspaceReference?: (targetPath: string) => boolean
+  getInlineItemsSnapshot?: () => UserMessageInlineItem[]
   getPendingSkillsSnapshot?: () => string[]
   consumePendingSkills?: () => string[]
   clearPendingSkills?: () => void
@@ -1963,12 +1965,18 @@ const clearComposerSkills = () => {
   chatInputRef.value?.clearPendingSkills?.()
 }
 
+const getComposerInlineItemsSnapshot = (): UserMessageInlineItem[] => {
+  return chatInputRef.value?.getInlineItemsSnapshot?.() ?? []
+}
+
 const withMessageSkills = (text: string, files: MessageFile[]) => {
   const activeSkills = getComposerSkillsSnapshot()
+  const inlineItems = getComposerInlineItemsSnapshot()
   return {
     text,
     files,
-    ...(activeSkills.length > 0 ? { activeSkills } : {})
+    ...(activeSkills.length > 0 ? { activeSkills } : {}),
+    ...(inlineItems.length > 0 ? { inlineItems } : {})
   }
 }
 
@@ -2274,7 +2282,8 @@ async function onPendingInputUpdate(payload: { itemId: string; text: string }) {
 
   await pendingInputStore.updateQueueInput(props.sessionId, payload.itemId, {
     text: payload.text,
-    files: target.payload.files ?? []
+    files: target.payload.files ?? [],
+    activeSkills: target.payload.activeSkills ?? []
   })
 }
 
diff --git a/src/renderer/src/pages/NewThreadPage.vue b/src/renderer/src/pages/NewThreadPage.vue
index f09791e02..6b80a84b2 100644
--- a/src/renderer/src/pages/NewThreadPage.vue
+++ b/src/renderer/src/pages/NewThreadPage.vue
@@ -190,6 +190,7 @@ import { DEFAULT_DISABLED_AGENT_TOOLS } from '@shared/agentTools'
 import type {
   DeepChatAgentConfig,
   MessageFile,
+  UserMessageInlineItem,
   SessionGenerationSettings
 } from '@shared/types/agent-interface'
 import { normalizeDeepChatSubagentConfig } from '@shared/lib/deepchatSubagents'
@@ -233,6 +234,7 @@ const isVoiceInputEnabled = ref(false)
 const chatInputRef = ref<{
   triggerAttach: () => void
   insertRecognizedText?: (text: string) => void
+  getInlineItemsSnapshot?: () => UserMessageInlineItem[]
   getPendingSkillsSnapshot?: () => string[]
   clearPendingSkills?: () => void
   focusInput?: () => void
@@ -842,10 +844,12 @@ async function submitText(text: string, files: MessageFile[]) {
     const pendingSkillsSnapshot =
       chatInputRef.value?.getPendingSkillsSnapshot?.() ?? pendingSkills.value
     const dedupedPendingSkills = Array.from(new Set(pendingSkillsSnapshot))
+    const inlineItems = chatInputRef.value?.getInlineItemsSnapshot?.() ?? []
     const messagePayload = {
       text,
       files,
-      ...(dedupedPendingSkills.length > 0 ? { activeSkills: dedupedPendingSkills } : {})
+      ...(dedupedPendingSkills.length > 0 ? { activeSkills: dedupedPendingSkills } : {}),
+      ...(inlineItems.length > 0 ? { inlineItems } : {})
     }
 
     if (isAcp && acpDraftSessionId.value) {
@@ -877,6 +881,7 @@ async function submitText(text: string, files: MessageFile[]) {
     await sessionStore.createSession({
       message: messagePayload.text,
       files: messagePayload.files,
+      inlineItems: messagePayload.inlineItems,
       projectDir: selectedSessionProjectDir.value,
       agentId,
       providerId,
diff --git a/src/renderer/src/stores/ui/message.ts b/src/renderer/src/stores/ui/message.ts
index f71e95abc..fa073e654 100644
--- a/src/renderer/src/stores/ui/message.ts
+++ b/src/renderer/src/stores/ui/message.ts
@@ -381,6 +381,7 @@ export const useMessageStore = defineStore('message', () => {
           search: parsed.search ?? false,
           think: parsed.think ?? false,
           activeSkills: Array.isArray(parsed.activeSkills) ? parsed.activeSkills : [],
+          inlineItems: Array.isArray(parsed.inlineItems) ? parsed.inlineItems : [],
           continue: parsed.continue,
           resources: parsed.resources,
           prompts: parsed.prompts,
@@ -396,7 +397,8 @@ export const useMessageStore = defineStore('message', () => {
       links: [],
       search: false,
       think: false,
-      activeSkills: []
+      activeSkills: [],
+      inlineItems: []
     }
     return entry.userContent
   }
@@ -605,7 +607,8 @@ export const useMessageStore = defineStore('message', () => {
         links: [],
         search: false,
         think: false,
-        activeSkills: normalizedInput.activeSkills ?? []
+        activeSkills: normalizedInput.activeSkills ?? [],
+        inlineItems: normalizedInput.inlineItems ?? []
       }),
       status: 'sent',
       isContextEdge: 0,
diff --git a/src/shared/chat.d.ts b/src/shared/chat.d.ts
index 73a5da017..8e928e347 100644
--- a/src/shared/chat.d.ts
+++ b/src/shared/chat.d.ts
@@ -61,6 +61,20 @@ export type UserMessageMentionBlock = {
   category: string
 }
 
+export type UserMessageInlineItem =
+  | {
+      type: 'skill'
+      offset: number
+      skillName: string
+    }
+  | {
+      type: 'file'
+      offset: number
+      fileName: string
+      filePath: string
+      mimeType?: string
+    }
+
 export type UserMessageContent = {
   continue?: boolean
   files: MessageFile[]
@@ -70,6 +84,7 @@ export type UserMessageContent = {
   think: boolean
   search: boolean
   text: string
+  inlineItems?: UserMessageInlineItem[]
   content?: (UserMessageTextBlock | UserMessageMentionBlock | UserMessageCodeBlock)[]
 }
 
diff --git a/src/shared/contracts/common.ts b/src/shared/contracts/common.ts
index b6559192d..4ba1d9322 100644
--- a/src/shared/contracts/common.ts
+++ b/src/shared/contracts/common.ts
@@ -157,10 +157,26 @@ export const MessageFileSchema = z.object({
   metadata: z.record(z.string(), FileMetadataValueSchema).optional()
 })
 
+export const UserMessageInlineItemSchema = z.discriminatedUnion('type', [
+  z.object({
+    type: z.literal('skill'),
+    offset: z.number().int().nonnegative(),
+    skillName: z.string()
+  }),
+  z.object({
+    type: z.literal('file'),
+    offset: z.number().int().nonnegative(),
+    fileName: z.string(),
+    filePath: z.string(),
+    mimeType: z.string().optional()
+  })
+])
+
 export const SendMessageInputSchema = z.object({
   text: z.string(),
   files: z.array(MessageFileSchema).optional(),
-  activeSkills: z.array(z.string()).optional()
+  activeSkills: z.array(z.string()).optional(),
+  inlineItems: z.array(UserMessageInlineItemSchema).optional()
 })
 
 export const ToolInteractionResponseSchema = z.discriminatedUnion('kind', [
diff --git a/src/shared/contracts/routes/sessions.routes.ts b/src/shared/contracts/routes/sessions.routes.ts
index 3deb75866..247c22d4c 100644
--- a/src/shared/contracts/routes/sessions.routes.ts
+++ b/src/shared/contracts/routes/sessions.routes.ts
@@ -19,6 +19,7 @@ import {
   ChatMessagePageResultSchema,
   EntityIdSchema,
   MessageFileSchema,
+  UserMessageInlineItemSchema,
   PermissionModeSchema,
   SessionCompactionStateSchema,
   SessionGenerationSettingsSchema,
@@ -63,6 +64,7 @@ export const CreateSessionInputSchema = z.object({
   agentId: EntityIdSchema,
   message: z.string(),
   files: z.array(MessageFileSchema).optional(),
+  inlineItems: z.array(UserMessageInlineItemSchema).optional(),
   projectDir: z.string().nullable().optional(),
   providerId: z.string().optional(),
   modelId: z.string().optional(),
diff --git a/src/shared/types/agent-interface.d.ts b/src/shared/types/agent-interface.d.ts
index dd46b5678..a69cc98a8 100644
--- a/src/shared/types/agent-interface.d.ts
+++ b/src/shared/types/agent-interface.d.ts
@@ -330,6 +330,20 @@ export interface IAgentImplementation {
 
 // ---- Message Types ----
 
+export type UserMessageInlineItem =
+  | {
+      type: 'skill'
+      offset: number
+      skillName: string
+    }
+  | {
+      type: 'file'
+      offset: number
+      fileName: string
+      filePath: string
+      mimeType?: string
+    }
+
 export interface UserMessageContent {
   text: string
   files: MessageFile[]
@@ -337,6 +351,7 @@ export interface UserMessageContent {
   search: boolean
   think: boolean
   activeSkills?: string[]
+  inlineItems?: UserMessageInlineItem[]
 }
 
 export interface LegacyImportStatus {
@@ -374,6 +389,7 @@ export interface SendMessageInput {
   text: string
   files?: MessageFile[]
   activeSkills?: string[]
+  inlineItems?: UserMessageInlineItem[]
 }
 
 export type PendingSessionInputMode = 'queue' | 'steer'
@@ -883,6 +899,7 @@ export interface CreateSessionInput {
   agentId: string
   message: string
   files?: MessageFile[]
+  inlineItems?: UserMessageInlineItem[]
   projectDir?: string | null
   providerId?: string
   modelId?: string
diff --git a/src/shared/types/core/chat.ts b/src/shared/types/core/chat.ts
index 97dbf9b3d..7b7b443af 100644
--- a/src/shared/types/core/chat.ts
+++ b/src/shared/types/core/chat.ts
@@ -23,6 +23,19 @@ export type UserMessageMentionBlock = {
   id: string
   category: string
 }
+export type UserMessageInlineItem =
+  | {
+      type: 'skill'
+      offset: number
+      skillName: string
+    }
+  | {
+      type: 'file'
+      offset: number
+      fileName: string
+      filePath: string
+      mimeType?: string
+    }
 
 export type UserMessageContent = {
   continue?: boolean
@@ -38,6 +51,7 @@ export type UserMessageContent = {
   search: boolean
   activeSkills?: string[]
   text: string
+  inlineItems?: UserMessageInlineItem[]
   content?: (UserMessageTextBlock | UserMessageMentionBlock | UserMessageCodeBlock)[]
 }
 
diff --git a/src/shared/types/presenters/tool.presenter.d.ts b/src/shared/types/presenters/tool.presenter.d.ts
index 87dc581fd..2a27ebb61 100644
--- a/src/shared/types/presenters/tool.presenter.d.ts
+++ b/src/shared/types/presenters/tool.presenter.d.ts
@@ -61,9 +61,10 @@ export interface IToolPresenter {
       signal?: AbortSignal
       permissionMode?: PermissionMode
       activeSkillNames?: string[]
+      enabledSkillNames?: string[] | null
       agentId?: string
       enabledMcpServerIds?: string[]
-      enabledPluginIds?: string[]
+      enabledPluginIds?: string[] | null
     }
   ): Promise<{ content: unknown; rawData: MCPToolResponse }>
 
diff --git a/test/main/presenter/skillPresenter/skillTools.test.ts b/test/main/presenter/skillPresenter/skillTools.test.ts
index 65c24b684..2a1d4964a 100644
--- a/test/main/presenter/skillPresenter/skillTools.test.ts
+++ b/test/main/presenter/skillPresenter/skillTools.test.ts
@@ -151,6 +151,16 @@ describe('SkillTools', () => {
         })
       ])
     })
+
+    it('does not treat current-message active skills as the agent allowlist', async () => {
+      ;(mockSkillPresenter.getActiveSkills as Mock).mockResolvedValue([])
+
+      const result = await skillTools.handleSkillList('conv-123', undefined, [])
+
+      expect(result.totalCount).toBe(2)
+      expect(result.activeCount).toBe(0)
+      expect(result.skills.map((skill) => skill.name)).toEqual(['code-review', 'git-commit'])
+    })
   })
 
   describe('handleSkillView', () => {
diff --git a/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts b/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts
index b6f939a10..ac8f01057 100644
--- a/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts
+++ b/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts
@@ -205,6 +205,28 @@ describe('AgentToolManager DeepChat settings tool gating', () => {
     ])
   })
 
+  it('does not use active skills as the skill_list allowlist', async () => {
+    skillPresenter.getActiveSkills.mockResolvedValue([])
+    skillPresenter.getActiveSkillsAllowedTools.mockResolvedValue([])
+
+    const manager = buildManager()
+    const result = (await manager.callTool('skill_list', {}, 'conv-1', {
+      activeSkillNames: []
+    })) as { content: string }
+    const content = JSON.parse(result.content) as {
+      skills: Array<{ name: string; active: boolean }>
+      totalCount: number
+    }
+
+    expect(content.totalCount).toBe(1)
+    expect(content.skills).toEqual([
+      expect.objectContaining({
+        name: 'code-review',
+        active: false
+      })
+    ])
+  })
+
   it('returns runtime skill_view activation metadata without persisting session skills', async () => {
     skillPresenter.getActiveSkills.mockResolvedValue([])
     skillPresenter.getActiveSkillsAllowedTools.mockResolvedValue([])
diff --git a/test/renderer/components/ChatInputBox.test.ts b/test/renderer/components/ChatInputBox.test.ts
index 5d87f1396..39dbba75c 100644
--- a/test/renderer/components/ChatInputBox.test.ts
+++ b/test/renderer/components/ChatInputBox.test.ts
@@ -13,7 +13,10 @@ const activeSkillsRef = ref<string[]>([])
 const pendingSkillsRef = ref<string[]>([])
 const activateSkillMock = vi.fn().mockResolvedValue(undefined)
 const deactivateSkillMock = vi.fn().mockResolvedValue(undefined)
+const closeDialogMock = vi.fn()
 let lastEditorOptions: any = null
+let lastEditorInstance: any = null
+let mockEditorText = ''
 const consumePendingSkillsMock = vi.fn(() => {
   const copied = [...pendingSkillsRef.value]
   pendingSkillsRef.value = []
@@ -33,7 +36,11 @@ vi.mock('@tiptap/vue-3', () => {
         content: {
           size: 0
         },
-        textBetween: vi.fn(() => '')
+        textBetween: vi.fn(() => ''),
+        descendants: vi.fn(),
+        forEach: vi.fn(),
+        firstChild: null,
+        nodeAt: vi.fn(() => null)
       },
       selection: {
         from: 0,
@@ -49,9 +56,10 @@ vi.mock('@tiptap/vue-3', () => {
     }
     constructor(options: any) {
       lastEditorOptions = options
+      lastEditorInstance = this
     }
     getText() {
-      return ''
+      return mockEditorText
     }
     chain() {
       const api = {
@@ -60,6 +68,8 @@ vi.mock('@tiptap/vue-3', () => {
           insertContentMock(content)
           return api
         },
+        insertContentAt: vi.fn(() => api),
+        deleteRange: vi.fn(() => api),
         run: () => true,
         setHardBreak: () => ({
           scrollIntoView: () => ({
@@ -83,7 +93,12 @@ vi.mock('@tiptap/vue-3', () => {
   }
 })
 
-vi.mock('@tiptap/core', () => ({}))
+vi.mock('@tiptap/core', () => ({
+  Node: {
+    create: vi.fn((config: any) => config || {})
+  },
+  mergeAttributes: (...attrs: any[]) => Object.assign({}, ...attrs)
+}))
 vi.mock('@tiptap/extension-mention', () => ({
   default: {
     configure: () => ({}),
@@ -119,7 +134,7 @@ vi.mock('@/components/chat/composables/useChatInputMentions', () => ({
     slashSuggestion: {},
     dialogState: ref(null),
     submitDialog: vi.fn(),
-    closeDialog: vi.fn(),
+    closeDialog: closeDialogMock,
     isSuggestionMenuOpen: ref(false),
     shouldSuppressSubmit: vi.fn(() => false)
   })
@@ -172,6 +187,9 @@ describe('ChatInputBox attachments', () => {
     activeSkillsRef.value = []
     pendingSkillsRef.value = []
     lastEditorOptions = null
+    lastEditorInstance = null
+    mockEditorText = ''
+    closeDialogMock.mockClear()
     Object.assign(((window as any).api ??= {}), {
       toRelativePath: vi.fn((filePath: string, basePath?: string) => {
         if (typeof filePath !== 'string' || typeof basePath !== 'string') {
@@ -368,16 +386,124 @@ describe('ChatInputBox attachments', () => {
     expect(handleDropMock).not.toHaveBeenCalled()
   })
 
-  it('handles remove attached file', async () => {
-    const wrapper = await mountComponent({
+  it('tracks attached file state via the files composable', async () => {
+    await mountComponent({
       files: [{ name: 'a.txt', path: '/tmp/a.txt' }]
     })
     selectedFilesRef.value = [{ name: 'a.txt', path: '/tmp/a.txt' }]
     await nextTick()
-    await wrapper.find('.group button[type="button"]').trigger('click')
+
+    expect(selectedFilesRef.value.length).toBe(1)
+
+    deleteFileMock(0)
     expect(deleteFileMock).toHaveBeenCalledWith(0)
   })
 
+  const textNode = (text: string) => ({ type: { name: 'text' }, text, attrs: {} })
+  const node = (name: string, attrs: Record<string, string>, nodeSize = 1) => ({
+    type: { name },
+    attrs,
+    nodeSize
+  })
+  const block = (children: any[]) => ({
+    forEach: (callback: (node: any) => void) => children.forEach(callback)
+  })
+
+  it('exposes inline item snapshots at plain text offsets', async () => {
+    const wrapper = await mountComponent()
+
+    expect(lastEditorOptions).toBeTruthy()
+    const editor = lastEditorInstance
+    expect(editor).toBeTruthy()
+    editor.state.doc.forEach = (callback: (block: any, offset: number, index: number) => void) => {
+      callback(
+        block([
+          textNode('我想要使用'),
+          node('skillChip', { skillName: 'skillA' }),
+          textNode(' ，把 '),
+          node('fileAttachment', {
+            fileName: 'file.pdf',
+            filePath: '/tmp/file.pdf',
+            mimeType: 'application/pdf'
+          })
+        ]),
+        0,
+        0
+      )
+      callback(block([textNode('文件怎么样怎么样')]), 0, 1)
+    }
+
+    expect((wrapper.vm as any).getInlineItemsSnapshot()).toEqual([
+      { type: 'skill', offset: 5, skillName: 'skillA' },
+      {
+        type: 'file',
+        offset: 9,
+        fileName: 'file.pdf',
+        filePath: '/tmp/file.pdf',
+        mimeType: 'application/pdf'
+      }
+    ])
+  })
+
+  it('syncs deleted inline editor nodes back to backing state on editor update', async () => {
+    await mountComponent()
+    activeSkillsRef.value = ['skillA']
+    selectedFilesRef.value = [
+      { name: 'file.pdf', path: '/tmp/file.pdf', mimeType: 'application/pdf' }
+    ]
+    const editor = lastEditorInstance
+    expect(editor).toBeTruthy()
+    editor.state.doc.descendants = (callback: (node: any, pos: number) => void) => {
+      callback(node('paragraph', {}, 1), 0)
+    }
+
+    lastEditorOptions.onUpdate({
+      editor,
+      transaction: { getMeta: vi.fn(() => false) }
+    })
+
+    expect(deactivateSkillMock).toHaveBeenCalledWith('skillA')
+    expect(deleteFileMock).toHaveBeenCalledWith(0)
+  })
+
+  it('clears pending command form data when the inline form node is removed by editor update', async () => {
+    await mountComponent()
+    const editor = lastEditorInstance
+    expect(editor).toBeTruthy()
+    editor.state.doc.descendants = (callback: (node: any, pos: number) => void) => {
+      callback(node('paragraph', {}, 1), 0)
+    }
+
+    lastEditorOptions.onUpdate({
+      editor,
+      transaction: { getMeta: vi.fn(() => false) }
+    })
+
+    expect(closeDialogMock).toHaveBeenCalled()
+  })
+
+  it('does not reconcile inline nodes for internal sync transactions', async () => {
+    await mountComponent()
+    activeSkillsRef.value = ['skillA']
+    selectedFilesRef.value = [
+      { name: 'file.pdf', path: '/tmp/file.pdf', mimeType: 'application/pdf' }
+    ]
+    const editor = lastEditorInstance
+    expect(editor).toBeTruthy()
+    editor.state.doc.descendants = (callback: (node: any, pos: number) => void) => {
+      callback(node('paragraph', {}, 1), 0)
+    }
+
+    lastEditorOptions.onUpdate({
+      editor,
+      transaction: { getMeta: vi.fn(() => true) }
+    })
+
+    expect(deactivateSkillMock).not.toHaveBeenCalled()
+    expect(deleteFileMock).not.toHaveBeenCalled()
+    expect(closeDialogMock).not.toHaveBeenCalled()
+  })
+
   it('exposes and clears deduplicated pending skills snapshot', async () => {
     pendingSkillsRef.value = ['review', 'review', 'commit']
     const wrapper = await mountComponent()
diff --git a/test/renderer/components/message/MessageItemUser.test.ts b/test/renderer/components/message/MessageItemUser.test.ts
index d9db0f92d..a4576684b 100644
--- a/test/renderer/components/message/MessageItemUser.test.ts
+++ b/test/renderer/components/message/MessageItemUser.test.ts
@@ -94,11 +94,24 @@ vi.mock('@/components/message/MessageContent.vue', () => ({
     },
     emits: ['mentionClick'],
     methods: {
-      renderBlock(block: { type: string; content: string; id?: string; category?: string }) {
+      renderBlock(block: {
+        type: string
+        content?: string
+        id?: string
+        category?: string
+        skillName?: string
+        fileName?: string
+      }) {
         if (block.type === 'mention') {
           return getVisibleMentionLabel(block as DisplayUserMessageMentionBlock)
         }
-        return block.content
+        if (block.type === 'skill') {
+          return block.skillName || ''
+        }
+        if (block.type === 'file') {
+          return block.fileName || ''
+        }
+        return block.content || ''
       }
     },
     template: `
@@ -234,6 +247,8 @@ describe('MessageItemUser', () => {
           {},
           {
             text: '',
+            activeSkills: ['rich-skill'],
+            inlineItems: [{ type: 'skill', offset: 2, skillName: 'rich-skill' }],
             content: [
               {
                 type: 'text',
@@ -260,6 +275,7 @@ describe('MessageItemUser', () => {
     expect(wrapper.find('[data-user-message-toggle="true"]').exists()).toBe(true)
     expect(wrapper.text()).toContain('prompt-name')
     expect(wrapper.text()).toContain('const answer = 42;')
+    expect(wrapper.findAll('[data-testid="user-message-active-skill"]')).toHaveLength(1)
   })
 
   it('shows message-scoped skills as metadata outside the message bubble', async () => {
@@ -276,6 +292,43 @@ describe('MessageItemUser', () => {
     expect(wrapper.get('[data-message-content="true"]').text()).not.toContain('algorithmic-art')
   })
 
+  it('renders inline skill and file chips at recorded text offsets without duplicate metadata', async () => {
+    const file = createFile({
+      name: 'file.pdf',
+      path: '/tmp/file.pdf',
+      mimeType: 'application/pdf'
+    })
+    const wrapper = mount(MessageItemUser, {
+      props: {
+        message: createMessage(
+          {},
+          {
+            text: '我想要使用 ，把  文件怎么样怎么样',
+            files: [file],
+            activeSkills: ['skillA'],
+            inlineItems: [
+              { type: 'skill', offset: 5, skillName: 'skillA' },
+              {
+                type: 'file',
+                offset: 9,
+                fileName: file.name,
+                filePath: file.path,
+                mimeType: file.mimeType
+              }
+            ]
+          }
+        )
+      },
+      ...globalMountOptions
+    })
+
+    expect(wrapper.findAll('[data-testid="user-message-active-skill"]')).toHaveLength(0)
+    expect(wrapper.findAll('.attachment-stub')).toHaveLength(0)
+    expect(wrapper.get('[data-message-content="true"]').text()).toContain(
+      '我想要使用skillA ，把 file.pdf 文件怎么样怎么样'
+    )
+  })
+
   it('keeps attachments visible when long text collapses', async () => {
     const wrapper = mount(MessageItemUser, {
       props: {