From 7af29fe07f280918dc7c0ac97c15317de0976952 Mon Sep 17 00:00:00 2001
From: "zhaowei.huang" <228127304@qq.com>
Date: Sun, 26 Jul 2026 14:14:19 +0800
Subject: [PATCH] fix: improve map editor and monitor operations

---
 .gitignore                                    |    4 +-
 .../Persistence/PlatformPersistence.cs        |    4 +-
 .../simple-platform-vue/src/api/vehicleOps.ts |   71 +-
 .../src/components/Workspace3D.vue            |   10 +-
 .../assistant/AiAssistantDrawer.vue           | 1351 +++++++++++++----
 .../map-editor/AiAssistantPanel.vue           |  170 ++-
 .../map-editor/EditPropertyPanel.vue          |   72 +-
 .../components/map-editor/EditStatusBar.vue   |    9 +-
 .../components/map-editor/EditToolRail.vue    |   53 +-
 .../src/components/map-editor/EditTopBar.vue  |  165 +-
 .../workbench/MonitorSelectionPanel.vue       |   33 +-
 .../workbench/VehicleMonitorPanel.vue         |  480 ++++--
 .../src/composables/useEditTool.ts            |    2 +
 .../src/composables/useMapEditStream.ts       |    2 +-
 .../src/composables/useSimpleFieldCatalog.ts  |   14 +-
 .../src/layouts/AppShell.vue                  |   35 -
 .../apps/simple-platform-vue/src/stores/ui.ts |    1 -
 .../simple-platform-vue/src/styles/theme.css  |  116 ++
 .../simple-platform-vue/src/styles/themes.ts  |    4 +-
 .../apps/simple-platform-vue/src/types/car.ts |   10 +
 .../src/utils/carRuntime.ts                   |  127 +-
 .../src/views/admin/MapEditorView.vue         |  939 ++++++++----
 .../src/views/admin/MapMonitorView.vue        |   72 +-
 23 files changed, 2786 insertions(+), 958 deletions(-)

diff --git a/.gitignore b/.gitignore
index 751bd87..535cae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ MiGu.Server/data/*.db
 MiGu.Server/data/*.db-shm
 MiGu.Server/data/*.db-wal
 MiGu.Server/data/.internal-token
-# OTA 运行时产物：拉取/上传包、任务、历史、settings（子目录，*.json 上面那行不递归）
+# OTA 运行时产物：拉取/上传包、任务、历史、settings（子目录 *.json 上面那行不递归）
 MiGu.Server/data/ota/
 
 # 前端构建产物
@@ -32,7 +32,7 @@ frontends/apps/simple-platform-vue/auto-imports.d.ts
 *.swp
 Thumbs.db
 Desktop.ini
-/.cursor/rules
+/.cursor/
 /MiGu.Server/wwwroot
 /MiGu.Server/data/platform.db
 
diff --git a/MiGu.Server/Persistence/PlatformPersistence.cs b/MiGu.Server/Persistence/PlatformPersistence.cs
index 5ef45b6..774c2f7 100644
--- a/MiGu.Server/Persistence/PlatformPersistence.cs
+++ b/MiGu.Server/Persistence/PlatformPersistence.cs
@@ -437,12 +437,12 @@ public static class PlatformPersistence
 
     private static async Task EnsureSqliteColumnAsync(PlatformDbContext db, string table, string column, string definition)
     {
-        // 仅允许内部迁移调用方传入的标识符；拒绝注入用分隔符/空白。
+        // 仅允许内部迁移调用方传入的标识符；definition 可含 GUID 默认值连字符。
         static bool IsSafeIdent(string s) =>
             !string.IsNullOrEmpty(s) && s.All(ch => char.IsAsciiLetterOrDigit(ch) || ch == '_');
         if (!IsSafeIdent(table) || !IsSafeIdent(column)
             || definition.Contains(';') || definition.Contains("--")
-            || !System.Text.RegularExpressions.Regex.IsMatch(definition, @"^[A-Za-z0-9_()'.,\s]+$"))
+            || !System.Text.RegularExpressions.Regex.IsMatch(definition, @"^[A-Za-z0-9_()'.,\s\-]+$"))
             throw new ArgumentException("unsafe sqlite migration identifier");
 
         var conn = db.Database.GetDbConnection();
diff --git a/frontends/apps/simple-platform-vue/src/api/vehicleOps.ts b/frontends/apps/simple-platform-vue/src/api/vehicleOps.ts
index a7cb79d..6ce6682 100644
--- a/frontends/apps/simple-platform-vue/src/api/vehicleOps.ts
+++ b/frontends/apps/simple-platform-vue/src/api/vehicleOps.ts
@@ -1,7 +1,15 @@
-import { reflectionApi } from './reflection'
+import { ReflectionApiError, reflectionApi } from './reflection'
 
 export type VehicleMaintenanceMode = 'online' | 'offline' | 'repair' | 'blown'
 
+/** 地图监控车辆列表快捷动作 */
+export type VehicleQuickAction =
+  | 'online'
+  | 'offline'
+  | 'endTask'
+  | 'disable'
+  | 'enable'
+
 const METHOD_MAP: Record<VehicleMaintenanceMode, string> = {
   online: 'OnlineCar',
   offline: 'OfflineCar',
@@ -9,6 +17,29 @@ const METHOD_MAP: Record<VehicleMaintenanceMode, string> = {
   blown: 'Blown'
 }
 
+/** 结束任务：按车型依次尝试（Dummy=ForceStop，Clumsy=ForceStopUI，通用=UIIntercept） */
+const END_TASK_METHODS = ['ForceStopUI', 'ForceStop', 'UIIntercept'] as const
+
+const QUICK_METHOD_MAP: Record<Exclude<VehicleQuickAction, 'endTask'>, string> = {
+  online: 'OnlineCar',
+  offline: 'OfflineCar',
+  disable: 'DisableCar',
+  enable: 'EnableCar'
+}
+
+export const VEHICLE_QUICK_ACTIONS: {
+  value: VehicleQuickAction
+  label: string
+  danger?: boolean
+  confirm: string
+}[] = [
+  { value: 'online', label: '上线', confirm: '确认将车辆上线？' },
+  { value: 'offline', label: '下线', confirm: '确认将车辆下线？下线后不再被任务选中。' },
+  { value: 'endTask', label: '结束任务', danger: true, confirm: '确认结束该车当前任务？' },
+  { value: 'disable', label: '禁用车辆', danger: true, confirm: '确认禁用该车？禁用后需先启用才能重新上线。' },
+  { value: 'enable', label: '启用车辆', confirm: '确认启用该车？启用后仍需上线才能参与调度。' }
+]
+
 export async function setVehicleMaintenance(
   carId: number,
   mode: VehicleMaintenanceMode
@@ -23,6 +54,44 @@ export async function setVehicleMaintenance(
   }
 }
 
+async function tryExecuteMethods(carId: number, methods: readonly string[]): Promise<boolean> {
+  let lastErr: unknown
+  for (const method of methods) {
+    try {
+      await reflectionApi.execute('car', carId, method)
+      return true
+    } catch (err) {
+      if (!isUnsupportedMethodError(err)) throw err
+      lastErr = err
+    }
+  }
+  if (lastErr) throw lastErr
+  return false
+}
+
+function isUnsupportedMethodError(err: unknown): boolean {
+  if (err instanceof ReflectionApiError && (err.code === 404 || err.code === 405)) return true
+  const msg = err instanceof Error ? err.message : String(err)
+  return /method|not\s*found|unsupported|not\s*supported/i.test(msg)
+}
+
+/** 执行车辆快捷动作；失败抛错，由调用方提示。 */
+export async function executeVehicleQuickAction(
+  carId: number,
+  action: VehicleQuickAction
+): Promise<void> {
+  if (!Number.isFinite(carId) || carId <= 0) {
+    throw new Error('无效车辆 ID')
+  }
+  if (action === 'endTask') {
+    const ok = await tryExecuteMethods(carId, END_TASK_METHODS)
+    if (!ok) throw new Error('当前车型不支持结束任务')
+    return
+  }
+  const method = QUICK_METHOD_MAP[action]
+  await reflectionApi.execute('car', carId, method)
+}
+
 export function openOnboardWeb(url?: string | null, ip?: string | null): void {
   const target = url ?? (ip ? `http://${ip}:8081` : null)
   if (!target) return
diff --git a/frontends/apps/simple-platform-vue/src/components/Workspace3D.vue b/frontends/apps/simple-platform-vue/src/components/Workspace3D.vue
index f9f5dae..19776ee 100644
--- a/frontends/apps/simple-platform-vue/src/components/Workspace3D.vue
+++ b/frontends/apps/simple-platform-vue/src/components/Workspace3D.vue
@@ -189,8 +189,14 @@ async function prepareAndLoad(forceReload = false) {
   const embedded = needsDeclare()
 
   if (embedded) {
-    // 并行：iframe 立即加载，declare 后台尽力发送（不挡首屏）。
-    void postDeclareBestEffort()
+    // embed 必须先 declare：migu 默认是 canvas-only，迟到的 /declareEmbedUi 会被跳过。
+    // canvas-only 与默认一致，可后台尽力发送不挡首屏。
+    if (props.embedUi) {
+      await postDeclareBestEffort()
+      if (generation !== prepareGeneration) return
+    } else {
+      void postDeclareBestEffort()
+    }
     iframeSrc.value = buildIframeSrc(forceReload || !!iframeSrc.value)
   } else {
     loadingHint.value = '正在等待 SimpleLite webVRender 就绪 ...'
diff --git a/frontends/apps/simple-platform-vue/src/components/assistant/AiAssistantDrawer.vue b/frontends/apps/simple-platform-vue/src/components/assistant/AiAssistantDrawer.vue
index eef4e1b..b027dc6 100644
--- a/frontends/apps/simple-platform-vue/src/components/assistant/AiAssistantDrawer.vue
+++ b/frontends/apps/simple-platform-vue/src/components/assistant/AiAssistantDrawer.vue
@@ -1,22 +1,26 @@
 <template>
-  <!-- 悬浮唤起按钮：所有界面右下角常驻 -->
+  <!-- 可拖动悬浮入口：位置持久化，点击打开抽屉 -->
   <button
     v-show="!open"
     class="ai-fab"
     type="button"
-    title="AI 分析助手（故障 / 日志 / 数据分析）"
-    @click="toggle(true)"
+    :class="{ 'is-dragging': fabDragging }"
+    :style="fabStyle"
+    title="AI 分析助手（可拖动调整位置）"
+    @pointerdown="onFabPointerDown"
+    @pointermove="onFabPointerMove"
+    @pointerup="onFabPointerUp"
+    @pointercancel="onFabPointerUp"
   >
-    <span class="ai-fab-glyph">✦</span>
+    <span class="ai-fab-glyph">*</span>
   </button>
 
-  <!-- 右侧抽屉 -->
   <section
     class="ai-drawer"
-    :class="{ 'is-open': open }"
-    :style="{ width: width + 'px' }"
+    :class="{ 'is-open': open, 'has-side': showSide }"
+    :style="{ width: drawerWidth + 'px' }"
     role="complementary"
-    aria-label="AI 助手"
+    aria-label="AI 分析助手"
   >
     <div
       class="ai-resizer"
@@ -27,131 +31,270 @@
       @pointercancel="onResizeEnd"
     />
 
-    <header class="ai-head">
-      <div class="ai-head-title">
-        <span class="ai-head-glyph">✦</span>
-        <div class="ai-head-text">
-          <div class="ai-head-main">AI 分析助手</div>
-          <div class="ai-head-sub">故障 / 日志 / 数据分析 · 操作答疑</div>
-        </div>
-      </div>
-      <div class="ai-head-actions">
-        <button class="ai-iconbtn" title="新建会话" @click="onNew">
-          <el-icon><Plus /></el-icon>
-        </button>
-        <button class="ai-iconbtn" :class="{ active: showSessions }" title="历史会话" @click="toggleSessions">
-          <el-icon><ChatLineSquare /></el-icon>
-        </button>
-        <button class="ai-iconbtn" title="收起" @click="toggle(false)">
-          <el-icon><Close /></el-icon>
-        </button>
-      </div>
-
-      <!-- 历史会话面板 -->
-      <div v-if="showSessions" class="ai-sessions">
-        <div class="ai-sessions-head">
-          <span>历史会话</span>
-          <button class="ai-link" @click="onNew">+ 新建</button>
-        </div>
-        <div v-if="sessions.length === 0" class="ai-sessions-empty">暂无历史会话</div>
-        <ul v-else class="ai-sessions-list">
-          <li
-            v-for="s in sessions"
-            :key="s.id"
-            class="ai-session-item"
-            :class="{ active: s.id === currentSessionId }"
-            @click="onPickSession(s.id)"
-          >
-            <div class="ai-session-main">
-              <div class="ai-session-title">{{ s.title || '未命名会话' }}</div>
-              <div class="ai-session-meta">{{ s.turns }} 轮 · {{ formatTime(s.updated) }}</div>
+    <div class="ai-shell">
+      <!-- 主对话区 -->
+      <div class="ai-main">
+        <header class="ai-head">
+          <div class="ai-head-title">
+            <span class="ai-head-glyph">*</span>
+            <div class="ai-head-text">
+              <div class="ai-head-main">AI 分析助手</div>
+              <div class="ai-head-sub">故障 / 日志 / 数据分析 · 操作答疑</div>
             </div>
-            <button class="ai-session-del" title="删除" @click.stop="onDeleteSession(s.id)">
-              <el-icon><Delete /></el-icon>
+          </div>
+          <div class="ai-head-actions">
+            <button class="ai-textbtn" title="新建对话" @click="onNew">
+              <el-icon><Plus /></el-icon>
+              <span>新建对话</span>
             </button>
-          </li>
-        </ul>
-      </div>
-    </header>
+            <button class="ai-iconbtn" :class="{ active: showSessions }" title="历史会话" @click="toggleSessions">
+              <el-icon><ChatLineSquare /></el-icon>
+            </button>
+            <button class="ai-iconbtn" :class="{ active: showSide }" title="知识与工具" @click="showSide = !showSide">
+              <el-icon><Grid /></el-icon>
+            </button>
+            <button class="ai-iconbtn" title="收起" @click="toggle(false)">
+              <el-icon><Close /></el-icon>
+            </button>
+          </div>
 
-    <div ref="listRef" class="ai-body" @click="showSessions = false">
-      <div v-if="messages.length === 0" class="ai-empty">
-        <div class="ai-empty-glyph">✦</div>
-        <div class="ai-empty-title">我帮你做故障 / 日志 / 数据分析</div>
-        <div class="ai-empty-tip">试着这样问：</div>
-        <button v-for="(ex, i) in examples" :key="i" class="ai-example" @click="useExample(ex)">
-          {{ ex }}
-        </button>
-      </div>
-
-      <div v-for="m in messages" :key="m.id" class="ai-msg" :class="`ai-msg--${m.role}`">
-        <div class="ai-bubble">
-          <div v-if="m.role === 'user'" class="ai-user-text">{{ m.content }}</div>
-
-          <template v-else>
-            <!-- 工具调用卡片 -->
-            <div v-if="m.tools.length" class="ai-tools">
-              <details v-for="(t, ti) in m.tools" :key="ti" class="ai-tool" :class="`is-${t.status}`">
-                <summary class="ai-tool-sum">
-                  <span class="ai-tool-ic">
-                    <el-icon v-if="t.status === 'running'" class="is-loading"><Loading /></el-icon>
-                    <el-icon v-else-if="t.status === 'ok'"><Select /></el-icon>
-                    <el-icon v-else><WarningFilled /></el-icon>
-                  </span>
-                  <span class="ai-tool-name">{{ t.name }}</span>
-                  <span class="ai-tool-badge" :class="t.isWrite ? 'write' : 'read'">{{ t.isWrite ? '写' : '读' }}</span>
-                </summary>
-                <div class="ai-tool-body">
-                  <div v-if="t.args !== undefined" class="ai-tool-kv">
-                    <span class="ai-tool-k">参数</span>
-                    <pre class="ai-tool-pre">{{ toJson(t.args) }}</pre>
-                  </div>
-                  <div v-if="t.result !== undefined" class="ai-tool-kv">
-                    <span class="ai-tool-k">结果</span>
-                    <pre class="ai-tool-pre">{{ toJson(t.result) }}</pre>
-                  </div>
+          <div v-if="showSessions" class="ai-sessions">
+            <div class="ai-sessions-head">
+              <span>历史会话</span>
+              <button class="ai-link" @click="onNew">+ 新建</button>
+            </div>
+            <div v-if="sessions.length === 0" class="ai-sessions-empty">暂无历史会话</div>
+            <ul v-else class="ai-sessions-list">
+              <li
+                v-for="s in sessions"
+                :key="s.id"
+                class="ai-session-item"
+                :class="{ active: s.id === currentSessionId }"
+                @click="onPickSession(s.id)"
+              >
+                <div class="ai-session-main">
+                  <div class="ai-session-title">{{ s.title || '未命名会话' }}</div>
+                  <div class="ai-session-meta">{{ s.turns }} 轮 · {{ formatTime(s.updated) }}</div>
                 </div>
-              </details>
-            </div>
+                <button class="ai-session-del" title="删除" @click.stop="onDeleteSession(s.id)">
+                  <el-icon><Delete /></el-icon>
+                </button>
+              </li>
+            </ul>
+          </div>
+        </header>
 
-            <!-- 助手正文（Markdown） -->
-            <div v-if="m.content" class="ai-md" v-html="render(m.content)" />
-            <span v-if="m.streaming && m.content" class="ai-caret" />
-            <div v-if="m.streaming && !m.content && m.tools.length === 0" class="ai-thinking">
-              <el-icon class="is-loading"><Loading /></el-icon><span>正在思考…</span>
-            </div>
+        <div ref="listRef" class="ai-body" @click="showSessions = false">
+          <div v-if="messages.length === 0" class="ai-empty">
+            <div class="ai-empty-glyph">*</div>
+            <div class="ai-empty-title">我帮你做故障 / 日志 / 数据分析</div>
+            <div class="ai-empty-tip">试着这样问，或从右侧知识与工具切入：</div>
+            <button v-for="(ex, i) in examples" :key="i" class="ai-example" @click="useExample(ex)">
+              {{ ex }}
+            </button>
+          </div>
 
-            <!-- 错误 -->
-            <div v-if="m.error" class="ai-error">
-              <el-icon><WarningFilled /></el-icon>
-              <span>{{ m.error }}</span>
+          <div v-for="m in messages" :key="m.id" class="ai-msg" :class="`ai-msg--${m.role}`">
+            <div v-if="m.role === 'assistant'" class="ai-avatar ai-avatar--bot" aria-hidden="true">*</div>
+            <div class="ai-bubble">
+              <div v-if="m.role === 'user'" class="ai-user-text">{{ m.content }}</div>
+
+              <template v-else>
+                <div v-if="m.tools.length" class="ai-tools">
+                  <details v-for="(t, ti) in m.tools" :key="ti" class="ai-tool" :class="`is-${t.status}`">
+                    <summary class="ai-tool-sum">
+                      <span class="ai-tool-ic">
+                        <el-icon v-if="t.status === 'running'" class="is-loading"><Loading /></el-icon>
+                        <el-icon v-else-if="t.status === 'ok'"><Select /></el-icon>
+                        <el-icon v-else><WarningFilled /></el-icon>
+                      </span>
+                      <span class="ai-tool-name">{{ t.name }}</span>
+                      <span class="ai-tool-badge" :class="t.isWrite ? 'write' : 'read'">{{ t.isWrite ? '写' : '读' }}</span>
+                    </summary>
+                    <div class="ai-tool-body">
+                      <div v-if="t.args !== undefined" class="ai-tool-kv">
+                        <span class="ai-tool-k">参数</span>
+                        <pre class="ai-tool-pre">{{ toJson(t.args) }}</pre>
+                      </div>
+                      <div v-if="t.result !== undefined" class="ai-tool-kv">
+                        <span class="ai-tool-k">结果</span>
+                        <pre class="ai-tool-pre">{{ toJson(t.result) }}</pre>
+                      </div>
+                    </div>
+                  </details>
+                </div>
+
+                <div v-if="m.content" class="ai-md" v-html="render(m.content)" />
+                <span v-if="m.streaming && m.content" class="ai-caret" />
+                <div v-if="m.streaming && !m.content && m.tools.length === 0" class="ai-thinking">
+                  <el-icon class="is-loading"><Loading /></el-icon><span>正在思考...</span>
+                </div>
+
+                <div v-if="m.error" class="ai-error">
+                  <el-icon><WarningFilled /></el-icon>
+                  <span>{{ m.error }}</span>
+                </div>
+
+                <div v-if="!m.streaming && m.content" class="ai-msg-actions">
+                  <button type="button" class="ai-act" title="复制" @click="copyText(m.content)">
+                    <el-icon><DocumentCopy /></el-icon>
+                  </button>
+                </div>
+              </template>
             </div>
-          </template>
+            <div v-if="m.role === 'user'" class="ai-avatar ai-avatar--user" aria-hidden="true">U</div>
+          </div>
         </div>
-      </div>
-    </div>
 
-    <footer class="ai-foot">
-      <el-input
-        v-model="draft"
-        type="textarea"
-        :rows="2"
-        :autosize="{ minRows: 2, maxRows: 6 }"
-        resize="none"
-        placeholder="描述你想分析的问题，例如：分析当前报警车辆的原因（Enter 发送，Shift+Enter 换行）"
-        @keydown="onKeydown"
-      />
-      <div class="ai-foot-row">
-        <span class="ai-foot-hint">{{ isStreaming ? 'AI 正在响应…' : '故障 / 日志 / 数据分析 · 操作答疑（只读）' }}</span>
-        <el-button v-if="isStreaming" type="danger" plain size="small" @click="onStop">停止</el-button>
-        <el-button v-else type="primary" size="small" :disabled="!draft.trim()" @click="onSend">发送</el-button>
+        <footer class="ai-foot">
+          <el-input
+            v-model="draft"
+            type="textarea"
+            :rows="2"
+            :autosize="{ minRows: 2, maxRows: 6 }"
+            resize="none"
+            placeholder="描述你想分析的问题，例如：分析当前报警车辆的原因（Enter 发送，Shift+Enter 换行）"
+            @keydown="onKeydown"
+          />
+          <div class="ai-foot-row">
+            <div class="ai-chips">
+              <button type="button" class="ai-chip" @click="useExample('现在有哪些车辆在报警？帮我分析原因和处理建议')">工具</button>
+              <button type="button" class="ai-chip" @click="useExample('结合车队健康数据，给出本周运维重点')">知识库</button>
+              <button type="button" class="ai-chip" @click="goPath('/admin/alarms')"># 报警</button>
+              <button type="button" class="ai-chip" @click="goPath('/admin/tasks')"># 任务</button>
+            </div>
+            <div class="ai-foot-actions">
+              <el-button v-if="isStreaming" type="danger" plain size="small" @click="onStop">停止</el-button>
+              <button
+                v-else
+                type="button"
+                class="ai-send"
+                :disabled="!draft.trim()"
+                title="发送"
+                @click="onSend"
+              >
+                <el-icon><Promotion /></el-icon>
+              </button>
+            </div>
+          </div>
+        </footer>
       </div>
-    </footer>
+
+      <!-- 右侧：知识与工具 -->
+      <aside v-show="showSide" class="ai-side">
+        <div class="ai-side-head">
+          <span>知识与工具</span>
+          <button type="button" class="ai-iconbtn" title="收起侧栏" @click="showSide = false">
+            <el-icon><Close /></el-icon>
+          </button>
+        </div>
+
+        <div class="ai-side-scroll">
+          <section class="ai-card">
+            <div class="ai-card-head">
+              <span>快捷工具</span>
+            </div>
+            <div class="ai-tool-grid">
+              <button
+                v-for="t in quickTools"
+                :key="t.id"
+                type="button"
+                class="ai-tool-tile"
+                @click="onQuickTool(t)"
+              >
+                <span class="ai-tool-tile-ic">{{ t.glyph }}</span>
+                <span class="ai-tool-tile-lb">{{ t.label }}</span>
+              </button>
+            </div>
+          </section>
+
+          <section class="ai-card">
+            <div class="ai-card-head">
+              <span>关键数据</span>
+              <button type="button" class="ai-link" @click="refreshSideData">刷新</button>
+            </div>
+            <div class="ai-kpi">
+              <div class="ai-kpi-main">
+                <div class="ai-kpi-label">车队在线</div>
+                <div class="ai-kpi-value">
+                  {{ healthSummary.reachable }}
+                  <span class="ai-kpi-unit">/ {{ healthSummary.total }}</span>
+                </div>
+              </div>
+              <div class="ai-spark" aria-hidden="true">
+                <span
+                  v-for="(h, i) in healthSummary.bars"
+                  :key="i"
+                  class="ai-spark-bar"
+                  :style="{ height: h + '%' }"
+                />
+              </div>
+            </div>
+            <div class="ai-kpi-sub">
+              活跃报警 <b>{{ healthSummary.alarms }}</b>
+              · 平均延迟 <b>{{ healthSummary.avgLatency }} ms</b>
+            </div>
+          </section>
+
+          <section class="ai-card">
+            <div class="ai-card-head">
+              <span>设备健康</span>
+              <button type="button" class="ai-link" @click="goPath('/admin/config/vehicle-hub')">更多</button>
+            </div>
+            <div class="ai-health">
+              <div class="ai-ring" :style="{ '--p': healthSummary.score + '%' }">
+                <span class="ai-ring-num">{{ healthSummary.score }}</span>
+              </div>
+              <ul class="ai-health-legend">
+                <li><i class="dot ok" />正常 <b>{{ healthSummary.ok }}</b></li>
+                <li><i class="dot warn" />告警 <b>{{ healthSummary.warn }}</b></li>
+                <li><i class="dot bad" />离线 <b>{{ healthSummary.offline }}</b></li>
+              </ul>
+            </div>
+          </section>
+
+          <section class="ai-card">
+            <div class="ai-card-head">
+              <span>分析模板</span>
+            </div>
+            <ul class="ai-kb-list">
+              <li v-for="k in knowledgeTips" :key="k.id">
+                <button type="button" class="ai-kb-item" @click="useExample(k.prompt)">
+                  <span class="ai-kb-title">{{ k.title }}</span>
+                  <span class="ai-kb-meta">
+                    <em>{{ k.tag }}</em>
+                    <span>{{ k.kind }}</span>
+                  </span>
+                </button>
+              </li>
+            </ul>
+          </section>
+
+          <section class="ai-card">
+            <div class="ai-card-head">
+              <span>最近报警</span>
+              <button type="button" class="ai-link" @click="goPath('/admin/alarms')">更多</button>
+            </div>
+            <ul v-if="recentAlarms.length" class="ai-wo-list">
+              <li v-for="a in recentAlarms" :key="a.id" class="ai-wo-item">
+                <div class="ai-wo-main">
+                  <div class="ai-wo-id">{{ a.title }}</div>
+                  <div class="ai-wo-meta">{{ a.meta }}</div>
+                </div>
+                <span class="ai-wo-badge" :class="a.level">{{ a.badge }}</span>
+              </li>
+            </ul>
+            <div v-else class="ai-side-empty">暂无报警记录</div>
+          </section>
+        </div>
+      </aside>
+    </div>
   </section>
 </template>
 
 <script setup lang="ts">
-import { ref, watch, nextTick, onMounted } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
 import {
   Plus,
   Close,
@@ -159,26 +302,65 @@ import {
   Loading,
   Select,
   WarningFilled,
-  ChatLineSquare
+  ChatLineSquare,
+  Grid,
+  DocumentCopy,
+  Promotion
 } from '@element-plus/icons-vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { renderMarkdown } from '@/utils/miniMarkdown'
 import { useAssistantChat } from '@/composables/useAssistantChat'
+import { fetchFleetHealth } from '@/api/fleetHealth'
+import { fetchAlarmFeed } from '@/api/alarm'
 
 const OPEN_KEY = 'assistant.drawer.open'
 const WIDTH_KEY = 'assistant.drawer.width'
-const MIN_W = 340
-const MAX_W = 760
+const SIDE_KEY = 'assistant.drawer.side'
+const FAB_POS_KEY = 'assistant.fab.pos'
+const MIN_W = 380
+const MAX_W = 1100
+const SIDE_W = 300
+const FAB_SIZE = 52
 
+const router = useRouter()
 const { messages, sessions, currentSessionId, isStreaming, ensureInit, loadSession, newSession, removeSession, send, stop } =
   useAssistantChat()
 
 const open = ref(localStorage.getItem(OPEN_KEY) === '1')
-const width = ref(clampWidth(Number(localStorage.getItem(WIDTH_KEY)) || 420))
+const chatWidth = ref(clampChatWidth(Number(localStorage.getItem(WIDTH_KEY)) || 440))
+const showSide = ref(localStorage.getItem(SIDE_KEY) !== '0')
 const draft = ref('')
 const showSessions = ref(false)
 const listRef = ref<HTMLElement | null>(null)
 
+const fabPos = reactive(loadFabPos())
+const fabDragging = ref(false)
+let fabPointerId: number | null = null
+let fabMoved = false
+let fabStart = { x: 0, y: 0, left: 0, top: 0 }
+
+const healthSummary = reactive({
+  total: 0,
+  reachable: 0,
+  alarms: 0,
+  avgLatency: 0,
+  score: 0,
+  ok: 0,
+  warn: 0,
+  offline: 0,
+  bars: [36, 48, 42, 58, 52, 64, 60, 72] as number[]
+})
+
+interface RecentAlarmRow {
+  id: string
+  title: string
+  meta: string
+  badge: string
+  level: 'ok' | 'warn' | 'bad'
+}
+
+const recentAlarms = ref<RecentAlarmRow[]>([])
+
 const examples = [
   '现在有哪些车辆在报警？帮我分析原因和处理建议',
   '汇总最近的诊断日志，有哪些异常？',
@@ -186,18 +368,126 @@ const examples = [
   '1 号车为什么停了？帮我排查'
 ]
 
-function clampWidth(w: number): number {
-  return Math.min(MAX_W, Math.max(MIN_W, w))
+const quickTools = [
+  { id: 'alarms', label: '报警查询', glyph: '!', path: '/admin/alarms', prompt: '列出当前活跃报警并给出处理优先级' },
+  { id: 'monitor', label: '地图监控', glyph: 'M', path: '/admin/map-monitor', prompt: null as string | null },
+  { id: 'health', label: '车队健康', glyph: '+', path: '/admin/config/vehicle-hub', prompt: '分析当前车队健康状况与风险车辆' },
+  { id: 'tasks', label: '任务管理', glyph: 'T', path: '/admin/tasks', prompt: null as string | null }
+]
+
+const knowledgeTips = [
+  {
+    id: 'k1',
+    title: '报警分级与升级处理指南',
+    tag: '最佳实践',
+    kind: '指南',
+    prompt: '按严重程度说明当前报警该如何分级处理和升级'
+  },
+  {
+    id: 'k2',
+    title: '车辆离线排查清单',
+    tag: '排障',
+    kind: '清单',
+    prompt: '按清单帮我排查离线车辆：网络、WatchDog、车载服务'
+  },
+  {
+    id: 'k3',
+    title: '车队能耗与负载观察要点',
+    tag: '运维',
+    kind: '要点',
+    prompt: '结合车队健康数据，给出本周运维观察重点'
+  }
+]
+
+const drawerWidth = computed(() => chatWidth.value + (showSide.value ? SIDE_W : 0))
+
+const fabStyle = computed(() => ({
+  left: `${fabPos.left}px`,
+  top: `${fabPos.top}px`,
+  right: 'auto',
+  bottom: 'auto'
+}))
+
+watch(showSide, (v) => {
+  try { localStorage.setItem(SIDE_KEY, v ? '1' : '0') } catch { /* ignore */ }
+})
+
+function clampChatWidth(w: number): number {
+  return Math.min(MAX_W - SIDE_W, Math.max(MIN_W, w))
+}
+
+function loadFabPos(): { left: number; top: number } {
+  try {
+    const raw = localStorage.getItem(FAB_POS_KEY)
+    if (raw) {
+      const p = JSON.parse(raw) as { left?: number; top?: number }
+      if (typeof p.left === 'number' && typeof p.top === 'number') {
+        return clampFab(p.left, p.top)
+      }
+    }
+  } catch { /* ignore */ }
+  const left = Math.max(16, window.innerWidth - FAB_SIZE - 22)
+  const top = Math.max(16, window.innerHeight - FAB_SIZE - 28)
+  return { left, top }
+}
+
+function clampFab(left: number, top: number): { left: number; top: number } {
+  const maxL = Math.max(8, window.innerWidth - FAB_SIZE - 8)
+  const maxT = Math.max(8, window.innerHeight - FAB_SIZE - 8)
+  return {
+    left: Math.min(maxL, Math.max(8, left)),
+    top: Math.min(maxT, Math.max(8, top))
+  }
+}
+
+function persistFab(): void {
+  try {
+    localStorage.setItem(FAB_POS_KEY, JSON.stringify({ left: fabPos.left, top: fabPos.top }))
+  } catch { /* ignore */ }
+}
+
+function onFabPointerDown(e: PointerEvent): void {
+  if (e.button !== 0) return
+  fabPointerId = e.pointerId
+  fabMoved = false
+  fabDragging.value = true
+  fabStart = { x: e.clientX, y: e.clientY, left: fabPos.left, top: fabPos.top }
+  ;(e.currentTarget as HTMLElement).setPointerCapture?.(e.pointerId)
+  e.preventDefault()
+}
+
+function onFabPointerMove(e: PointerEvent): void {
+  if (fabPointerId !== e.pointerId || !fabDragging.value) return
+  const dx = e.clientX - fabStart.x
+  const dy = e.clientY - fabStart.y
+  if (Math.abs(dx) > 4 || Math.abs(dy) > 4) fabMoved = true
+  const next = clampFab(fabStart.left + dx, fabStart.top + dy)
+  fabPos.left = next.left
+  fabPos.top = next.top
+}
+
+function onFabPointerUp(e: PointerEvent): void {
+  if (fabPointerId !== e.pointerId) return
+  fabDragging.value = false
+  fabPointerId = null
+  ;(e.currentTarget as HTMLElement).releasePointerCapture?.(e.pointerId)
+  persistFab()
+  if (!fabMoved) toggle(true)
+}
+
+function onViewportResize(): void {
+  const next = clampFab(fabPos.left, fabPos.top)
+  fabPos.left = next.left
+  fabPos.top = next.top
 }
 
 function toggle(v: boolean): void {
   open.value = v
-  try {
-    localStorage.setItem(OPEN_KEY, v ? '1' : '0')
-  } catch {
-    /* ignore */
+  try { localStorage.setItem(OPEN_KEY, v ? '1' : '0') } catch { /* ignore */ }
+  if (v) {
+    void ensureInit()
+    void refreshSideData()
   }
-  if (v) void ensureInit()
 }
 
 function toggleSessions(): void {
@@ -234,6 +524,15 @@ function useExample(ex: string): void {
   draft.value = ex
 }
 
+function goPath(path: string): void {
+  void router.push(path)
+}
+
+function onQuickTool(t: (typeof quickTools)[number]): void {
+  if (t.prompt) useExample(t.prompt)
+  else goPath(t.path)
+}
+
 function onKeydown(e: Event | KeyboardEvent): void {
   if (!(e instanceof KeyboardEvent)) return
   if (e.key === 'Enter' && !e.shiftKey && !e.isComposing) {
@@ -254,10 +553,19 @@ function onStop(): void {
   stop()
 }
 
+async function copyText(text: string): Promise<void> {
+  try {
+    await navigator.clipboard.writeText(text)
+    ElMessage.success('已复制')
+  } catch {
+    ElMessage.warning('复制失败')
+  }
+}
+
 function toJson(v: unknown): string {
   try {
     const s = JSON.stringify(v, null, 2)
-    return s.length > 4000 ? s.slice(0, 4000) + '\n… (已截断)' : s
+    return s.length > 4000 ? s.slice(0, 4000) + '\n...(已截断)' : s
   } catch {
     return String(v)
   }
@@ -280,81 +588,120 @@ async function scrollToBottom(): Promise<void> {
   if (el) el.scrollTop = el.scrollHeight
 }
 
-// 流式更新 / 新消息时自动滚到底。
-watch(
-  messages,
-  () => {
-    void scrollToBottom()
-  },
-  { deep: true }
-)
+async function refreshSideData(): Promise<void> {
+  try {
+    const rows = await fetchFleetHealth()
+    const total = rows.length
+    const reachable = rows.filter((r) => r.reachable).length
+    const alarms = rows.filter((r) => r.isAlarmActive).length
+    const offline = total - reachable
+    const warn = Math.max(0, alarms)
+    const ok = Math.max(0, reachable - warn)
+    const avgLatency = total
+      ? Math.round(rows.reduce((s, r) => s + (r.latencyMs || 0), 0) / total)
+      : 0
+    const score = total ? Math.round((ok / total) * 100) : 0
+    healthSummary.total = total
+    healthSummary.reachable = reachable
+    healthSummary.alarms = alarms
+    healthSummary.avgLatency = avgLatency
+    healthSummary.score = score
+    healthSummary.ok = ok
+    healthSummary.warn = warn
+    healthSummary.offline = offline
+    if (total) {
+      healthSummary.bars = rows.slice(0, 8).map((r) => {
+        const base = r.reachable ? 55 : 18
+        const bump = Math.min(40, Math.round((100 - Math.min(r.latencyMs || 0, 2000) / 50)))
+        return Math.min(92, Math.max(14, base + bump / 4))
+      })
+      while (healthSummary.bars.length < 8) healthSummary.bars.push(30)
+    }
+  } catch {
+    /* 侧栏失败不阻塞对话 */
+  }
+
+  try {
+    const feed = await fetchAlarmFeed(8)
+    recentAlarms.value = (feed.alarms ?? []).slice(0, 5).map((a) => {
+      const level: RecentAlarmRow['level'] =
+        a.level >= 3 ? 'bad' : a.status === 'active' ? 'warn' : 'ok'
+      return {
+        id: a.id,
+        title: `${a.carName || `车${a.carId}`} · ${String(a.info || '报警').slice(0, 28)}`,
+        meta: a.lastAt ? formatTime(a.lastAt) : (a.firstAt ? formatTime(a.firstAt) : '最近'),
+        badge: a.status === 'active' ? (level === 'bad' ? '严重' : '处理中') : '已清除',
+        level
+      }
+    })
+  } catch {
+    recentAlarms.value = []
+  }
+}
+
+watch(messages, () => { void scrollToBottom() }, { deep: true })
 
-// ── 拖拽调整宽度（左沿手柄向左拖变宽）──
 let resizing = false
 let startX = 0
 let startW = 0
 function onResizeStart(e: PointerEvent): void {
   resizing = true
   startX = e.clientX
-  startW = width.value
+  startW = chatWidth.value
   ;(e.currentTarget as HTMLElement).setPointerCapture?.(e.pointerId)
   e.preventDefault()
 }
 function onResizeMove(e: PointerEvent): void {
   if (!resizing) return
-  width.value = clampWidth(startW + (startX - e.clientX))
+  chatWidth.value = clampChatWidth(startW + (startX - e.clientX))
 }
 function onResizeEnd(e: PointerEvent): void {
   if (!resizing) return
   resizing = false
   ;(e.currentTarget as HTMLElement).releasePointerCapture?.(e.pointerId)
-  try {
-    localStorage.setItem(WIDTH_KEY, String(width.value))
-  } catch {
-    /* ignore */
-  }
+  try { localStorage.setItem(WIDTH_KEY, String(chatWidth.value)) } catch { /* ignore */ }
 }
 
 onMounted(() => {
-  if (open.value) void ensureInit()
+  window.addEventListener('resize', onViewportResize)
+  if (open.value) {
+    void ensureInit()
+    void refreshSideData()
+  }
+})
+
+onUnmounted(() => {
+  window.removeEventListener('resize', onViewportResize)
 })
 </script>
 
 <style scoped>
-/* ─────────────── FAB ─────────────── */
 .ai-fab {
   position: fixed;
-  right: 22px;
-  bottom: 28px;
   z-index: 1800;
   width: 52px;
   height: 52px;
   border-radius: 50%;
-  border: 1px solid rgba(var(--mg-accent-rgb, 196, 181, 253), 0.5);
-  background: linear-gradient(135deg, var(--mg-primary, #7c3aed) 0%, var(--mg-primary-active, #5b21b6) 100%);
-  color: #fff;
-  cursor: pointer;
-  box-shadow: 0 10px 28px rgba(91, 33, 182, 0.5), 0 0 0 0 rgba(124, 58, 237, 0.5);
+  border: none;
+  background: var(--ai-fab-bg);
+  color: var(--ai-fab-fg);
+  cursor: grab;
+  box-shadow: var(--ai-fab-shadow), var(--ai-fab-glow);
   display: flex;
   align-items: center;
   justify-content: center;
-  transition: transform 0.2s ease, box-shadow 0.2s ease;
-  animation: ai-fab-pulse 3.6s ease-in-out infinite;
+  touch-action: none;
+  user-select: none;
+  transition: transform 0.18s ease, box-shadow 0.18s ease, filter 0.15s ease;
 }
-.ai-fab:hover {
-  transform: translateY(-2px) scale(1.06);
-  box-shadow: 0 14px 36px rgba(124, 58, 237, 0.6);
-}
-.ai-fab-glyph {
-  font-size: 24px;
-  text-shadow: 0 0 12px rgba(255, 255, 255, 0.6);
-}
-@keyframes ai-fab-pulse {
-  0%, 100% { box-shadow: 0 10px 28px rgba(91, 33, 182, 0.5), 0 0 0 0 rgba(124, 58, 237, 0.45); }
-  50% { box-shadow: 0 10px 28px rgba(91, 33, 182, 0.5), 0 0 0 12px rgba(124, 58, 237, 0); }
+.ai-fab:hover { filter: brightness(1.06); transform: scale(1.04); }
+.ai-fab.is-dragging {
+  cursor: grabbing;
+  transform: scale(1.08);
+  box-shadow: 0 12px 28px color-mix(in srgb, var(--mg-primary) 36%, transparent);
 }
+.ai-fab-glyph { font-size: 22px; line-height: 1; pointer-events: none; }
 
-/* ─────────────── Drawer ─────────────── */
 .ai-drawer {
   position: fixed;
   top: 0;
@@ -364,14 +711,14 @@ onMounted(() => {
   display: flex;
   flex-direction: column;
   max-width: 96vw;
-  background: linear-gradient(180deg, rgba(28, 14, 56, 0.99) 0%, rgba(16, 7, 34, 0.99) 100%);
-  border-left: 1px solid rgba(var(--mg-accent-rgb, 196, 181, 253), 0.28);
-  box-shadow: -14px 0 40px rgba(8, 2, 16, 0.6);
-  color: rgba(236, 224, 250, 0.95);
+  background: var(--ai-panel-bg);
+  border-left: 1px solid var(--ai-panel-border);
+  box-shadow: var(--ai-panel-shadow);
+  color: var(--ai-bot-fg);
   transform: translateX(100%);
   opacity: 0;
   visibility: hidden;
-  transition: transform 0.28s cubic-bezier(0.25, 0.8, 0.25, 1), opacity 0.28s ease, visibility 0.28s;
+  transition: transform 0.28s cubic-bezier(0.25, 0.8, 0.25, 1), opacity 0.28s ease, visibility 0.28s, width 0.2s ease;
 }
 .ai-drawer.is-open {
   transform: translateX(0);
@@ -388,13 +735,259 @@ onMounted(() => {
   cursor: ew-resize;
   z-index: 5;
   touch-action: none;
-  transition: background 0.15s ease;
 }
-.ai-resizer:hover {
-  background: rgba(var(--mg-accent-rgb, 196, 181, 253), 0.45);
+.ai-resizer:hover { background: var(--ai-accent-soft); }
+
+.ai-shell {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: row;
+}
+
+.ai-main {
+  flex: 1 1 auto;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+
+.ai-side {
+  flex: none;
+  width: 300px;
+  border-left: 1px solid var(--ai-panel-border);
+  background: var(--ai-side-bg);
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+
+.ai-side-head {
+  flex: none;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 14px 14px 10px;
+  font-size: 13px;
+  font-weight: 700;
+  color: var(--ai-title);
+  border-bottom: 1px solid var(--ai-head-border);
+}
+.ai-side-scroll {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  padding: 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  scrollbar-width: thin;
+  scrollbar-color: var(--ai-scrollbar) transparent;
+}
+
+.ai-card {
+  border: 1px solid var(--ai-bot-border);
+  border-radius: 12px;
+  background: var(--ai-bot-bg);
+  padding: 12px;
+}
+.ai-card-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+  font-size: 12px;
+  font-weight: 700;
+  color: var(--ai-title);
+}
+
+.ai-tool-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 8px;
+}
+.ai-tool-tile {
+  appearance: none;
+  border: 1px solid var(--ai-example-border);
+  background: var(--ai-example-bg);
+  color: var(--ai-example-fg);
+  border-radius: 10px;
+  padding: 12px 8px;
+  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 6px;
+  transition: border-color 0.15s ease, transform 0.15s ease;
+}
+.ai-tool-tile:hover {
+  border-color: var(--ai-accent);
+  transform: translateY(-1px);
+}
+.ai-tool-tile-ic { font-size: 18px; line-height: 1; }
+.ai-tool-tile-lb { font-size: 11.5px; font-weight: 600; }
+
+.ai-kpi { display: flex; align-items: center; justify-content: space-between; gap: 10px; }
+.ai-kpi-label { font-size: 11px; color: var(--ai-muted); }
+.ai-kpi-value {
+  font-size: 26px;
+  font-weight: 750;
+  color: var(--ai-title);
+  line-height: 1.1;
+  margin-top: 2px;
+  font-variant-numeric: tabular-nums;
+}
+.ai-kpi-unit { font-size: 13px; font-weight: 600; color: var(--ai-muted); }
+.ai-kpi-sub {
+  margin-top: 8px;
+  font-size: 11.5px;
+  color: var(--ai-muted);
+}
+.ai-kpi-sub b { color: var(--ai-title); font-weight: 700; }
+
+.ai-spark {
+  display: flex;
+  align-items: flex-end;
+  gap: 3px;
+  height: 36px;
+  padding-bottom: 2px;
+}
+.ai-spark-bar {
+  width: 5px;
+  border-radius: 2px 2px 0 0;
+  background: linear-gradient(180deg, var(--ai-accent), color-mix(in srgb, var(--ai-accent) 40%, transparent));
+  opacity: 0.85;
+}
+
+.ai-health { display: flex; align-items: center; gap: 14px; }
+.ai-ring {
+  --p: 80%;
+  width: 72px;
+  height: 72px;
+  border-radius: 50%;
+  flex: none;
+  display: grid;
+  place-items: center;
+  background:
+    radial-gradient(circle at center, var(--ai-bot-bg) 58%, transparent 59%),
+    conic-gradient(var(--ai-accent) var(--p), color-mix(in srgb, var(--ai-muted) 28%, transparent) 0);
+}
+.ai-ring-num {
+  font-size: 20px;
+  font-weight: 750;
+  color: var(--ai-title);
+  font-variant-numeric: tabular-nums;
+}
+.ai-health-legend {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  font-size: 12px;
+  color: var(--ai-muted);
+}
+.ai-health-legend b { color: var(--ai-title); margin-left: 4px; }
+.ai-health-legend .dot {
+  display: inline-block;
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  margin-right: 6px;
+}
+.ai-health-legend .dot.ok { background: #10b981; }
+.ai-health-legend .dot.warn { background: #f59e0b; }
+.ai-health-legend .dot.bad { background: #ef4444; }
+
+.ai-kb-list, .ai-wo-list {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+.ai-kb-item {
+  appearance: none;
+  width: 100%;
+  text-align: left;
+  border: 0;
+  background: transparent;
+  border-radius: 8px;
+  padding: 8px;
+  cursor: pointer;
+  transition: background 0.15s ease;
+}
+.ai-kb-item:hover { background: var(--ai-accent-soft); }
+.ai-kb-title {
+  display: block;
+  font-size: 12.5px;
+  font-weight: 600;
+  color: var(--ai-title);
+  line-height: 1.35;
+}
+.ai-kb-meta {
+  display: flex;
+  gap: 8px;
+  margin-top: 4px;
+  font-size: 10.5px;
+  color: var(--ai-muted);
+}
+.ai-kb-meta em {
+  font-style: normal;
+  color: var(--ai-accent);
+  font-weight: 650;
+}
+
+.ai-wo-item {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  padding: 8px;
+  border-radius: 8px;
+  background: var(--ai-thinking-bg);
+}
+.ai-wo-main { min-width: 0; flex: 1; }
+.ai-wo-id {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--ai-title);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.ai-wo-meta { font-size: 11px; color: var(--ai-muted); margin-top: 2px; }
+.ai-wo-badge {
+  flex: none;
+  font-size: 10px;
+  font-weight: 700;
+  padding: 2px 7px;
+  border-radius: 999px;
+}
+.ai-wo-badge.warn {
+  background: rgba(245, 158, 11, 0.14);
+  color: #d97706;
+  border: 1px solid rgba(245, 158, 11, 0.28);
+}
+.ai-wo-badge.bad {
+  background: rgba(239, 68, 68, 0.12);
+  color: #dc2626;
+  border: 1px solid rgba(239, 68, 68, 0.28);
+}
+.ai-wo-badge.ok {
+  background: rgba(16, 185, 129, 0.12);
+  color: #059669;
+  border: 1px solid rgba(16, 185, 129, 0.28);
+}
+.ai-side-empty {
+  font-size: 12px;
+  color: var(--ai-muted);
+  text-align: center;
+  padding: 12px 0;
 }
 
-/* ─────────────── Header ─────────────── */
 .ai-head {
   position: relative;
   flex: none;
@@ -402,145 +995,274 @@ onMounted(() => {
   align-items: center;
   justify-content: space-between;
   gap: 8px;
-  padding: 12px 14px;
-  background: linear-gradient(135deg, rgba(120, 70, 220, 0.55) 0%, rgba(168, 85, 247, 0.4) 100%);
-  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+  padding: 14px 16px;
+  background: var(--ai-head-bg);
+  border-bottom: 1px solid var(--ai-head-border);
 }
 .ai-head-title { display: flex; align-items: center; gap: 10px; min-width: 0; }
-.ai-head-glyph { font-size: 19px; color: #fff; text-shadow: 0 0 10px rgba(255, 200, 250, 0.7); flex: none; }
+.ai-head-glyph {
+  width: 32px;
+  height: 32px;
+  border-radius: 10px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
+  flex: none;
+  color: var(--ai-avatar-bot-fg);
+  background: var(--ai-avatar-bot-bg);
+  border: 1px solid var(--ai-avatar-bot-border);
+}
 .ai-head-text { min-width: 0; }
-.ai-head-main { font-size: 15px; font-weight: 700; color: #fff; line-height: 1.2; }
-.ai-head-sub { font-size: 11px; color: rgba(240, 222, 255, 0.78); margin-top: 2px; white-space: nowrap; }
+.ai-head-main { font-size: 15px; font-weight: 700; color: var(--ai-title); line-height: 1.2; }
+.ai-head-sub { font-size: 11px; color: var(--ai-muted); margin-top: 2px; white-space: nowrap; }
 .ai-head-actions { display: flex; align-items: center; gap: 6px; flex: none; }
+
+.ai-textbtn {
+  appearance: none;
+  border: 1px solid var(--ai-accent-soft-border);
+  background: transparent;
+  color: var(--ai-accent);
+  height: 30px;
+  padding: 0 10px;
+  border-radius: 8px;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 12px;
+  font-weight: 650;
+  transition: background 0.15s ease;
+}
+.ai-textbtn:hover { background: var(--ai-accent-soft); }
+
 .ai-iconbtn {
   appearance: none;
-  border: 0;
-  background: rgba(255, 255, 255, 0.12);
-  color: #fff;
-  width: 28px;
-  height: 28px;
-  border-radius: 7px;
+  border: 1px solid transparent;
+  background: transparent;
+  color: var(--ai-muted);
+  width: 30px;
+  height: 30px;
+  border-radius: 8px;
   cursor: pointer;
   display: inline-flex;
   align-items: center;
   justify-content: center;
   font-size: 14px;
-  transition: background 0.15s ease;
+  transition: background 0.15s ease, color 0.15s ease, border-color 0.15s ease;
+}
+.ai-iconbtn:hover,
+.ai-iconbtn.active {
+  background: var(--ai-close-hover-bg);
+  color: var(--ai-close-hover-fg);
+  border-color: var(--ai-accent-soft-border);
 }
-.ai-iconbtn:hover, .ai-iconbtn.active { background: rgba(255, 255, 255, 0.26); }
 
-/* Sessions popover */
 .ai-sessions {
   position: absolute;
-  top: 56px;
+  top: 60px;
   right: 12px;
   width: 280px;
   max-height: 360px;
   overflow: auto;
-  background: rgba(22, 11, 44, 0.99);
-  border: 1px solid rgba(var(--mg-accent-rgb, 196, 181, 253), 0.3);
+  background: var(--ai-panel-bg);
+  border: 1px solid var(--ai-panel-border);
   border-radius: 12px;
-  box-shadow: 0 18px 40px rgba(0, 0, 0, 0.5);
+  box-shadow: 0 16px 36px rgba(15, 23, 42, 0.12);
   z-index: 20;
   padding: 8px;
+  color: var(--ai-bot-fg);
 }
 .ai-sessions-head {
   display: flex;
   align-items: center;
   justify-content: space-between;
   font-size: 12px;
-  color: rgba(210, 188, 240, 0.8);
+  color: var(--ai-muted);
   padding: 4px 6px 8px;
 }
-.ai-link { appearance: none; border: 0; background: transparent; color: var(--mg-accent, #c4b5fd); cursor: pointer; font-size: 12px; }
-.ai-sessions-empty { padding: 16px; text-align: center; color: rgba(210, 188, 240, 0.5); font-size: 12px; }
+.ai-link {
+  appearance: none;
+  border: 0;
+  background: transparent;
+  color: var(--ai-accent);
+  cursor: pointer;
+  font-size: 12px;
+  font-weight: 600;
+}
+.ai-sessions-empty { padding: 16px; text-align: center; color: var(--ai-muted); font-size: 12px; }
 .ai-sessions-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 2px; }
 .ai-session-item {
   display: flex;
   align-items: center;
   gap: 8px;
-  padding: 8px 8px;
+  padding: 8px;
   border-radius: 8px;
   cursor: pointer;
-  transition: background 0.15s ease;
 }
-.ai-session-item:hover { background: rgba(255, 255, 255, 0.06); }
-.ai-session-item.active { background: rgba(124, 58, 237, 0.28); }
+.ai-session-item:hover,
+.ai-session-item.active { background: var(--ai-accent-soft); }
 .ai-session-main { min-width: 0; flex: 1; }
-.ai-session-title { font-size: 13px; color: #fff; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-.ai-session-meta { font-size: 11px; color: rgba(210, 188, 240, 0.6); margin-top: 2px; }
-.ai-session-del {
-  appearance: none; border: 0; background: transparent; color: rgba(255, 160, 180, 0.7);
-  cursor: pointer; width: 24px; height: 24px; border-radius: 6px; flex: none;
-  display: inline-flex; align-items: center; justify-content: center;
+.ai-session-title {
+  font-size: 13px;
+  color: var(--ai-title);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
-.ai-session-del:hover { background: rgba(255, 90, 110, 0.2); color: #ff8aa0; }
+.ai-session-meta { font-size: 11px; color: var(--ai-muted); margin-top: 2px; }
+.ai-session-del {
+  appearance: none;
+  border: 0;
+  background: transparent;
+  color: var(--ai-muted);
+  cursor: pointer;
+  width: 24px;
+  height: 24px;
+  border-radius: 6px;
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+.ai-session-del:hover { background: rgba(239, 68, 68, 0.12); color: #ef4444; }
 
-/* ─────────────── Body ─────────────── */
 .ai-body {
   flex: 1 1 0;
   min-height: 0;
   overflow-y: auto;
-  padding: 14px;
+  padding: 16px;
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 14px;
   scrollbar-width: thin;
-  scrollbar-color: rgba(var(--mg-accent-rgb, 196, 181, 253), 0.3) transparent;
+  scrollbar-color: var(--ai-scrollbar) transparent;
 }
 .ai-body::-webkit-scrollbar { width: 6px; }
-.ai-body::-webkit-scrollbar-thumb { background: rgba(var(--mg-accent-rgb, 196, 181, 253), 0.28); border-radius: 3px; }
+.ai-body::-webkit-scrollbar-thumb { background: var(--ai-scrollbar); border-radius: 3px; }
 
-.ai-empty { text-align: center; padding: 28px 12px; display: flex; flex-direction: column; align-items: center; gap: 8px; }
-.ai-empty-glyph { font-size: 34px; color: var(--mg-accent, #c4b5fd); text-shadow: 0 0 20px rgba(196, 181, 253, 0.5); }
-.ai-empty-title { font-size: 15px; font-weight: 600; color: #fff; }
-.ai-empty-tip { font-size: 12px; color: rgba(210, 188, 240, 0.65); margin-top: 4px; }
+.ai-empty {
+  text-align: center;
+  padding: 28px 12px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+}
+.ai-empty-glyph {
+  width: 48px;
+  height: 48px;
+  border-radius: 14px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 22px;
+  color: var(--ai-avatar-bot-fg);
+  background: var(--ai-avatar-bot-bg);
+  border: 1px solid var(--ai-avatar-bot-border);
+  margin-bottom: 4px;
+}
+.ai-empty-title { font-size: 15px; font-weight: 650; color: var(--ai-title); }
+.ai-empty-tip { font-size: 12px; color: var(--ai-muted); margin: 2px 0 4px; }
 .ai-example {
   appearance: none;
   width: 100%;
   text-align: left;
-  border: 1px dashed rgba(var(--mg-accent-rgb, 196, 181, 253), 0.4);
-  background: rgba(255, 255, 255, 0.04);
-  color: rgba(232, 215, 245, 0.92);
-  border-radius: 9px;
-  padding: 9px 11px;
+  border: 1px solid var(--ai-example-border);
+  background: var(--ai-example-bg);
+  color: var(--ai-example-fg);
+  border-radius: 10px;
+  padding: 10px 12px;
   font-size: 12.5px;
   cursor: pointer;
-  transition: all 0.15s ease;
+  transition: border-color 0.15s ease, transform 0.15s ease;
+}
+.ai-example:hover {
+  border-color: var(--ai-accent);
+  transform: translateY(-1px);
 }
-.ai-example:hover { background: rgba(150, 90, 230, 0.22); border-color: rgba(var(--mg-accent-rgb, 196, 181, 253), 0.7); color: #fff; }
 
-.ai-msg { display: flex; }
+.ai-msg { display: flex; align-items: flex-end; gap: 8px; }
 .ai-msg--user { justify-content: flex-end; }
 .ai-msg--assistant { justify-content: flex-start; }
+.ai-avatar {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 12px;
+  font-weight: 700;
+}
+.ai-avatar--bot {
+  color: var(--ai-avatar-bot-fg);
+  background: var(--ai-avatar-bot-bg);
+  border: 1px solid var(--ai-avatar-bot-border);
+}
+.ai-avatar--user {
+  color: var(--ai-avatar-user-fg);
+  background: var(--ai-avatar-user-bg);
+}
 .ai-bubble {
-  max-width: 90%;
-  padding: 10px 12px;
-  border-radius: 13px;
+  max-width: min(90%, 520px);
+  padding: 10px 13px;
+  border-radius: 14px;
   font-size: 13.5px;
   line-height: 1.6;
 }
 .ai-msg--user .ai-bubble {
-  background: linear-gradient(135deg, rgba(150, 90, 240, 0.96) 0%, rgba(120, 70, 220, 0.96) 100%);
-  color: #fff;
+  background: var(--ai-user-bg);
+  color: var(--ai-user-fg);
   border-bottom-right-radius: 4px;
 }
 .ai-msg--assistant .ai-bubble {
-  background: rgba(255, 255, 255, 0.06);
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  color: rgba(236, 224, 250, 0.96);
+  background: var(--ai-bot-bg);
+  border: 1px solid var(--ai-bot-border);
+  border-left: 3px solid var(--ai-accent);
+  color: var(--ai-bot-fg);
   border-bottom-left-radius: 4px;
+  box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
 }
 .ai-user-text { white-space: pre-wrap; word-break: break-word; }
+.ai-msg-actions {
+  display: flex;
+  gap: 4px;
+  margin-top: 8px;
+  padding-top: 6px;
+  border-top: 1px solid var(--ai-bot-border);
+}
+.ai-act {
+  appearance: none;
+  border: 0;
+  background: transparent;
+  color: var(--ai-muted);
+  width: 26px;
+  height: 26px;
+  border-radius: 6px;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+.ai-act:hover { background: var(--ai-accent-soft); color: var(--ai-accent); }
 
-.ai-thinking { display: inline-flex; align-items: center; gap: 8px; color: rgba(210, 188, 240, 0.85); font-size: 13px; }
+.ai-thinking {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 4px 2px;
+  color: var(--ai-thinking-fg);
+  font-size: 13px;
+}
 .ai-caret {
   display: inline-block;
   width: 7px;
   height: 15px;
   margin-left: 2px;
   vertical-align: text-bottom;
-  background: var(--mg-accent, #c4b5fd);
+  background: var(--ai-dot);
   animation: ai-blink 1s steps(2) infinite;
 }
 @keyframes ai-blink { 0%, 50% { opacity: 1; } 50.01%, 100% { opacity: 0; } }
@@ -552,23 +1274,22 @@ onMounted(() => {
   margin-top: 8px;
   padding: 8px 10px;
   border-radius: 8px;
-  background: rgba(255, 90, 110, 0.14);
-  border: 1px solid rgba(255, 90, 110, 0.35);
-  color: #ffb3c0;
+  background: rgba(239, 68, 68, 0.08);
+  border: 1px solid rgba(239, 68, 68, 0.28);
+  color: #dc2626;
   font-size: 12.5px;
 }
 
-/* ─────────────── Tool cards ─────────────── */
 .ai-tools { display: flex; flex-direction: column; gap: 6px; margin-bottom: 8px; }
 .ai-tool {
-  border: 1px solid rgba(255, 255, 255, 0.12);
+  border: 1px solid var(--ai-bot-border);
   border-radius: 9px;
-  background: rgba(0, 0, 0, 0.22);
+  background: var(--ai-thinking-bg);
   overflow: hidden;
 }
-.ai-tool.is-running { border-color: rgba(196, 181, 253, 0.5); }
-.ai-tool.is-ok { border-color: rgba(80, 220, 160, 0.4); }
-.ai-tool.is-error { border-color: rgba(255, 120, 120, 0.5); }
+.ai-tool.is-running { border-color: var(--ai-accent-soft-border); }
+.ai-tool.is-ok { border-color: rgba(16, 185, 129, 0.4); }
+.ai-tool.is-error { border-color: rgba(239, 68, 68, 0.45); }
 .ai-tool-sum {
   display: flex;
   align-items: center;
@@ -579,10 +1300,16 @@ onMounted(() => {
   font-size: 12.5px;
 }
 .ai-tool-sum::-webkit-details-marker { display: none; }
-.ai-tool-ic { display: inline-flex; align-items: center; color: rgba(220, 205, 250, 0.9); }
-.ai-tool.is-ok .ai-tool-ic { color: #4fe0a0; }
-.ai-tool.is-error .ai-tool-ic { color: #ff8a8a; }
-.ai-tool-name { font-family: var(--mg-font-mono, monospace); color: #fff; font-weight: 600; flex: 1; min-width: 0; }
+.ai-tool-ic { display: inline-flex; align-items: center; color: var(--ai-muted); }
+.ai-tool.is-ok .ai-tool-ic { color: #10b981; }
+.ai-tool.is-error .ai-tool-ic { color: #ef4444; }
+.ai-tool-name {
+  font-family: var(--mg-font-mono, monospace);
+  color: var(--ai-title);
+  font-weight: 600;
+  flex: 1;
+  min-width: 0;
+}
 .ai-tool-badge {
   flex: none;
   font-size: 10px;
@@ -590,29 +1317,37 @@ onMounted(() => {
   border-radius: 999px;
   font-weight: 600;
 }
-.ai-tool-badge.read { background: rgba(96, 165, 250, 0.2); color: #93c5fd; border: 1px solid rgba(96, 165, 250, 0.4); }
-.ai-tool-badge.write { background: rgba(251, 146, 60, 0.2); color: #fdba74; border: 1px solid rgba(251, 146, 60, 0.45); }
+.ai-tool-badge.read {
+  background: rgba(59, 130, 246, 0.12);
+  color: #2563eb;
+  border: 1px solid rgba(59, 130, 246, 0.28);
+}
+.ai-tool-badge.write {
+  background: rgba(245, 158, 11, 0.12);
+  color: #d97706;
+  border: 1px solid rgba(245, 158, 11, 0.3);
+}
 .ai-tool-body { padding: 0 10px 8px; }
 .ai-tool-kv { margin-top: 6px; }
-.ai-tool-k { font-size: 11px; color: rgba(210, 188, 240, 0.65); }
+.ai-tool-k { font-size: 11px; color: var(--ai-muted); }
 .ai-tool-pre {
   margin: 3px 0 0;
   padding: 7px 9px;
-  background: rgba(0, 0, 0, 0.35);
+  background: var(--ai-md-pre-bg);
+  border: 1px solid var(--ai-md-pre-border);
   border-radius: 7px;
   font-size: 11.5px;
   font-family: var(--mg-font-mono, monospace);
-  color: rgba(220, 230, 245, 0.92);
+  color: var(--ai-bot-fg);
   white-space: pre-wrap;
   word-break: break-word;
   max-height: 220px;
   overflow: auto;
 }
 
-/* ─────────────── Markdown ─────────────── */
 .ai-md :deep(p) { margin: 0 0 8px; }
 .ai-md :deep(p:last-child) { margin-bottom: 0; }
-.ai-md :deep(.mmd-h) { margin: 10px 0 6px; font-weight: 700; color: #fff; line-height: 1.3; }
+.ai-md :deep(.mmd-h) { margin: 10px 0 6px; font-weight: 700; color: var(--ai-title); line-height: 1.3; }
 .ai-md :deep(h3.mmd-h) { font-size: 15px; }
 .ai-md :deep(h4.mmd-h) { font-size: 14px; }
 .ai-md :deep(h5.mmd-h) { font-size: 13px; }
@@ -621,16 +1356,17 @@ onMounted(() => {
 .ai-md :deep(.mmd-code) {
   font-family: var(--mg-font-mono, monospace);
   font-size: 12px;
-  background: rgba(0, 0, 0, 0.4);
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  background: var(--ai-md-code-bg);
+  color: var(--ai-md-code-fg);
+  border: 1px solid var(--ai-example-border);
   border-radius: 5px;
   padding: 1px 5px;
 }
 .ai-md :deep(.mmd-pre) {
   margin: 6px 0;
   padding: 10px 12px;
-  background: rgba(0, 0, 0, 0.42);
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  background: var(--ai-md-pre-bg);
+  border: 1px solid var(--ai-md-pre-border);
   border-radius: 9px;
   overflow: auto;
   max-height: 320px;
@@ -638,40 +1374,97 @@ onMounted(() => {
 .ai-md :deep(.mmd-pre code) {
   font-family: var(--mg-font-mono, monospace);
   font-size: 12px;
-  color: rgba(220, 230, 245, 0.95);
+  color: var(--ai-bot-fg);
   white-space: pre;
 }
-.ai-md :deep(.mmd-link) { color: var(--mg-accent, #c4b5fd); text-decoration: underline; }
+.ai-md :deep(.mmd-link) { color: var(--ai-md-link); text-decoration: underline; }
 .ai-md :deep(.mmd-quote) {
   margin: 6px 0;
   padding: 4px 12px;
-  border-left: 3px solid rgba(var(--mg-accent-rgb, 196, 181, 253), 0.6);
-  color: rgba(220, 205, 250, 0.85);
+  border-left: 3px solid var(--ai-md-blockquote-border);
+  color: var(--ai-md-blockquote-fg);
 }
-.ai-md :deep(strong) { color: #fff; }
+.ai-md :deep(strong) { color: var(--ai-title); }
 
-/* ─────────────── Footer ─────────────── */
 .ai-foot {
   flex: none;
-  padding: 10px 12px 12px;
-  border-top: 1px solid rgba(255, 255, 255, 0.1);
+  padding: 12px 14px 14px;
+  border-top: 1px solid var(--ai-composer-border);
+  background: var(--ai-composer-bg);
   display: flex;
   flex-direction: column;
   gap: 8px;
 }
 .ai-foot :deep(.el-textarea__inner) {
-  background: rgba(255, 255, 255, 0.06);
-  border: 1px solid rgba(var(--mg-accent-rgb, 196, 181, 253), 0.25);
-  color: #fff;
-  box-shadow: none;
+  background: var(--ai-input-bg) !important;
+  border: 1px solid var(--ai-input-border) !important;
+  color: var(--ai-input-fg) !important;
+  box-shadow: none !important;
+  border-radius: 10px;
+}
+.ai-foot :deep(.el-textarea__inner::placeholder) {
+  color: var(--ai-input-placeholder) !important;
 }
 .ai-foot :deep(.el-textarea__inner:focus) {
-  border-color: rgba(var(--mg-accent-rgb, 196, 181, 253), 0.6);
+  border-color: var(--ai-accent) !important;
+}
+.ai-foot-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+}
+.ai-chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+  min-width: 0;
+}
+.ai-chip {
+  appearance: none;
+  border: 1px solid var(--ai-example-border);
+  background: var(--ai-example-bg);
+  color: var(--ai-example-fg);
+  border-radius: 999px;
+  padding: 4px 10px;
+  font-size: 11.5px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: border-color 0.15s ease, background 0.15s ease;
+}
+.ai-chip:hover { border-color: var(--ai-accent); }
+.ai-foot-actions { display: flex; align-items: center; gap: 8px; flex: none; }
+.ai-send {
+  appearance: none;
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
+  border: none;
+  background: var(--ai-send-bg);
+  color: var(--ai-send-fg);
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
+  transition: filter 0.15s ease, transform 0.15s ease;
+}
+.ai-send:hover:not(:disabled) {
+  filter: brightness(1.06);
+  transform: scale(1.04);
+}
+.ai-send:disabled {
+  background: var(--ai-send-disabled);
+  cursor: not-allowed;
+  opacity: 0.75;
 }
-.ai-foot-row { display: flex; align-items: center; justify-content: space-between; gap: 8px; }
-.ai-foot-hint { font-size: 11px; color: rgba(210, 188, 240, 0.6); }
 
+@media (max-width: 900px) {
+  .ai-side { display: none !important; }
+  .ai-drawer { width: min(100vw, 480px) !important; }
+}
 @media (max-width: 560px) {
   .ai-drawer { width: 100vw !important; }
+  .ai-textbtn span { display: none; }
 }
 </style>
diff --git a/frontends/apps/simple-platform-vue/src/components/map-editor/AiAssistantPanel.vue b/frontends/apps/simple-platform-vue/src/components/map-editor/AiAssistantPanel.vue
index 38bce1c..434e88c 100644
--- a/frontends/apps/simple-platform-vue/src/components/map-editor/AiAssistantPanel.vue
+++ b/frontends/apps/simple-platform-vue/src/components/map-editor/AiAssistantPanel.vue
@@ -257,6 +257,7 @@ async function send() {
 </script>
 
 <style scoped>
+/* Shares --ai-* tokens with AiAssistantDrawer (A/E paper · C amethyst) */
 .ai-assistant-panel {
   position: absolute;
   top: 0;
@@ -265,11 +266,10 @@ async function send() {
   z-index: 30;
   display: flex;
   flex-direction: column;
-  /* 实底（高不透明），解决「太透明看不清」 */
-  background: linear-gradient(180deg, rgba(28, 12, 56, 0.98) 0%, rgba(16, 6, 34, 0.99) 100%);
-  border-left: 1px solid rgba(190, 140, 240, 0.28);
-  box-shadow: -10px 0 30px rgba(8, 2, 16, 0.55);
-  color: rgba(236, 224, 250, 0.95);
+  background: var(--ai-panel-bg);
+  border-left: 1px solid var(--ai-panel-border);
+  box-shadow: var(--ai-panel-shadow);
+  color: var(--ai-bot-fg);
   transform: translateX(100%);
   opacity: 0;
   visibility: hidden;
@@ -281,7 +281,6 @@ async function send() {
   visibility: visible;
 }
 
-/* 左沿拖拽手柄：覆盖在 border-left 上方，hover 高亮提示可拖拽。 */
 .aap-resizer {
   position: absolute;
   left: 0;
@@ -294,7 +293,7 @@ async function send() {
   transition: background 0.15s ease;
   touch-action: none;
 }
-.aap-resizer:hover { background: rgba(190, 140, 240, 0.45); }
+.aap-resizer:hover { background: var(--ai-accent-soft); }
 
 .aap-header {
   flex: none;
@@ -302,35 +301,46 @@ async function send() {
   align-items: center;
   justify-content: space-between;
   gap: 8px;
-  padding: 12px 14px;
-  background: linear-gradient(135deg, rgba(120, 70, 220, 0.5) 0%, rgba(255, 90, 200, 0.4) 100%);
-  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+  padding: 14px 16px;
+  background: var(--ai-head-bg);
+  border-bottom: 1px solid var(--ai-head-border);
 }
 .aap-title { display: flex; align-items: center; gap: 10px; min-width: 0; }
 .aap-glyph {
-  font-size: 20px;
-  color: #fff;
-  text-shadow: 0 0 10px rgba(255, 200, 250, 0.7);
+  width: 32px;
+  height: 32px;
+  border-radius: 10px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
   flex: none;
+  color: var(--ai-avatar-bot-fg);
+  background: var(--ai-avatar-bot-bg);
+  border: 1px solid var(--ai-avatar-bot-border);
 }
 .aap-title-text { min-width: 0; }
-.aap-title-main { font-size: 15px; font-weight: 700; color: #fff; line-height: 1.2; }
-.aap-title-sub { font-size: 11px; color: rgba(240, 222, 255, 0.78); margin-top: 2px; }
+.aap-title-main { font-size: 15px; font-weight: 700; color: var(--ai-title); line-height: 1.2; }
+.aap-title-sub { font-size: 11px; color: var(--ai-muted); margin-top: 2px; }
 .aap-close {
   appearance: none;
-  border: 0;
-  background: rgba(255, 255, 255, 0.12);
-  color: #fff;
-  width: 26px;
-  height: 26px;
-  border-radius: 6px;
+  border: 1px solid transparent;
+  background: transparent;
+  color: var(--ai-muted);
+  width: 28px;
+  height: 28px;
+  border-radius: 8px;
   cursor: pointer;
   font-size: 13px;
   line-height: 1;
   flex: none;
-  transition: background 0.15s ease;
+  transition: background 0.15s ease, color 0.15s ease, border-color 0.15s ease;
+}
+.aap-close:hover {
+  background: var(--ai-close-hover-bg);
+  color: var(--ai-close-hover-fg);
+  border-color: var(--ai-accent-soft-border);
 }
-.aap-close:hover { background: rgba(255, 255, 255, 0.24); }
 
 .aap-alert { margin: 10px 12px 0; }
 
@@ -338,30 +348,33 @@ async function send() {
   flex: 1 1 0;
   min-height: 0;
   overflow-y: auto;
-  padding: 12px;
+  padding: 14px;
   display: flex;
   flex-direction: column;
   gap: 10px;
+  scrollbar-width: thin;
+  scrollbar-color: var(--ai-scrollbar) transparent;
 }
+.aap-messages::-webkit-scrollbar { width: 6px; }
+.aap-messages::-webkit-scrollbar-thumb { background: var(--ai-scrollbar); border-radius: 3px; }
 
 .aap-empty { padding: 8px 2px; display: flex; flex-direction: column; gap: 8px; }
-.aap-empty-title { font-size: 12px; color: rgba(210, 188, 240, 0.7); }
+.aap-empty-title { font-size: 12px; color: var(--ai-muted); }
 .aap-example {
   appearance: none;
   text-align: left;
-  border: 1px dashed rgba(190, 140, 240, 0.4);
-  background: rgba(255, 255, 255, 0.04);
-  color: rgba(232, 215, 245, 0.9);
-  border-radius: 8px;
-  padding: 8px 10px;
+  border: 1px solid var(--ai-example-border);
+  background: var(--ai-example-bg);
+  color: var(--ai-example-fg);
+  border-radius: 10px;
+  padding: 9px 11px;
   font-size: 12.5px;
   cursor: pointer;
-  transition: all 0.15s ease;
+  transition: border-color 0.15s ease, transform 0.15s ease;
 }
 .aap-example:hover {
-  background: rgba(150, 90, 230, 0.22);
-  border-color: rgba(190, 140, 240, 0.7);
-  color: #fff;
+  border-color: var(--ai-accent);
+  transform: translateY(-1px);
 }
 
 .aap-msg { display: flex; }
@@ -369,38 +382,38 @@ async function send() {
 .aap-msg--assistant { justify-content: flex-start; }
 .aap-bubble {
   max-width: 86%;
-  padding: 8px 11px;
-  border-radius: 12px;
+  padding: 9px 12px;
+  border-radius: 14px;
   font-size: 13px;
-  line-height: 1.5;
+  line-height: 1.55;
 }
 .aap-msg--user .aap-bubble {
-  background: linear-gradient(135deg, rgba(150, 90, 240, 0.95) 0%, rgba(120, 70, 220, 0.95) 100%);
-  color: #fff;
+  background: var(--ai-user-bg);
+  color: var(--ai-user-fg);
   border-bottom-right-radius: 4px;
 }
 .aap-msg--assistant .aap-bubble {
-  background: rgba(255, 255, 255, 0.07);
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  color: rgba(236, 224, 250, 0.95);
+  background: var(--ai-bot-bg);
+  border: 1px solid var(--ai-bot-border);
+  color: var(--ai-bot-fg);
   border-bottom-left-radius: 4px;
+  box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
 }
 .aap-bubble-text { white-space: pre-wrap; word-break: break-word; }
 .aap-meta {
   margin-top: 6px;
   padding-top: 6px;
-  border-top: 1px dashed rgba(255, 255, 255, 0.14);
+  border-top: 1px dashed var(--ai-bot-border);
   font-size: 11.5px;
-  color: rgba(210, 188, 240, 0.8);
+  color: var(--ai-muted);
 }
-.aap-meta b { color: var(--mg-accent, #c4a4ff); }
-.aap-meta-ic { color: #6ee7b7; margin-right: 4px; vertical-align: -2px; }
+.aap-meta b { color: var(--ai-accent); }
+.aap-meta-ic { color: #10b981; margin-right: 4px; vertical-align: -2px; }
 
-/* assistant 消息 Markdown 渲染 */
-.aap-md { font-size: 13px; line-height: 1.6; word-break: break-word; color: rgba(236, 224, 250, 0.95); }
+.aap-md { font-size: 13px; line-height: 1.6; word-break: break-word; color: var(--ai-bot-fg); }
 .aap-md :deep(p) { margin: 0 0 7px; }
 .aap-md :deep(p:last-child) { margin-bottom: 0; }
-.aap-md :deep(.mmd-h) { margin: 8px 0 5px; font-weight: 700; color: #fff; }
+.aap-md :deep(.mmd-h) { margin: 8px 0 5px; font-weight: 700; color: var(--ai-title); }
 .aap-md :deep(h3.mmd-h) { font-size: 14px; }
 .aap-md :deep(h4.mmd-h) { font-size: 13px; }
 .aap-md :deep(.mmd-ul), .aap-md :deep(.mmd-ol) { margin: 4px 0 7px; padding-left: 18px; }
@@ -408,16 +421,17 @@ async function send() {
 .aap-md :deep(.mmd-code) {
   font-family: var(--mg-font-mono, monospace);
   font-size: 12px;
-  background: rgba(0, 0, 0, 0.4);
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  background: var(--ai-md-code-bg);
+  color: var(--ai-md-code-fg);
+  border: 1px solid var(--ai-example-border);
   border-radius: 5px;
   padding: 1px 5px;
 }
 .aap-md :deep(.mmd-pre) {
   margin: 6px 0;
   padding: 9px 11px;
-  background: rgba(0, 0, 0, 0.42);
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  background: var(--ai-md-pre-bg);
+  border: 1px solid var(--ai-md-pre-border);
   border-radius: 8px;
   overflow: auto;
   max-height: 280px;
@@ -425,22 +439,24 @@ async function send() {
 .aap-md :deep(.mmd-pre code) {
   font-family: var(--mg-font-mono, monospace);
   font-size: 12px;
-  color: rgba(220, 230, 245, 0.95);
+  color: var(--ai-bot-fg);
   white-space: pre;
 }
-.aap-md :deep(.mmd-link) { color: var(--mg-accent, #c4a4ff); text-decoration: underline; }
+.aap-md :deep(.mmd-link) { color: var(--ai-md-link); text-decoration: underline; }
 .aap-md :deep(.mmd-quote) {
   margin: 6px 0;
   padding: 3px 10px;
-  border-left: 3px solid rgba(190, 140, 240, 0.6);
-  color: rgba(220, 205, 250, 0.85);
+  border-left: 3px solid var(--ai-md-blockquote-border);
+  color: var(--ai-md-blockquote-fg);
 }
-.aap-md :deep(strong) { color: #fff; }
+.aap-md :deep(strong) { color: var(--ai-title); }
 .aap-bubble--loading {
   display: inline-flex;
   align-items: center;
   gap: 8px;
-  color: rgba(210, 188, 240, 0.85);
+  color: var(--ai-thinking-fg);
+  background: var(--ai-thinking-bg) !important;
+  border: 1px solid var(--ai-thinking-border) !important;
 }
 
 .aap-toolbar {
@@ -448,21 +464,51 @@ async function send() {
   display: flex;
   align-items: center;
   gap: 8px;
-  padding: 8px 12px 0;
+  padding: 8px 14px 0;
   flex-wrap: wrap;
+  border-top: 1px solid var(--ai-composer-border);
+  background: var(--ai-composer-bg);
 }
-.aap-toolbar-label { font-size: 11.5px; color: rgba(210, 188, 240, 0.7); flex: none; }
+.aap-toolbar-label { font-size: 11.5px; color: var(--ai-muted); flex: none; }
 .aap-toolbar :deep(.el-radio-button__inner) {
   padding: 5px 9px;
   font-size: 12px;
+  background: var(--ai-input-bg);
+  color: var(--ai-input-fg);
+  border-color: var(--ai-input-border);
+}
+.aap-toolbar :deep(.el-radio-button__original-radio:checked + .el-radio-button__inner) {
+  background: var(--ai-accent) !important;
+  border-color: var(--ai-accent) !important;
+  color: #fff !important;
+  box-shadow: none !important;
 }
 
 .aap-input {
   flex: none;
-  padding: 8px 12px 12px;
+  padding: 8px 14px 14px;
   display: flex;
   flex-direction: column;
   gap: 8px;
+  background: var(--ai-composer-bg);
+}
+.aap-input :deep(.el-textarea__inner) {
+  background: var(--ai-input-bg) !important;
+  border: 1px solid var(--ai-input-border) !important;
+  color: var(--ai-input-fg) !important;
+  box-shadow: none !important;
+  border-radius: 10px;
+}
+.aap-input :deep(.el-textarea__inner::placeholder) {
+  color: var(--ai-input-placeholder) !important;
+}
+.aap-input :deep(.el-textarea__inner:focus) {
+  border-color: var(--ai-accent) !important;
 }
 .aap-send { align-self: flex-end; min-width: 84px; }
+.aap-send.el-button--primary {
+  background: var(--ai-send-bg) !important;
+  border-color: transparent !important;
+  color: var(--ai-send-fg) !important;
+}
 </style>
diff --git a/frontends/apps/simple-platform-vue/src/components/map-editor/EditPropertyPanel.vue b/frontends/apps/simple-platform-vue/src/components/map-editor/EditPropertyPanel.vue
index c2dca9c..2c6889a 100644
--- a/frontends/apps/simple-platform-vue/src/components/map-editor/EditPropertyPanel.vue
+++ b/frontends/apps/simple-platform-vue/src/components/map-editor/EditPropertyPanel.vue
@@ -166,7 +166,8 @@
 
               <button
                 class="prop-add-field-btn"
-                :disabled="!addableFieldOptions.length"
+                :disabled="fieldCatalogLoading"
+                type="button"
                 @click="openAddFieldDialog"
               >
                 ＋ 添加字段
@@ -180,12 +181,24 @@
             width="420px"
             append-to-body
             destroy-on-close
+            align-center
+            class="add-field-dialog"
           >
+            <p v-if="fieldCatalogError" class="add-field-hint is-warn">
+              字段目录加载失败：{{ fieldCatalogError }}。仍可手动输入字段名。
+            </p>
+            <p v-else-if="!addableFieldOptions.length" class="add-field-hint">
+              目录中暂无可添加项（可能尚未在「字段管理」配置，或已全部加到该对象）。可手动输入字段名。
+            </p>
             <el-select
               v-model="addFieldPickKey"
               filterable
-              placeholder="选择要添加的字段"
+              allow-create
+              default-first-option
+              clearable
+              placeholder="选择或输入字段名"
               class="add-field-select"
+              teleported
             >
               <el-option
                 v-for="opt in addableFieldOptions"
@@ -196,7 +209,7 @@
             </el-select>
             <template #footer>
               <el-button @click="addFieldDialogOpen = false">取消</el-button>
-              <el-button type="primary" :disabled="!addFieldPickKey" @click="confirmAddField">
+              <el-button type="primary" :disabled="!addFieldPickKey.trim()" @click="confirmAddField">
                 确定
               </el-button>
             </template>
@@ -525,9 +538,10 @@ watch(
 )
 
 watch(
-  () => props.selectionKind,
-  (k) => {
-    if (k === 'site' || k === 'track') tab.value = 'defaults'
+  () => [props.selectionKind, props.primary?.id] as const,
+  ([k, id]) => {
+    // 选中站点 / 路径 / 车辆时默认停在「对象」页；类型默认仅用户主动点开。
+    if (id != null && (k === 'site' || k === 'track' || k === 'car')) tab.value = 'object'
   }
 )
 
@@ -607,6 +621,8 @@ const carTypeRef = computed(() => props.carType ?? null)
 const {
   loading: fieldCatalogLoading,
   records: fieldCatalogRecords,
+  lastError: fieldCatalogError,
+  reload: reloadFieldCatalog,
   labelForKey,
   defaultValueForKey
 } = useSimpleFieldCatalog(selectionKindRef, carTypeRef)
@@ -626,20 +642,18 @@ function customFieldDisplayLabel(key: string, chinese: string): string {
   return `${key} - ${cn}`
 }
 
-/** 仅展示已在对象上存在、且在 simple_fields 目录中的扩展字段 */
+/** 展示对象上已有的扩展字段；目录有中文名则带上，目录外字段仍可编辑 */
 const customFieldRows = computed(() =>
-  otherFields.value
-    .filter((f) => catalogKeySet.value.has(f.key))
-    .map((f) => {
-      const chinese = labelForKey(f.key)
-      return {
-        key: f.key,
-        value: f.value,
-        dataType: catalogDataTypeByKey.value.get(f.key) ?? '',
-        chinese,
-        label: customFieldDisplayLabel(f.key, chinese)
-      }
-    })
+  otherFields.value.map((f) => {
+    const chinese = catalogKeySet.value.has(f.key) ? labelForKey(f.key) : ''
+    return {
+      key: f.key,
+      value: f.value,
+      dataType: catalogDataTypeByKey.value.get(f.key) ?? '',
+      chinese,
+      label: customFieldDisplayLabel(f.key, chinese || '—')
+    }
+  })
 )
 
 const addableFieldOptions = computed(() => {
@@ -714,14 +728,23 @@ function onCustomFieldCommit(key: string, value: string) {
   onFieldChange(key, value)
 }
 
-function openAddFieldDialog() {
+async function openAddFieldDialog() {
+  await reloadFieldCatalog()
   addFieldPickKey.value = addableFieldOptions.value[0]?.key ?? ''
   addFieldDialogOpen.value = true
 }
 
 function confirmAddField() {
-  const key = addFieldPickKey.value
+  const key = addFieldPickKey.value.trim()
   if (!key) return
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
+    ElMessage.warning('字段名仅允许字母/数字/下划线，且不能以数字开头')
+    return
+  }
+  if (customFieldRows.value.some((r) => r.key === key) || props.fields.some((f) => f.key === key)) {
+    ElMessage.warning(`字段 ${key} 已存在`)
+    return
+  }
   const value = defaultValueForKey(key)
   customFieldDrafts.value = { ...customFieldDrafts.value, [key]: value }
   addFieldDialogOpen.value = false
@@ -1276,6 +1299,13 @@ function onDelete() {
     0 0 0 3px rgba(var(--mg-primary-rgb), 0.14) !important;
 }
 .add-field-select { width: 100%; }
+.add-field-hint {
+  margin: 0 0 10px;
+  font-size: 12px;
+  line-height: 1.45;
+  color: var(--me-text-muted);
+}
+.add-field-hint.is-warn { color: #b45309; }
 
 /* 运行状态：胶囊行 */
 .prop-status-list {
diff --git a/frontends/apps/simple-platform-vue/src/components/map-editor/EditStatusBar.vue b/frontends/apps/simple-platform-vue/src/components/map-editor/EditStatusBar.vue
index d28c1da..d67f456 100644
--- a/frontends/apps/simple-platform-vue/src/components/map-editor/EditStatusBar.vue
+++ b/frontends/apps/simple-platform-vue/src/components/map-editor/EditStatusBar.vue
@@ -13,14 +13,14 @@
       吸附：<b :class="{ on: snapOn, off: !snapOn }">{{ snapOn ? '开' : '关' }}</b>
     </span>
     <span class="spacer" />
-    <span class="seg">历史 {{ undoSize }} / {{ redoSize }}</span>
+    <span class="seg">可撤销 {{ undoSize }}/{{ undoLimit }} · 可重做 {{ redoSize }}</span>
     <span v-if="connected" class="seg ok">● 实时通道在线</span>
     <span v-else class="seg warn">● 实时通道断开</span>
   </div>
 </template>
 
 <script setup lang="ts">
-defineProps<{
+withDefaults(defineProps<{
   selectedCount: number
   mouseX: number
   mouseY: number
@@ -28,8 +28,11 @@ defineProps<{
   snapOn: boolean
   undoSize: number
   redoSize: number
+  undoLimit?: number
   connected: boolean
-}>()
+}>(), {
+  undoLimit: 20
+})
 
 function formatXY(v: number) {
   if (!Number.isFinite(v)) return '--'
diff --git a/frontends/apps/simple-platform-vue/src/components/map-editor/EditToolRail.vue b/frontends/apps/simple-platform-vue/src/components/map-editor/EditToolRail.vue
index 9ab17fb..8972660 100644
--- a/frontends/apps/simple-platform-vue/src/components/map-editor/EditToolRail.vue
+++ b/frontends/apps/simple-platform-vue/src/components/map-editor/EditToolRail.vue
@@ -50,6 +50,8 @@ interface ToolGroup { id: string; title: string; tools: ToolDef[] }
 
 const props = defineProps<{
   activeTool: EditToolId
+  /** 左侧「仅*」互斥过滤模式；与 activeTool 独立，可与绘制工具同时生效。 */
+  activeSelectOnly?: 'site' | 'straight' | 'curve' | 'decor' | null
 }>()
 
 const emit = defineEmits<{
@@ -62,17 +64,10 @@ const groups: ToolGroup[] = [
     id: 'select',
     title: '选择',
     tools: [
-      { id: 'select.single', label: '单选', glyph: '⌖', tip: '点击拾取单个对象' },
-      { id: 'select.rect', label: '矩形框选', glyph: '▱' },
-      { id: 'select.lasso', label: '套索圈选', glyph: '◯' },
-      { id: 'select.byType.site', label: '仅站点', glyph: '·' },
-      { id: 'select.byType.polyline', label: '仅折线', glyph: '╱', tip: '仅 UITrack（直线/折线）' },
-      { id: 'select.byType.bezier', label: '仅贝塞尔', glyph: '∽', tip: '仅 UIBezierTrack' },
-      { id: 'select.byType.arc', label: '仅弧形', glyph: '◜', tip: '仅 UICircularArcTrack' },
-      { id: 'select.byType.decor', label: '仅装饰', glyph: '★' },
-      { id: 'select.byType.currentLayer', label: '当前图层', glyph: '▤', tip: '保留当前图层对象' },
-      { id: 'select.invert', label: '反选', glyph: '⇄' },
-      { id: 'select.clear', label: '清空选中', glyph: '⊘' }
+      { id: 'select.byType.site', label: '仅站点', glyph: '·', tip: '画布只能选中站点；再点一次取消' },
+      { id: 'select.byType.straight', label: '仅直线', glyph: '─', tip: '仅 UITrack（直线/折线）；再点一次取消' },
+      { id: 'select.byType.curve', label: '仅曲线', glyph: '∽', tip: '贝塞尔 / 弧 / NURBS；再点一次取消' },
+      { id: 'select.byType.decor', label: '仅装饰', glyph: '★', tip: '画布只能选中装饰；再点一次取消' }
     ]
   },
   {
@@ -80,29 +75,23 @@ const groups: ToolGroup[] = [
     title: '绘制',
     tools: [
       { id: 'draw.site', label: '添加站点', glyph: '＋', tip: '点击工具后在画布单击放置' },
-      { id: 'draw.sites.continuous', label: '连续站点', glyph: '⁂', tip: '切换工具或 Esc 退出' },
-      { id: 'draw.track.polyline', label: '折线路径', glyph: '─', tip: '依序点击两端站点' },
-      { id: 'draw.track.bezier', label: '贝塞尔路径', glyph: '∼', tip: '点两端站点 → 弹框输入中间控制点个数 → 连续点选每个控制点' },
-      { id: 'draw.track.arc', label: '弧形路径', glyph: '◜', tip: '点两端站点 → 输入半径（≥ |AB|/2，等于即半圆）' },
-      { id: 'draw.decor.line', label: '装饰线段', glyph: '╱' },
-      { id: 'draw.decor.rect', label: '装饰矩形', glyph: '▭' },
-      { id: 'draw.decor.circle', label: '装饰圆', glyph: '◯' },
-      { id: 'draw.decor.text', label: '装饰文本', glyph: 'T' },
-      { id: 'draw.image', label: '插入图片', glyph: '🖼' },
-      { id: 'draw.model', label: '插入模型', glyph: '◎', tip: 'CycleGUI 3D 模型 (obj/glb/gltf)' }
+      { id: 'draw.sites.continuous', label: '连续站点', glyph: '⁂', tip: '切换工具或右键退出' },
+      { id: 'draw.track.polyline', label: '直线路径', glyph: '─', tip: '依序点击两端站点' },
+      { id: 'draw.tracks.continuous', label: '连续直线', glyph: '⇉', tip: '连续点两端站点建直线；右键退出' },
+      { id: 'draw.track.bezier', label: '贝塞尔路径', glyph: '∼', tip: '点两端站点 → 输入中间控制点个数 → 连续点选' },
+      { id: 'draw.track.arc', label: '弧形路径', glyph: '◜', tip: '点两端站点 → 输入半径（≥ |AB|/2）' },
+      { id: 'draw.decor.text', label: '装饰文本', glyph: 'T', tip: '输入内容后在画布单击落点' },
+      { id: 'draw.image', label: '插入图片', glyph: '🖼', tip: '选择图片后在画布单击落点' }
     ]
   },
   {
     id: 'transform',
     title: '变换',
     tools: [
-      { id: 'transform.move', label: '移动', glyph: '✥' },
-      { id: 'transform.rotate', label: '旋转', glyph: '⟳' },
-      { id: 'transform.scale', label: '缩放', glyph: '⤡' },
       { id: 'transform.copy', label: '复制', glyph: '📋', tip: 'Ctrl+C' },
-      { id: 'transform.paste', label: '粘贴', glyph: '📥', tip: 'Ctrl+V' },
-      { id: 'transform.delete', label: '删除', glyph: '🗑', tip: 'Delete' },
-      { id: 'transform.copyFields', label: '复制字段', glyph: '⇉', tip: '多选时第 1 个为源，其余为目标' }
+      { id: 'transform.paste', label: '粘贴', glyph: '📥', tip: 'Ctrl+V，相对原位置偏移 200mm' },
+      { id: 'transform.duplicate', label: '复制副本', glyph: '⧉', tip: 'Ctrl+D' },
+      { id: 'transform.delete', label: '删除', glyph: '🗑', tip: 'Delete' }
     ]
   },
   {
@@ -111,7 +100,7 @@ const groups: ToolGroup[] = [
     tools: [
       { id: 'align.left', label: '左对齐', glyph: '⫷' },
       { id: 'align.right', label: '右对齐', glyph: '⫸' },
-      { id: 'align.top', label: '上对齐', glyph: '⫵' },
+      { id: 'align.top', label: '上对齐', glyph: '⤒' },
       { id: 'align.bottom', label: '下对齐', glyph: '⫶' },
       { id: 'align.centerH', label: '水平居中', glyph: '⇔' },
       { id: 'align.centerV', label: '垂直居中', glyph: '⇕' },
@@ -143,7 +132,13 @@ const groups: ToolGroup[] = [
   }
 ]
 
-function isActive(id: EditToolId) { return id === props.activeTool }
+function isActive(id: EditToolId) {
+  if (id.startsWith('select.byType.')) {
+    const t = id.replace('select.byType.', '')
+    return props.activeSelectOnly === t
+  }
+  return id === props.activeTool
+}
 function onClick(id: EditToolId) { emit('select-tool', id) }
 </script>
 
diff --git a/frontends/apps/simple-platform-vue/src/components/map-editor/EditTopBar.vue b/frontends/apps/simple-platform-vue/src/components/map-editor/EditTopBar.vue
index 81b91cb..2433d3d 100644
--- a/frontends/apps/simple-platform-vue/src/components/map-editor/EditTopBar.vue
+++ b/frontends/apps/simple-platform-vue/src/components/map-editor/EditTopBar.vue
@@ -16,7 +16,6 @@
           <el-dropdown-item command="file.import.dwg">导入 .dwg/.dxf</el-dropdown-item>
           <el-dropdown-item command="file.import.geojson">导入 .geojson</el-dropdown-item>
           <el-dropdown-item command="file.upload.image" divided>导入图片</el-dropdown-item>
-          <el-dropdown-item command="file.upload.model">导入 CycleGUI 模型</el-dropdown-item>
           <el-dropdown-item command="file.export.png" divided>导出 PNG</el-dropdown-item>
           <el-dropdown-item command="file.export.svg">导出 SVG</el-dropdown-item>
           <el-dropdown-item command="file.export.json">导出 JSON</el-dropdown-item>
@@ -25,109 +24,67 @@
     </el-dropdown>
 
     <el-dropdown trigger="click" @command="onCmd">
-      <el-button text class="topbar-btn">编辑</el-button>
+      <el-button text class="topbar-btn">
+        撤销
+        <span class="topbar-count">{{ undoCount }}/{{ undoLimit }}</span>
+      </el-button>
       <template #dropdown>
         <el-dropdown-menu>
-          <el-dropdown-item command="edit.cut">剪切 (Ctrl+X)</el-dropdown-item>
-          <el-dropdown-item command="edit.copy">复制 (Ctrl+C)</el-dropdown-item>
-          <el-dropdown-item command="edit.paste">粘贴 (Ctrl+V)</el-dropdown-item>
-          <el-dropdown-item command="edit.delete">删除 (Del)</el-dropdown-item>
-          <el-dropdown-item command="edit.selectAll" divided>全选</el-dropdown-item>
-          <el-dropdown-item command="edit.invert">反选</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-
-    <el-dropdown trigger="click" @command="onCmd">
-      <el-button text class="topbar-btn">撤销</el-button>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item command="edit.undo" :disabled="!canUndo">撤销 (Ctrl+Z)</el-dropdown-item>
-          <el-dropdown-item command="edit.redo" :disabled="!canRedo">重做 (Ctrl+Y)</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-
-    <el-dropdown trigger="click" @command="onCmd">
-      <el-button text class="topbar-btn">视图</el-button>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item command="view.fitAll">缩放至全屏</el-dropdown-item>
-          <el-dropdown-item command="view.fitSelection">缩放至选中</el-dropdown-item>
-          <el-dropdown-item command="view.toggleGrid" divided>显示网格</el-dropdown-item>
-          <el-dropdown-item command="view.toggleScale">显示比例尺</el-dropdown-item>
-          <el-dropdown-item command="view.toggle2D">切换 2D / 3D</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-
-    <el-dropdown trigger="click" @command="onCmd">
-      <el-button text class="topbar-btn">图层</el-button>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item command="layer.new">新建图层…</el-dropdown-item>
-          <el-dropdown-item command="layer.toggleVisibility">切换显示图层…</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-
-    <!--
-      「过滤」菜单：对齐 SimpleLite 桌面底部工具栏的「选择 / 对齐 / 显示内容」三组开关。
-      由 MapEditorView 维护 viewFilter 状态：
-        - selectFilter.{sites,tracks,cars,decor}：未勾选的类型不会进入 selection（也就不会被高亮 + 不会出现在右侧属性面板），等价于 SimpleLite 的 SelectFilter*。
-        - alignSnap.{sites,cars,tracks}：影响绘制工具吸附目标。
-        - showViewport.{sceneLabels,scenePrimitives,cars}：影响右侧属性面板的类型筛选；画布渲染本身仍由 SimpleLite LayerToShow / 后端开关控制，等后续后端 API 打通后可双向同步。
-      历史上「图层」菜单里的「站点层可见 / 可选」等三项是 stub，已删除并搬到这里。
-    -->
-    <el-dropdown trigger="click" @command="onCmd">
-      <el-button text class="topbar-btn">过滤</el-button>
-      <template #dropdown>
-        <el-dropdown-menu class="topbar-filter-menu">
-          <el-dropdown-item disabled class="topbar-filter-header">选择（可拾取）</el-dropdown-item>
-          <el-dropdown-item command="view.select.sites">{{ mark(viewFilter.selectFilter.sites) }} 站点</el-dropdown-item>
-          <el-dropdown-item command="view.select.tracks">{{ mark(viewFilter.selectFilter.tracks) }} 路径</el-dropdown-item>
-          <el-dropdown-item command="view.select.cars">{{ mark(viewFilter.selectFilter.cars) }} AGV</el-dropdown-item>
-          <el-dropdown-item command="view.select.decor">{{ mark(viewFilter.selectFilter.decor) }} 区域 / 装饰</el-dropdown-item>
-
-          <el-dropdown-item divided disabled class="topbar-filter-header">对齐（鼠标吸附）</el-dropdown-item>
-          <el-dropdown-item command="view.snap.sites">{{ mark(viewFilter.alignSnap.sites) }} 吸附站点</el-dropdown-item>
-          <el-dropdown-item command="view.snap.cars">{{ mark(viewFilter.alignSnap.cars) }} 吸附 AGV</el-dropdown-item>
-          <el-dropdown-item command="view.snap.tracks">{{ mark(viewFilter.alignSnap.tracks) }} 吸附路径</el-dropdown-item>
-
-          <el-dropdown-item divided disabled class="topbar-filter-header">显示内容</el-dropdown-item>
-          <el-dropdown-item command="view.show.sceneLabels">{{ mark(viewFilter.showViewport.sceneLabels) }} 场景图元标记</el-dropdown-item>
-          <el-dropdown-item command="view.show.scenePrimitives">{{ mark(viewFilter.showViewport.scenePrimitives) }} 场景图元</el-dropdown-item>
-          <el-dropdown-item command="view.show.cars">{{ mark(viewFilter.showViewport.cars) }} 车辆</el-dropdown-item>
+          <el-dropdown-item command="edit.undo" :disabled="!canUndo">
+            撤销 (Ctrl+Z) · {{ undoCount }}/{{ undoLimit }}
+          </el-dropdown-item>
+          <el-dropdown-item command="edit.redo" :disabled="!canRedo">
+            重做 (Ctrl+Y) · {{ redoCount }}
+          </el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
 
+    <!-- 编辑 / 视图 / 图层 / 过滤 已从顶栏移除；过滤由左侧「仅*」与 MapEditorView 驱动。 -->
     <div class="spacer" />
 
-    <el-tooltip content="撤销 (Ctrl+Z)" placement="bottom">
-      <el-button size="small" :disabled="!canUndo" class="topbar-icon-btn" @click="onCmd('edit.undo')">↶</el-button>
+    <el-tooltip :content="`撤销 (Ctrl+Z) · ${undoCount}/${undoLimit}`" placement="bottom">
+      <el-button size="small" :disabled="!canUndo" class="topbar-icon-btn" @click="onCmd('edit.undo')">
+        ↶
+        <span v-if="undoCount > 0" class="topbar-badge">{{ undoCount }}</span>
+      </el-button>
     </el-tooltip>
-    <el-tooltip content="重做 (Ctrl+Y)" placement="bottom">
-      <el-button size="small" :disabled="!canRedo" class="topbar-icon-btn" @click="onCmd('edit.redo')">↷</el-button>
+    <el-tooltip :content="`重做 (Ctrl+Y) · ${redoCount}`" placement="bottom">
+      <el-button size="small" :disabled="!canRedo" class="topbar-icon-btn" @click="onCmd('edit.redo')">
+        ↷
+        <span v-if="redoCount > 0" class="topbar-badge">{{ redoCount }}</span>
+      </el-button>
     </el-tooltip>
-
   </div>
 </template>
 
 <script setup lang="ts">
 export interface ViewFilterState {
-  selectFilter: { sites: boolean; tracks: boolean; cars: boolean; decor: boolean }
+  selectFilter: {
+    sites: boolean
+    tracks: boolean
+    cars: boolean
+    decor: boolean
+    trackMode?: 'all' | 'straight' | 'curve'
+  }
   alignSnap: { sites: boolean; cars: boolean; tracks: boolean }
   showViewport: { sceneLabels: boolean; scenePrimitives: boolean; cars: boolean }
 }
 
-defineProps<{
+withDefaults(defineProps<{
   canUndo: boolean
   canRedo: boolean
   saving?: boolean
-  // 由 MapEditorView 注入：「过滤」菜单的三组开关状态。父组件保证非空。
-  viewFilter: ViewFilterState
-}>()
+  undoCount?: number
+  redoCount?: number
+  undoLimit?: number
+  /** 保留类型兼容；顶栏「过滤」菜单已移除。 */
+  viewFilter?: ViewFilterState
+}>(), {
+  undoCount: 0,
+  redoCount: 0,
+  undoLimit: 20
+})
 
 const emit = defineEmits<{
   (e: 'cmd', cmd: string): void
@@ -136,10 +93,6 @@ const emit = defineEmits<{
 function onCmd(cmd: string) {
   emit('cmd', cmd)
 }
-
-function mark(on: boolean): string {
-  return on ? '☑' : '☐'
-}
 </script>
 
 <style scoped>
@@ -154,7 +107,6 @@ function mark(on: boolean): string {
   box-shadow: 0 2px 8px rgba(var(--mg-shadow-rgb, 22, 58, 74), 0.08);
 }
 .spacer { flex: 1; }
-.el-divider--vertical { margin: 0 6px; background: var(--me-border); }
 
 .topbar-btn {
   color: var(--me-text) !important;
@@ -169,23 +121,43 @@ function mark(on: boolean): string {
   color: var(--mg-primary) !important;
   background: var(--me-hover) !important;
 }
-.topbar-btn:focus {
-  background: var(--me-hover) !important;
+.topbar-count {
+  margin-left: 6px;
+  font-size: 11px;
+  font-weight: 500;
+  opacity: 0.72;
+  font-variant-numeric: tabular-nums;
 }
 
 .topbar-icon-btn {
+  position: relative;
   color: var(--me-text) !important;
   background: var(--me-surface) !important;
   border: 1px solid var(--me-border) !important;
   font-size: 15px;
+  min-width: 36px;
 }
 .topbar-icon-btn:hover:not(.is-disabled) {
   background: var(--me-hover) !important;
   border-color: rgba(var(--mg-primary-rgb), 0.55) !important;
   color: var(--mg-primary) !important;
 }
-.topbar-icon-btn.is-disabled {
-  opacity: 0.4;
+.topbar-icon-btn.is-disabled { opacity: 0.4; }
+.topbar-badge {
+  position: absolute;
+  top: -4px;
+  right: -4px;
+  min-width: 16px;
+  height: 16px;
+  padding: 0 4px;
+  border-radius: 8px;
+  background: var(--mg-primary);
+  color: #fff;
+  font-size: 10px;
+  font-weight: 700;
+  line-height: 16px;
+  text-align: center;
+  font-variant-numeric: tabular-nums;
 }
 
 .topbar-save-btn {
@@ -204,15 +176,4 @@ function mark(on: boolean): string {
   --el-button-text-color: #fff !important;
   --el-button-hover-text-color: #fff !important;
 }
-
-.topbar-filter-menu :deep(.topbar-filter-header) {
-  font-size: 11px;
-  color: var(--me-text-muted);
-  cursor: default;
-  pointer-events: none;
-  padding-top: 6px;
-  padding-bottom: 2px;
-  text-transform: none;
-  letter-spacing: 0.4px;
-}
 </style>
diff --git a/frontends/apps/simple-platform-vue/src/components/workbench/MonitorSelectionPanel.vue b/frontends/apps/simple-platform-vue/src/components/workbench/MonitorSelectionPanel.vue
index 7f2fac1..9a49ca6 100644
--- a/frontends/apps/simple-platform-vue/src/components/workbench/MonitorSelectionPanel.vue
+++ b/frontends/apps/simple-platform-vue/src/components/workbench/MonitorSelectionPanel.vue
@@ -217,6 +217,7 @@ import {
   extractSocFromKv,
   socToPercent
 } from '@/utils/batterySoc'
+import { formatTrafficStatus as formatTrafficStatusText } from '@/utils/carRuntime'
 import type { Car } from '@/types/car'
 import type { Mission } from '@/types/mission'
 import type { SelectedObjectRef } from '@/types/workbench'
@@ -406,36 +407,8 @@ function formatCarPosition(): string {
 }
 
 function formatTrafficStatus(): string {
-  const tc = pickStatus('TCStat') || pickField('TCStat')
-  if (tc && tc !== '/' && tc.trim() !== '') return tc
-
-  const blockedRaw = pickStatus('blockedBy')
-  if (blockedRaw && blockedRaw !== '[]' && blockedRaw !== '/') {
-    try {
-      const arr = JSON.parse(blockedRaw) as Array<{ carid?: number; type?: number }>
-      if (Array.isArray(arr) && arr.length > 0) {
-        const ids = arr.map((b) => b.carid).filter((id): id is number => id != null)
-        if (ids.length) return `被车辆 ${ids.join('、')} 交管`
-        return '交管阻塞'
-      }
-    } catch {
-      return blockedRaw.length > 48 ? `${blockedRaw.slice(0, 48)}…` : blockedRaw
-    }
-  }
-
-  const stopped = pickStatus('trafficStopped')
-  if (stopped && stopped !== '(0, 0)' && stopped !== '(0,0)' && stopped !== '/') {
-    return `交管暂停 ${stopped}`
-  }
-
-  const holding = pickStatus('holdingLocks')
-  const pending = pickStatus('pendingLocks')
-  const parts: string[] = []
-  if (holding && holding !== '[]') parts.push(`已占 ${holding}`)
-  if (pending && pending !== '[]') parts.push(`待锁 ${pending}`)
-  if (parts.length) return parts.join('；')
-
-  return '正常'
+  // 与车体浮窗 / 车辆列表同一口径（畅通 · 正常拿锁 · 被 X 车阻塞）
+  return formatTrafficStatusText(statusRows.value)
 }
 
 function formatAlarmStatus(): { text: string; warn: boolean } {
diff --git a/frontends/apps/simple-platform-vue/src/components/workbench/VehicleMonitorPanel.vue b/frontends/apps/simple-platform-vue/src/components/workbench/VehicleMonitorPanel.vue
index 8c92f4b..fbdf6ff 100644
--- a/frontends/apps/simple-platform-vue/src/components/workbench/VehicleMonitorPanel.vue
+++ b/frontends/apps/simple-platform-vue/src/components/workbench/VehicleMonitorPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="vehicle-monitor" :class="{ 'is-compact': compact, 'is-table': table }">
+  <div class="vehicle-monitor" :class="{ 'is-compact': compact, 'is-table': table, 'is-lite': lite }">
     <div v-if="!compact && !table" class="overview-row">
       <div class="overview-item">
         <div class="overview-num">{{ cars.length }}</div>
@@ -28,7 +28,7 @@
         v-model="search"
         size="small"
         clearable
-        :placeholder="table ? '搜索车辆编号/名称' : '搜索 ID / 名称 / 任务'"
+        :placeholder="tablePlaceholder"
         class="search"
       />
       <el-select
@@ -65,29 +65,92 @@
     </div>
 
     <div v-if="table" class="table-wrap">
-      <div class="table-head" aria-hidden="true">
-        <span class="col-id">车辆编号</span>
-        <span class="col-state">状态</span>
-        <span class="col-bat">电量</span>
-        <span class="col-pos">当前位置</span>
-      </div>
-      <div class="vehicle-list table-body">
-        <button
-          v-for="car in filteredCars"
-          :key="car.id"
-          type="button"
-          class="table-row"
-          :class="{ 'is-selected': car.id === selectedId }"
-          @click="onSelect(car)"
-        >
-          <span class="col-id" :title="car.name">{{ shortId(car) }}</span>
-          <span class="col-state">
-            <span class="state-dot" :class="`dot-${car.state}`" />
-            {{ stateLabel(car.state) }}
-          </span>
-          <span class="col-bat" :class="batteryLevel(batteryPct(car))">{{ batteryText(car) }}</span>
-          <span class="col-pos" :title="positionText(car)">{{ positionText(car) }}</span>
-        </button>
+      <div class="dense-scroll">
+        <table class="dense-table" aria-label="车辆列表">
+          <thead>
+            <tr>
+              <th class="col-vehicle">车辆</th>
+              <th class="col-state">状态</th>
+              <th class="col-bat">电量</th>
+              <th class="col-mission">任务</th>
+              <th v-if="!lite" class="col-alarm">报警</th>
+              <th class="col-tc">交管</th>
+              <th v-if="!lite" class="col-lock">锁点</th>
+              <th v-if="!lite" class="col-ops">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr
+              v-for="car in filteredCars"
+              :key="car.id"
+              class="dense-row"
+              :class="{
+                'is-selected': car.id === selectedId,
+                'has-alarm': !lite && hasAlarm(car),
+                'is-busy': !lite && !!actingId && actingId === carKey(car)
+              }"
+              tabindex="0"
+              @click="onSelect(car)"
+              @keydown.enter.prevent="onSelect(car)"
+            >
+              <td class="col-vehicle">
+                <div class="veh-cell">
+                  <span class="veh-id">{{ shortId(car) }}</span>
+                  <span class="veh-name" :title="car.name">{{ car.name || `车辆 ${shortId(car)}` }}</span>
+                </div>
+                <div class="veh-meta" :title="positionMeta(car)">{{ positionMeta(car) }}</div>
+              </td>
+              <td class="col-state">
+                <span class="state-pill" :class="`pill-${car.state}`">
+                  <i class="state-dot" :class="`dot-${car.state}`" />
+                  {{ stateLabel(car.state) }}
+                </span>
+              </td>
+              <td class="col-bat" :class="batteryLevel(batteryPct(car))">{{ batteryText(car) }}</td>
+              <td class="col-mission" :class="{ muted: !missionForCar(car) }" :title="missionTitle(car)">
+                {{ missionCell(car) }}
+              </td>
+              <td v-if="!lite" class="col-alarm" :class="{ warn: hasAlarm(car) }" :title="alarmText(car)">
+                {{ alarmCell(car) }}
+              </td>
+              <td class="col-tc" :class="{ warn: isTrafficBlocked(car) }" :title="trafficText(car)">
+                {{ trafficCell(car) }}
+              </td>
+              <td v-if="!lite" class="col-lock mono" :title="lockText(car)">{{ lockCell(car) }}</td>
+              <td v-if="!lite" class="col-ops" @click.stop>
+                <el-dropdown
+                  trigger="click"
+                  placement="bottom-end"
+                  :disabled="!!actingId"
+                  @command="(cmd: VehicleQuickAction) => onQuickAction(car, cmd)"
+                >
+                  <button
+                    type="button"
+                    class="ops-btn"
+                    :disabled="!!actingId"
+                    title="车辆操作"
+                  >
+                    操作
+                    <el-icon class="ops-caret"><ArrowDown /></el-icon>
+                  </button>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item
+                        v-for="op in quickActions"
+                        :key="op.value"
+                        :command="op.value"
+                        :divided="op.value === 'disable'"
+                        :class="{ 'is-danger-item': op.danger }"
+                      >
+                        {{ op.label }}
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </td>
+            </tr>
+          </tbody>
+        </table>
         <div v-if="!filteredCars.length" class="empty muted">无匹配车辆</div>
       </div>
     </div>
@@ -157,9 +220,17 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue'
+import { ArrowDown } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Car, CarState } from '@/types/car'
 import type { Mission, MissionStatus } from '@/types/mission'
 import type { SelectedObjectRef } from '@/types/workbench'
+import {
+  VEHICLE_QUICK_ACTIONS,
+  executeVehicleQuickAction,
+  type VehicleQuickAction
+} from '@/api/vehicleOps'
+import { isTrafficCongested } from '@/utils/carRuntime'
 
 const props = defineProps<{
   cars: Car[]
@@ -167,14 +238,27 @@ const props = defineProps<{
   selectedId?: string | null
   /** 紧凑模式：隐藏顶部概览条 */
   compact?: boolean
-  /** 表格模式：筛选芯片 + 四列表格（地图监控参考布局） */
+  /** 表格模式：筛选芯片 + 紧凑数据表（地图监控） */
   table?: boolean
+  /** 双栏精简：隐藏报警 / 锁点 / 操作列 */
+  lite?: boolean
 }>()
 
 const emit = defineEmits<{
   select: [ref: SelectedObjectRef]
+  'action-done': []
 }>()
 
+const quickActions = VEHICLE_QUICK_ACTIONS
+const actingId = ref<string | null>(null)
+
+const tablePlaceholder = computed(() => {
+  if (!props.table) return '搜索 ID / 名称 / 任务'
+  return props.lite
+    ? '搜索编号 / 名称 / 交管 / 任务'
+    : '搜索编号 / 名称 / 报警 / 交管 / 任务'
+})
+
 const search = ref('')
 const filterState = ref<CarState | ''>('')
 type QuickFilter = 'all' | 'running' | 'idle' | 'offline' | 'fault'
@@ -326,6 +410,63 @@ function positionText(car: Car): string {
   return `${Math.round(car.x)}, ${Math.round(car.y)}`
 }
 
+function positionMeta(car: Car): string {
+  const parts = [positionText(car)]
+  if (car.siteId != null) parts.push(`站点 #${car.siteId}`)
+  if (car.lstatus) parts.push(car.lstatus)
+  return parts.filter((p) => p && p !== '-').join(' · ') || '—'
+}
+
+function hasAlarm(car: Car): boolean {
+  return (car.alarmLevel != null && car.alarmLevel > 0) || !!car.alarmInfo || car.state === 'fault'
+}
+
+function alarmText(car: Car): string {
+  if (car.alarmInfo) return car.alarmInfo
+  if (car.state === 'fault') return car.lstatus || '故障'
+  return '无'
+}
+
+function alarmCell(car: Car): string {
+  const t = alarmText(car)
+  if (t === '无') return '—'
+  return t.length > 10 ? `${t.slice(0, 10)}…` : t
+}
+
+function trafficText(car: Car): string {
+  return (car.trafficStatus || '—').trim() || '—'
+}
+
+function isTrafficBlocked(car: Car): boolean {
+  return isTrafficCongested(trafficText(car))
+}
+
+function trafficCell(car: Car): string {
+  const t = trafficText(car)
+  return t.length > 14 ? `${t.slice(0, 14)}…` : t
+}
+
+function lockText(car: Car): string {
+  return (car.lockPoint || '—').trim() || '—'
+}
+
+function lockCell(car: Car): string {
+  const t = lockText(car)
+  return t.length > 10 ? `${t.slice(0, 10)}…` : t
+}
+
+function missionCell(car: Car): string {
+  const m = missionForCar(car)
+  if (!m) return car.missionId ? '有任务' : '空闲'
+  return missionStatusLabel(m.status)
+}
+
+function missionTitle(car: Car): string {
+  const m = missionForCar(car)
+  if (!m) return car.missionId ? `任务 ${car.missionId}` : '空闲'
+  return `${missionStatusLabel(m.status)} · ${m.name}`
+}
+
 const filteredCars = computed(() => {
   const q = search.value.trim().toLowerCase()
   const tokens = q ? q.split(/\s+/).filter(Boolean) : []
@@ -346,6 +487,11 @@ const filteredCars = computed(() => {
       c.typeName ?? '',
       c.group ?? '',
       c.ip ?? '',
+      c.lstatus ?? '',
+      c.alarmInfo ?? '',
+      c.trafficStatus ?? '',
+      c.lockPoint ?? '',
+      c.siteId != null ? String(c.siteId) : '',
       stateLabel(c.state),
       mission?.name ?? '',
       mission ? missionStatusLabel(mission.status) : '',
@@ -365,6 +511,51 @@ function detailIdForCar(car: Car): string {
   if (car.rawId != null) return String(car.rawId)
   return car.id.replace(/^C/i, '').replace(/^0+/, '') || car.id
 }
+
+function carKey(car: Car): string {
+  return String(car.rawId ?? car.id)
+}
+
+function rawIdOf(car: Car): number | null {
+  if (car.rawId != null && Number.isFinite(car.rawId)) return car.rawId
+  const n = Number(detailIdForCar(car))
+  return Number.isFinite(n) && n > 0 ? n : null
+}
+
+async function onQuickAction(car: Car, action: VehicleQuickAction) {
+  const rawId = rawIdOf(car)
+  if (rawId == null) {
+    ElMessage.warning('无法解析车辆 ID')
+    return
+  }
+  const op = quickActions.find((x) => x.value === action)
+  if (!op) return
+  try {
+    await ElMessageBox.confirm(
+      `${op.confirm}\n目标：${car.name || shortId(car)}（#${rawId}）`,
+      op.label,
+      {
+        type: op.danger ? 'warning' : 'info',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        distinguishCancelAndClose: true
+      }
+    )
+  } catch {
+    return
+  }
+
+  actingId.value = carKey(car)
+  try {
+    await executeVehicleQuickAction(rawId, action)
+    ElMessage.success(`已执行「${op.label}」`)
+    emit('action-done')
+  } catch (err) {
+    ElMessage.error(`「${op.label}」失败：${(err as Error).message}`)
+  } finally {
+    actingId.value = null
+  }
+}
 </script>
 
 <style scoped>
@@ -377,7 +568,12 @@ function detailIdForCar(car: Car): string {
   overflow: hidden;
 }
 .vehicle-monitor.is-compact { gap: 8px; }
-.vehicle-monitor.is-table { gap: 8px; }
+.vehicle-monitor.is-table { gap: 6px; }
+.vehicle-monitor.is-lite .col-vehicle { width: 36%; }
+.vehicle-monitor.is-lite .col-state { width: 86px; }
+.vehicle-monitor.is-lite .col-bat { width: 48px; }
+.vehicle-monitor.is-lite .col-mission { width: 72px; }
+.vehicle-monitor.is-lite .col-tc { width: auto; }
 
 .vehicle-monitor.is-compact .vehicle-row {
   border-radius: 8px;
@@ -450,7 +646,7 @@ function detailIdForCar(car: Car): string {
   color: var(--mg-text-muted);
   font-size: 11px;
   font-weight: 550;
-  height: 26px;
+  height: 24px;
   padding: 0 8px;
   border-radius: 6px;
   cursor: pointer;
@@ -480,80 +676,190 @@ function detailIdForCar(car: Car): string {
   display: flex;
   flex-direction: column;
   overflow: hidden;
+  border: 1px solid var(--mg-veil-border);
+  border-radius: 8px;
+  background: #fff;
 }
-.table-head,
-.table-row {
-  display: grid;
-  grid-template-columns: 56px 64px 48px minmax(0, 1fr);
-  gap: 6px;
-  align-items: center;
-  padding: 0 8px;
-}
-.table-head {
-  flex: none;
-  height: 28px;
-  font-size: 11px;
-  font-weight: 600;
-  color: var(--mg-text-muted);
-  border-bottom: 1px solid var(--mg-veil-border);
-}
-.table-body {
+.dense-scroll {
   flex: 1 1 0;
   min-height: 0;
-  overflow-y: auto;
-  gap: 0;
-  padding-right: 0;
+  overflow: auto;
 }
-.table-row {
-  appearance: none;
+.dense-table {
   width: 100%;
-  border: 0;
-  border-bottom: 1px solid var(--mg-veil-border);
-  background: transparent;
-  color: var(--mg-text-light);
+  border-collapse: separate;
+  border-spacing: 0;
+  table-layout: fixed;
+  font-size: 12px;
+}
+.dense-table thead th {
+  position: sticky;
+  top: 0;
+  z-index: 2;
+  height: 30px;
+  padding: 0 8px;
   text-align: left;
-  height: 40px;
-  font-size: 12px;
-  cursor: pointer;
-  transition: background 0.15s ease;
-}
-.table-row:hover {
-  background: var(--mg-veil-1);
-}
-.table-row.is-selected {
-  background: rgba(var(--mg-primary-rgb), 0.1);
-  box-shadow: inset 3px 0 0 var(--mg-primary);
-}
-.col-id {
-  font-family: var(--mg-font-mono);
-  font-variant-numeric: tabular-nums;
-  font-weight: 650;
-  font-size: 12px;
-}
-.col-state {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
   font-size: 11px;
+  font-weight: 650;
   color: var(--mg-text-muted);
+  background: var(--mg-veil-1, #f6f3fb);
+  border-bottom: 1px solid var(--mg-veil-border);
   white-space: nowrap;
 }
-.col-bat {
-  font-family: var(--mg-font-mono);
-  font-variant-numeric: tabular-nums;
-  font-size: 11px;
-  font-weight: 600;
+.dense-row {
+  cursor: pointer;
+  transition: background 0.12s ease;
 }
-.col-bat.low { color: var(--mg-status-danger); }
-.col-bat.mid { color: var(--mg-status-warning); }
-.col-bat.high { color: var(--mg-status-success); }
-.col-pos {
-  font-size: 11px;
-  color: var(--mg-text-dim);
+.dense-row td {
+  height: 40px;
+  padding: 4px 8px;
+  vertical-align: middle;
+  border-bottom: 1px solid rgba(40, 33, 58, 0.06);
+  color: var(--mg-text-light);
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.dense-row:hover td {
+  background: rgba(var(--mg-primary-rgb), 0.04);
+}
+.dense-row.is-selected td {
+  background: rgba(var(--mg-primary-rgb), 0.08);
+}
+.dense-row.is-selected td:first-child {
+  box-shadow: inset 3px 0 0 var(--mg-primary);
+}
+.dense-row.has-alarm td.col-alarm {
+  font-weight: 650;
+}
+.dense-row.is-busy {
+  opacity: 0.65;
+  pointer-events: none;
+}
+
+.col-vehicle { width: 22%; }
+.col-state { width: 88px; }
+.col-bat { width: 52px; }
+.col-mission { width: 72px; }
+.col-alarm { width: 14%; }
+.col-tc { width: 14%; }
+.col-lock { width: 72px; }
+.col-ops { width: 64px; text-align: right; }
+
+.veh-cell {
+  display: flex;
+  align-items: baseline;
+  gap: 6px;
+  min-width: 0;
+}
+.veh-id {
+  font-family: var(--mg-font-mono);
+  font-variant-numeric: tabular-nums;
+  font-size: 13px;
+  font-weight: 750;
+  color: var(--mg-text-light);
+  flex: none;
+}
+.veh-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 12px;
+  font-weight: 550;
+  color: var(--mg-text-light);
+}
+.veh-meta {
+  margin-top: 1px;
+  font-size: 10.5px;
+  color: var(--mg-text-faint);
+  font-family: var(--mg-font-mono);
+  font-variant-numeric: tabular-nums;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.state-pill {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  height: 22px;
+  padding: 0 7px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 650;
+  background: var(--mg-veil-1);
+  color: var(--mg-text-muted);
+  border: 1px solid var(--mg-veil-border);
+}
+.state-pill.pill-running {
+  color: var(--mg-status-success);
+  background: color-mix(in srgb, var(--mg-status-success) 12%, #fff);
+  border-color: color-mix(in srgb, var(--mg-status-success) 28%, transparent);
+}
+.state-pill.pill-fault {
+  color: var(--mg-status-danger);
+  background: color-mix(in srgb, var(--mg-status-danger) 10%, #fff);
+  border-color: color-mix(in srgb, var(--mg-status-danger) 28%, transparent);
+}
+.state-pill.pill-offline {
+  color: var(--mg-text-faint);
+}
+.state-pill.pill-charging {
+  color: var(--mg-primary);
+  background: rgba(var(--mg-primary-rgb), 0.08);
+  border-color: rgba(var(--mg-primary-rgb), 0.28);
+}
+.state-pill.pill-paused {
+  color: var(--mg-status-warning);
+  background: color-mix(in srgb, var(--mg-status-warning) 12%, #fff);
+}
+
+.ops-btn {
+  appearance: none;
+  height: 24px;
+  padding: 0 8px;
+  border-radius: 6px;
+  border: 1px solid rgba(var(--mg-primary-rgb), 0.35);
+  background: rgba(var(--mg-primary-rgb), 0.08);
+  color: var(--mg-primary);
+  font-size: 11px;
+  font-weight: 650;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  gap: 1px;
+  transition: background 0.15s ease, border-color 0.15s ease;
+}
+.ops-btn:hover:not(:disabled) {
+  background: rgba(var(--mg-primary-rgb), 0.14);
+  border-color: rgba(var(--mg-primary-rgb), 0.55);
+}
+.ops-btn:disabled { opacity: 0.55; cursor: not-allowed; }
+.ops-caret { font-size: 11px; margin-left: 1px; }
+
+.col-bat,
+.col-mission,
+.col-alarm,
+.col-tc,
+.col-lock {
+  font-variant-numeric: tabular-nums;
+}
+.col-bat.low,
+.col-alarm.warn,
+.col-tc.warn { color: var(--mg-status-danger); font-weight: 650; }
+.col-bat.mid { color: var(--mg-status-warning); font-weight: 650; }
+.col-bat.high { color: var(--mg-status-success); font-weight: 650; }
+.col-mission.muted { color: var(--mg-text-faint); }
+.mono {
+  font-family: var(--mg-font-mono);
+  font-variant-numeric: tabular-nums;
+}
+
+:deep(.is-danger-item) {
+  color: var(--mg-status-danger) !important;
+}
 .state-dot {
   width: 6px;
   height: 6px;
diff --git a/frontends/apps/simple-platform-vue/src/composables/useEditTool.ts b/frontends/apps/simple-platform-vue/src/composables/useEditTool.ts
index 6eae460..9ce26d7 100644
--- a/frontends/apps/simple-platform-vue/src/composables/useEditTool.ts
+++ b/frontends/apps/simple-platform-vue/src/composables/useEditTool.ts
@@ -46,6 +46,7 @@ export type EditToolId =
   | 'transform.scale'
   | 'transform.copy'
   | 'transform.paste'
+  | 'transform.duplicate'
   | 'transform.delete'
   | 'transform.copyFields'
   // 对齐组
@@ -136,6 +137,7 @@ export function useEditTool() {
       'transform.scale': '缩放',
       'transform.copy': '复制',
       'transform.paste': '粘贴',
+      'transform.duplicate': '复制副本',
       'transform.delete': '删除',
       'transform.copyFields': '复制字段',
       'align.left': '左对齐',
diff --git a/frontends/apps/simple-platform-vue/src/composables/useMapEditStream.ts b/frontends/apps/simple-platform-vue/src/composables/useMapEditStream.ts
index 4618baf..014b528 100644
--- a/frontends/apps/simple-platform-vue/src/composables/useMapEditStream.ts
+++ b/frontends/apps/simple-platform-vue/src/composables/useMapEditStream.ts
@@ -50,7 +50,7 @@ export interface SelectionDetailEvent {
 }
 
 export interface WorkspaceShortcutEvent {
-  action: 'undo' | 'redo' | 'delete'
+  action: 'undo' | 'redo' | 'delete' | 'copy' | 'paste' | 'duplicate'
 }
 
 export interface MapEditStreamHandlers {
diff --git a/frontends/apps/simple-platform-vue/src/composables/useSimpleFieldCatalog.ts b/frontends/apps/simple-platform-vue/src/composables/useSimpleFieldCatalog.ts
index 831a63d..86a5d85 100644
--- a/frontends/apps/simple-platform-vue/src/composables/useSimpleFieldCatalog.ts
+++ b/frontends/apps/simple-platform-vue/src/composables/useSimpleFieldCatalog.ts
@@ -43,6 +43,7 @@ export function useSimpleFieldCatalog(
 ) {
   const loading = ref(false)
   const records = ref<SimpleFieldRecord[]>([])
+  const lastError = ref<string | null>(null)
 
   const fieldType = computed(() => fieldCategoryForMapKind(kind.value))
 
@@ -56,9 +57,11 @@ export function useSimpleFieldCatalog(
     const ft = fieldType.value
     if (!ft) {
       records.value = []
+      lastError.value = null
       return
     }
     loading.value = true
+    lastError.value = null
     try {
       // 车辆：为兼容 shortName / assembly.shortName 等不同 car_type 存储格式，先拉 carFields 再前端匹配当前车型。
       if (ft === 'carFields') {
@@ -68,14 +71,22 @@ export function useSimpleFieldCatalog(
         const rows = await listSimpleFields(ft)
         records.value = dedupeByKey(rows)
       }
-    } catch {
+    } catch (err) {
       records.value = []
+      lastError.value = (err as Error)?.message || '字段目录加载失败'
     } finally {
       loading.value = false
     }
   }
 
   watch(fieldType, () => { void reload() }, { immediate: true })
+  // 选中车后 typeName 异步到齐时需重滤 carFields
+  watch(
+    () => carType?.value,
+    () => {
+      if (fieldType.value === 'carFields') void reload()
+    }
+  )
 
   function labelForKey(key: string): string {
     const row = byKey.value.get(key)
@@ -89,6 +100,7 @@ export function useSimpleFieldCatalog(
   return {
     loading,
     records,
+    lastError,
     fieldType,
     byKey,
     reload,
diff --git a/frontends/apps/simple-platform-vue/src/layouts/AppShell.vue b/frontends/apps/simple-platform-vue/src/layouts/AppShell.vue
index 24525c2..986c4eb 100644
--- a/frontends/apps/simple-platform-vue/src/layouts/AppShell.vue
+++ b/frontends/apps/simple-platform-vue/src/layouts/AppShell.vue
@@ -82,15 +82,6 @@
                 <el-dropdown-menu>
                   <el-dropdown-item v-if="auth.scope === 'Platform'" command="wizard">配置向导</el-dropdown-item>
                   <el-dropdown-item command="status">服务状态</el-dropdown-item>
-                  <el-dropdown-item divided disabled class="legacy-theme-label">高级 · 兼容主题</el-dropdown-item>
-                  <el-dropdown-item
-                    v-for="t in ui.legacyThemes"
-                    :key="t.id"
-                    :command="`theme:${t.id}`"
-                    :class="{ 'is-legacy-active': t.id === ui.themeId }">
-                    <span class="legacy-swatch" :style="{ background: t.preview }" />
-                    {{ t.name }}
-                  </el-dropdown-item>
                   <el-dropdown-item command="logout" divided>退出登录</el-dropdown-item>
                 </el-dropdown-menu>
               </template>
@@ -184,10 +175,6 @@ const activePath = computed(() => {
 const currentTitle = computed(() => (route.meta.title as string | undefined) ?? '')
 
 function onUserCommand(cmd: string) {
-  if (cmd.startsWith('theme:')) {
-    ui.setThemeId(cmd.slice('theme:'.length))
-    return
-  }
   if (cmd === 'logout') {
     auth.logout()
     router.push('/login')
@@ -568,25 +555,3 @@ function onUserCommand(cmd: string) {
   flex-direction: column;
 }
 </style>
-
-<style>
-/* 用户菜单「兼容主题」项（teleport 到 body） */
-.legacy-theme-label {
-  font-size: 11px !important;
-  opacity: 0.65;
-  cursor: default !important;
-}
-.legacy-swatch {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-  margin-right: 8px;
-  vertical-align: middle;
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.12);
-}
-.el-dropdown-menu__item.is-legacy-active {
-  color: var(--mg-primary) !important;
-  font-weight: 600;
-}
-</style>
diff --git a/frontends/apps/simple-platform-vue/src/stores/ui.ts b/frontends/apps/simple-platform-vue/src/stores/ui.ts
index 189d55b..f3dad76 100644
--- a/frontends/apps/simple-platform-vue/src/stores/ui.ts
+++ b/frontends/apps/simple-platform-vue/src/stores/ui.ts
@@ -54,7 +54,6 @@ function loadInitial(): UiState {
     const schema = Number(localStorage.getItem(THEME_SCHEMA_KEY) || '0')
     const migrated = schema < THEME_SCHEMA_VERSION
     if (migrated) {
-      // ponytail: 一次强制 outpost-light，兼容主题仍可从高级菜单切回
       themeId = DEFAULT_THEME_ID
       localStorage.setItem(THEME_SCHEMA_KEY, String(THEME_SCHEMA_VERSION))
     }
diff --git a/frontends/apps/simple-platform-vue/src/styles/theme.css b/frontends/apps/simple-platform-vue/src/styles/theme.css
index 51529b9..cc6ca99 100644
--- a/frontends/apps/simple-platform-vue/src/styles/theme.css
+++ b/frontends/apps/simple-platform-vue/src/styles/theme.css
@@ -2323,3 +2323,119 @@ a:hover { color: rgba(var(--mg-accent-rgb), 0.85); }
 :root[data-theme="outpost-light"] .mg-content .map-editor-page .el-checkbox__label {
   color: #64748b !important;
 }
+
+/* ?? AI Assistant surface tokens (A Porcelain / C Amethyst / E Paper Split) ?? */
+:root[data-shell="outpost"] {
+  --ai-panel-bg: #ffffff;
+  --ai-side-bg: color-mix(in srgb, var(--ai-panel-bg) 92%, var(--ai-accent-soft));
+  --ai-panel-border: #e5e7eb;
+  --ai-panel-shadow: -12px 0 40px rgba(15, 23, 42, 0.08);
+  --ai-head-bg: #ffffff;
+  --ai-head-border: #e5e7eb;
+  --ai-title: rgba(45, 27, 105, 0.96);
+  --ai-muted: rgba(76, 29, 149, 0.52);
+  --ai-accent: var(--mg-primary);
+  --ai-accent-soft: color-mix(in srgb, var(--mg-primary) 12%, #ffffff);
+  --ai-accent-soft-border: color-mix(in srgb, var(--mg-primary) 28%, transparent);
+  --ai-user-bg: var(--mg-primary);
+  --ai-user-fg: #ffffff;
+  --ai-bot-bg: #ffffff;
+  --ai-bot-fg: rgba(45, 27, 105, 0.92);
+  --ai-bot-border: #e5e7eb;
+  --ai-example-bg: color-mix(in srgb, var(--mg-primary) 8%, #ffffff);
+  --ai-example-border: color-mix(in srgb, var(--mg-primary) 22%, transparent);
+  --ai-example-fg: color-mix(in srgb, var(--mg-primary) 78%, #1a0f3d);
+  --ai-input-bg: #ffffff;
+  --ai-input-border: #e5e7eb;
+  --ai-input-fg: rgba(45, 27, 105, 0.92);
+  --ai-input-placeholder: rgba(76, 29, 149, 0.4);
+  --ai-composer-bg: #ffffff;
+  --ai-composer-border: #e5e7eb;
+  --ai-send-bg: var(--mg-primary);
+  --ai-send-fg: #ffffff;
+  --ai-send-disabled: #c4b5fd;
+  --ai-dot: var(--mg-primary);
+  --ai-scrollbar: color-mix(in srgb, var(--mg-primary) 28%, transparent);
+  --ai-fab-bg: var(--mg-primary);
+  --ai-fab-fg: #ffffff;
+  --ai-fab-shadow: 0 8px 24px color-mix(in srgb, var(--mg-primary) 28%, transparent);
+  --ai-fab-glow: none;
+  --ai-md-code-bg: color-mix(in srgb, var(--mg-primary) 8%, #ffffff);
+  --ai-md-code-fg: color-mix(in srgb, var(--mg-primary) 72%, #1a0f3d);
+  --ai-md-pre-bg: #f8fafc;
+  --ai-md-pre-border: #e5e7eb;
+  --ai-md-blockquote-border: color-mix(in srgb, var(--mg-primary) 45%, transparent);
+  --ai-md-blockquote-fg: rgba(76, 29, 149, 0.72);
+  --ai-md-link: var(--mg-primary);
+  --ai-md-hr: #e5e7eb;
+  --ai-md-table-border: #e5e7eb;
+  --ai-md-th-bg: #f8fafc;
+  --ai-avatar-bot-bg: color-mix(in srgb, var(--mg-primary) 12%, #ffffff);
+  --ai-avatar-bot-fg: var(--mg-primary);
+  --ai-avatar-bot-border: color-mix(in srgb, var(--mg-primary) 28%, transparent);
+  --ai-avatar-user-bg: var(--mg-primary);
+  --ai-avatar-user-fg: #ffffff;
+  --ai-close-hover-bg: color-mix(in srgb, var(--mg-primary) 10%, #ffffff);
+  --ai-close-hover-fg: var(--mg-primary);
+  --ai-thinking-bg: color-mix(in srgb, var(--mg-primary) 6%, #ffffff);
+  --ai-thinking-border: color-mix(in srgb, var(--mg-primary) 18%, transparent);
+  --ai-thinking-fg: rgba(76, 29, 149, 0.62);
+}
+
+/* C �� Amethyst Dock �� purple theme only */
+:root[data-theme="outpost-purple"] {
+  --ai-panel-bg: linear-gradient(180deg, #1e1235 0%, #160e28 48%, #120a22 100%);
+  --ai-side-bg: rgba(26, 16, 44, 0.96);
+  --ai-panel-border: rgba(167, 139, 250, 0.22);
+  --ai-panel-shadow: -16px 0 48px rgba(0, 0, 0, 0.45);
+  --ai-head-bg: rgba(30, 18, 53, 0.92);
+  --ai-head-border: rgba(167, 139, 250, 0.18);
+  --ai-title: rgba(245, 243, 255, 0.96);
+  --ai-muted: rgba(196, 181, 253, 0.55);
+  --ai-accent: #a78bfa;
+  --ai-accent-soft: rgba(124, 58, 237, 0.22);
+  --ai-accent-soft-border: rgba(167, 139, 250, 0.35);
+  --ai-user-bg: linear-gradient(135deg, #7c3aed 0%, #6d28d9 100%);
+  --ai-user-fg: #ffffff;
+  --ai-bot-bg: rgba(255, 255, 255, 0.06);
+  --ai-bot-fg: rgba(237, 233, 254, 0.92);
+  --ai-bot-border: rgba(167, 139, 250, 0.2);
+  --ai-example-bg: rgba(124, 58, 237, 0.18);
+  --ai-example-border: rgba(167, 139, 250, 0.32);
+  --ai-example-fg: rgba(221, 214, 254, 0.92);
+  --ai-input-bg: rgba(255, 255, 255, 0.06);
+  --ai-input-border: rgba(167, 139, 250, 0.28);
+  --ai-input-fg: rgba(245, 243, 255, 0.94);
+  --ai-input-placeholder: rgba(196, 181, 253, 0.42);
+  --ai-composer-bg: rgba(22, 14, 40, 0.96);
+  --ai-composer-border: rgba(167, 139, 250, 0.18);
+  --ai-send-bg: linear-gradient(135deg, #8b5cf6 0%, #7c3aed 100%);
+  --ai-send-fg: #ffffff;
+  --ai-send-disabled: rgba(124, 58, 237, 0.35);
+  --ai-dot: #c4b5fd;
+  --ai-scrollbar: rgba(167, 139, 250, 0.35);
+  --ai-fab-bg: linear-gradient(160deg, #8b5cf6 0%, #6d28d9 100%);
+  --ai-fab-fg: #ffffff;
+  --ai-fab-shadow: 0 10px 28px rgba(109, 40, 217, 0.45);
+  --ai-fab-glow: 0 0 0 1px rgba(196, 181, 253, 0.25);
+  --ai-md-code-bg: rgba(124, 58, 237, 0.28);
+  --ai-md-code-fg: #ddd6fe;
+  --ai-md-pre-bg: rgba(0, 0, 0, 0.28);
+  --ai-md-pre-border: rgba(167, 139, 250, 0.22);
+  --ai-md-blockquote-border: rgba(167, 139, 250, 0.45);
+  --ai-md-blockquote-fg: rgba(196, 181, 253, 0.75);
+  --ai-md-link: #c4b5fd;
+  --ai-md-hr: rgba(167, 139, 250, 0.22);
+  --ai-md-table-border: rgba(167, 139, 250, 0.22);
+  --ai-md-th-bg: rgba(124, 58, 237, 0.18);
+  --ai-avatar-bot-bg: rgba(124, 58, 237, 0.28);
+  --ai-avatar-bot-fg: #ddd6fe;
+  --ai-avatar-bot-border: rgba(167, 139, 250, 0.35);
+  --ai-avatar-user-bg: #7c3aed;
+  --ai-avatar-user-fg: #ffffff;
+  --ai-close-hover-bg: rgba(167, 139, 250, 0.16);
+  --ai-close-hover-fg: #ddd6fe;
+  --ai-thinking-bg: rgba(124, 58, 237, 0.14);
+  --ai-thinking-border: rgba(167, 139, 250, 0.22);
+  --ai-thinking-fg: rgba(196, 181, 253, 0.7);
+}
diff --git a/frontends/apps/simple-platform-vue/src/styles/themes.ts b/frontends/apps/simple-platform-vue/src/styles/themes.ts
index 3bb0b9d..cd85c52 100644
--- a/frontends/apps/simple-platform-vue/src/styles/themes.ts
+++ b/frontends/apps/simple-platform-vue/src/styles/themes.ts
@@ -424,7 +424,9 @@ const THEME_ALIASES: Record<string, string> = {
 export function resolveThemeId(id: string | undefined | null): string {
   if (!id) return DEFAULT_THEME_ID
   const aliased = THEME_ALIASES[id] ?? id
-  if (THEMES.some((t) => t.id === aliased)) return aliased
+  // 兼容主题入口已移除：旧 id 一律回落到 Outpost 浅色
+  if (LEGACY_THEMES.some((t) => t.id === aliased)) return DEFAULT_THEME_ID
+  if (PRIMARY_THEMES.some((t) => t.id === aliased)) return aliased
   return DEFAULT_THEME_ID
 }
 
diff --git a/frontends/apps/simple-platform-vue/src/types/car.ts b/frontends/apps/simple-platform-vue/src/types/car.ts
index 0eb0276..7d2a8af 100644
--- a/frontends/apps/simple-platform-vue/src/types/car.ts
+++ b/frontends/apps/simple-platform-vue/src/types/car.ts
@@ -23,6 +23,16 @@ export interface Car {
   ip?: string
   onboardUrl?: string
   lstatus?: string
+  /** 运行时富化：报警文案（车体_AlarmInfo） */
+  alarmInfo?: string
+  /** 运行时富化：报警级别（>0 视为有报警） */
+  alarmLevel?: number
+  /** 运行时富化：交管摘要（畅通 / 正常拿锁 / 被 X 车阻塞 / 互锁） */
+  trafficStatus?: string
+  /** 运行时富化：当前锁点 / 占点摘要 */
+  lockPoint?: string
+  /** 运行时富化：当前站点 id（siteID，-1 表示无） */
+  siteId?: number
 }
 
 /** 车队健康探测行（优先 GET /api/fleet/health；延迟为 WatchDog TCP RTT） */
diff --git a/frontends/apps/simple-platform-vue/src/utils/carRuntime.ts b/frontends/apps/simple-platform-vue/src/utils/carRuntime.ts
index 2bd7df3..b5c0f11 100644
--- a/frontends/apps/simple-platform-vue/src/utils/carRuntime.ts
+++ b/frontends/apps/simple-platform-vue/src/utils/carRuntime.ts
@@ -12,6 +12,36 @@ function kv(rows: Kv[] | null | undefined, ...keys: string[]): string {
   return ''
 }
 
+function isEmptyStatus(v: string): boolean {
+  const s = v.trim()
+  return !s || s === '/' || s === '-' || s === '[]' || s === '(0, 0)' || s === '(0,0)' || /^none$/i.test(s)
+}
+
+function compactJsonList(raw: string, maxItems = 3): string {
+  if (isEmptyStatus(raw)) return ''
+  try {
+    const arr = JSON.parse(raw) as unknown
+    if (!Array.isArray(arr) || arr.length === 0) return ''
+    const items = arr.slice(0, maxItems).map((x) => {
+      if (x == null) return ''
+      if (typeof x === 'number' || typeof x === 'string') return String(x)
+      if (typeof x === 'object') {
+        const o = x as Record<string, unknown>
+        if (o.siteId != null) return `#${o.siteId}`
+        if (o.siteID != null) return `#${o.siteID}`
+        if (o.id != null) return `#${o.id}`
+        if (o.carid != null) return `车${o.carid}`
+      }
+      return ''
+    }).filter(Boolean)
+    if (!items.length) return ''
+    const more = arr.length > maxItems ? `+${arr.length - maxItems}` : ''
+    return items.join(',') + more
+  } catch {
+    return raw.length > 24 ? `${raw.slice(0, 24)}…` : raw
+  }
+}
+
 /**
  * SimpleLite /projection/cars 会把「正常但未初始化」「导航失联」等一律标成 fault，
  * 与地图标签/车体 AlarmLevel 不一致。这里用 lstatus + 车体 status 重新推导。
@@ -28,7 +58,7 @@ export function deriveCarState(car: Pick<Car, 'state' | 'lstatus'>, statusRows?:
   const hasAlarm =
     (Number.isFinite(alarmLevel) && alarmLevel > 0) ||
     (/true/i.test(riskAlarm)) ||
-    (alarmInfo.length > 0 && !/^\/$|^-$|^none$/i.test(alarmInfo))
+    (alarmInfo.length > 0 && !isEmptyStatus(alarmInfo))
 
   // 明确健康：以「正常」开头（含「正常但未初始化」）→ 绝不是故障
   if (/^正常/.test(lstatus)) {
@@ -62,6 +92,90 @@ export function deriveCarState(car: Pick<Car, 'state' | 'lstatus'>, statusRows?:
   return 'idle'
 }
 
+/**
+ * 与 SimpleLite 车体浮窗 CarVisual.FormatTrafficStatus 对齐：
+ * 1) TCStat 含 BeforeLock → 互锁
+ * 2) blockedBy 有车 →「被 X、Y 车阻塞」；仅非车阻塞 →「阻塞中」
+ * 3) 有 holdingLocks → 正常拿锁；否则 → 畅通
+ */
+export function formatTrafficStatus(statusRows?: Kv[] | null): string {
+  if (!statusRows?.length) return '—'
+
+  const tc = kv(statusRows, 'TCStat')
+  if (tc && /BeforeLock/i.test(tc)) return '互锁（interlock）'
+
+  const blockedIds = parseBlockedByCarIds(kv(statusRows, 'blockedBy'))
+  if (blockedIds != null) {
+    return blockedIds.length > 0
+      ? `被 ${blockedIds.join('、')} 车阻塞`
+      : '阻塞中'
+  }
+
+  const holding = kv(statusRows, 'holdingLocks')
+  if (holding && !isEmptyStatus(holding) && holding !== '[]') return '正常拿锁'
+  return '畅通'
+}
+
+/** @returns null=无阻塞；[]=阻塞但无车 id；number[]=阻塞车 id */
+function parseBlockedByCarIds(raw: string): number[] | null {
+  if (!raw || isEmptyStatus(raw)) return null
+
+  try {
+    const arr = JSON.parse(raw) as unknown
+    if (!Array.isArray(arr) || arr.length === 0) return null
+    const ids = arr
+      .map((item) => {
+        if (item == null) return null
+        if (typeof item === 'number') return item
+        if (typeof item === 'object') {
+          const o = item as Record<string, unknown>
+          const n = Number(o.carid ?? o.Item1 ?? o.item1)
+          return Number.isFinite(n) ? n : null
+        }
+        return null
+      })
+      .filter((n): n is number => n != null && n !== -1)
+    return [...new Set(ids)]
+  } catch {
+    // 兼容 ToString 形态：[(11, 2), (12, 3)]
+    const ids = [...raw.matchAll(/\(\s*(-?\d+)\s*,\s*-?\d+\s*\)/g)]
+      .map((m) => Number(m[1]))
+      .filter((n) => Number.isFinite(n) && n !== -1)
+    if (!ids.length && /\[\s*\]/.test(raw)) return null
+    if (raw.includes('(') || raw.includes('[')) return [...new Set(ids)]
+    return null
+  }
+}
+
+export function isTrafficCongested(status: string | undefined | null): boolean {
+  return !!status && /阻塞|互锁|拥堵/.test(status)
+}
+
+export function formatLockPoint(statusRows?: Kv[] | null, fields?: { siteId?: string }): string {
+  const holding = compactJsonList(kv(statusRows, 'holdingLocks'))
+  if (holding) return holding
+  const pending = compactJsonList(kv(statusRows, 'pendingLocks'))
+  if (pending) return `待 ${pending}`
+
+  const siteRaw = fields?.siteId || kv(statusRows, 'siteID', 'siteId')
+  const siteId = Number(siteRaw)
+  if (Number.isFinite(siteId) && siteId > 0) return `#${siteId}`
+  return '—'
+}
+
+export function formatAlarmInfo(statusRows?: Kv[] | null, lstatus?: string): { text: string; level: number } {
+  const levelRaw = Number(kv(statusRows, '车体_AlarmLevel', 'AlarmLevel'))
+  const level = Number.isFinite(levelRaw) ? levelRaw : 0
+  const info = kv(statusRows, '车体_AlarmInfo', 'AlarmInfo').trim()
+  if (info && !isEmptyStatus(info) && info !== '0') {
+    return { text: info, level: level > 0 ? level : 1 }
+  }
+  if (lstatus && /故障|报警|异常|失联|超时|检修/i.test(lstatus)) {
+    return { text: lstatus, level: Math.max(level, 1) }
+  }
+  return { text: '', level }
+}
+
 export function applyRuntimeEnrichment(car: Car, statusRows?: Kv[] | null): Car {
   const socFromStatus = extractSocFromKv(statusRows)
   let batterySoc: number
@@ -74,9 +188,18 @@ export function applyRuntimeEnrichment(car: Car, statusRows?: Kv[] | null): Car
     batterySoc = parseSocNumber(car.batterySoc) ?? 0
   }
 
+  const alarm = formatAlarmInfo(statusRows, car.lstatus)
+  const siteRaw = kv(statusRows, 'siteID', 'siteId')
+  const siteIdNum = Number(siteRaw)
+
   return {
     ...car,
     batterySoc,
-    state: deriveCarState(car, statusRows)
+    state: deriveCarState(car, statusRows),
+    alarmInfo: alarm.text || undefined,
+    alarmLevel: alarm.level || undefined,
+    trafficStatus: formatTrafficStatus(statusRows),
+    lockPoint: formatLockPoint(statusRows, { siteId: siteRaw }),
+    siteId: Number.isFinite(siteIdNum) && siteIdNum > 0 ? siteIdNum : undefined
   }
 }
diff --git a/frontends/apps/simple-platform-vue/src/views/admin/MapEditorView.vue b/frontends/apps/simple-platform-vue/src/views/admin/MapEditorView.vue
index e32498b..6b51d09 100644
--- a/frontends/apps/simple-platform-vue/src/views/admin/MapEditorView.vue
+++ b/frontends/apps/simple-platform-vue/src/views/admin/MapEditorView.vue
@@ -3,6 +3,9 @@
     <EditTopBar
       :can-undo="history.canUndo.value"
       :can-redo="history.canRedo.value"
+      :undo-count="history.undoCount.value"
+      :redo-count="history.redoCount.value"
+      :undo-limit="history.maxDepth"
       :saving="saving"
       :view-filter="viewFilter"
       @cmd="onTopBarCmd"
@@ -11,6 +14,7 @@
     <div class="me-body">
       <EditToolRail
         :active-tool="editTool.activeTool.value"
+        :active-select-only="activeSelectOnly"
         @select-tool="onSelectTool"
         @open-ai="openAiDialog"
       />
@@ -61,12 +65,12 @@
       <button
         class="ai-assistant-fab"
         :class="{ 'is-open': aiAssistantOpen }"
-        :style="aiAssistantOpen ? { right: aiPanelWidth + 'px' } : undefined"
+        :style="{ right: aiAssistantOpen ? `${aiPanelWidth}px` : '0' }"
         type="button"
         :title="aiAssistantOpen ? '收起 AI 助手' : '打开 AI 助手'"
         @click="toggleAiAssistant"
       >
-        <span class="fab-glyph">✦</span>
+        <span class="fab-glyph">*</span>
         <span class="fab-text">AI<br>助手</span>
       </button>
 
@@ -86,8 +90,9 @@
       :mouse-y="mouseXY.y"
       :tool-label="editTool.toolLabel.value"
       :snap-on="snapAny"
-      :undo-size="history.undoStack.value.length"
-      :redo-size="history.redoStack.value.length"
+      :undo-size="history.undoCount.value"
+      :redo-size="history.redoCount.value"
+      :undo-limit="history.maxDepth"
       :connected="streamConnected"
     />
 
@@ -103,8 +108,8 @@
       图层显示切换对话框：列出所有已知图层，每行一个 visible/selectable 开关 +
       「设为当前默认层」按钮。本面板与右侧 EditPropertyPanel 的图层卡片共享同一份
       layerRows，操作后双向同步；defaults.site/track.layer 决定下次创建对象的落点。
-      备注：画布渲染本身受 SimpleLite 端 LayerToShow 控制，要做"画布也跟着隐藏"
-      还需后端补 REST API；当前 toggle 只影响前端面板筛选。
+      备注：画布渲染本身受 SimpleLite 的 LayerToShow 控制；要让画布也跟着隐藏，
+      还需后端 REST API；当前 toggle 只影响前端面板筛选。
     -->
     <el-dialog v-model="layerVisibilityDialogOpen" title="切换显示图层" width="520px">
       <el-table :data="layerRows" size="small" style="width: 100%">
@@ -124,7 +129,7 @@
             <el-color-picker v-model="row.color" size="small" />
           </template>
         </el-table-column>
-        <el-table-column label="默认层" width="110">
+        <el-table-column label="默认" width="110">
           <template #default="{ row }">
             <el-button
               size="small"
@@ -138,7 +143,7 @@
       </el-table>
       <template #footer>
         <el-button @click="layerVisibilityDialogOpen = false">关闭</el-button>
-        <el-button type="primary" @click="promptCreateLayer">新建图层…</el-button>
+        <el-button type="primary" @click="promptCreateLayer">新建图层</el-button>
       </template>
     </el-dialog>
 
@@ -149,6 +154,13 @@
       :accept="fileAcceptHint"
       @change="onFilePicked"
     />
+
+    <BetterAddFieldDialog
+      v-model:open="betterAddFieldOpen"
+      :targets="betterAddFieldTargets"
+      :target-summary="betterAddFieldSummary"
+      @applied="refreshAfterMutation"
+    />
   </div>
 </template>
 
@@ -163,6 +175,7 @@ import EditPropertyPanel from '@/components/map-editor/EditPropertyPanel.vue'
 import EditStatusBar from '@/components/map-editor/EditStatusBar.vue'
 import AiGenerateDialog from '@/components/map-editor/AiGenerateDialog.vue'
 import AiAssistantPanel from '@/components/map-editor/AiAssistantPanel.vue'
+import BetterAddFieldDialog from '@/components/map-editor/BetterAddFieldDialog.vue'
 import { useAuthStore } from '@/stores/auth'
 import { useEditTool, type EditToolId } from '@/composables/useEditTool'
 import { useSelection, type SelectionItem } from '@/composables/useSelection'
@@ -195,13 +208,17 @@ const router = useRouter()
 const vrHost = defaultVrHost()
 
 // 当前正在编辑的「固定文件夹地图名」。从地图管理页带 ?map=<name> 进入时载入；
-// 决定保存时的默认名称与「是否替换原地图」确认逻辑。新建地图（?new=1）时为空。
+// 决定保存时的默认名称与「是否替换原地图」确认逻辑。新建地图（?new=1）时为空?
 const editingMapName = ref<string>('')
 
 const workspaceRef = ref<InstanceType<typeof Workspace3D> | null>(null)
 const fileInputRef = ref<HTMLInputElement | null>(null)
 const fileAcceptHint = ref<string>('image/*')
 const fileUploadKind = ref<'image' | 'model'>('image')
+/** 插入图片：上传完成后待落点的本地/服务端路?*/
+const pendingImagePath = ref<string | null>(null)
+/** 装饰文本：确认内容后待落?*/
+const pendingTextContent = ref<string | null>(null)
 
 const editTool = useEditTool()
 const selection = useSelection()
@@ -210,8 +227,8 @@ const history = useHistory({})
 const mouseXY = reactive({ x: 0, y: 0 })
 
 const aiDialogOpen = ref(false)
-// 右侧固定停靠的「AI 助手」聊天面板开关（与 AI 生图对话框相互独立）。
-// 开关状态与面板宽度都持久化到 localStorage，下次进入编辑器自动恢复。
+// 右侧固定停靠的「AI 助手」聊天面板开关（?AI 生图对话框相互独立）?
+// 开关状态与面板宽度都持久化?localStorage，下次进入编辑器自动恢复?
 const aiAssistantOpen = ref(false)
 const aiPanelWidth = ref(360)
 const AI_PANEL_OPEN_KEY = 'mapEditor.aiAssistant.open'
@@ -227,9 +244,9 @@ const primaryFields = ref<Array<{ key: string; value: string }>>([])
 const primaryMethods = ref<ReflectionMethod[]>([])
 const primaryStatus = ref<Array<{ key: string; value: string }>>([])
 
-// 默认图层与 SimpleLite/Prop.layerName 默认值一致（'g'）；
-// 顶栏「图层」菜单提供「新建图层 / 切换显示图层」入口，新建后会自动设为
-// defaults.site.layer / defaults.track.layer，下一次 Add-Site / Add-Track 自动落到新层。
+// 默认图层?SimpleLite/Prop.layerName 默认值一致（'g'）；
+// 顶栏「图层」菜单提供「新建图?/ 切换显示图层」入口，新建后会自动设为
+// defaults.site.layer / defaults.track.layer，下一?Add-Site / Add-Track 自动落到新层?
 const defaults = reactive({
   site: { layer: 'g', namePrefix: 'S', color: '#ffffff' },
   track: { layer: 'g', lineWidth: 2, color: '#88ccff' }
@@ -242,7 +259,7 @@ let viewportPatchTimer: ReturnType<typeof setTimeout> | null = null
 let viewportPatchSeq = 0
 let pendingViewportPatch: { site?: ViewportStyleSite; track?: ViewportStyleTrack } = {}
 
-/** 单选且为 site/track/car 时驱动属性扩展；类型默认 Tab 仍只支持 site/track。 */
+/** 单选且?site/track/car 时驱动属性扩展；类型默认 Tab 仍只支持 site/track?*/
 const selectionKind = computed<'site' | 'track' | 'car' | null>(() => {
   const items = selection.items.value
   if (items.length !== 1) return null
@@ -252,10 +269,10 @@ const selectionKind = computed<'site' | 'track' | 'car' | null>(() => {
   return null
 })
 
-/** 当前选中车的车型唯一标识（用于 simple_fields.carFields 过滤）。 */
+/** 当前选中车的车型唯一标识（用?simple_fields.carFields 过滤）?*/
 const selectionCarType = computed<string | null>(() => {
   if (selectionKind.value !== 'car') return null
-  // 选中车后 primary 会刷新为真实对象摘要，typeName 比 selection item 更可靠（不是 "Car" 占位名）。
+  // 选中车后 primary 会刷新为真实对象摘要，typeName ?selection item 更可靠（不是 "Car" 占位名）?
   return primary.value?.typeName?.trim() || null
 })
 
@@ -265,20 +282,59 @@ const layerRows = ref<LayerRow[]>([
   { name: 'g', visible: true, selectable: true, color: '#cccccc' }
 ])
 
-// 「过滤」菜单状态：对齐 SimpleLite 桌面端 WorkspaceBottomBar 的「选择 / 对齐 / 显示内容」三组开关。
-// 三组语义：
-//   selectFilter.*  画布命中后允许进入 selection 的对象类型，与 SimpleUI.SelectFilter{Sites,Tracks,Cars,Decor} 对齐。
-//   alignSnap.*     绘制工具吸附时考虑的目标类型，与 SimpleUI.AlignSnap{Sites,Cars,Tracks} 对齐。
-//   showViewport.*  显示内容过滤，与 SimpleUI.ShowViewport{SceneLabels,ScenePrimitives,Cars} 对齐。
+// 「过滤」菜单状态：对齐 SimpleLite 桌面?WorkspaceBottomBar 的「选择 / 对齐 / 显示内容」三组开关?
+// 三组语义?
+//   selectFilter.*  画布命中后允许进?selection 的对象类型，?SimpleUI.SelectFilter{Sites,Tracks,Cars,Decor} 对齐?
+//   alignSnap.*     绘制工具吸附时考虑的目标类型，?SimpleUI.AlignSnap{Sites,Cars,Tracks} 对齐?
+//   showViewport.*  显示内容过滤，与 SimpleUI.ShowViewport{SceneLabels,ScenePrimitives,Cars} 对齐?
 //
-// 当前阶段仅在 Vue 前端生效（影响 selection 接收 / 属性面板筛选）；画布本身的可见性由 SimpleLite
-// 端 LayerToShow / 各 ShowViewport* 控制，待后端 REST API 打通后再做双向同步。
+// 当前阶段仅在 Vue 前端生效（影?selection 接收 / 属性面板筛选）；画布本身的可见性由 SimpleLite
+// ?LayerToShow / ?ShowViewport* 控制，待后端 REST API 打通后再做双向同步?
 const viewFilter = reactive<ViewFilterState>({
   selectFilter: { sites: true, tracks: true, cars: true, decor: true },
   alignSnap: { sites: true, cars: true, tracks: true },
   showViewport: { sceneLabels: true, scenePrimitives: true, cars: true }
 })
 
+/**
+ * 路径子类型过滤（后端 SelectFilter 只有 tracks 总开关）?
+ * - all：不限制直线/曲线
+ * - straight：仅 UITrack
+ * - curve：贝塞尔 / ?/ NURBS
+ * 由左侧「仅直线 / 仅曲线」驱动?
+ */
+const trackSelectMode = ref<'all' | 'straight' | 'curve'>('all')
+
+type SelectOnlyMode = 'site' | 'straight' | 'curve' | 'decor'
+
+function isCurveTrackType(typeName: string): boolean {
+  const tn = typeName.toLowerCase()
+  return tn.includes('bezier') || tn.includes('arc') || tn.includes('nurbs')
+}
+
+function isStraightTrackType(typeName: string): boolean {
+  const tn = typeName.toLowerCase()
+  return tn.includes('track') && !isCurveTrackType(typeName)
+}
+
+function trackPassesSelectMode(typeName: string): boolean {
+  if (trackSelectMode.value === 'straight') return isStraightTrackType(typeName)
+  if (trackSelectMode.value === 'curve') return isCurveTrackType(typeName)
+  return true
+}
+
+/** 当前是否处于左侧「仅*」互斥模式（用于工具栏高亮）?*/
+const activeSelectOnly = computed<SelectOnlyMode | null>(() => {
+  const sf = viewFilter.selectFilter
+  if (sf.sites && !sf.tracks && !sf.cars && !sf.decor) return 'site'
+  if (!sf.sites && sf.tracks && !sf.cars && !sf.decor) {
+    if (trackSelectMode.value === 'straight') return 'straight'
+    if (trackSelectMode.value === 'curve') return 'curve'
+  }
+  if (!sf.sites && !sf.tracks && !sf.cars && sf.decor) return 'decor'
+  return null
+})
+
 function persistViewFilter() {
   try { localStorage.setItem('mapEditor.viewFilter', JSON.stringify(viewFilter)) }
   catch { /* localStorage 可能被禁用，忽略 */ }
@@ -296,14 +352,15 @@ function loadViewFilter() {
 }
 
 /**
- * 当 selectFilter 中的某类型被关闭时，把当前 selection 里这类对象剔掉。
- * 否则之前选中的、现在不该被选的会一直留在右侧属性面板，体验突兀。
+ * ?selectFilter 中的某类型被关闭时，把当?selection 里这类对象剔掉?
+ * 否则之前选中的、现在不该被选的会一直留在右侧属性面板，体验突兀?
+ * 同时尊重 trackSelectMode（仅直线 / 仅曲线）?
  */
 function pruneSelectionByFilter() {
   const sf = viewFilter.selectFilter
   const kept = selection.items.value.filter((it) => {
     if (it.kind === 'site') return sf.sites
-    if (it.kind === 'track') return sf.tracks
+    if (it.kind === 'track') return sf.tracks && trackPassesSelectMode(it.typeName)
     if (it.kind === 'car') return sf.cars
     if (it.kind === 'special') return sf.decor
     return true
@@ -311,58 +368,71 @@ function pruneSelectionByFilter() {
   if (kept.length !== selection.items.value.length) selection.set(kept)
 }
 
-// 「切换显示图层」对话框。开关 visible 直接改 layerRows[i]，与右侧 EditPropertyPanel 共享 state。
-// 注：画布渲染本身由 SimpleLite 端 LayerToShow 控制，目前后端没有暴露写 API；
-// 这里 toggle 仅控制前端面板的可见性筛选（同步到画布需另加后端 API，待 Fody 修好再做）。
+// 「切换显示图层」对话框。开?visible 直接?layerRows[i]，与右侧 EditPropertyPanel 共享 state?
+// 注：画布渲染本身?SimpleLite ?LayerToShow 控制，目前后端没有暴露写 API?
+// 这里 toggle 仅控制前端面板的可见性筛选（同步到画布需另加后端 API，待 Fody 修好再做）?
 const layerVisibilityDialogOpen = ref(false)
 
-// 用于「绘制路径」工具的两次拾取状态机：第一次记录 siteA，第二次创建路径
+// 用于「绘制路径」工具的两次拾取状态机：第一次记?siteA，第二次创建路径
 const drawTrackState = ref<{ siteA: number | null }>({ siteA: null })
 
-// 贝塞尔 / NURBS 创建第二步：siteA + siteB 拾取完后，会进入 N 次「中间控制点」连续拾取阶段。
+// 贝塞?/ NURBS 创建第二步：siteA + siteB 拾取完后，会进入 N 次「中间控制点」连续拾取阶段?
 // 这一阶段直接 await mapEditApi.pick()，与 startPickLoop 那条主循环并存会出现两条
-// pick 监听竞争同一条 SSE pick-result。inFollowupPick=true 期间：
-//   - startPickLoop 已被 handleTrackPick 主动 break，不会再拉新 pick；
-//   - onCanvasPick（iframe → workspace.pick postMessage 旁路）短路返回，避免被
-//     再走一次工具状态机重复落对象。
+// pick 监听竞争同一?SSE pick-result。inFollowupPick=true 期间?
+//   - startPickLoop 已被 handleTrackPick 主动 break，不会再拉新 pick?
+//   - onCanvasPick（iframe ?workspace.pick postMessage 旁路）短路返回，避免?
+//     再走一次工具状态机重复落对象?
 const inFollowupPick = ref(false)
 
 const streamConnected = ref(false)
 
-// 选中同步防回环：保存"本地刚发出去"的选中 key。
-// 后端广播 selection-detail 时如果与此 key 等价，跳过 selection.set，避免:
-//   watch(selection) → reflectionApi.setSelection → SSE selection-detail → onSelectionDetail
-//   → selection.set → 再 watch 的死循环。
+// 选中同步防回环：保存"本地刚发出去"的选中 key?
+// 后端广播 selection-detail 时如果与?key 等价，跳?selection.set，避?
+//   watch(selection) ?reflectionApi.setSelection ?SSE selection-detail ?onSelectionDetail
+//   ?selection.set ??watch 的死循环?
 const lastSyncedSelectionKey = ref<string>('')
 
 function makeSelectionKey(list: Array<{ kind: string; id: number }>): string {
   return list.map((x) => `${x.kind}:${x.id}`).sort().join(',')
 }
 
-// 拾取循环开关：切换到拾取工具时拉起，切走时落下。
+// 拾取循环开关：切换到拾取工具时拉起，切走时落下?
 const pickLoopActive = ref(false)
 const pickToolIds: EditToolId[] = [
   'draw.site',
   'draw.sites.continuous',
   'draw.track.polyline',
+  'draw.tracks.continuous',
   'draw.track.bezier',
   'draw.track.arc',
-  'draw.track.nurbs'
+  'draw.track.nurbs',
+  'draw.decor.text',
+  'draw.image'
 ]
 
+/** 布线取端点需要站点吸附；站点/文本/图片落点必须关吸附，否则会被附近站点吸走?*/
+function pickNeedsSiteSnap(tool: EditToolId): boolean {
+  return (
+    tool === 'draw.track.polyline'
+    || tool === 'draw.tracks.continuous'
+    || tool === 'draw.track.bezier'
+    || tool === 'draw.track.arc'
+    || tool === 'draw.track.nurbs'
+  )
+}
+
 async function startPickLoop() {
   if (pickLoopActive.value) return
   pickLoopActive.value = true
   // 工具栏交互约定：
-  // - 单次工具（draw.site / draw.track.*）：完成一次操作后自动退出循环 + 退选。
-  // - 连续工具（draw.sites.continuous）：保持选中状态、循环到右键取消（pick 抛 cancel）为止。
-  // - 用户主动切换工具：onSelectTool 把 pickLoopActive 置 false 并 setTool 新工具，
-  //   循环退出后我们检测 activeTool 已不是 pick 类，就不覆盖；仅在还停留在 pick 类时
-  //   把它切回 transform.move，以避免按钮残留高亮。
+  // - 单次工具（draw.site / draw.track.*）：完成一次后退出循环，但保持工具高亮（可再点工具续画）?
+  // - 连续工具：保持选中，右键取消为止?
+  // - 不再自动切到「移动」（该工具已移除）；避免绘制中偶发跳工具?
   while (pickLoopActive.value) {
     let result: { x: number; y: number; siteId: number } | null = null
+    const toolBeforePick = editTool.activeTool.value
     try {
-      result = await mapEditApi.pick()
+      result = await mapEditApi.pick({ snap: pickNeedsSiteSnap(toolBeforePick) })
     } catch {
       break
     }
@@ -376,11 +446,13 @@ async function startPickLoop() {
       break
     } else if (tool === 'draw.sites.continuous') {
       await runCreateSite(result.x, result.y)
-      // 连续模式：不 break，等待下一次 pick；右键 → mapEditApi.pick() 抛错 → 走 catch break。
-    } else if (tool === 'draw.track.polyline' || tool === 'draw.track.bezier' || tool === 'draw.track.arc' || tool === 'draw.track.nurbs') {
-      // handleTrackPick 是两次 pick 的状态机：第一次 siteA: null→x（继续等第二次），
-      // 第二次完成后 siteA: x→null（已经创建了 track / 异常 reset）。所以"siteA 之前不为空、
-      // 现在为空"就视为完成了一条 track，单次工具退出。
+    } else if (
+      tool === 'draw.track.polyline'
+      || tool === 'draw.tracks.continuous'
+      || tool === 'draw.track.bezier'
+      || tool === 'draw.track.arc'
+      || tool === 'draw.track.nurbs'
+    ) {
       const before = drawTrackState.value.siteA
       await handleTrackPick(result.siteId)
       if (before != null && drawTrackState.value.siteA == null) {
@@ -389,18 +461,29 @@ async function startPickLoop() {
           : tool === 'draw.track.nurbs' ? 'NURBS 路径'
           : '直线路径'
         ElMessage.success(`已添加${label}`)
+        if (tool !== 'draw.tracks.continuous') break
+      }
+    } else if (tool === 'draw.decor.text') {
+      const content = pendingTextContent.value || 'Label'
+      pendingTextContent.value = null
+      await runCreateText(result.x, result.y, content)
+      ElMessage.success(`已添加文本「${content}」`)
+      break
+    } else if (tool === 'draw.image') {
+      const path = pendingImagePath.value
+      if (!path) {
+        ElMessage.warning('请先选择要插入的图片')
         break
       }
+      pendingImagePath.value = null
+      await runCreateImage(result.x, result.y, path)
+      ElMessage.success('已插入图片')
+      break
     } else {
       break
     }
   }
   pickLoopActive.value = false
-  // 单次完成 / 右键取消 / 工具切换都退出循环；只有当用户没主动切到别的工具时
-  // （activeTool 仍停留在 pick 类工具）才切回 transform.move 取消按钮高亮。
-  if (pickToolIds.includes(editTool.activeTool.value)) {
-    editTool.setTool('transform.move')
-  }
 }
 
 const snapAny = computed(() => editTool.snap.value.grid || editTool.snap.value.object || editTool.snap.value.endpoint || editTool.snap.value.midpoint)
@@ -414,6 +497,9 @@ async function onTopBarCmd(cmd: string) {
     case 'edit.undo': await history.undo(); break
     case 'edit.redo': await history.redo(); break
     case 'edit.delete': await deleteSelection(); break
+    case 'edit.copy': await copySelection(); break
+    case 'edit.paste': await pasteClipboard(); break
+    case 'edit.cut': await cutSelection(); break
     case 'edit.selectAll': ElMessage.info('全选：请使用工具栏「按类型选」批量选中'); break
     case 'edit.invert': ElMessage.info('反选功能后续实现'); break
     case 'project.save': await saveMapAndLeave(); break
@@ -427,7 +513,7 @@ async function onTopBarCmd(cmd: string) {
     // 「图层」菜单：新建图层 / 切换图层显示
     case 'layer.new': await promptCreateLayer(); break
     case 'layer.toggleVisibility': layerVisibilityDialogOpen.value = true; break
-    // 「过滤」菜单：选择 / 对齐 / 显示三组开关
+    // 「过滤」菜单：选择 / 对齐 / 显示三组开?
     case 'view.select.sites': toggleViewFilter('selectFilter', 'sites'); break
     case 'view.select.tracks': toggleViewFilter('selectFilter', 'tracks'); break
     case 'view.select.cars': toggleViewFilter('selectFilter', 'cars'); break
@@ -443,18 +529,18 @@ async function onTopBarCmd(cmd: string) {
 }
 
 /**
- * 切换某一个 viewFilter 开关并落地副作用：
+ * 切换某一?viewFilter 开关并落地副作用：
  * - 立即更新本地 reactive 状态，保证菜单勾选和右侧属性面板立即响应；
- * - selectFilter 改变后立即从 selection 里剔除被禁的类型；
- * - 同步调 `POST /map-edit/view-filter` 把变化写到 SimpleLite 后端：
- *     selectFilter → SimpleUI.SelectFilter* + RebuildWorkspaceSelectablePatterns（影响画布拾取 + hover）
- *     alignSnap   → SimpleUI.AlignSnap*（影响绘制工具吸附）
- *     showViewport → SimpleUI.ShowViewport*（影响画布渲染：取消勾选后对应对象消失）
- *   后端会触发 SimpleSceneRenderer.NotifyStateChanged() 立即重画画布。
- * - 三组都会写一次 localStorage 记住偏好。
+ * - selectFilter 改变后立即从 selection 里剔除被禁的类型?
+ * - 同步?`POST /map-edit/view-filter` 把变化写?SimpleLite 后端?
+ *     selectFilter ?SimpleUI.SelectFilter* + RebuildWorkspaceSelectablePatterns（影响画布拾?+ hover?
+ *     alignSnap   ?SimpleUI.AlignSnap*（影响绘制工具吸附）
+ *     showViewport ?SimpleUI.ShowViewport*（影响画布渲染：取消勾选后对应对象消失?
+ *   后端会触?SimpleSceneRenderer.NotifyStateChanged() 立即重画画布?
+ * - 三组都会写一?localStorage 记住偏好?
  *
- * E2 修复：后端请求失败时回滚本地状态 + localStorage，让菜单勾选与"实际生效的过滤"保持一致 ——
- * 否则用户看到菜单是 ON、画布表现是 OFF，会以为 SimpleLite 配置错乱。回滚后再弹一条带"重试"按钮的提示。
+ * E2 修复：后端请求失败时回滚本地状?+ localStorage，让菜单勾选与"实际生效的过?保持一?—?
+ * 否则用户看到菜单?ON、画布表现是 OFF，会以为 SimpleLite 配置错乱。回滚后再弹一条带"重试"按钮的提示?
  */
 async function toggleViewFilter<G extends keyof ViewFilterState>(
   group: G,
@@ -464,17 +550,23 @@ async function toggleViewFilter<G extends keyof ViewFilterState>(
   const k = key as string
   const prev = groupObj[k]
   groupObj[k] = !groupObj[k]
+  // 顶栏手动改选择过滤时，退出「仅直线/仅曲线」细分，避免与总开关语义冲?
+  const prevTrack = trackSelectMode.value
+  if (group === 'selectFilter') trackSelectMode.value = 'all'
   persistViewFilter()
   if (group === 'selectFilter') pruneSelectionByFilter()
 
-  const patch: Record<string, Record<string, boolean>> = {}
-  patch[group as string] = { [k]: groupObj[k] }
+  const patch: Record<string, Record<string, unknown>> = {}
+  patch[group as string] = group === 'selectFilter'
+    ? { [k]: groupObj[k], trackMode: 'all' }
+    : { [k]: groupObj[k] }
   try {
-    await mapEditApi.setViewFilter(patch)
+    await mapEditApi.setViewFilter(patch as Parameters<typeof mapEditApi.setViewFilter>[0])
   } catch (err) {
     console.warn('[MapEditor] 写后端 viewFilter 失败：', err)
-    // 回滚本地状态，与后端保持一致
+    // 回滚本地状态，与后端保持一?
     groupObj[k] = prev
+    if (group === 'selectFilter') trackSelectMode.value = prevTrack
     persistViewFilter()
     if (group === 'selectFilter') pruneSelectionByFilter()
     ElMessage({
@@ -486,6 +578,45 @@ async function toggleViewFilter<G extends keyof ViewFilterState>(
   }
 }
 
+async function applySelectOnlyMode(mode: SelectOnlyMode) {
+  const allOn = { sites: true, tracks: true, cars: true, decor: true }
+  const exclusive: Record<SelectOnlyMode, Omit<ViewFilterState['selectFilter'], 'trackMode'>> = {
+    site: { sites: true, tracks: false, cars: false, decor: false },
+    straight: { sites: false, tracks: true, cars: false, decor: false },
+    curve: { sites: false, tracks: true, cars: false, decor: false },
+    decor: { sites: false, tracks: false, cars: false, decor: true }
+  }
+  const turningOff = activeSelectOnly.value === mode
+  const nextSf = turningOff ? allOn : exclusive[mode]
+  const nextTrack: typeof trackSelectMode.value =
+    turningOff ? 'all' : mode === 'straight' ? 'straight' : mode === 'curve' ? 'curve' : 'all'
+
+  const prevSf = { ...viewFilter.selectFilter }
+  const prevTrack = trackSelectMode.value
+  Object.assign(viewFilter.selectFilter, nextSf)
+  trackSelectMode.value = nextTrack
+  persistViewFilter()
+  pruneSelectionByFilter()
+
+  try {
+    await mapEditApi.setViewFilter({
+      selectFilter: { ...nextSf, trackMode: nextTrack }
+    })
+  } catch (err) {
+    console.warn('[MapEditor] 写后端 selectOnly 失败：', err)
+    Object.assign(viewFilter.selectFilter, prevSf)
+    trackSelectMode.value = prevTrack
+    persistViewFilter()
+    pruneSelectionByFilter()
+    ElMessage({
+      message: '选择过滤写入后端失败，已回滚；请检查 SimpleLite 是否连通后重试。',
+      type: 'warning',
+      duration: 5000,
+      showClose: true
+    })
+  }
+}
+
 function trackKindLabel(kind: 'track' | 'bezier' | 'arc' | 'nurbs'): string {
   return kind === 'bezier' ? '贝塞尔路径'
     : kind === 'nurbs' ? 'NURBS 路径'
@@ -494,9 +625,9 @@ function trackKindLabel(kind: 'track' | 'bezier' | 'arc' | 'nurbs'): string {
 }
 
 /**
- * 画布绘制弧线时收集半径并拼出 typeInfo。
+ * 画布绘制弧线时收集半径并拼出 typeInfo?
  *
- * 半径校验：必须 ≥ |AB|/2（小于则圆心不存在或重合，无法形成弧）。默认值用 ceil(|AB|/2) 即半圆。
+ * 半径校验：必??|AB|/2（小于则圆心不存在或重合，无法形成弧）。默认值用 ceil(|AB|/2) 即半圆?
  */
 async function collectArcTypeInfoByCoord(
   a: number,
@@ -513,14 +644,14 @@ async function collectArcTypeInfoByCoord(
   let radius: number
   try {
     const v = await ElMessageBox.prompt(
-      `请输入半径 (mm)，必须 ≥ ${minR.toFixed(1)}（等于即半圆）`,
+      `请输入半径 (mm)，必须 >= ${minR.toFixed(1)}（等于即半圆）`,
       '添加弧形路径',
       { inputValue: String(Math.ceil(minR)) }
     )
     radius = Number(v.value)
   } catch { return 'cancelled' }
   if (!Number.isFinite(radius) || radius < minR) {
-    ElMessage.warning(`半径必须 ≥ ${minR.toFixed(1)} mm`)
+    ElMessage.warning(`半径必须 >= ${minR.toFixed(1)} mm`)
     return 'cancelled'
   }
   return {
@@ -530,42 +661,41 @@ async function collectArcTypeInfoByCoord(
 }
 
 /**
- * 创建完一条 bezier / arc / nurbs 路径后给用户一句简短反馈。
- * 现在所有几何参数（贝塞尔/NURBS 的控制点、弧线的圆心+半径）都在创建前就由前端
- * 通过 typeInfo 字段一并落盘，画布选中时 SimpleSceneRenderer.DrawTrackEditHandles
- * 能直接画出控制点 / 控制折线 / 圆心，无需用户再走属性面板「设置圆心」「输入控制点」补救。
+ * 创建完一?bezier / arc / nurbs 路径后给用户一句简短反馈?
+ * 现在所有几何参数（贝塞?NURBS 的控制点、弧线的圆心+半径）都在创建前就由前端
+ * 通过 typeInfo 字段一并落盘，画布选中?SimpleSceneRenderer.DrawTrackEditHandles
+ * 能直接画出控制点 / 控制折线 / 圆心，无需用户再走属性面板「设置圆心」「输入控制点」补救?
  */
 function notifyTrackCreatedDefaults(kind: 'track' | 'bezier' | 'arc' | 'nurbs') {
   if (kind === 'bezier' || kind === 'nurbs') {
     ElMessage.success(
-      `${kind === 'bezier' ? '贝塞尔' : 'NURBS'}路径已创建。选中后可在画布看到控制点（白色端点 + 黄色中间点）和控制折线，可在属性面板拖动 / 输入坐标 / 增删控制点继续调整。`
+      `${kind === 'bezier' ? '贝塞尔' : 'NURBS'}路径已创建。选中后可在画布看到控制点（白色端点 + 黄色中间点）和控制折线，可在属性面板拖拽 / 输入坐标 / 增删控制点继续调整。`
     )
   } else if (kind === 'arc') {
-    ElMessage.success(
-      '弧形路径已创建。选中后可在画布看到圆心；属性面板「设置圆心、半径」「设定相邻切线」可继续微调。'
-    )
+    ElMessage.success('弧形路径已创建。选中后可在画布看到圆心；属性面板「设置圆心、半径」「设定相邻切线」可继续微调。')
   }
 }
 
+
 // ──────────────────────────────────────────────────────────────────────────
-// typeInfo 几何工具：把贝塞尔 / NURBS / 弧线的几何序列化为 SimpleLite 后端
-// `Track.typeInfo`（[FieldMember]）可识别的字符串。后端 ApplyExtraFields 会通过
-// reflection 把 typeInfo 写到刚刚 new 出的 UIBezierTrack/UICircularArcTrack/UINurbsTrack
-// 上，画布渲染时 TrackTypeInfoGeometry.HydrateTypedTrackFields / TrySamplePolyline
+// typeInfo 几何工具：把贝塞?/ NURBS / 弧线的几何序列化?SimpleLite 后端
+// `Track.typeInfo`（[FieldMember]）可识别的字符串。后?ApplyExtraFields 会通过
+// reflection ?typeInfo 写到刚刚 new 出的 UIBezierTrack/UICircularArcTrack/UINurbsTrack
+// 上，画布渲染?TrackTypeInfoGeometry.HydrateTypedTrackFields / TrySamplePolyline
 // 即按此字符串还原 BezierCurve.ControlPoints / Arc 几何，从而：
-//   - 第一次渲染就显示正确曲线（不是 EnsureControlPoints 的 [A, midpoint, B] 兜底直线）
-//   - 选中后 DrawTrackEditHandles 立刻画出控制点 + 灰色控制折线 + 圆心十字
+//   - 第一次渲染就显示正确曲线（不?EnsureControlPoints ?[A, midpoint, B] 兜底直线?
+//   - 选中?DrawTrackEditHandles 立刻画出控制?+ 灰色控制折线 + 圆心十字
 //
-// 格式（来自 TrackTypeInfoGeometry & SimpleComposer 端 UpdateInfo）：
+// 格式（来?TrackTypeInfoGeometry & SimpleComposer ?UpdateInfo）：
 //   弧线   : "1,{cx},{cy},{radius},{angleStartDeg},{angleEndDeg}"
-//   贝塞尔 : "2,{count},{x0},{y0},{x1},{y1},...,{x_{count-1}},{y_{count-1}}"
+//   贝塞?: "2,{count},{x0},{y0},{x1},{y1},...,{x_{count-1}},{y_{count-1}}"
 //   NURBS  : "3,{count},{x0},{y0},...,{x_{count-1}},{y_{count-1}}"
-// 坐标都是毫米，与 Site.x/y 量纲一致。
+// 坐标都是毫米，与 Site.x/y 量纲一致?
 // ──────────────────────────────────────────────────────────────────────────
 
 interface XYPoint { x: number; y: number }
 
-/** 拉取站点真实坐标用于拼 typeInfo（后端 createTrack 不会回填 site 坐标，前端必须自己取）。 */
+/** 拉取站点真实坐标用于?typeInfo（后?createTrack 不会回填 site 坐标，前端必须自己取）?*/
 async function fetchSiteXY(id: number): Promise<XYPoint | null> {
   try {
     const b = await reflectionApi.getBundle('site', id)
@@ -576,7 +706,7 @@ async function fetchSiteXY(id: number): Promise<XYPoint | null> {
   } catch { return null }
 }
 
-/** 贝塞尔 / NURBS 共享控制折线序列化（kindFlag=2 贝塞尔 / 3 NURBS）。allPoints = [siteA, ...中间, siteB]。 */
+/** 贝塞?/ NURBS 共享控制折线序列化（kindFlag=2 贝塞?/ 3 NURBS）。allPoints = [siteA, ...中间, siteB]?*/
 function buildCurveTypeInfo(allPoints: XYPoint[], kindFlag: 2 | 3): string {
   const parts: string[] = [String(kindFlag), String(allPoints.length)]
   for (const p of allPoints) {
@@ -587,8 +717,8 @@ function buildCurveTypeInfo(allPoints: XYPoint[], kindFlag: 2 | 3): string {
 }
 
 /**
- * 弧线 typeInfo：圆心在 AB 中垂线上、距 AB 中点 d = sqrt(R² - |AB|²/4)。
- * 调用前应已校验 radius >= |AB|/2。side='left' 时圆心在 AB 法线左侧（默认）。
+ * 弧线 typeInfo：圆心在 AB 中垂线上、距 AB 中点 d = sqrt(R² - |AB|²/4)?
+ * 调用前应已校?radius >= |AB|/2。side='left' 时圆心在 AB 法线左侧（默认）?
  */
 function buildArcTypeInfo(sa: XYPoint, sb: XYPoint, radius: number, side: 'left' | 'right' = 'left'): string {
   const ax = sb.x - sa.x
@@ -607,7 +737,7 @@ function buildArcTypeInfo(sa: XYPoint, sb: XYPoint, radius: number, side: 'left'
   return ['1', cx.toFixed(3), cy.toFixed(3), radius.toFixed(3), angleStart.toFixed(3), angleEnd.toFixed(3)].join(',')
 }
 
-// 把指定图层设为下次创建对象的默认落点。也作为 dialog 中「设为默认」按钮回调。
+// 把指定图层设为下次创建对象的默认落点。也作为 dialog 中「设为默认」按钮回调?
 function setDefaultLayer(name: string) {
   if (!name) return
   defaults.site.layer = name
@@ -615,15 +745,15 @@ function setDefaultLayer(name: string) {
   ElMessage.success(`默认图层已切到 "${name}"`)
 }
 
-// 「图层」菜单：弹出 prompt 输入新图层名，加进 knownLayers/layerRows 并把它设为
-// defaults.site.layer / defaults.track.layer。下次 Add-Site / Add-Track 自动落到新层。
+// 「图层」菜单：弹出 prompt 输入新图层名，加?knownLayers/layerRows 并把它设?
+// defaults.site.layer / defaults.track.layer。下?Add-Site / Add-Track 自动落到新层?
 async function promptCreateLayer() {
   try {
     const v = await ElMessageBox.prompt('请输入新图层名（同名会被忽略）', '新建图层', { inputValue: '' })
     const name = (v.value ?? '').trim()
     if (!name) return
     if (knownLayers.value.includes(name)) {
-      // 同名直接切到该层作为当前默认层即可
+      // 同名直接切到该层作为当前默认层即?
       defaults.site.layer = name
       defaults.track.layer = name
       ElMessage.info(`图层 "${name}" 已存在，已切到该层`)
@@ -637,24 +767,59 @@ async function promptCreateLayer() {
 }
 
 // ──────────────────────────────────────────────────────────────────────────
-// 工具栏交互
+// 工具栏交?
 // ──────────────────────────────────────────────────────────────────────────
 
 async function onSelectTool(id: EditToolId) {
+  // 「仅*」是选择过滤开关，不抢占当前绘?变换工具，也不打?pick 循环
+  if (id.startsWith('select.byType.')) {
+    const t = id.replace('select.byType.', '')
+    const mode: SelectOnlyMode | null =
+      t === 'site' || t === 'decor' || t === 'straight' || t === 'curve' ? t
+      : t === 'polyline' ? 'straight'
+      : t === 'bezier' || t === 'arc' ? 'curve'
+      : null
+    if (mode) await applySelectOnlyMode(mode)
+    return
+  }
+
   editTool.setTool(id)
   drawTrackState.value.siteA = null
+  // 切走文本/图片工具时清掉未完成的落点载荷，避免下次误用
+  if (id !== 'draw.decor.text') pendingTextContent.value = null
+  if (id !== 'draw.image') pendingImagePath.value = null
 
-  // 切换工具会终止上一轮拾取循环（SimpleLite 端的 GetPoint 会被下一次 cancel 截断）
+  // 切换工具会终止上一轮拾取循环（SimpleLite 端的 GetPoint 会被下一?cancel 截断?
   pickLoopActive.value = false
 
-  // 一些工具是一次性 action，点完直接执行：
+  // 一些工具是一次?action，点完直接执行：
   if (id === 'select.clear') {
     selection.clear()
     await reflectionApi.clearSelection().catch(() => {})
     return
   }
+  if (id === 'draw.decor.text') {
+    try {
+      const { value } = await ElMessageBox.prompt('请输入文本内容', '装饰文本', {
+        inputValue: 'Label',
+        confirmButtonText: '下一步：点选落点',
+        cancelButtonText: '取消'
+      })
+      pendingTextContent.value = (value ?? '').trim() || 'Label'
+    } catch {
+      editTool.setTool('select.single')
+      return
+    }
+    startPickLoop()
+    return
+  }
+  if (id === 'draw.image') {
+    // 先选文件；上传成功后再进入画布点选落点（?onFilePicked?
+    triggerUpload('image')
+    return
+  }
   if (pickToolIds.includes(id)) {
-    // 切到需要画布拾取的工具：异步起一次 pick 循环；用户每点一次就反射调 create。
+    // 切到需要画布拾取的工具：异步起一?pick 循环；用户每点一次就反射?create?
     startPickLoop()
   }
   if (id.startsWith('align.')) {
@@ -665,41 +830,20 @@ async function onSelectTool(id: EditToolId) {
     await runBatchGenerate(id)
     return
   }
+  if (id === 'transform.copy') { await copySelection(); return }
+  if (id === 'transform.paste') { await pasteClipboard(); return }
+  if (id === 'transform.duplicate') { await duplicateSelection(); return }
   if (id === 'transform.delete') {
     await deleteSelection()
     return
   }
-  if (id.startsWith('select.byType.')) {
-    const t = id.replace('select.byType.', '')
-    applyTypeFilter(t)
-    return
-  }
   if (id === 'show.controlPoints') editTool.showControlPoints.value = !editTool.showControlPoints.value
   if (id === 'show.controlHandles') editTool.showControlHandles.value = !editTool.showControlHandles.value
-  if (id === 'draw.image') triggerUpload('image')
-  if (id === 'draw.model') triggerUpload('model')
-  if (id === 'transform.copyFields') { await runCopyFields(); return }
-}
-
-function applyTypeFilter(t: string) {
-  if (t === 'site') selection.filterByKind('site')
-  else if (t === 'polyline' || t === 'bezier' || t === 'arc') {
-    selection.items.value = selection.items.value.filter((s) => {
-      if (s.kind !== 'track') return false
-      const tn = s.typeName.toLowerCase()
-      if (t === 'polyline') return tn === 'uitrack'
-      if (t === 'bezier') return tn.includes('bezier')
-      if (t === 'arc') return tn.includes('arc')
-      return false
-    })
-  } else if (t === 'decor') selection.filterByKind('special')
-  else if (t === 'currentLayer' && primary.value?.layer) {
-    selection.items.value = selection.items.value.filter((s) => s.layer === primary.value!.layer)
-  }
+  if (id === 'transform.copyFields') { openBetterAddFieldDialog(); return }
 }
 
 // ──────────────────────────────────────────────────────────────────────────
-// 画布事件：根据当前工具决定 pick 后的行为
+// 画布事件：根据当前工具决?pick 后的行为
 // ──────────────────────────────────────────────────────────────────────────
 
 async function onCanvasPick(p: { x: number; y: number }) {
@@ -708,44 +852,53 @@ async function onCanvasPick(p: { x: number; y: number }) {
 
   const id = editTool.activeTool.value
 
-  // 双路径防护：pick 类工具激活后，所有创建/连线动作由 startPickLoop 一家负责
-  // （它会等待后端 SSE pick-result）。useCanvasBridge.onPick 收到 iframe 的
-  // workspace.pick postMessage 时如果再触发一次 runCreateSite/handleTrackPick，
-  // 同一次点击会被创建两个站点。
+  // 双路径防护：pick 类工具激活后，所有创?连线动作?startPickLoop 一家负?
+  // （它会等待后?SSE pick-result）。useCanvasBridge.onPick 收到 iframe ?
+  // workspace.pick postMessage 时如果再触发一?runCreateSite/handleTrackPick?
+  // 同一次点击会被创建两个站点?
   if (pickLoopActive.value && pickToolIds.includes(id)) return
 
-  // 贝塞尔 / NURBS 收集中间控制点期间，handleTrackPick 已直接 await mapEditApi.pick()。
+  // 贝塞?/ NURBS 收集中间控制点期间，handleTrackPick 已直?await mapEditApi.pick()?
   // 这里再走一次状态机会把同一次点击当成新一轮的 siteA。短路即可，pick-result 已被
-  // collectAndCreateBezierLike 消费。
+  // collectAndCreateBezierLike 消费?
   if (inFollowupPick.value) return
 
   if (id === 'draw.site' || id === 'draw.sites.continuous') {
     await runCreateSite(p.x, p.y)
     return
   }
-  if (id === 'draw.track.polyline' || id === 'draw.track.bezier' || id === 'draw.track.arc' || id === 'draw.track.nurbs') {
+  if (
+    id === 'draw.track.polyline'
+    || id === 'draw.tracks.continuous'
+    || id === 'draw.track.bezier'
+    || id === 'draw.track.arc'
+    || id === 'draw.track.nurbs'
+  ) {
     try {
-      const pick = await mapEditApi.pick()
+      const pick = await mapEditApi.pick({ snap: true })
       await handleTrackPick(pick.siteId)
-    } catch { /* user cancelled */ }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err)
+      return
+    }
     return
   }
 }
 
 function onCanvasSelect(names: string[]) {
   // names 形如 ["UISite-12", "UITrack-7", "UIBezierTrack-3", "UICircularArcTrack-5", "Car-2", ...]
-  // 直接走 selection.set，由 parseSelectionNames 在内部按 viewFilter.selectFilter 过滤掉被禁类型。
+  // 直接?selection.set，由 parseSelectionNames 在内部按 viewFilter.selectFilter 过滤掉被禁类型?
   selection.set(parseSelectionNames(names))
 }
 
 /**
- * 把 SimpleLite 端 prop name 解析为 SelectionItem。
- * 之前的 onCanvasSelect 用了 "(?:Track)?" 的非贪婪正则，会把
- * "UIBezierTrack-3" 拆成 typeName="Bezier" → kind 错判成 "special"。
- * 这里改成统一逻辑：贪婪吃完字母前缀，再用 typeName 内容判定 kind。
+ * ?SimpleLite ?prop name 解析?SelectionItem?
+ * 之前?onCanvasSelect 用了 "(?:Track)?" 的非贪婪正则，会?
+ * "UIBezierTrack-3" 拆成 typeName="Bezier" ?kind 错判?"special"?
+ * 这里改成统一逻辑：贪婪吃完字母前缀，再?typeName 内容判定 kind?
  *
- * 解析后会按 viewFilter.selectFilter 过滤——和 SimpleLite 桌面端「选择」菜单语义一致：
- * 关闭某类型则该类型不会被选中（即使画布层面物理上点中了它）。
+ * 解析后会?viewFilter.selectFilter 过滤——和 SimpleLite 桌面端「选择」菜单语义一致：
+ * 关闭某类型则该类型不会被选中（即使画布层面物理上点中了它）?
  */
 function parseSelectionNames(names: readonly string[]): SelectionItem[] {
   const items: SelectionItem[] = []
@@ -767,11 +920,14 @@ function parseSelectionNames(names: readonly string[]): SelectionItem[] {
     if (kind === 'car' && !sf.cars) continue
     if (kind === 'special' && !sf.decor) continue
 
+    const typeName = n.startsWith('UI') ? `UI${rawType}` : rawType
+    if (kind === 'track' && !trackPassesSelectMode(typeName)) continue
+
     items.push({
       kind,
       id,
       name: n,
-      typeName: n.startsWith('UI') ? `UI${rawType}` : rawType
+      typeName
     })
   }
   return items
@@ -796,10 +952,10 @@ async function handleTrackPick(siteId: number) {
     editTool.activeTool.value === 'draw.track.bezier' ? 'bezier'
     : editTool.activeTool.value === 'draw.track.arc' ? 'arc'
     : editTool.activeTool.value === 'draw.track.nurbs' ? 'nurbs'
-    : 'track'
+    : 'track' // polyline / tracks.continuous 都走直线 UITrack
 
-  // 收集 typeInfo（贝塞尔/NURBS：弹个数后在画布上连续 pick；弧线：弹半径自动算圆心）。
-  // 用户取消或参数非法 → 整个创建动作终止，不调 createTrack（避免落一条没有几何的曲线）。
+  // 收集 typeInfo（贝塞尔/NURBS：弹个数后在画布上连?pick；弧线：弹半径自动算圆心）?
+  // 用户取消或参数非??整个创建动作终止，不?createTrack（避免落一条没有几何的曲线）?
   let typeInfo: string | undefined
   let extraLabel = ''
   if (kind === 'bezier' || kind === 'nurbs') {
@@ -820,7 +976,7 @@ async function handleTrackPick(siteId: number) {
 
   let lastId = -1
   await history.run({
-    label: `新建${trackKindLabel(kind)} (${a}→${b})${extraLabel}`,
+    label: `新建${trackKindLabel(kind)} (${a}->${b})${extraLabel}`,
     apply: async () => {
       const payload: Record<string, unknown> = { siteA: a, siteB: b, layer: defaults.track.layer }
       if (typeInfo) payload.typeInfo = typeInfo
@@ -835,14 +991,14 @@ async function handleTrackPick(siteId: number) {
 }
 
 /**
- * 「画布拾取」场景下的贝塞尔 / NURBS typeInfo 收集：
- * 1. 弹「中间控制点个数」对话框（默认 2）。
- * 2. 进入 inFollowupPick=true，连续 N 次 await mapEditApi.pick()——画布任意位置点击都算（不限站点）。
- *    用户右键中途取消 → mapEditApi.pick() 抛错 → 整个收集中止。
- * 3. 收集完拼 typeInfo。
+ * 「画布拾取」场景下的贝塞尔 / NURBS typeInfo 收集?
+ * 1. 弹「中间控制点个数」对话框（默?2）?
+ * 2. 进入 inFollowupPick=true，连?N ?await mapEditApi.pick()——画布任意位置点击都算（不限站点）?
+ *    用户右键中途取??mapEditApi.pick() 抛错 ?整个收集中止?
+ * 3. 收集完拼 typeInfo?
  *
- * 注意：startPickLoop 主循环在 await handleTrackPick 时不会再调 mapEditApi.pick()，
- * 所以这里的 pick() 不会与主循环竞争同一个 SSE pick-result。
+ * 注意：startPickLoop 主循环在 await handleTrackPick 时不会再?mapEditApi.pick()?
+ * 所以这里的 pick() 不会与主循环竞争同一?SSE pick-result?
  */
 async function collectCurveTypeInfoByPick(
   a: number,
@@ -912,42 +1068,260 @@ async function runCreateSite(x: number, y: number) {
   })
 }
 
-async function deleteSelection() {
-  const items = [...selection.items.value]
-  if (items.length === 0) return
-
-  // 先抓快照（每个对象的字段全量）用于 revert 时通过 batch.create 重建。
-  // 注意：重建后 id 会变；这是后端 SimpleLib.SetSite/SetTrack 自增 id 决定的，
-  // 业务上可接受 —— 撤销主要恢复"形态"，id 重排由 SSE 通知所有面板刷新。
-  type Snapshot = { kind: string; typeName: string; data: Record<string, unknown> }
-  const snapshots: Snapshot[] = []
-  for (const it of items) {
-    try {
-      const b = await reflectionApi.getBundle(it.kind, it.id)
-      snapshots.push({ kind: it.kind, typeName: b.typeName, data: { ...(b.fields ?? {}) } })
-    } catch { /* 抓不到就跳过 */ }
-  }
-
+async function runCreateText(x: number, y: number, content: string) {
+  let createdId = -1
   await history.run({
-    label: `删除 ${items.length} 个对象`,
+    label: `新建文本「${content}」`,
     apply: async () => {
-      const ops = items.map((it) => ({ action: 'delete' as const, kind: it.kind, id: it.id }))
-      await mapEditApi.batch(ops)
-      selection.clear()
+      const r = await mapEditApi.createText({
+        x,
+        y,
+        content,
+        layer: defaults.site.layer,
+        color: '#ffffff',
+        size: 16
+      })
+      createdId = r.id
     },
     revert: async () => {
-      const ops = snapshots.map((s) => {
-        const kindForCreate = pickCreateKind(s.kind, s.typeName)
-        return { action: 'create' as const, kind: kindForCreate, data: s.data }
-      })
-      if (ops.length) {
-        await mapEditApi.batch(ops)
-        ElMessage.success(`已恢复 ${ops.length} 个对象（注意：id 已重排）`)
-      }
+      if (createdId > 0) await mapEditApi.deleteObject('text', createdId)
     }
   })
 }
 
+async function runCreateImage(x: number, y: number, imagePath: string) {
+  let createdId = -1
+  await history.run({
+    label: '插入图片',
+    apply: async () => {
+      const r = await mapEditApi.createImage({
+        x,
+        y,
+        imagePath,
+        size: 1200,
+        layer: defaults.site.layer
+      })
+      createdId = r.id
+    },
+    revert: async () => {
+      if (createdId > 0) await mapEditApi.deleteObject('image', createdId)
+    }
+  })
+}
+
+type ObjectSnapshot = { kind: string; typeName: string; data: Record<string, unknown> }
+
+const PASTE_OFFSET_MM = 200
+/** 粘贴只带可安全重建的字段，避?bundle 全量字段污染新建对象、打?Web 通道?*/
+const PASTE_FIELD_ALLOW = new Set([
+  'x', 'y', 'z', 'name', 'layer', 'layerName', 'color', 'displaySetting',
+  'siteA', 'siteB', 'typeInfo', 'direction',
+  'content', 'size', 'imagePath', 'angle', 'opacity', 'modelPath', 'scale', 'rotation', 'theta'
+])
+/** 删除撤销需恢复自定义字段；排除运行时态与主键?*/
+const DELETE_SNAPSHOT_FIELD_DENY = new Set(['id', 'tags'])
+const editorClipboard = ref<ObjectSnapshot[]>([])
+const betterAddFieldOpen = ref(false)
+
+const betterAddFieldTargets = computed(() =>
+  selection.items.value.map((it) => ({ kind: it.kind, id: it.id }))
+)
+
+const betterAddFieldSummary = computed(() => {
+  let sites = 0
+  let tracks = 0
+  let others = 0
+  for (const it of selection.items.value) {
+    if (it.kind === 'site') sites++
+    else if (it.kind === 'track') tracks++
+    else others++
+  }
+  const parts: string[] = []
+  if (sites) parts.push(`${sites} 个站点`)
+  if (tracks) parts.push(`${tracks} 条路径`)
+  if (others) parts.push(`${others} 个其它`)
+  return parts.length ? parts.join(' + ') : '未选中'
+})
+
+async function snapshotItems(
+  items: Array<{ kind: string; id: number }>,
+  opts?: { mode?: 'paste' | 'delete' }
+): Promise<ObjectSnapshot[]> {
+  const mode = opts?.mode ?? 'paste'
+  const snapshots: ObjectSnapshot[] = []
+  for (const it of items) {
+    try {
+      const b = await reflectionApi.getBundle(it.kind as ReflectionKind, it.id)
+      const raw = (b.fields ?? {}) as Record<string, unknown>
+      const data: Record<string, unknown> = {}
+      for (const [k, v] of Object.entries(raw)) {
+        if (mode === 'delete') {
+          if (DELETE_SNAPSHOT_FIELD_DENY.has(k)) continue
+        } else if (!PASTE_FIELD_ALLOW.has(k)) {
+          continue
+        }
+        if (v == null || v === '') continue
+        data[k] = v
+      }
+      if (data.layerName != null && (data.layer == null || data.layer === '')) {
+        data.layer = data.layerName
+      }
+      snapshots.push({ kind: it.kind, typeName: b.typeName, data })
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err)
+      throw new Error(`读取对象快照失败（${it.kind}#${it.id}）：${msg}`)
+    }
+  }
+  return snapshots
+}
+
+async function snapshotSelection(): Promise<ObjectSnapshot[]> {
+  return snapshotItems(selection.items.value, { mode: 'paste' })
+}
+
+function offsetSnapshotData(data: Record<string, unknown>, dx: number, dy: number): Record<string, unknown> {
+  const next = { ...data }
+  delete next.id
+  if (next.x != null && next.x !== '') next.x = Number(next.x) + dx
+  if (next.y != null && next.y !== '') next.y = Number(next.y) + dy
+  return next
+}
+
+async function copySelection(): Promise<boolean> {
+  const selectedCount = selection.items.value.length
+  if (!selectedCount) {
+    editorClipboard.value = []
+    ElMessage.warning('请先选中要复制的对象')
+    return false
+  }
+  try {
+    const snapshots = await snapshotSelection()
+    if (snapshots.length !== selectedCount) {
+      throw new Error(`只读取到 ${snapshots.length}/${selectedCount} 个对象快照`)
+    }
+    editorClipboard.value = snapshots
+    ElMessage.success(`已复制 ${snapshots.length} 个对象`)
+    return true
+  } catch (err) {
+    editorClipboard.value = []
+    ElMessage.error(`复制失败：${(err as Error).message}`)
+    return false
+  }
+}
+
+async function pasteClipboard() {
+  if (!editorClipboard.value.length) {
+    ElMessage.warning('剪贴板为空，请先复制')
+    return
+  }
+  const ops = editorClipboard.value.map((s) => ({
+    action: 'create' as const,
+    kind: pickCreateKind(s.kind, s.typeName),
+    data: offsetSnapshotData(s.data, PASTE_OFFSET_MM, PASTE_OFFSET_MM)
+  }))
+  let createdIds: { kind: string; id: number }[] = []
+  try {
+    await history.run({
+      label: `粘贴 ${ops.length} 个对象`,
+      apply: async () => {
+        const r = await mapEditApi.batch(ops)
+        createdIds = (r.results as Array<{ ok: boolean; action: string; kind?: string; result?: { kind: string; id: number } }>)
+          .filter((x) => x.ok && x.action === 'create' && x.result?.id)
+          .map((x) => ({ kind: x.result!.kind || x.kind || 'site', id: x.result!.id }))
+      },
+      revert: async () => {
+        if (!createdIds.length) return
+        await mapEditApi.batch(createdIds.map((c) => ({ action: 'delete' as const, kind: c.kind, id: c.id })))
+      }
+    })
+    ElMessage.success(`已粘贴 ${createdIds.length || ops.length} 个对象`)
+  } catch (err) {
+    ElMessage.error(`粘贴失败：${(err as Error).message}`)
+  }
+}
+
+async function duplicateSelection() {
+  const copied = await copySelection()
+  if (!copied) return
+  await pasteClipboard()
+}
+
+async function cutSelection() {
+  if (selection.items.value.length === 0) {
+    ElMessage.warning('请先选中对象')
+    return
+  }
+  const copied = await copySelection()
+  if (!copied) return
+  await deleteSelection({ skipEmptyWarn: true })
+}
+
+function openBetterAddFieldDialog() {
+  if (selection.items.value.length === 0) {
+    ElMessage.warning('请先在地图上选中要添加字段的站点、路径或车辆（可框选多选）')
+    return
+  }
+  betterAddFieldOpen.value = true
+}
+
+async function deleteSelection(opts?: { skipEmptyWarn?: boolean }) {
+  const items = [...selection.items.value]
+  if (items.length === 0) {
+    if (!opts?.skipEmptyWarn) ElMessage.warning('请先选中要删除的对象')
+    return
+  }
+
+  try {
+    await ElMessageBox.confirm(
+      `确定删除选中的 ${items.length} 个对象？此操作可通过撤销恢复。`,
+      '删除确认',
+      {
+        type: 'warning',
+        confirmButtonText: '删除',
+        cancelButtonText: '取消',
+        distinguishCancelAndClose: true
+      }
+    )
+  } catch {
+    return
+  }
+
+  // 删除前必须拿到完整快照，否则撤销无法可靠恢复。
+  let snapshots: ObjectSnapshot[]
+  try {
+    snapshots = await snapshotItems(items, { mode: 'delete' })
+    if (snapshots.length !== items.length) {
+      throw new Error(`只读取到 ${snapshots.length}/${items.length} 个对象快照`)
+    }
+  } catch (err) {
+    ElMessage.error(`删除已取消：${(err as Error).message}`)
+    return
+  }
+
+  try {
+    await history.run({
+      label: `删除 ${items.length} 个对象`,
+      apply: async () => {
+        const ops = items.map((it) => ({ action: 'delete' as const, kind: it.kind, id: it.id }))
+        await mapEditApi.batch(ops)
+        selection.clear()
+      },
+      revert: async () => {
+        const ops = snapshots.map((s) => {
+          const kindForCreate = pickCreateKind(s.kind, s.typeName)
+          return { action: 'create' as const, kind: kindForCreate, data: s.data }
+        })
+        if (ops.length) {
+          await mapEditApi.batch(ops)
+          ElMessage.success(`已恢复 ${ops.length} 个对象（注意：id 已重排）`)
+        }
+      }
+    })
+  } catch (err) {
+    ElMessage.error(`删除失败：${(err as Error).message}`)
+  }
+}
+
 function pickCreateKind(originalKind: string, typeName: string): string {
   const tn = (typeName ?? '').toLowerCase()
   if (originalKind === 'track') {
@@ -965,17 +1339,20 @@ function pickCreateKind(originalKind: string, typeName: string): string {
 }
 
 async function applyAlignment(mode: AlignMode) {
-  // 选中对象必须是有 x,y 坐标的（site / special）
+  // 选中对象必须是有 x,y 坐标的（site / special?
   const targets: AlignTarget[] = []
   for (const it of selection.items.value) {
     if (it.kind === 'track') continue
-    // 拉一遍 bundle 拿 x/y
+    // 拉一?bundle ?x/y
     try {
       const b = await reflectionApi.getBundle(it.kind, it.id)
       const x = Number(b.fields?.x ?? 0)
       const y = Number(b.fields?.y ?? 0)
       targets.push({ kind: it.kind, id: it.id, x, y })
-    } catch { /* skip */ }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err)
+      throw new Error(`读取对象坐标失败（${it.kind}#${it.id}）：${msg}`)
+    }
   }
   if (targets.length < 2) {
     ElMessage.warning('对齐需要选中至少 2 个对象')
@@ -1009,7 +1386,10 @@ async function runBatchGenerate(id: EditToolId) {
         ? genLinearH(Number(a.value), Number(e.value), Number(b.value), { count, layer: defaults.site.layer })
         : genLinearV(Number(a.value), Number(b.value), Number(f.value), { count, layer: defaults.site.layer })
       await applyBatchAsCommand(`${dir}间隔生成 ${count}`, ops)
-    } catch { /* cancel */ }
+    } catch {
+      return
+    }
+    return
     return
   }
   if (id === 'batch.matrix') {
@@ -1022,7 +1402,10 @@ async function runBatchGenerate(id: EditToolId) {
       const y2 = Number((await ElMessageBox.prompt('y2', '矩阵生成', { inputValue: '5000' })).value)
       const ops = genMatrix(x1, y1, x2, y2, { rows, cols, layer: defaults.site.layer })
       await applyBatchAsCommand(`矩阵生成 ${rows}×${cols}`, ops)
-    } catch { /* cancel */ }
+    } catch {
+      return
+    }
+    return
     return
   }
   if (id === 'batch.circular') {
@@ -1033,7 +1416,10 @@ async function runBatchGenerate(id: EditToolId) {
       const n = Number((await ElMessageBox.prompt('站点数量', '环形阵列', { inputValue: '8' })).value)
       const ops = genCircular(cx, cy, r, { count: n, layer: defaults.site.layer })
       await applyBatchAsCommand(`环形阵列 r=${r} n=${n}`, ops)
-    } catch { /* cancel */ }
+    } catch {
+      return
+    }
+    return
     return
   }
   if (id === 'batch.alongPath') {
@@ -1059,7 +1445,7 @@ async function runAlongPathSampling() {
 
   const createdAll: number[] = []
   await history.run({
-    label: `沿 ${tracks.length} 条路径间距 ${spacing}mm 采样`,
+    label: `沿 ${tracks.length} 条路径间隔 ${spacing}mm 采样`,
     apply: async () => {
       for (const t of tracks) {
         const r = await mapEditApi.sampleSitesAlongTrack(t.id, { spacingMm: spacing, includeEndpoints, layer: defaults.site.layer })
@@ -1077,7 +1463,7 @@ async function runAlongPathSampling() {
 
 async function runCopyFields() {
   if (selection.items.value.length < 2) {
-    ElMessage.warning('字段复制需要 ≥ 2 个选中对象（第 1 个为源，其余为目标）')
+    ElMessage.warning('字段复制需要至少 2 个选中对象（第 1 个为源，其余为目标）')
     return
   }
   const [src, ...targets] = selection.items.value
@@ -1090,7 +1476,7 @@ async function runCopyFields() {
     const fieldNames = fieldsStr.split(',').map((s) => s.trim()).filter(Boolean)
     if (!fieldNames.length) return
 
-    // 抓 targets 原值用于 revert
+    // 记录 targets 原值用于 revert
     const beforeMap = new Map<string, Record<string, string>>()
     for (const t of targets) {
       try {
@@ -1098,11 +1484,14 @@ async function runCopyFields() {
         const sub: Record<string, string> = {}
         for (const f of fieldNames) sub[f] = String(b.fields?.[f] ?? '')
         beforeMap.set(`${t.kind}:${t.id}`, sub)
-      } catch { /* skip */ }
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err)
+        throw new Error(`读取对象字段失败（${t.kind}#${t.id}）：${msg}`)
+      }
     }
 
     await history.run({
-      label: `字段复制 ${fieldNames.join(',')} → ${targets.length} 个`,
+      label: `字段复制 ${fieldNames.join(',')} -> ${targets.length} 个`,
       apply: async () => {
         const r = await mapEditApi.copyFieldsTo(
           src!.kind,
@@ -1144,9 +1533,21 @@ async function applyBatchAsCommand(label: string, ops: { action: 'create' | 'del
 }
 
 // ──────────────────────────────────────────────────────────────────────────
-// 属性面板交互
+// 属性面板交?
 // ──────────────────────────────────────────────────────────────────────────
 
+/** 反射字段值展示：避免 object/array ?String() ?[object Object] 而「读不到」?*/
+function fieldValueToDisplay(v: unknown): string {
+  if (v == null) return ''
+  if (typeof v === 'string') return v
+  if (typeof v === 'number' || typeof v === 'boolean' || typeof v === 'bigint') return String(v)
+  try {
+    return JSON.stringify(v)
+  } catch {
+    return String(v)
+  }
+}
+
 async function refreshPrimary(opts?: { silent?: boolean }) {
   if (selection.items.value.length === 0) {
     primary.value = null
@@ -1160,7 +1561,7 @@ async function refreshPrimary(opts?: { silent?: boolean }) {
   try {
     const b = await reflectionApi.getBundle(first.kind, first.id)
     primary.value = b.summary
-    primaryFields.value = Object.entries(b.fields).map(([k, v]) => ({ key: k, value: String(v) }))
+    primaryFields.value = Object.entries(b.fields ?? {}).map(([k, v]) => ({ key: k, value: fieldValueToDisplay(v) }))
     primaryMethods.value = b.methods
     primaryStatus.value = (b.status ?? []).map((s) => ({ key: s.key, value: s.value }))
   } catch (err) {
@@ -1199,7 +1600,7 @@ async function onRename(name: string) {
   const oldName = primary.value.name ?? ''
   if (oldName === name) return
   await history.run({
-    label: `重命名 ${oldName || '(无)'} → ${name}`,
+    label: `重命名 ${oldName || '(空)'} → ${name}`,
     apply: async () => {
       await reflectionApi.setField(it.kind, targetId, 'name', name)
     },
@@ -1218,7 +1619,7 @@ async function onChangeLayer(layer: string) {
   const oldLayer = primary.value.layer ?? ''
   if (oldLayer === layer) return
   await history.run({
-    label: `修改图层 ${oldLayer || '(无)'} → ${layer}`,
+    label: `修改图层 ${oldLayer || '(空)'} -> ${layer}`,
     apply: async () => {
       await reflectionApi.setField(it.kind, targetId, 'layerName', layer)
     },
@@ -1399,7 +1800,7 @@ async function openAiDialog() {
   aiDialogOpen.value = true
 }
 
-// 恢复「AI 助手」面板的开关状态与宽度（来自上次会话的 localStorage）。
+// 恢复「AI 助手」面板的开关状态与宽度（来自上次会话的 localStorage）?
 function restoreAiPanelPrefs() {
   try {
     aiAssistantOpen.value = localStorage.getItem(AI_PANEL_OPEN_KEY) === '1'
@@ -1415,7 +1816,7 @@ watch(aiPanelWidth, (v) => {
   try { localStorage.setItem(AI_PANEL_WIDTH_KEY, String(Math.round(v))) } catch { /* ignore */ }
 })
 
-// 右侧「AI 助手」入口：展开前刷新一次 AI 配置状态，保证「未配置」提示与后端一致。
+// 右侧「AI 助手」入口：展开前刷新一?AI 配置状态，保证「未配置」提示与后端一致?
 async function toggleAiAssistant() {
   if (!aiAssistantOpen.value) {
     try {
@@ -1431,15 +1832,15 @@ async function toggleAiAssistant() {
 async function onAiGenerated(r: import('@/api/mapEdit').AiMapGenerateResult) {
   refreshAfterMutation()
 
-  // 把本次 AI 落地的所有对象登记到撤销栈：用户一次 Ctrl+Z 即可整体回退。
-  // 注意：r.created 里既有 ok=true 的成功项，也可能有 { tool, error } 的失败项；只挑成功项删除。
+  // 把本?AI 落地的所有对象登记到撤销栈：用户一?Ctrl+Z 即可整体回退?
+  // 注意：r.created 里既?ok=true 的成功项，也可能?{ tool, error } 的失败项；只挑成功项删除?
   type CreatedObj = { kind: string; id: number; tool: string; typeName?: string; error?: string }
   const ok: Array<CreatedObj> = (r.created ?? [])
     .filter((c): c is CreatedObj => typeof c === 'object' && c != null && typeof (c as { id?: unknown }).id === 'number' && !c.error)
   if (ok.length === 0) return
 
-  // 直接 push 一条「假装已 apply」的命令到栈：apply 是 noop（落地已发生），revert 是批量删除。
-  // 这样用户不需要在生成对话框里再确认一次。
+  // 直接 push 一条「假装已 apply」的命令到栈：apply ?noop（落地已发生），revert 是批量删除?
+  // 这样用户不需要在生成对话框里再确认一次?
   const cmd = {
     label: `AI 生图：落地 ${ok.length} 个对象`,
     apply: async () => { /* already applied by backend */ },
@@ -1449,7 +1850,7 @@ async function onAiGenerated(r: import('@/api/mapEdit').AiMapGenerateResult) {
       ElMessage.success(`已撤销 AI 生图（删除 ${ops.length} 个对象）`)
     }
   }
-  // 走 history.run 会再次调用 apply（noop），所以直接 await cmd.apply() + 手动入栈。
+  // ?history.run 会再次调?apply（noop），所以直?await cmd.apply() + 手动入栈?
   await history.run(cmd)
 }
 
@@ -1458,9 +1859,9 @@ async function onAiGenerated(r: import('@/api/mapEdit').AiMapGenerateResult) {
 // ──────────────────────────────────────────────────────────────────────────
 
 /**
- * 保存当前场景到服务器地图目录，成功后返回地图管理页。
- * - 否，在原项目基础上保存：名称不变，直接覆盖原地图；
- * - 是，保存成新项目：默认「当前地图名_修改日期」，确认后落盘到服务器。
+ * 保存当前场景到服务器地图目录，成功后返回地图管理页?
+ * - 否，在原项目基础上保存：名称不变，直接覆盖原地图?
+ * - 是，保存成新项目：默认「当前地图名_修改日期」，确认后落盘到服务器?
  */
 async function saveMapAndLeave() {
   const mode = await promptSaveMode()
@@ -1539,21 +1940,28 @@ function triggerUpload(kind: 'image' | 'model') {
 async function onFilePicked(ev: Event) {
   const input = ev.target as HTMLInputElement
   const file = input.files?.[0]
-  if (!file) return
+  if (!file) {
+    if (fileUploadKind.value === 'image' && editTool.activeTool.value === 'draw.image') {
+      editTool.setTool('select.single')
+    }
+    return
+  }
   try {
     const buf = await file.arrayBuffer()
     const b64 = arrayBufferToBase64(buf)
     const r = await mapEditApi.uploadAsset(file.name, b64)
-    ElMessage.success(`已上传：${r.fileName}`)
+    ElMessage.success(`已上传：${r.fileName}，请在画布单击落点`)
     if (fileUploadKind.value === 'image') {
-      // 简化：直接在原点创建图片对象
-      await mapEditApi.createImage({ x: 0, y: 0, imagePath: r.savedPath, size: 1000 })
+      pendingImagePath.value = r.savedPath
+      editTool.setTool('draw.image')
+      pickLoopActive.value = false
+      startPickLoop()
     } else {
-      await mapEditApi.createModel({ x: 0, y: 0, modelPath: r.savedPath, scale: 1 })
+      ElMessage.info('插入模型功能暂缓（SimpleLite 侧未完整实现）')
     }
-    refreshAfterMutation()
   } catch (err) {
     ElMessage.error(`上传失败：${(err as Error).message}`)
+    if (editTool.activeTool.value === 'draw.image') editTool.setTool('select.single')
   } finally {
     input.value = ''
   }
@@ -1567,7 +1975,7 @@ function arrayBufferToBase64(buffer: ArrayBuffer): string {
 }
 
 // ──────────────────────────────────────────────────────────────────────────
-// SSE 订阅 + 画布桥（鼠标坐标）
+// SSE 订阅 + 画布桥（鼠标坐标?
 // ──────────────────────────────────────────────────────────────────────────
 
 useCanvasBridge({
@@ -1585,18 +1993,18 @@ const stream = useMapEditStream({
   onObjectBatchChanged: () => refreshAfterMutation(),
   onViewportStyleUpdated: () => { void loadViewportStyle() },
   onSelectionDetail: (e) => {
-    // 把 SimpleLite 端 canvas 内的选中实时同步到 Vue 端，让右侧属性面板自动刷新。
+    // ?SimpleLite ?canvas 内的选中实时同步?Vue 端，让右侧属性面板自动刷新?
     //
-    // 重要：仅在 e.names 是数组时才覆盖 selection。
-    // 历史教训：早期某些后端路径（ReflectionApiController.SetSelection / ClearSelection）
-    // 广播的 selection-detail 缺少 names 字段，e.names 为 undefined。
-    // 若此时直接 `e.names ?? []` 会把刚选中的对象误清空，进一步触发 watch 把 primary 设 null
-    // → 右侧属性面板瞬时显示 "未选中对象"。所以这里非数组直接忽略，保留当前 selection。
+    // 重要：仅?e.names 是数组时才覆?selection?
+    // 历史教训：早期某些后端路径（ReflectionApiController.SetSelection / ClearSelection?
+    // 广播?selection-detail 缺少 names 字段，e.names ?undefined?
+    // 若此时直?`e.names ?? []` 会把刚选中的对象误清空，进一步触?watch ?primary ?null
+    // ?右侧属性面板瞬时显?"未选中对象"。所以这里非数组直接忽略，保留当?selection?
     if (!Array.isArray(e.names)) return
     const incoming = parseSelectionNames(e.names)
     const incomingKey = makeSelectionKey(incoming)
-    // 防回环：广播回来的就是本地刚推上去的同一份，跳过避免死循环
-    // watch(selection) → reflectionApi.setSelection → 后端广播 selection-detail → 这里。
+    // 防回环：广播回来的就是本地刚推上去的同一份，跳过避免死循?
+    // watch(selection) ?reflectionApi.setSelection ?后端广播 selection-detail ?这里?
     if (incomingKey === lastSyncedSelectionKey.value) return
     lastSyncedSelectionKey.value = incomingKey
     selection.set(incoming)
@@ -1611,9 +2019,9 @@ watch(() => stream.connected.value, (v) => (streamConnected.value = v), { immedi
 
 watch(() => makeSelectionKey(selection.items.value), (key) => {
   refreshPrimary()
-  // 记录"本地刚发出"的 key 给 onSelectionDetail 用，无论单选/多选都先记下
-  // （setSelection 是 fire-and-forget，但后端广播一定晚于本调用，因此 last
-  // SyncedSelectionKey 在广播到达时已就绪）。
+  // 记录"本地刚发??key ?onSelectionDetail 用，无论单?多选都先记?
+  // （setSelection ?fire-and-forget，但后端广播一定晚于本调用，因?last
+  // SyncedSelectionKey 在广播到达时已就绪）?
   lastSyncedSelectionKey.value = key
   // 把后端选中状态同步到 SimpleLite（单选）
   if (selection.items.value.length === 1) {
@@ -1622,7 +2030,7 @@ watch(() => makeSelectionKey(selection.items.value), (key) => {
 })
 
 // ──────────────────────────────────────────────────────────────────────────
-// 键盘快捷键（顶栏/侧栏聚焦时走 document；画布 iframe 聚焦时走 SSE workspace-shortcut）
+// 键盘快捷键（顶栏/侧栏聚焦时走 document；画?iframe 聚焦时走 SSE workspace-shortcut?
 // ──────────────────────────────────────────────────────────────────────────
 
 function isEditableShortcutTarget(target: EventTarget | null): boolean {
@@ -1633,13 +2041,21 @@ function isEditableShortcutTarget(target: EventTarget | null): boolean {
   return !!target.closest('.el-input, .el-textarea, .el-select, [contenteditable="true"]')
 }
 
-async function handleEditorShortcut(action: 'undo' | 'redo' | 'delete') {
+async function handleEditorShortcut(
+  action: 'undo' | 'redo' | 'delete' | 'copy' | 'paste' | 'duplicate'
+) {
   if (action === 'undo') {
     if (!history.canUndo.value) return
     await history.undo()
   } else if (action === 'redo') {
     if (!history.canRedo.value) return
     await history.redo()
+  } else if (action === 'copy') {
+    await copySelection()
+  } else if (action === 'paste') {
+    await pasteClipboard()
+  } else if (action === 'duplicate') {
+    await duplicateSelection()
   } else {
     await deleteSelection()
   }
@@ -1655,6 +2071,18 @@ function onKeyDown(ev: KeyboardEvent) {
   } else if (meta && (ev.key.toLowerCase() === 'y' || (ev.key.toLowerCase() === 'z' && ev.shiftKey))) {
     ev.preventDefault()
     void handleEditorShortcut('redo')
+  } else if (meta && ev.key.toLowerCase() === 'c') {
+    ev.preventDefault()
+    void handleEditorShortcut('copy')
+  } else if (meta && ev.key.toLowerCase() === 'v') {
+    ev.preventDefault()
+    void handleEditorShortcut('paste')
+  } else if (meta && ev.key.toLowerCase() === 'd') {
+    ev.preventDefault()
+    void handleEditorShortcut('duplicate')
+  } else if (meta && ev.key.toLowerCase() === 'i' && !ev.altKey && !ev.shiftKey) {
+    ev.preventDefault()
+    openBetterAddFieldDialog()
   } else if (ev.key === 'Delete') {
     ev.preventDefault()
     void handleEditorShortcut('delete')
@@ -1663,16 +2091,23 @@ function onKeyDown(ev: KeyboardEvent) {
 
 function onWorkspaceShortcutEvent(ev: Event) {
   const action = (ev as CustomEvent<{ action?: string }>).detail?.action
-  if (action === 'undo' || action === 'redo' || action === 'delete') {
+  if (
+    action === 'undo'
+    || action === 'redo'
+    || action === 'delete'
+    || action === 'copy'
+    || action === 'paste'
+    || action === 'duplicate'
+  ) {
     void handleEditorShortcut(action)
   }
 }
 
 /**
- * 从后端拉当前的 viewFilter 真实状态，把本地 reactive 覆盖。
- * SimpleLite 是 source of truth：避免「前端勾着、SimpleLite 真实开关却没改」的偏差
- * （比如另一个 tab 已经把过滤打开 / 关掉，本 tab 进入时应当反映那次状态）。
- * 失败时静默回退到本地 localStorage 缓存（loadViewFilter 已先调过）。
+ * 从后端拉当前?viewFilter 真实状态，把本?reactive 覆盖?
+ * SimpleLite ?source of truth：避免「前端勾着、SimpleLite 真实开关却没改」的偏差
+ * （比如另一?tab 已经把过滤打开 / 关掉，本 tab 进入时应当反映那次状态）?
+ * 失败时静默回退到本?localStorage 缓存（loadViewFilter 已先调过）?
  */
 async function syncViewFilterFromBackend() {
   try {
@@ -1680,6 +2115,8 @@ async function syncViewFilterFromBackend() {
     Object.assign(viewFilter.selectFilter, snap.selectFilter)
     Object.assign(viewFilter.alignSnap, snap.alignSnap)
     Object.assign(viewFilter.showViewport, snap.showViewport)
+    const tm = snap.selectFilter?.trackMode
+    if (tm === 'straight' || tm === 'curve' || tm === 'all') trackSelectMode.value = tm
     persistViewFilter()
   } catch (err) {
     console.warn('[MapEditor] 拉后端 viewFilter 失败，沿用本地缓存：', err)
@@ -1705,9 +2142,9 @@ onMounted(async () => {
 })
 
 /**
- * 从地图管理页跳转进来时的初始加载：
- * - ?map=<name>：加载该地图到场景供编辑，并记录原名（保存默认沿用 + 替换确认）；
- * - ?new=1：新建地图，仅清空「正在编辑的地图名」，保存时按时间默认命名。
+ * 从地图管理页跳转进来时的初始加载?
+ * - ?map=<name>：加载该地图到场景供编辑，并记录原名（保存默认沿?+ 替换确认）；
+ * - ?new=1：新建地图，仅清空「正在编辑的地图名」，保存时按时间默认命名?
  */
 async function loadFromRouteQuery() {
   const mapName = typeof route.query.map === 'string' ? route.query.map : ''
@@ -1740,7 +2177,7 @@ onUnmounted(() => {
 .map-editor-page {
   height: calc(100vh - 56px);
   display: flex; flex-direction: column;
-  /* 画布区保持深色；色相跟当前主题侧栏 (--me-chrome-*) */
+  /* 画布区保持深色；色相跟当前主题侧?(--me-chrome-*) */
   background: radial-gradient(
     ellipse at 50% 40%,
     var(--me-chrome-1) 0%,
@@ -1756,13 +2193,13 @@ onUnmounted(() => {
   position: relative;
 }
 
-/* AI 助手悬浮入口：贴右侧边缘的竖向手柄；面板展开时随面板左移变成其左沿把手。 */
+/* AI 助手入口：关闭贴页面最右侧；打开?AI 面板左沿?*/
 .ai-assistant-fab {
   position: absolute;
   top: 50%;
   right: 0;
   transform: translateY(-50%);
-  z-index: 31;
+  z-index: 40;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -1772,23 +2209,17 @@ onUnmounted(() => {
   border: none;
   border-radius: 12px 0 0 12px;
   cursor: pointer;
-  color: #fff;
-  background: var(--mg-primary);
-  box-shadow: -4px 0 16px var(--me-active-glow);
+  color: var(--ai-fab-fg, #fff);
+  background: var(--ai-fab-bg, var(--mg-primary));
+  box-shadow: -4px 0 16px color-mix(in srgb, var(--mg-primary) 22%, transparent), var(--ai-fab-glow, none);
   transition: right 0.26s cubic-bezier(0.25, 0.8, 0.25, 1), filter 0.15s ease, box-shadow 0.15s ease;
 }
 .ai-assistant-fab:hover {
-  filter: brightness(1.08);
-  box-shadow: -6px 0 22px var(--me-active-glow);
-}
-/* 展开时 right 偏移由内联样式按面板实际宽度设置（默认 360）；此处仅作兜底。 */
-.ai-assistant-fab.is-open {
-  right: 360px;
+  filter: brightness(1.06);
 }
 .ai-assistant-fab .fab-glyph {
   font-size: 18px;
   line-height: 1;
-  text-shadow: 0 0 10px rgba(255, 220, 255, 0.85);
 }
 .ai-assistant-fab .fab-text {
   font-size: 12px;
diff --git a/frontends/apps/simple-platform-vue/src/views/admin/MapMonitorView.vue b/frontends/apps/simple-platform-vue/src/views/admin/MapMonitorView.vue
index 2721347..2fdf1f0 100644
--- a/frontends/apps/simple-platform-vue/src/views/admin/MapMonitorView.vue
+++ b/frontends/apps/simple-platform-vue/src/views/admin/MapMonitorView.vue
@@ -63,7 +63,7 @@
             type="button"
             class="mm-toggle-btn"
             :class="{ 'is-active': layoutMode === 'immersive' }"
-            title="沉浸：全幅地图 + 底部抽屉"
+            title="沉浸：指挥条在上、列表在下，中间为地图"
             @click="setLayout('immersive')"
           >沉浸</button>
         </div>
@@ -81,7 +81,8 @@
           :scope="auth.scope ?? 'Platform'"
           :token="auth.token ?? ''"
           :read-only="!!readOnly"
-          :canvas-only="true"
+          :canvas-only="false"
+          :embed-ui="true"
           :hide-toolbar="true"
           @pick="onPick"
           @select="onSelect"
@@ -122,7 +123,7 @@
           <button type="button" class="mm-sheet-toggle" @click="toggleSheet">
             {{ sheetCollapsed ? '展开列表' : '收起列表' }}
           </button>
-          <span class="mm-sheet-hint">沉浸模式 · 底栏</span>
+          <span class="mm-sheet-hint">沉浸 · 画布下方列表</span>
         </div>
 
         <div v-show="!sheetCollapsed || layoutMode === 'dual'" class="mm-panel-list">
@@ -171,10 +172,12 @@
             <VehicleMonitorPanel
               v-show="workbenchTab === 'vehicle'"
               table
+              :lite="layoutMode === 'dual'"
               :cars="cars"
               :missions="missions"
               :selected-id="selectedVehicleId"
               @select="onVehicleSelect"
+              @action-done="refreshAll"
             />
             <MissionListPanel
               v-show="workbenchTab === 'mission'"
@@ -361,7 +364,7 @@ function setLayout(mode: MonitorLayout) {
   layoutMode.value = mode
   try { localStorage.setItem(LAYOUT_KEY, mode) } catch { /* ignore */ }
   if (mode === 'immersive') {
-    floatPos.value = { right: 14, bottom: sheetCollapsed.value ? 56 : 280 }
+    floatPos.value = { right: 14, bottom: 14 }
   } else {
     floatPos.value = { right: 14, bottom: 14 }
     sheetCollapsed.value = false
@@ -370,9 +373,6 @@ function setLayout(mode: MonitorLayout) {
 
 function toggleSheet() {
   sheetCollapsed.value = !sheetCollapsed.value
-  if (layoutMode.value === 'immersive' && floatPos.value.left === undefined) {
-    floatPos.value = { right: 14, bottom: sheetCollapsed.value ? 56 : 280 }
-  }
 }
 
 let floatDragStartX = 0
@@ -419,10 +419,7 @@ function onFloatDragEnd() {
 watch(selection, (next, prev) => {
   // 新开选中时若尚未拖过，回到默认右下角（沉浸模式抬高避开底栏）
   if (next && !prev && floatPos.value.left === undefined) {
-    floatPos.value = {
-      right: 14,
-      bottom: layoutMode.value === 'immersive' ? (sheetCollapsed.value ? 56 : 280) : 14
-    }
+    floatPos.value = { right: 14, bottom: 14 }
   }
 })
 
@@ -949,7 +946,8 @@ onUnmounted(() => {
 <style scoped>
 /* Option A：Outpost 浅色 chrome + 品牌紫；画布/浮层保持深色指挥视口 */
 .map-monitor-page {
-  --mm-rail-w: 380px;
+  /* 双栏精简列：车辆/状态/电量/任务/交管；沉浸底栏仍用满宽完整列 */
+  --mm-rail-w: 420px;
   --mm-sheet-h: min(34vh, 340px);
   --mm-radius: 14px;
   --mm-ease: cubic-bezier(0.16, 1, 0.3, 1);
@@ -1175,7 +1173,7 @@ onUnmounted(() => {
 .layout-dual .mm-panel {
   flex: 0 0 var(--mm-rail-w);
   width: var(--mm-rail-w);
-  min-width: 300px;
+  min-width: 360px;
   min-height: 0;
   display: flex;
   flex-direction: column;
@@ -1204,51 +1202,39 @@ onUnmounted(() => {
   border-top: 1px solid var(--mm-border);
 }
 
-/* —— C 沉浸 —— */
-.layout-immersive .mm-command-bar {
-  position: absolute;
-  top: 8px;
-  left: 8px;
-  right: 8px;
-  background: rgba(255, 254, 253, 0.94);
-  backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
-  box-shadow:
-    0 1px 2px rgba(40, 33, 58, 0.06),
-    0 12px 28px rgba(54, 35, 78, 0.14);
-}
+/* —— C 沉浸：指挥条在上、列表在下，中间画布（不遮挡 iframe 内外工具条） —— */
 .layout-immersive .mm-workspace {
   flex: 1;
-  gap: 0;
+  min-height: 0;
+  flex-direction: column;
+  gap: 8px;
 }
 .layout-immersive .mm-canvas {
-  position: absolute;
-  inset: 0;
+  position: relative;
+  flex: 1 1 auto;
+  min-height: 0;
   border-radius: var(--mm-radius);
-  z-index: 1;
 }
 .layout-immersive .mm-panel {
-  position: absolute;
-  left: 8px;
-  right: 8px;
-  bottom: 8px;
+  position: relative;
+  flex: 0 0 var(--mm-sheet-h);
   height: var(--mm-sheet-h);
-  z-index: 8;
+  max-height: var(--mm-sheet-h);
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  border-radius: 14px;
+  border-radius: var(--mm-radius);
   border: 1px solid var(--mm-border);
-  background: rgba(255, 254, 253, 0.96);
-  backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
+  background: var(--mm-surface);
   box-shadow:
-    0 -4px 20px rgba(54, 35, 78, 0.16),
-    0 1px 0 rgba(255, 255, 255, 0.6) inset;
-  transition: height 0.22s var(--mm-ease);
+    0 1px 2px rgba(40, 33, 58, 0.04),
+    0 10px 26px rgba(54, 35, 78, 0.08);
+  transition: flex-basis 0.22s var(--mm-ease), height 0.22s var(--mm-ease), max-height 0.22s var(--mm-ease);
 }
 .layout-immersive.sheet-collapsed .mm-panel {
+  flex-basis: 44px;
   height: 44px;
+  max-height: 44px;
 }
 .layout-immersive .mm-panel-list {
   flex: 1;
@@ -1565,7 +1551,7 @@ onUnmounted(() => {
 }
 
 @media (max-width: 1100px) {
-  .map-monitor-page { --mm-rail-w: 320px; }
+  .map-monitor-page { --mm-rail-w: 360px; }
   .mm-clock { display: none; }
   .mm-pill--muted { display: none; }
 }