@veltra/ai 2.1.6 → 2.1.7

package/src/components/ai-chat/tool-icons.ts

@@ -0,0 +1,33 @@
+import { EditPen, Folder, Internet, QuestionFilled, Terminal, Tools } from '@veltra/icons/normal'
+import type { Component } from 'vue'
+
+/**
+ * 内置 toolName → icon：按名称子串匹配，顺序即优先级。
+ * 未命中任何规则时走兜底图标，不得 throw。
+ */
+const TOOL_ICON_RULES: [needles: string[], icon: Component][] = [
+  [['bash', 'terminal'], Terminal],
+  [['fs', 'file'], Folder],
+  [['web', 'globe'], Internet],
+  [['edit', 'pencil'], EditPen],
+  [['ask', 'question'], QuestionFilled]
+]
+
+/** 未知名工具的兜底图标 */
+export const FALLBACK_TOOL_ICON: Component = Tools
+
+/**
+ * 按工具名解析图标。
+ * 宿主 `toolIcons` 精确名覆盖优先于内置规则；都未命中则兜底。
+ */
+export function resolveToolIcon(name: string, overrides?: Record<string, Component>): Component {
+  const key = String(name ?? '')
+  const fromOverride = overrides?.[key]
+  if (fromOverride) return fromOverride
+
+  const lower = key.toLowerCase()
+  for (const [needles, icon] of TOOL_ICON_RULES) {
+    if (needles.some((needle) => lower.includes(needle))) return icon
+  }
+  return FALLBACK_TOOL_ICON
+}

package/src/components/ai-chat/tool-json.vue

@@ -0,0 +1,52 @@
+<template>
+  <div :class="cls.e('tool-call-json')">
+    <div :class="cls.e('tool-call-json-head')">
+      <span :class="cls.e('tool-call-section')">{{ title }}</span>
+      <UButton
+        v-if="overLimit"
+        :class="cls.e('tool-call-json-toggle')"
+        size="small"
+        text
+        type="primary"
+        @click="expanded = !expanded"
+      >
+        {{ expanded ? '收起' : '展开' }}
+      </UButton>
+    </div>
+    <pre :class="[cls.e('tool-call-code'), bem.is('truncated', overLimit && !expanded)]">{{
+      shown
+    }}</pre>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UButton } from '@veltra/desktop'
+import { bem } from '@veltra/utils'
+import { computed, inject, ref } from 'vue'
+
+import { AiChatDIKey } from './di'
+
+defineOptions({ name: 'UAiChatToolJson' })
+
+/** 超过该字符数截断，展开后可见全文 */
+const PREVIEW_LIMIT = 480
+
+const { title, text } = defineProps<{
+  /** 区块标题（参数 / 结果 / 视图） */
+  title: string
+  /** 已格式化的 JSON 或原文 */
+  text: string
+}>()
+
+const di = inject(AiChatDIKey)
+const cls = di?.cls ?? bem('ai-chat')
+
+const expanded = ref(false)
+
+const overLimit = computed(() => text.length > PREVIEW_LIMIT)
+
+const shown = computed(() => {
+  if (expanded.value || !overLimit.value) return text
+  return `${text.slice(0, PREVIEW_LIMIT)}…`
+})
+</script>

package/src/tools/ask-question/ask-question.ts

@@ -1,9 +1,9 @@
 import { QuestionFilled } from '@veltra/icons/normal'
-import type { Component } from 'vue'
+import { computed, defineComponent, h, type Component, type PropType } from 'vue'
 
-import type { ChatTool } from '../../chat/types'
+import type { ChatTool, ChatToolCall } from '../../chat/types'
 import AskQuestion from '../../components/ai-chat/ask-question.vue'
-import { deferAskQuestion, takeAskQuestionDeferred } from './deferred'
+import { deferAskQuestion, resolveAskQuestion, takeAskQuestionDeferred } from './deferred'
 
 /** 单个提问项 */
 export interface AskQuestionItem {
@@ -75,6 +75,55 @@ const QUESTIONS_SCHEMA: Record<string, unknown> = {
   required: ['questions']
 }
 
+function parseQuestions(toolCall: ChatToolCall): AskQuestionItem[] {
+  try {
+    const args = JSON.parse(toolCall.arguments || '{}') as Partial<AskQuestionArgs>
+    return Array.isArray(args.questions) ? args.questions : []
+  } catch {
+    return []
+  }
+}
+
+function parseAnswers(toolCall: ChatToolCall): AskQuestionAnswer[] | undefined {
+  if (toolCall.status !== 'success' || !toolCall.result) return undefined
+  try {
+    const result = JSON.parse(toolCall.result) as Partial<AskQuestionResult>
+    return Array.isArray(result.answers) ? result.answers : undefined
+  } catch {
+    return undefined
+  }
+}
+
+function statusError(toolCall: ChatToolCall): string | undefined {
+  if (toolCall.status !== 'error') return undefined
+  const err = toolCall.error ?? ''
+  if (err.includes('Abort') || err.includes('取消')) return '已取消'
+  return err || '提问失败'
+}
+
+/** 把 toolCall 转成提问表单的 questions / onSubmit；提交仍走 resolveAskQuestion */
+const AskQuestionRender = defineComponent({
+  name: 'AskQuestionRender',
+  props: { toolCall: { type: Object as PropType<ChatToolCall>, required: true } },
+  setup(props) {
+    const questions = computed(() => parseQuestions(props.toolCall))
+    const answers = computed(() => parseAnswers(props.toolCall))
+    const error = computed(() => statusError(props.toolCall))
+    const onSubmit = (value: AskQuestionAnswer[] | AskQuestionResult) => {
+      resolveAskQuestion(props.toolCall.id, {
+        answers: Array.isArray(value) ? value : value.answers
+      })
+    }
+    return () =>
+      h(AskQuestion, {
+        questions: questions.value,
+        answers: answers.value,
+        error: error.value,
+        onSubmit
+      })
+  }
+})
+
 /**
  * 创建内置提问工具：execute 挂起等待用户在 UI 中作答，提交后结果回灌模型。
  * 工具卡片由内联提问表单渲染（多题分页导航，提交后展示问答摘要，不自动折叠）。
@@ -95,7 +144,7 @@ export function createAskQuestionTool(
     parameters: QUESTIONS_SCHEMA,
     icon,
     label,
-    render: AskQuestion,
+    render: AskQuestionRender,
     execute: (_args, { toolCall, signal }) =>
       new Promise<AskQuestionResult>((resolve, reject) => {
         deferAskQuestion(toolCall.id, { resolve, reject })

package/src/types/ai-chat.ts

@@ -1,6 +1,7 @@
 import type { DeconstructValue } from '@veltra/utils'
-import type { Ref } from 'vue'
+import type { Component, Ref } from 'vue'
 
+import type { ChatSessionTransport } from '../chat/session'
 import type {
   ChatAttachment,
   ChatMessage,
@@ -8,15 +9,19 @@ import type {
   ChatTokenUsage,
   ChatTool,
   ChatToolCall,
+  ChatToolMeta,
   ChatTransport
 } from '../chat/types'
 import type { ChatModelOption } from '../providers'
 
 export interface AiChatProps {
-  /** 传输层（必填），可使用导出的 createOpenAITransport() 创建 */
-  transport: ChatTransport
-  /** 工具定义列表，不同场景传入不同工具赋予助手不同能力 */
-  tools?: ChatTool[]
+  /** 传输层（必填）；函数型 ChatTransport 或 session 对象，可使用 createOpenAITransport / createServerTransport */
+  transport: ChatTransport | ChatSessionTransport
+  /**
+   * 工具列表。函数 transport 传入 ChatTool[]（必有 execute）；
+   * session 下可为 ChatToolMeta[]（仅渲染元信息）。ChatTool[] 仍可赋值。
+   */
+  tools?: (ChatTool | ChatToolMeta)[]
   /** 系统提示词 */
   systemPrompt?: string
   /**
@@ -50,6 +55,13 @@ export interface AiChatProps {
    * 默认 false：仅在拿到 usage 时显示会话累计「总 token」。接口未返回 usage 时不展示。
    */
   tokenUsageDetail?: boolean
+  /**
+   * 覆盖包内 toolName → icon 映射（精确名优先于内置名称规则）。
+   * 缺省不传则走内置表；未命中的名称仍用兜底图标，不得 throw。
+   */
+  toolIcons?: Record<string, Component>
+  /** 只读：不展示输入区、欢迎语不可发送、队列无插队/编辑/移除。默认 false */
+  readonly?: boolean
 }
 
 export interface AiChatEmits {