cc 1 неделя назад
Родитель
Сommit
6be6ec0ff7

+ 4 - 0
ai-electron/frontend/src/ai/api/types.ts

@@ -328,6 +328,8 @@ export interface AiModel {
   apiKey?: string;
   baseUrl?: string;
   defaultModel?: boolean;
+  /** 模型上下文窗口(tokens);0/空 = 按模型名推断 */
+  contextWindowSize?: number;
   config?: string;
   headersJson?: string;
   extraJson?: string;
@@ -359,6 +361,8 @@ export interface CreateModelParams {
   apiKey?: string;
   baseUrl?: string;
   defaultModel?: boolean;
+  /** 模型上下文窗口(tokens);0/空 = 按模型名推断 */
+  contextWindowSize?: number;
   config?: string;
   headersJson?: string;
   extraJson?: string;

+ 67 - 14
ai-electron/frontend/src/ai/components/ModelFormModal.vue

@@ -49,6 +49,17 @@
         />
       </a-form-item>
 
+      <a-form-item label="上下文窗口(K tokens)" name="contextWindowSize">
+        <a-select
+          v-model:value="form.contextWindowSize"
+          :options="WINDOW_OPTIONS"
+          placeholder="选择上下文窗口"
+        />
+        <div class="ai-model-form__switch-tip">
+          对话内容超过所选窗口的 80% 时会自动压缩历史,避免超出模型上限。
+        </div>
+      </a-form-item>
+
       <a-form-item name="defaultModel">
         <div class="ai-model-form__switch">
           <a-switch v-model:checked="form.defaultModel" size="small" />
@@ -84,8 +95,19 @@
    * 选择厂商后自动带出该厂商默认 Base URL。
    */
   import { computed, reactive, ref, watch } from 'vue';
-  import { Button, Collapse, Form, FormItem, Input, InputPassword, Select, Switch, Textarea } from 'ant-design-vue';
+  import {
+    Button,
+    Collapse,
+    Form,
+    FormItem,
+    Input,
+    InputPassword,
+    Select,
+    Switch,
+    Textarea,
+  } from 'ant-design-vue';
   import { BasicModal } from '@/core/components/Modal';
+  import { useMessage } from '@/core/hooks/web/useMessage';
   import type { AiModel, CreateModelParams, ModelProvider, UpdateModelParams } from '../api/types';
   import * as modelApi from '../api/modelApi';
 
@@ -111,6 +133,20 @@
     { value: 'embedding', label: '向量模型(仅供表结构语义检索)' },
   ];
 
+  /**
+   * 上下文窗口预设,默认 256K(262,144)。
+   * 自动压缩触发线 = 窗口 × 80%(后端 agent.compaction.trigger-ratio)。
+   */
+  const DEFAULT_WINDOW_SIZE = 262144;
+
+  const WINDOW_OPTIONS = [
+    { value: 65536, label: '64' },
+    { value: 131072, label: '128' },
+    { value: 262144, label: '256' },
+    { value: 524288, label: '512' },
+    { value: 1048576, label: '1M' },
+  ];
+
   const props = withDefaults(
     defineProps<{
       open: boolean;
@@ -125,13 +161,21 @@
 
   const emit = defineEmits<{ 'update:open': [v: boolean]; saved: [] }>();
 
+  const { showMessage } = useMessage();
+
   const formRef = ref<any>();
   const submitting = ref(false);
   const advancedKeys = ref<string[]>([]);
 
   const isEdit = computed(() => !!props.record?.id);
 
-  const emptyForm = (): CreateModelParams & { status?: string } => ({
+  /** 表单状态(contextWindowSize 直接对应后端 agent_model.context_window_size) */
+  type ModelFormState = CreateModelParams & {
+    status?: string;
+    contextWindowSize?: number;
+  };
+
+  const emptyForm = (): ModelFormState => ({
     provider: '',
     name: '',
     modelId: '',
@@ -143,6 +187,7 @@
     config: '',
     headersJson: '',
     extraJson: '',
+    contextWindowSize: DEFAULT_WINDOW_SIZE,
   });
 
   const form = reactive(emptyForm());
@@ -198,6 +243,10 @@
           config: props.record.config || '',
           headersJson: props.record.headersJson || '',
           extraJson: props.record.extraJson || '',
+          contextWindowSize:
+            Number(props.record.contextWindowSize) > 0
+              ? Number(props.record.contextWindowSize)
+              : DEFAULT_WINDOW_SIZE,
         });
       }
       advancedKeys.value = [];
@@ -227,27 +276,31 @@
     }
     submitting.value = true;
     try {
+      const basePayload = {
+        provider: form.provider,
+        name: form.name,
+        modelId: form.modelId,
+        type: form.type,
+        apiKey: form.apiKey,
+        baseUrl: form.baseUrl,
+        contextWindowSize: form.contextWindowSize ?? 0,
+        config: form.config,
+        headersJson: form.headersJson,
+        extraJson: form.extraJson,
+      };
       if (isEdit.value && props.record) {
-        const payload = compact({
-          provider: form.provider,
-          name: form.name,
-          modelId: form.modelId,
-          type: form.type,
-          apiKey: form.apiKey,
-          baseUrl: form.baseUrl,
-          config: form.config,
-          headersJson: form.headersJson,
-          extraJson: form.extraJson,
-        }) as UpdateModelParams;
+        const payload = compact(basePayload) as UpdateModelParams;
         payload.defaultModel = form.defaultModel;
         await modelApi.updateModel(props.record.id, payload);
       } else {
-        const payload = compact({ ...form }) as CreateModelParams;
+        const payload = compact(basePayload) as CreateModelParams;
         payload.defaultModel = form.defaultModel;
         await modelApi.createModel(payload);
       }
       emit('saved');
       close();
+    } catch (e: any) {
+      showMessage(e?.message || '保存模型失败', 'error');
     } finally {
       submitting.value = false;
     }

+ 15 - 0
ai-electron/frontend/src/ai/views/aiModel/index.vue

@@ -77,6 +77,11 @@
                 <span class="ai-model__mono ai-model__ellipsis">{{ record.baseUrl || '—' }}</span>
               </div>
 
+              <div class="ai-model__card-meta">
+                <span class="ai-model__meta-label">上下文窗口</span>
+                <span class="ai-model__mono">{{ contextWindowText(record) }}</span>
+              </div>
+
               <div class="ai-model__card-sub">更新:{{ record.updatedAt || record.createdAt || '—' }}</div>
 
               <div class="ai-model__card-ops">
@@ -233,6 +238,16 @@
     }
   }
 
+  /** 模型卡片上的上下文窗口展示(按 K/M 显示;未设置按默认 256K) */
+  function contextWindowText(record: AiModel): string {
+    const value = Number(record.contextWindowSize);
+    if (!Number.isFinite(value) || value <= 0) return '256K tokens';
+    if (value % 1048576 === 0) return `${value / 1048576}M tokens`;
+    return value % 1024 === 0
+      ? `${value / 1024}K tokens`
+      : `${value.toLocaleString()} tokens`;
+  }
+
   /** 新增时默认落在当前 Tab 的类型下,避免用户新增完发现"不在当前列表里" */
   function openCreate() {
     editing.value = null;

+ 5 - 11
ai-server/src/main/resources/application.yaml

@@ -42,15 +42,10 @@ agent:
   compaction:
     # false = 显式关闭压缩(b.disableCompaction())
     enabled: "${AGENT_COMPACTION_ENABLED:true}"
-    # 非系统消息数触发线。0 = 禁用条数触发,只按 token 触发(对齐 ZCode 纯 token 策略,
-    # 低 token 的短对话不做无谓的摘要调用)
-    trigger-messages: "${AGENT_COMPACTION_TRIGGER_MESSAGES:0}"
-    # token 触发阈值(静态):上下文 token 达到 200k 才压缩。
-    # 框架会钳制到 min(阈值, 模型窗口 − reserved):模型窗口小于阈值时提前触发防超窗,
-    # 真超窗还有 overflow 自动强制压缩重试兜底
-    trigger-tokens: "${AGENT_COMPACTION_TRIGGER_TOKENS:200000}"
-    # 动态 token 触发线的保留量:仅 trigger-tokens=0(动态模式)时生效
-    reserved: "${AGENT_COMPACTION_RESERVED:20000}"
+    # 压缩触发比例:默认 0.8(模型设置窗口的 80% 就压缩)。
+    # 窗口来自模型管理页下拉框(agent_model.context_window_size);未设置统一按 256K。
+    # 条数触发固定关闭、静态 token 阈值不再提供(窗口一定有值)。
+    trigger-ratio: "${AGENT_COMPACTION_TRIGGER_RATIO:0.8}"
     # 压缩摘要用模型 id;空 = 主模型。非空暂不支持(启动打 WARN 忽略)
     summary-model-id: "${AGENT_COMPACTION_SUMMARY_MODEL_ID:}"
     # 大参数裁剪(非 LLM):保留窗口外消息里的超长工具调用参数剪短,对齐 ZCode microcompact
@@ -58,10 +53,9 @@ agent:
       enabled: "${AGENT_COMPACTION_TRUNCATE_ARGS:true}"
       max-arg-length: "${AGENT_COMPACTION_TRUNCATE_ARGS_MAX:2000}"
   # 工具结果驱逐(对应 ZCode resultBudget):单条超大工具输出落盘到 workspace 的
-  # large_tool_results/,上下文里只留头尾预览
+  # large_tool_results/,上下文里只留头尾预览。阈值按模型窗口的 8% 计算(256K≈84K 字符)
   tool-result-eviction:
     enabled: "${AGENT_TOOL_RESULT_EVICTION:true}"
-    max-result-chars: "${AGENT_TOOL_RESULT_EVICTION_MAX_CHARS:80000}"
 
 spring:
   application:

+ 22 - 0
sql/agent_model_context_window.sql

@@ -0,0 +1,22 @@
+-- ---------------------------------------------------------------------------
+-- 模型上下文窗口(K tokens)
+--
+-- 口径:模型页设置多少就用多少;未设置(0/NULL)一律按 256K(262,144)。
+-- 上下文压缩触发线 = 窗口 × agent.compaction.trigger-ratio(默认 80%),
+-- 不再按厂商/模型名推断。
+--
+-- 幂等脚本,可重复执行。
+-- ---------------------------------------------------------------------------
+ALTER TABLE agent_model
+    ADD COLUMN IF NOT EXISTS context_window_size INTEGER;
+
+-- 列默认值 + 存量数据统一回填 256K
+ALTER TABLE agent_model
+    ALTER COLUMN context_window_size SET DEFAULT 262144;
+
+UPDATE agent_model
+SET context_window_size = 262144
+WHERE context_window_size IS NULL OR context_window_size <= 0;
+
+COMMENT ON COLUMN agent_model.context_window_size IS
+    '模型上下文窗口(tokens);未设置按 256K(262,144)处理';