-
-
-
+
-
`);
- if (sidebar && sidebarFooter) sidebar.insertBefore(syncSidebar, sidebarFooter);
+ `);
+ if (sidebar && sidebarFooter) {
+ sidebar.insertBefore(syncSidebar, sidebarFooter);
+ $(".v2-sync-sidebar-overview", syncSidebar)?.append(sidebarFooter);
+ const sidebarToggle = $("#v2SidebarToggle", sidebar);
+ if (sidebarToggle) $(".v2-sync-sidebar-heading", syncSidebar)?.append(sidebarToggle);
+ }
const naturalPanel = $("#v2NaturalPanel");
const taskOverview = make("section", "v2-task-overview", `
@@ -952,6 +1189,8 @@
}
setSidePanelVisibility("devices", panelVisible("devices"));
setSidePanelVisibility("extensions", panelVisible("extensions"));
+ window.addEventListener("resize", syncSidebarLogBaseline);
+ requestAnimationFrame(syncSidebarLogBaseline);
document.addEventListener("click", (event) => {
const toggle = event.target.closest("[data-panel-toggle], [data-panel-close]");
if (toggle) {
@@ -959,10 +1198,34 @@
setSidePanelVisibility(key, !panelVisible(key));
}
});
- $("#v2DeviceSyncGrid")?.addEventListener("click", (event) => {
- const card = event.target.closest("[data-device]");
- if (!card) return;
- presentTwinDevice(card.dataset.device, { pinned: true });
+ const deviceGrid = $("#v2DeviceSyncGrid");
+ deviceGrid?.addEventListener("click", (event) => {
+ const controlToggle = event.target.closest("[data-device-control-toggle]");
+ if (controlToggle) {
+ const deviceId = controlToggle.dataset.deviceControlToggle;
+ displaySync.controlDevice = displaySync.controlDevice === deviceId ? null : deviceId;
+ if (displaySync.controlDevice) presentTwinDevice(deviceId, { pinned: true });
+ else if (displaySync.pinnedDevice === deviceId) clearTwinDevicePreview({ force: true });
+ renderSyncedDevices();
+ return;
+ }
+ const apply = event.target.closest("[data-device-control-apply]");
+ if (apply) {
+ sendDeviceControl(apply.dataset.deviceControlApply);
+ return;
+ }
+ const focus = event.target.closest("[data-device-focus]");
+ if (focus) {
+ const samePinned = displaySync.pinnedDevice === focus.dataset.deviceFocus;
+ if (samePinned) clearTwinDevicePreview({ force: true });
+ else presentTwinDevice(focus.dataset.deviceFocus, { pinned: true });
+ }
+ });
+ deviceGrid?.addEventListener("input", (event) => {
+ if (event.target.matches("[data-device-control]")) storeDeviceControlDraft(event.target);
+ });
+ deviceGrid?.addEventListener("change", (event) => {
+ if (event.target.matches("select[data-device-control]")) storeDeviceControlDraft(event.target);
});
$("#v2LogFilter")?.addEventListener("change", renderSyncLogs);
window.addEventListener("cognitive-agent:result", (event) => {
@@ -976,8 +1239,22 @@
});
});
window.addEventListener("cognitive-agent:request-complete", (event) => {
- if (!event.detail?.error) return;
- appendSyncLog({ category: "task", title: "编排任务执行失败", detail: event.detail.error.message || "请求失败", status: "error" });
+ const pendingDevice = Object.entries(displaySync.pendingControls).find(([, utterance]) => utterance === event.detail?.utterance)?.[0];
+ if (pendingDevice) {
+ const device = syncedDevices.find((item) => item.id === pendingDevice);
+ delete displaySync.pendingControls[pendingDevice];
+ if (!event.detail?.error) delete displaySync.deviceDrafts[pendingDevice];
+ appendSyncLog({
+ category: "device",
+ title: event.detail?.error ? `${device?.name || "设备"}控制发送失败` : `${device?.name || "设备"}控制已执行`,
+ detail: event.detail?.error?.message || "控制结果已进入车机状态同步链路",
+ status: event.detail?.error ? "error" : "success",
+ });
+ renderSyncedDevices();
+ }
+ if (event.detail?.error) {
+ appendSyncLog({ category: "task", title: "编排任务执行失败", detail: event.detail.error.message || "请求失败", status: "error" });
+ }
});
window.addEventListener("cognitive-agent:connection", (event) => {
const online = event.detail?.status === "online";
@@ -1152,7 +1429,7 @@
"aria-label",
ui.sidebarCollapsed ? "展开左侧控制台" : "折叠左侧控制台",
);
- button.innerHTML = `
`;
+ button.innerHTML = `
${ui.sidebarCollapsed ? "展开" : "收起"}`;
}
window.lucide?.createIcons({ attrs: { "aria-hidden": "true" } });
window.setTimeout(() => window.dispatchEvent(new Event("resize")), 180);
@@ -1273,6 +1550,7 @@
if (event.key === "Escape") {
closeCustomDropdowns();
closeReasoningPicker();
+ clearTwinDevicePreview({ force: true });
}
});
window.addEventListener("resize", updateScrollCues);
diff --git a/apps/web-console/index.html b/apps/web-console/index.html
index ccbbb49..a1e2a3a 100755
--- a/apps/web-console/index.html
+++ b/apps/web-console/index.html
@@ -10,8 +10,8 @@
511工程-智能座舱
-
-
+
+
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/apps/web-console/service-worker.js b/apps/web-console/service-worker.js
index 7c63e0b..bdbe271 100644
--- a/apps/web-console/service-worker.js
+++ b/apps/web-console/service-worker.js
@@ -1,4 +1,4 @@
-const CACHE_VERSION = "cognitive-agent-pad-v163";
+const CACHE_VERSION = "cognitive-agent-pad-v178";
const SHELL_CACHE = `${CACHE_VERSION}-shell`;
const RUNTIME_CACHE = `${CACHE_VERSION}-runtime`;
const APP_SHELL = [
@@ -9,10 +9,10 @@ const APP_SHELL = [
"/app.js?v=dual-seat-85",
"/gesture-control.js?v=android-pad-8",
"/pwa.js?v=android-pad-2",
- "/console-v2.css?v=sync-layout-11",
- "/console-v2.js?v=sync-layout-11",
- "/self-extension.css?v=sync-layout-11",
- "/self-extension.js?v=sync-layout-11",
+ "/console-v2.css?v=sync-layout-26",
+ "/console-v2.js?v=sync-layout-26",
+ "/self-extension.css?v=sync-layout-26",
+ "/self-extension.js?v=sync-layout-26",
"/assets/pets/self-extension-cat.png?v=3",
"/assets/pets/self-extension-cat-entrance.png?v=3",
"/manifest.webmanifest",
diff --git a/tests/e2e/test_seat_web_api.py b/tests/e2e/test_seat_web_api.py
index a9ea2fa..e251645 100755
--- a/tests/e2e/test_seat_web_api.py
+++ b/tests/e2e/test_seat_web_api.py
@@ -236,19 +236,19 @@ operations:
) as response:
gesture_script = response.read().decode("utf-8")
with self.opener.open(
- f"{self.base_url}/console-v2.js?v=sync-layout-11", timeout=3
+ f"{self.base_url}/console-v2.js?v=sync-layout-26", timeout=3
) as response:
console_script = response.read().decode("utf-8")
with self.opener.open(
- f"{self.base_url}/console-v2.css?v=sync-layout-11", timeout=3
+ f"{self.base_url}/console-v2.css?v=sync-layout-26", timeout=3
) as response:
console_styles = response.read().decode("utf-8")
with self.opener.open(
- f"{self.base_url}/self-extension.js?v=sync-layout-11", timeout=3
+ f"{self.base_url}/self-extension.js?v=sync-layout-26", timeout=3
) as response:
extension_script = response.read().decode("utf-8")
with self.opener.open(
- f"{self.base_url}/self-extension.css?v=sync-layout-11", timeout=3
+ f"{self.base_url}/self-extension.css?v=sync-layout-26", timeout=3
) as response:
extension_styles = response.read().decode("utf-8").replace("\r\n", "\n")
with self.opener.open(
@@ -279,10 +279,10 @@ operations:
self.assertIn('href="/styles.css?v=dual-seat-9"', html)
self.assertIn('src="/gesture-control.js?v=android-pad-8"', html)
self.assertNotIn('class="vehicle-system-hud"', html)
- self.assertIn('src="/console-v2.js?v=sync-layout-11"', html)
- self.assertIn('href="/console-v2.css?v=sync-layout-11"', html)
- self.assertIn('src="/self-extension.js?v=sync-layout-11"', html)
- self.assertIn('href="/self-extension.css?v=sync-layout-11"', html)
+ self.assertIn('src="/console-v2.js?v=sync-layout-26"', html)
+ self.assertIn('href="/console-v2.css?v=sync-layout-26"', html)
+ self.assertIn('src="/self-extension.js?v=sync-layout-26"', html)
+ self.assertIn('href="/self-extension.css?v=sync-layout-26"', html)
self.assertNotIn("self-calibration", html)
self.assertNotIn("self-repair", html)
self.assertNotIn("self-evolution", html)
@@ -484,7 +484,7 @@ operations:
self.assertIn('client_type: "web_console"', app_script)
self.assertIn('canvas.addEventListener("webglcontextlost"', app_script)
self.assertIn('"cognitive-agent:module-change"', app_script)
- self.assertIn('const CACHE_VERSION = "cognitive-agent-pad-v163"', service_worker)
+ self.assertIn('const CACHE_VERSION = "cognitive-agent-pad-v178"', service_worker)
self.assertIn('"/assets/pets/self-extension-cat.png?v=3"', service_worker)
self.assertIn(".then(() => self.skipWaiting())", service_worker)
self.assertNotIn("const cached = await caches.match(request)", service_worker)
diff --git a/tests/unit/test_requested_frontend_enhancements.py b/tests/unit/test_requested_frontend_enhancements.py
index 76e3980..b65228b 100644
--- a/tests/unit/test_requested_frontend_enhancements.py
+++ b/tests/unit/test_requested_frontend_enhancements.py
@@ -103,3 +103,113 @@ def test_orchestration_session_reset_remains_available() -> None:
orchestration = source("app.js")
assert 'sessionStorage.removeItem("cognitive-agent.conversation-id")' in orchestration
+
+
+def test_vehicle_device_status_cards_prioritize_seats_and_expose_manual_controls() -> None:
+ console = source("console-v2.js")
+ styles = source("console-v2.css")
+
+ passenger = console.index('id: "passenger", name: "副驾座椅"')
+ driver = console.index('id: "driver", name: "主驾座椅"')
+ windows = console.index('id: "windows", name: "车窗"')
+ assert passenger < driver < windows
+
+ for key_status in (
+ '["左前窗", readText("#frontLeftWindow")]',
+ '["右前窗", readText("#frontRightWindow")]',
+ '["左后窗", readText("#rearLeftWindow")]',
+ '["右后窗", readText("#rearRightWindow")]',
+ '["当前位置", readText("#shadePositionValue")]',
+ '["按摩模式", massageMode]',
+ '["按摩强度", massageStrength]',
+ '["前排亮度", frontBrightness]',
+ '["前排颜色", frontColor]',
+ '["后排亮度", rearBrightness]',
+ '["后排颜色", rearColor]',
+ ):
+ assert key_status in console
+
+ assert 'data-device-control-toggle="${device.id}"' in console
+ assert 'data-device-control-apply="${device.id}"' in console
+ assert 'new CustomEvent("cognitive-agent:vehicle-control-request"' in console
+ assert "window.CognitiveAgentConsole?.executeUtterance?.(utterance" in console
+ assert '.v2-device-control-row input[type="range"]' in styles
+ assert ".v2-device-control-select" in styles
+ assert ".v2-device-control-apply" in styles
+
+
+def test_interactive_console_keeps_actions_inside_composer_and_collapsed_rails_aligned() -> None:
+ console = source("console-v2.js")
+ styles = source("console-v2.css")
+
+ assert 'const resetButton = $("#newConversation", originalForm);' in console
+ assert 'const runButton = $("#runButton", originalForm);' in console
+ assert "if (resetButton) composer.append(resetButton);" in console
+ assert "if (runButton) composer.append(runButton);" in console
+
+ assert ".v2-request-form .command-composer" in styles
+ assert "overflow: hidden;" in styles
+ assert "transform: translateY(-50%);" in styles
+ assert '.joint-twin-shell[data-open-panels="none"]' in styles
+ assert "grid-template-columns: 48px minmax(520px, 1fr) 48px;" in styles
+ assert "writing-mode: horizontal-tb;" in styles
+ assert "writing-mode: vertical-rl;" in styles
+
+
+def test_left_sync_rail_can_collapse_and_log_aligns_with_lower_workspace() -> None:
+ console = source("console-v2.js")
+ styles = source("console-v2.css")
+
+ assert 'make("section", "v2-sync-sidebar"' in console
+ assert '