newmark-agent 0.3.12 → 0.4.0

package/dist/ui/index.html

@@ -136,6 +136,21 @@ try {
   --duration-normal: 250ms;
   --duration-slow: 400ms;
 
+  /* Stable Newmark semantic layers. Components depend on meaning, not on an
+     upstream developer-preview framework's private tokens or brand palette. */
+  --nm-surface-canvas: var(--app-bg);
+  --nm-surface-sunken: var(--glass-bg-1);
+  --nm-surface-raised: var(--glass-bg-2);
+  --nm-surface-overlay: var(--modal-surface);
+  --nm-label-primary: var(--text-bright);
+  --nm-label-secondary: var(--text);
+  --nm-label-tertiary: var(--text-dim);
+  --nm-state-info: var(--accent);
+  --nm-state-success: var(--accent2);
+  --nm-state-warning: #f4c95d;
+  --nm-state-danger: #ff7785;
+  --nm-focus-ring: 0 0 0 3px var(--accent-glow);
+
   /* Layout sizes */
   --left-width: 200px;
   --left-secondary-width: 220px;
@@ -338,6 +353,19 @@ html, body {
   border: 0;
 }
 button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus { outline: none; }
+:where(button, select, input, textarea, [contenteditable], [tabindex]):focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 2px;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  *, *::before, *::after {
+    scroll-behavior: auto !important;
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+  }
+}
 ::-webkit-scrollbar { width: 4px; height: 4px; }
 ::-webkit-scrollbar-track { background: transparent; }
 ::-webkit-scrollbar-thumb { background: rgba(255,255,255,0.10); border-radius: var(--radius-full); }
@@ -527,6 +555,24 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
   flex-shrink: 0;
 }
 
+button.lt-item,
+button.left-nav-icon {
+  border: 0;
+  background: transparent;
+  font-family: var(--font-ui);
+  text-align: left;
+}
+
+button.left-nav-icon { width: calc(100% - 12px); }
+
+.lt-item:focus-visible,
+.left-nav-icon:focus-visible {
+  outline: none;
+  color: var(--text-bright);
+  background: var(--control-hover-bg);
+  box-shadow: inset 0 0 0 2px var(--accent);
+}
+
 .lt-item:hover {
   background: var(--glass-bg-2);
   color: var(--text);
@@ -749,6 +795,14 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
   overflow: hidden;
 }
 
+button.left-ws-item {
+  width: 100%;
+  border: 0;
+  background: transparent;
+  font-family: var(--font-ui);
+  text-align: left;
+}
+
 .left-ws-item:hover { background: var(--glass-bg-2); }
 .left-ws-item.active { background: var(--accent-glow); color: var(--text-bright); }
 
@@ -1055,6 +1109,11 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 }
 
 .resize-handle:hover { background: var(--accent); }
+.resize-handle:focus-visible {
+  outline: none;
+  background: var(--accent);
+  box-shadow: 0 0 0 2px var(--accent-glow);
+}
 
 .resize-handle[data-side="left"] {
   cursor: col-resize;
@@ -1883,12 +1942,12 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 
 .terminal-output {
   flex: 1;
-  overflow-y: auto;
+  overflow: auto;
   padding: 8px 12px;
   font-family: var(--font-mono);
   font-size: 12px;
   color: var(--text-dim);
-  white-space: pre-wrap;
+  white-space: pre;
   line-height: 1.5;
 }
 
@@ -2419,6 +2478,8 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 .conversation-work-subagent-chip.completed .conversation-work-subagent-status { color: var(--accent2); }
 .conversation-work-command-label { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .conversation-work-activity-detail { margin-top: 2px; color: color-mix(in srgb, var(--text-dim) 88%, transparent); font: 10px/1.45 var(--font-mono); white-space: pre-wrap; word-break: break-word; }
+.conversation-work-thought-text { margin: 4px 0 5px 24px; color: color-mix(in srgb, var(--text-dim) 92%, transparent); font: 11px/1.55 var(--font-mono); white-space: pre-wrap; word-break: break-word; }
+.conversation-work-thought-pending { color: var(--text-dim); font-style: italic; }
 .conversation-work-files { margin-top: 1px; }
 .conversation-work-files > summary { display: grid; grid-template-columns: 17px minmax(0,1fr) 10px; gap: 7px; align-items: center; min-height: 26px; cursor: pointer; list-style: none; color: var(--text); font-size: 11px; font-weight: 600; }
 .conversation-work-files > summary::-webkit-details-marker,
@@ -2524,7 +2585,7 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 .shell-block {
   margin: 8px 0;
   border-radius: var(--radius-md);
-  background: rgba(0,0,0,0.3);
+  background: var(--nm-surface-sunken);
   border: 1px solid var(--glass-border-1);
   overflow: hidden;
 }
@@ -2550,7 +2611,7 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
   font-family: var(--font-mono);
   font-size: 12px;
   color: var(--text-dim);
-  white-space: pre-wrap;
+  white-space: pre;
   line-height: 1.5;
   max-height: 400px;
   overflow: auto;
@@ -2583,6 +2644,23 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 .diff-block-header .arrow { transition: transform var(--duration-fast) var(--ease-out-expo); font-size: 9px; }
 .diff-block.collapsed .diff-block-header .arrow { transform: rotate(-90deg); }
 
+button.shell-block-header,
+button.diff-block-header,
+button.flow-item-header,
+button.work-review-head,
+button.todo-item {
+  width: 100%;
+  border: 0;
+  font-family: var(--font-ui);
+  text-align: left;
+}
+
+button.shell-block-header { background: rgba(255,255,255,0.03); }
+button.diff-block-header,
+button.flow-item-header,
+button.work-review-head,
+button.todo-item { background: transparent; }
+
 .diff-stat { display: flex; gap: 8px; margin-left: auto; }
 .diff-add { color: var(--accent2); font-size: 11px; }
 .diff-del { color: #ff6666; font-size: 11px; }
@@ -2958,6 +3036,8 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 .work-review-actions { display:flex; align-items:center; gap:5px; }
 .work-review-btn { height:28px; padding:0 10px; border:1px solid var(--glass-border-2); border-radius:6px; background:transparent; color:var(--text); cursor:pointer; font:600 11px var(--font); }
 .work-review-btn:hover { background:var(--control-hover-bg); border-color:var(--border-hover); }
+.work-review-toggle { width:28px; height:28px; display:inline-flex; align-items:center; justify-content:center; padding:0; border:1px solid transparent; border-radius:6px; background:transparent; color:var(--text-dim); cursor:pointer; }
+.work-review-toggle:hover { background:var(--control-hover-bg); border-color:var(--border-hover); }
 .work-review-list { border-top:1px solid var(--glass-border-1); }
 .work-review.collapsed .work-review-list { display: none; }
 .work-review-head { cursor: pointer; }
@@ -3057,6 +3137,16 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
   font: 9px var(--font-mono);
 }
 
+.conv-branch-comm-badge {
+  flex: 0 0 auto;
+  padding: 2px 5px;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--accent) 16%, transparent);
+  color: var(--accent);
+  font: 9px var(--font-mono);
+  white-space: nowrap;
+}
+
 .conv-runtime-badge.running { color: var(--accent2); }
 .conv-runtime-badge.stopping,
 .conv-runtime-badge.force_restarting { color: #ffd27a; }
@@ -3391,9 +3481,47 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
   flex: 0 0 auto;
 }
 
+#context-inspector {
+  position: absolute;
+  right: -8px;
+  bottom: calc(100% + 10px);
+  z-index: 80;
+  display: none;
+  width: min(320px, calc(100vw - 24px));
+  padding: 12px;
+  border: 1px solid var(--glass-border-2);
+  border-radius: var(--radius-lg);
+  background: var(--modal-surface);
+  box-shadow: var(--shadow-lg);
+  backdrop-filter: blur(var(--glass-blur-3)) saturate(1.08);
+  color: var(--text);
+  font-size: 10px;
+  line-height: 1.45;
+}
+#context-inspector.open { display: block; animation: model-menu-in 150ms var(--ease-out-expo); }
+.context-inspector-head { display:flex; align-items:flex-start; gap:8px; margin-bottom:10px; }
+.context-inspector-title { flex:1; min-width:0; color:var(--text-bright); font-size:12px; font-weight:700; }
+.context-inspector-subtitle { margin-top:2px; color:var(--text-dim); font-size:9px; }
+.context-inspector-close { width:22px; height:22px; padding:0; border:0; border-radius:var(--radius-sm); background:transparent; color:var(--text-dim); cursor:pointer; }
+.context-inspector-close:hover, .context-inspector-close:focus-visible { color:var(--text-bright); background:var(--control-hover-bg); outline:none; }
+.context-inspector-meter { height:6px; margin:8px 0 10px; overflow:hidden; border-radius:var(--radius-full); background:rgba(168,168,168,.18); }
+.context-inspector-meter-fill { height:100%; border-radius:inherit; background:var(--accent); transition:width var(--duration-normal) var(--ease-out-expo), background var(--duration-fast) var(--ease-out-expo); }
+.context-inspector-grid { display:grid; grid-template-columns:1fr 1fr; gap:7px; }
+.context-inspector-cell { padding:7px 8px; border:1px solid var(--glass-border-1); border-radius:var(--radius-sm); background:var(--glass-bg-1); }
+.context-inspector-label { display:block; color:var(--text-dim); font-size:9px; }
+.context-inspector-value { display:block; margin-top:2px; color:var(--text-bright); font:600 10px var(--font-mono); }
+.context-inspector-section { margin-top:10px; padding-top:9px; border-top:1px solid var(--glass-border-1); }
+.context-inspector-section-title { color:var(--text-bright); font-size:10px; font-weight:650; }
+.context-inspector-meta { margin-top:3px; color:var(--text-dim); overflow-wrap:anywhere; }
+.context-inspector-actions { display:flex; align-items:center; gap:7px; margin-top:10px; }
+.context-inspector-actions .sec-btn { flex:1; min-width:0; }
+.context-inspector-actions .sec-btn:disabled { opacity:.55; cursor:wait; }
+
 #context-token-ring {
   width: 16px;
   height: 16px;
+  padding: 0;
+  border: 0;
   border-radius: 50%;
   background: conic-gradient(#a8a8a8 0deg, rgba(168,168,168,0.22) 0deg);
   cursor: default;
@@ -3601,6 +3729,124 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
   50% { box-shadow: 0 0 24px rgba(91,120,255,0.5), 0 0 60px rgba(91,120,255,0.15); }
 }
 
+/* ============================================================
+   KEYBOARD COMMAND SURFACE
+   ============================================================ */
+.command-surface-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 320;
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+  padding: min(12vh, 96px) 18px 18px;
+  background: color-mix(in srgb, var(--nm-surface-canvas) 62%, transparent);
+  opacity: 0;
+  visibility: hidden;
+  pointer-events: none;
+  transition: opacity var(--duration-fast) var(--ease-out-expo), visibility 0ms linear var(--duration-fast);
+}
+
+.command-surface-overlay.open {
+  opacity: 1;
+  visibility: visible;
+  pointer-events: auto;
+  transition-delay: 0ms, 0ms;
+}
+
+.command-surface {
+  width: min(680px, calc(100vw - 36px));
+  max-height: min(680px, calc(100vh - 132px));
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  border: 1px solid var(--glass-border-2);
+  border-radius: var(--radius-xl);
+  background: var(--nm-surface-overlay);
+  box-shadow: var(--shadow-lg);
+  backdrop-filter: blur(var(--glass-blur-3)) saturate(150%);
+  transform: translateY(-8px) scale(0.985);
+  transition: transform var(--duration-fast) var(--ease-out-expo);
+}
+
+.command-surface-overlay.open .command-surface { transform: translateY(0) scale(1); }
+.command-surface-header { display:flex; align-items:flex-start; gap:12px; padding:14px 16px 10px; }
+.command-surface-heading { flex:1; min-width:0; }
+.command-surface-title { color:var(--text-bright); font-size:14px; font-weight:700; }
+.command-surface-subtitle { margin-top:3px; color:var(--text-dim); font-size:10px; line-height:1.45; }
+.command-surface-close { width:28px; height:28px; border:0; border-radius:var(--radius-sm); background:transparent; color:var(--text-dim); cursor:pointer; }
+.command-surface-close:hover { color:var(--text-bright); background:var(--control-hover-bg); }
+.command-search-wrap { padding:0 14px 12px; }
+.command-search {
+  width:100%;
+  height:40px;
+  box-sizing:border-box;
+  padding:0 12px;
+  border:1px solid var(--glass-border-2);
+  border-radius:var(--radius-md);
+  background:var(--control-bg);
+  color:var(--text);
+  font:12px var(--font-ui);
+}
+.command-search:focus { border-color:var(--accent); box-shadow:0 0 0 3px var(--accent-glow); }
+.command-list { min-height:96px; overflow:auto; padding:0 8px 8px; }
+.command-category { padding:9px 9px 5px; color:var(--text-dim); font-size:9px; font-weight:700; letter-spacing:.07em; text-transform:uppercase; }
+.command-option {
+  width:100%;
+  min-height:42px;
+  display:grid;
+  grid-template-columns:minmax(0,1fr) auto;
+  align-items:center;
+  gap:12px;
+  padding:6px 9px;
+  border:1px solid transparent;
+  border-radius:var(--radius-md);
+  background:transparent;
+  color:var(--text);
+  text-align:left;
+  cursor:pointer;
+  font-family:var(--font-ui);
+}
+.command-option.active,
+.command-option:hover { background:var(--control-hover-bg); border-color:var(--glass-border-1); }
+.command-option[aria-disabled="true"] { opacity:.48; cursor:not-allowed; }
+.command-option-title { display:block; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; font-size:12px; }
+.command-option-context { display:block; margin-top:2px; color:var(--text-dim); font-size:9px; }
+.command-shortcuts { display:flex; justify-content:flex-end; gap:4px; }
+.command-key {
+  min-width:22px;
+  padding:3px 6px;
+  border:1px solid var(--glass-border-2);
+  border-bottom-color:var(--border-hover);
+  border-radius:5px;
+  background:var(--glass-bg-1);
+  color:var(--text-dim);
+  font:10px var(--font-mono);
+  text-align:center;
+  white-space:nowrap;
+}
+.command-empty { padding:24px 12px; color:var(--text-dim); font-size:11px; text-align:center; }
+.command-surface-footer { padding:8px 14px 10px; border-top:1px solid var(--glass-border-1); color:var(--text-dim); font-size:9px; }
+.shortcut-chord-hint {
+  position:fixed;
+  z-index:330;
+  left:50%;
+  bottom:22px;
+  max-width:min(520px, calc(100vw - 32px));
+  padding:7px 10px;
+  border:1px solid var(--glass-border-2);
+  border-radius:var(--radius-md);
+  background:var(--modal-surface);
+  color:var(--text);
+  box-shadow:var(--shadow-md);
+  font:10px var(--font-mono);
+  opacity:0;
+  visibility:hidden;
+  transform:translate(-50%, 4px);
+  transition:opacity var(--duration-fast) var(--ease-out-expo), transform var(--duration-fast) var(--ease-out-expo), visibility 0ms linear var(--duration-fast);
+}
+.shortcut-chord-hint.open { opacity:1; visibility:visible; transform:translate(-50%, 0); transition-delay:0ms; }
+
 /* ============================================================
    SUB-WINDOW SYSTEM
    ============================================================ */
@@ -3702,6 +3948,7 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 }
 
 .sub-win-close:hover { background: rgba(255,68,68,0.15); color: #ff6666; }
+.sub-win-close:focus-visible { outline:none; color:#ff7777; box-shadow:inset 0 0 0 2px currentColor; }
 
 .sub-win-body {
   flex: 1;
@@ -3734,6 +3981,81 @@ button:focus, select:focus, input:focus, textarea:focus, [contenteditable]:focus
 
 .stab-btn:hover { background: rgba(255,255,255,0.05); color: var(--text); }
 .stab-btn.active { background: rgba(91,120,255,0.12); color: var(--accent); border-color: rgba(91,120,255,0.25); }
+.stab-btn:focus-visible { outline:none; border-color:var(--accent); box-shadow:0 0 0 3px var(--accent-glow); color:var(--text-bright); }
+
+.plugin-tabs { overflow-x:auto; scrollbar-width:thin; }
+.plugin-tabs .stab-btn { flex:0 0 auto; }
+.plugin-panel { min-height:180px; margin-top:10px; }
+.plugin-panel-state { display:flex; align-items:flex-start; gap:10px; padding:14px; border:1px solid var(--glass-border-1); border-radius:var(--radius-md); background:var(--glass-bg-1); color:var(--text-dim); font-size:11px; line-height:1.5; }
+.plugin-panel-state::before { content:""; flex:0 0 auto; width:7px; height:7px; margin-top:5px; border-radius:50%; background:var(--nm-state-info); box-shadow:0 0 0 3px color-mix(in srgb, var(--nm-state-info) 14%, transparent); }
+.plugin-panel-state.error::before { background:var(--nm-state-danger); box-shadow:0 0 0 3px color-mix(in srgb, var(--nm-state-danger) 14%, transparent); }
+.plugin-panel-state.error { border-color:var(--notice-error-border); color:var(--notice-error-text); }
+.plugin-panel-state .sec-btn { flex:0 0 auto; margin-left:auto; }
+.plugin-toolbar { display:flex; align-items:center; gap:8px; margin-bottom:12px; }
+.plugin-toolbar-copy { flex:1; min-width:0; }
+.plugin-toolbar-title { color:var(--text-bright); font-size:13px; font-weight:650; }
+.plugin-toolbar-meta { margin-top:2px; color:var(--text-dim); font-size:10px; }
+.plugin-toolbar .sec-btn { flex:0 0 auto; }
+.plugin-search { width:min(220px, 38%); height:34px; padding:0 10px; border:1px solid var(--glass-border-2); border-radius:var(--radius-md); background:var(--control-bg); color:var(--text); font:11px var(--font-ui); }
+.plugin-search:focus { border-color:var(--accent); box-shadow:0 0 0 2px var(--accent-glow); }
+.plugin-section { margin-top:14px; }
+.plugin-section-head { display:flex; align-items:center; gap:8px; margin-bottom:8px; }
+.plugin-section-title { color:var(--text-bright); font-size:12px; font-weight:650; }
+.plugin-count-badge,
+.plugin-status-badge { display:inline-flex; align-items:center; min-height:20px; padding:1px 7px; border:1px solid var(--glass-border-2); border-radius:var(--radius-full); color:var(--text-dim); font-size:9px; font-weight:650; }
+.plugin-status-badge.enabled { border-color:color-mix(in srgb, var(--accent2) 45%, transparent); color:var(--accent2); }
+.plugin-status-badge.preview { border-color:color-mix(in srgb, var(--accent) 45%, transparent); color:var(--text-accent); }
+.plugin-empty { padding:18px 12px; border:1px dashed var(--glass-border-2); border-radius:var(--radius-md); color:var(--text-dim); text-align:center; font-size:11px; line-height:1.5; }
+.mcp-form-card { padding:12px; margin-bottom:14px; border:1px solid var(--glass-border-2); border-radius:var(--radius-md); background:var(--glass-bg-1); }
+.mcp-form-head { display:flex; align-items:flex-start; gap:10px; margin-bottom:12px; }
+.mcp-form-copy { flex:1; min-width:0; }
+.mcp-form-title { color:var(--text-bright); font-size:13px; font-weight:650; }
+.mcp-form-subtitle { margin-top:2px; color:var(--text-dim); font-size:10px; line-height:1.45; }
+.mcp-field-grid { display:grid; grid-template-columns:minmax(0,1fr) 130px; gap:10px; }
+.mcp-field { display:flex; flex-direction:column; gap:5px; margin-bottom:10px; }
+.mcp-field label { color:var(--text); font-size:10px; font-weight:600; }
+.mcp-input { width:100%; min-height:36px; padding:8px 10px; border:1px solid var(--glass-border-2); border-radius:var(--radius-md); background:var(--control-bg); color:var(--text); font:11px var(--font-ui); }
+textarea.mcp-input { min-height:76px; resize:vertical; font-family:var(--font-mono); line-height:1.5; }
+.mcp-input:focus { border-color:var(--accent); box-shadow:0 0 0 2px var(--accent-glow); }
+.mcp-field-help { margin-top:-1px; color:var(--text-dim); font-size:9px; line-height:1.45; word-break:break-word; }
+.mcp-enabled-check { display:inline-flex; align-items:center; gap:7px; color:var(--text); font-size:10px; cursor:pointer; }
+.mcp-enabled-check input { accent-color:var(--accent); }
+.mcp-form-actions { display:flex; align-items:center; justify-content:flex-end; gap:8px; margin-top:4px; }
+.mcp-form-actions .sec-btn { flex:0 0 auto; }
+.mcp-server-row { display:flex; align-items:center; gap:10px; padding:10px; margin:7px 0; border:1px solid var(--glass-border-1); border-radius:var(--radius-md); background:var(--glass-bg-1); }
+.mcp-server-copy { flex:1; min-width:0; }
+.mcp-server-title { display:flex; align-items:center; gap:6px; flex-wrap:wrap; color:var(--text-bright); font-size:12px; font-weight:650; }
+.mcp-server-meta { margin-top:4px; color:var(--text-dim); font:10px/1.45 var(--font-mono); overflow-wrap:anywhere; }
+.mcp-row-actions { display:flex; align-items:center; gap:5px; flex-wrap:wrap; justify-content:flex-end; }
+.mcp-row-actions .sec-btn { flex:0 0 auto; }
+.dsh-hero { padding:14px; border:1px solid var(--glass-border-2); border-radius:var(--radius-md); background:var(--glass-bg-1); }
+.dsh-hero-head { display:flex; align-items:flex-start; gap:10px; }
+.dsh-hero-copy { flex:1; min-width:0; }
+.dsh-title { color:var(--text-bright); font-size:14px; font-weight:700; }
+.dsh-description { margin-top:5px; color:var(--text-dim); font-size:11px; line-height:1.55; }
+.dsh-actions { display:flex; flex-wrap:wrap; gap:7px; margin-top:11px; }
+.dsh-actions .sec-btn { flex:0 0 auto; }
+.dsh-grid { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); gap:10px; margin-top:10px; }
+.dsh-card { min-width:0; padding:11px; border:1px solid var(--glass-border-1); border-radius:var(--radius-md); background:var(--glass-bg-1); }
+.dsh-card-title { color:var(--text-bright); font-size:11px; font-weight:650; }
+.dsh-kv { display:grid; grid-template-columns:minmax(92px,auto) minmax(0,1fr); gap:5px 10px; margin-top:8px; font-size:10px; line-height:1.45; }
+.dsh-kv dt { color:var(--text-dim); }
+.dsh-kv dd { color:var(--text); overflow-wrap:anywhere; }
+.dsh-list { display:flex; flex-direction:column; gap:6px; margin-top:8px; }
+.dsh-list-item { padding:7px 8px; border:1px solid var(--glass-border-1); border-radius:var(--radius-sm); color:var(--text); font-size:10px; line-height:1.45; overflow-wrap:anywhere; }
+.dsh-list-item.warning { border-color:var(--notice-error-border); color:var(--notice-error-text); }
+.dsh-layer-profile { margin-top:10px; padding-top:9px; border-top:1px solid var(--glass-border-1); }
+.dsh-candidate-actions { display:flex; align-items:center; gap:7px; margin-top:7px; }
+.dsh-candidate-actions .sec-btn { flex:0 0 auto; }
+
+@media (max-width: 560px) {
+  .sub-win { width:calc(100vw - 20px); min-width:0; }
+  .plugin-toolbar { align-items:stretch; flex-wrap:wrap; }
+  .plugin-search { width:100%; order:3; }
+  .mcp-field-grid, .dsh-grid { grid-template-columns:1fr; }
+  .mcp-server-row { align-items:flex-start; flex-direction:column; }
+  .mcp-row-actions { width:100%; justify-content:flex-start; }
+}
 
 .stab-panel {
   display: none;
@@ -4806,6 +5128,89 @@ html.newmark-memory-overview-viewer body {
 
 .hidden { display: none !important; }
 .no-select { user-select: none; -webkit-user-select: none; }
+
+/* ============================================================
+   NEWMARK CONVERSATION HIERARCHY (三级字体体系)
+   最终回复 > Build 内联历史 > 工具调用 toolcall
+   保持原有 DOM 结构不变，仅通过字体大小/行高/不透明度体现差异。
+   ============================================================ */
+
+/* --- Level 1: 最终回复（最大、最醒目） --- */
+.chat-msg.assistant {
+  font-size: 15px;
+  line-height: 1.72;
+}
+
+/* Build 块内的最终回复同样以 Level 1 呈现 */
+.chat-msg.run-final-response {
+  font-size: 15px;
+  line-height: 1.72;
+}
+
+/* 用户消息保持可读的稍大字号 */
+.chat-msg.user {
+  font-size: 14px;
+  line-height: 1.65;
+}
+
+/* --- Level 2: Build 内联历史（中等字号） --- */
+.conversation-work-event.narrative {
+  font-size: 13px;
+  line-height: 1.6;
+  opacity: 0.9;
+}
+
+/* Build 块标题保持中等偏小，作为历史导航 */
+.conversation-work-run-head {
+  font-size: 12px;
+  opacity: 0.78;
+}
+
+/* --- Level 3: 工具调用 toolcall（最小、最淡、等宽） --- */
+.tool-event-summary {
+  font-size: 11px;
+  font-family: var(--font-mono);
+  opacity: 0.78;
+}
+
+.tool-event-content {
+  font-size: 11px;
+  font-family: var(--font-mono);
+  line-height: 1.45;
+  opacity: 0.72;
+  color: var(--text-dim);
+}
+
+/* 工具调用外的活动/状态项也归入 Level 3 */
+.conversation-work-event:not(.narrative):not(.guide):not(.error) {
+  font-size: 11px;
+  line-height: 1.45;
+  opacity: 0.72;
+  font-family: var(--font-mono);
+}
+
+.conversation-work-event.activity-summary {
+  font-size: 11px;
+}
+
+/* 工具调用活动列表项保持最小字号 */
+.conversation-work-activity-item {
+  font-size: 10.5px;
+  opacity: 0.68;
+}
+
+/* --- 层级间距调整，强化视觉层次 --- */
+.chat-msg.assistant { margin-top: 2px; }
+.chat-msg.run-final-response { margin-bottom: 6px; }
+.conversation-work-run { margin: 4px 0 7px; }
+
+/* 浅色主题下放宽不透明度，保证可读性 */
+.light .tool-event-content,
+.light .tool-event-summary,
+.light .conversation-work-event:not(.narrative):not(.guide):not(.error) {
+  opacity: 0.8;
+}
+
 </style>
 </head>
 <body>
@@ -4941,6 +5346,14 @@ html.newmark-memory-overview-viewer body {
       <circle cx="15" cy="5" r="1" />
       <circle cx="15" cy="19" r="1" />
     </symbol>
+    <symbol id="group" viewBox="0 0 24 24">
+      <path d="M3 7V5c0-1.1.9-2 2-2h2" />
+      <path d="M17 3h2c1.1 0 2 .9 2 2v2" />
+      <path d="M21 17v2c0 1.1-.9 2-2 2h-2" />
+      <path d="M7 21H5c-1.1 0-2-.9-2-2v-2" />
+      <rect width="7" height="5" x="7" y="7" rx="1" />
+      <rect width="7" height="5" x="10" y="12" rx="1" />
+    </symbol>
     <symbol id="image" viewBox="0 0 24 24">
       <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
       <circle cx="9" cy="9" r="2" />
@@ -4968,6 +5381,14 @@ html.newmark-memory-overview-viewer body {
       <path d="m3 17 2 2 4-4" />
       <path d="m3 7 2 2 4-4" />
     </symbol>
+    <symbol id="list" viewBox="0 0 24 24">
+      <path d="M3 5h.01" />
+      <path d="M3 12h.01" />
+      <path d="M3 19h.01" />
+      <path d="M8 5h13" />
+      <path d="M8 12h13" />
+      <path d="M8 19h13" />
+    </symbol>
     <symbol id="loader-circle" viewBox="0 0 24 24">
       <path d="M21 12a9 9 0 1 1-6.219-8.56" />
     </symbol>
@@ -5008,6 +5429,9 @@ html.newmark-memory-overview-viewer body {
       <path d="m5 9-3 3 3 3" />
       <path d="m9 5 3-3 3 3" />
     </symbol>
+    <symbol id="navigation" viewBox="0 0 24 24">
+      <polygon points="3 11 22 2 13 21 11 13 3 11" />
+    </symbol>
     <symbol id="octagon-x" viewBox="0 0 24 24">
       <path d="m15 9-6 6" />
       <path d="M2.586 16.726A2 2 0 0 1 2 15.312V8.688a2 2 0 0 1 .586-1.414l4.688-4.688A2 2 0 0 1 8.688 2h6.624a2 2 0 0 1 1.414.586l4.688 4.688A2 2 0 0 1 22 8.688v6.624a2 2 0 0 1-.586 1.414l-4.688 4.688a2 2 0 0 1-1.414.586H8.688a2 2 0 0 1-1.414-.586z" />
@@ -5020,6 +5444,13 @@ html.newmark-memory-overview-viewer body {
       <path d="M3 3h6l6 18h6" />
       <path d="M14 3h7" />
     </symbol>
+    <symbol id="palette" viewBox="0 0 24 24">
+      <path d="M12 22a1 1 0 0 1 0-20 10 9 0 0 1 10 9 5 5 0 0 1-5 5h-2.25a1.75 1.75 0 0 0-1.4 2.8l.3.4a1.75 1.75 0 0 1-1.4 2.8z" />
+      <circle cx="13.5" cy="6.5" r=".5" fill="currentColor" />
+      <circle cx="17.5" cy="10.5" r=".5" fill="currentColor" />
+      <circle cx="6.5" cy="12.5" r=".5" fill="currentColor" />
+      <circle cx="8.5" cy="7.5" r=".5" fill="currentColor" />
+    </symbol>
     <symbol id="panel-left-open" viewBox="0 0 24 24">
       <rect width="18" height="18" x="3" y="3" rx="2" />
       <path d="M9 3v18" />
@@ -5231,37 +5662,37 @@ html.newmark-memory-overview-viewer body {
     <!-- Left Sidebar -->
     <div id="left">
       <div id="left-thumb">
-        <div class="lt-item" onclick="window.showNewConversationPage()" title="New conversation"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#message-square"></use></svg><span class="icon-only-label">New conversation</span></div>
-        <div class="lt-item" onclick="window.showPluginList()" title="Plugins"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#plug"></use></svg><span class="icon-only-label">Plugins</span></div>
-        <div class="lt-item" onclick="window.showMemoryLab()" title="Memory Lab"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#brain"></use></svg><span class="icon-only-label">Memory Lab</span></div>
-        <div class="lt-item" onclick="window.showAutomationWindow()" title="Automation"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#calendar"></use></svg><span class="icon-only-label">Automation</span></div>
-        <div class="lt-item" onclick="window.showFlowEditor()" title="Flow"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#workflow"></use></svg><span class="icon-only-label">Flow</span></div>
-        <div class="lt-item" onclick="window.openSettings()" title="Settings"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#settings"></use></svg><span class="icon-only-label">Settings</span></div>
-        <div class="lt-item" id="lt-ws-icon" onclick="window.toggleSecondarySidebar()" title="Workspaces"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#folder-open"></use></svg><span class="icon-only-label">Workspaces</span></div>
+        <button type="button" class="lt-item" onclick="window.showNewConversationPage()" title="New conversation"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#message-square"></use></svg><span class="icon-only-label">New conversation</span></button>
+        <button type="button" class="lt-item" onclick="window.showPluginList()" title="Plugins"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#plug"></use></svg><span class="icon-only-label">Plugins</span></button>
+        <button type="button" class="lt-item" onclick="window.showMemoryLab()" title="Memory Lab"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#brain"></use></svg><span class="icon-only-label">Memory Lab</span></button>
+        <button type="button" class="lt-item" onclick="window.showAutomationWindow()" title="Automation"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#calendar"></use></svg><span class="icon-only-label">Automation</span></button>
+        <button type="button" class="lt-item" onclick="window.showFlowEditor()" title="Flow"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#workflow"></use></svg><span class="icon-only-label">Flow</span></button>
+        <button type="button" class="lt-item" onclick="window.openSettings()" title="Settings"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#settings"></use></svg><span class="icon-only-label">Settings</span></button>
+        <button type="button" class="lt-item" id="lt-ws-icon" onclick="window.toggleSecondarySidebar()" title="Workspaces"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#folder-open"></use></svg><span class="icon-only-label">Workspaces</span></button>
       </div>
       <div id="left-content">
         <div style="padding:10px 12px 4px;font-size:10px;color:var(--text-dim);text-transform:uppercase;letter-spacing:0.05em;flex-shrink:0;">Tools</div>
-        <div class="left-nav-icon" onclick="window.showNewConversationPage()" title="New conversation">
+        <button type="button" class="left-nav-icon" onclick="window.showNewConversationPage()" title="New conversation">
           <span class="icon"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#message-square"></use></svg></span><span>New chat</span>
-        </div>
-        <div class="left-nav-icon" onclick="window.showPluginList()">
+        </button>
+        <button type="button" class="left-nav-icon" onclick="window.showPluginList()">
           <span class="icon"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#plug"></use></svg></span><span>Plugins</span>
-        </div>
-        <div class="left-nav-icon" onclick="window.showMemoryLab()">
+        </button>
+        <button type="button" class="left-nav-icon" onclick="window.showMemoryLab()">
           <span class="icon"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#brain"></use></svg></span><span>Memory Lab</span>
-        </div>
-        <div class="left-nav-icon" onclick="window.showAutomationWindow()">
+        </button>
+        <button type="button" class="left-nav-icon" onclick="window.showAutomationWindow()">
           <span class="icon"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#calendar"></use></svg></span><span>Automation</span>
-        </div>
-        <div class="left-nav-icon" onclick="window.showFlowEditor()">
+        </button>
+        <button type="button" class="left-nav-icon" onclick="window.showFlowEditor()">
           <span class="icon"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#workflow"></use></svg></span><span>Flow</span>
-        </div>
-        <div class="left-nav-icon" onclick="window.openSettings()">
+        </button>
+        <button type="button" class="left-nav-icon" onclick="window.openSettings()">
           <span class="icon"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#settings"></use></svg></span><span>Settings</span>
-        </div>
+        </button>
         <div id="left-ws-section">
           <div id="left-ws-header">Workspaces</div>
-          <div id="left-ws-list"></div>
+          <div id="left-ws-list" role="list" aria-label="Workspaces"></div>
           <button id="left-ws-add" class="icon-label-btn" onclick="window.showNewWorkspaceDialog()"><svg class="nm-icon tiny" aria-hidden="true" focusable="false"><use href="#plus"></use></svg><span>New</span></button>
         </div>
       </div>
@@ -5275,11 +5706,11 @@ html.newmark-memory-overview-viewer body {
         <button class="sec-btn primary icon-label-btn" onclick="window.newConversation()"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#message-square"></use></svg><span>New chat</span></button>
         <button class="sec-btn" onclick="window.toggleLeftSecondary()" title="Collapse" style="flex:0;padding:6px 8px;"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#chevron-left"></use></svg><span class="icon-only-label">Collapse</span></button>
       </div>
-      <div id="conversation-list"></div>
+          <div id="conversation-list" role="list" aria-label="Conversations"></div>
     </div>
 
     <!-- Resize Handle: left area (left + secondary) to center-stack -->
-    <div class="resize-handle" data-side="right" data-target="left" title="Resize left sidebar"></div>
+    <div class="resize-handle" data-side="right" data-target="left" role="separator" aria-orientation="vertical" aria-label="Resize left sidebar" tabindex="0" title="Resize left sidebar"></div>
 
     <!-- Center Stack (chat + terminal) -->
     <div id="center-stack">
@@ -5305,7 +5736,7 @@ html.newmark-memory-overview-viewer body {
             <div id="todo-header" class="stack-row" onclick="window.toggleTodoCollapse()">
               <span id="todo-header-label" class="stack-title">Task</span>
               <span class="stack-actions">
-                <button class="stack-icon-btn" onclick="event.stopPropagation();window.toggleTodoCollapse()" title="Expand tasks"><svg class="nm-icon tiny" aria-hidden="true" focusable="false"><use href="#chevron-up"></use></svg><span class="icon-only-label">Expand tasks</span></button>
+                <button class="stack-icon-btn" aria-expanded="false" aria-controls="todo-list" onclick="event.stopPropagation();window.toggleTodoCollapse()" title="Expand tasks"><svg class="nm-icon tiny" aria-hidden="true" focusable="false"><use href="#chevron-up"></use></svg><span class="icon-only-label">Expand tasks</span></button>
               </span>
             </div>
             <div id="todo-list"></div>
@@ -5317,7 +5748,7 @@ html.newmark-memory-overview-viewer body {
               <span id="queue-header-label" class="stack-title">Next</span>
               <span class="stack-actions">
                 <button class="stack-icon-btn" id="queue-pause-btn" onclick="event.stopPropagation();window.toggleQueuePause()" title="Pause queue" aria-pressed="false"><svg class="nm-icon tiny" aria-hidden="true" focusable="false"><use href="#pause"></use></svg><span class="icon-only-label">Pause queue</span></button>
-                <button class="stack-icon-btn" id="queue-expand-btn" onclick="event.stopPropagation();window.toggleQueuePanel()" title="Expand queue"><svg class="nm-icon tiny" aria-hidden="true" focusable="false"><use href="#chevron-up"></use></svg><span class="icon-only-label">Expand queue</span></button>
+                <button class="stack-icon-btn" id="queue-expand-btn" aria-expanded="false" aria-controls="queue-list" onclick="event.stopPropagation();window.toggleQueuePanel()" title="Expand queue"><svg class="nm-icon tiny" aria-hidden="true" focusable="false"><use href="#chevron-up"></use></svg><span class="icon-only-label">Expand queue</span></button>
               </span>
             </div>
             <div id="queue-list"></div>
@@ -5361,8 +5792,9 @@ html.newmark-memory-overview-viewer body {
               <div class="model-select-menu" id="model-select-menu" role="listbox" aria-label="Model" popover="manual"></div>
             </div>
             <div class="context-token-wrap">
-              <div id="context-token-ring" title="Context tokens" tabindex="0" onmouseenter="window.showContextWindowTooltip()" onmouseleave="window.hideContextWindowTooltip()" onfocus="window.showContextWindowTooltip()" onblur="window.hideContextWindowTooltip()"></div>
+              <button type="button" id="context-token-ring" title="Context tokens" aria-haspopup="dialog" aria-expanded="false" onclick="window.toggleContextInspector()" onmouseenter="window.showContextWindowTooltip()" onmouseleave="window.hideContextWindowTooltip()" onfocus="window.showContextWindowTooltip()" onblur="window.hideContextWindowTooltip()"><span class="icon-only-label">Context tokens</span></button>
               <div id="context-token-tooltip"></div>
+              <div id="context-inspector" role="dialog" aria-label="Context management" aria-live="polite"></div>
             </div>
             <select class="tool-select" id="intel-select">
               <option value="low">low</option>
@@ -5376,7 +5808,7 @@ html.newmark-memory-overview-viewer body {
               <button class="mode-toggle-btn active" data-mode="guide" onclick="window.setInputMode('guide')">Guide</button>
               <button class="mode-toggle-btn" data-mode="next" onclick="window.setInputMode('next')">Next</button>
             </div>
-            <button id="submit-btn" onclick="window.submitCurrentAction()" title="Send"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#send"></use></svg><span class="icon-only-label">Send</span></button>
+            <button id="submit-btn" onclick="window.submitCurrentAction('click')" title="Send"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#send"></use></svg><span class="icon-only-label">Send</span></button>
           </div>
         </div>
       </div>
@@ -5384,7 +5816,7 @@ html.newmark-memory-overview-viewer body {
       <!-- Bottom Terminal -->
       <div id="bottom" class="open">
         <div id="bottom-header">
-          <div id="terminal-tabs"></div>
+          <div id="terminal-tabs" role="tablist" aria-label="Terminals"></div>
           <select id="terminal-shell-select" onchange="window.spawnTerminal(this.value)">
             <option value="powershell" data-platform-shell="win32">PowerShell</option>
             <option value="cmd" data-platform-shell="win32">CMD</option>
@@ -5402,7 +5834,7 @@ html.newmark-memory-overview-viewer body {
             <div class="terminal-output"><span style="color:var(--text-dim);opacity:0.5;">Terminal ready</span></div>
             <div class="terminal-input-row">
               <span class="terminal-prompt">PS&gt;</span>
-              <input class="terminal-input" type="text" placeholder="Enter command..." onfocus="window.ensureTerminalStarted&&window.ensureTerminalStarted()" onkeydown="if(event.key==='Enter')window.terminalSend()">
+              <input class="terminal-input" type="text" placeholder="Enter command..." onfocus="window.ensureTerminalStarted&&window.ensureTerminalStarted()" onkeydown="if(event.key==='Enter'&&!event.isComposing&&event.key!=='Process'&&event.keyCode!==229)window.terminalSend()">
             </div>
           </div>
         </div>
@@ -5410,25 +5842,25 @@ html.newmark-memory-overview-viewer body {
     </div>
 
     <!-- Right Resize Handle -->
-    <div class="resize-handle" data-side="left" data-target="right" title="Resize right sidebar"></div>
+    <div class="resize-handle" data-side="left" data-target="right" role="separator" aria-orientation="vertical" aria-label="Resize right sidebar" tabindex="0" title="Resize right sidebar"></div>
 
     <!-- Right Sidebar -->
     <div id="right" class="open">
-      <div id="right-tabs">
-        <button class="tab-btn active" data-tab="file-tree" onclick="window.switchRightTab('file-tree')" title="Files"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#folder"></use></svg><span class="icon-only-label">Files</span></button>
-        <button class="tab-btn" data-tab="editor" onclick="window.switchRightTab('editor')" title="Editor"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#square-pen"></use></svg><span class="icon-only-label">Editor</span></button>
-        <button class="tab-btn" data-tab="plan" onclick="window.switchRightTab('plan')" title="Conversation plan"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#list-checks"></use></svg><span class="icon-only-label">Conversation plan</span></button>
-        <button class="tab-btn" data-tab="subagent" onclick="window.switchRightTab('subagent')" title="Subagents"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#bot"></use></svg><span class="icon-only-label">Subagents</span></button>
-        <button class="tab-btn" data-tab="browser" onclick="window.switchRightTab('browser')" title="Browser"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#globe"></use></svg><span class="icon-only-label">Browser</span></button>
+      <div id="right-tabs" role="tablist" aria-label="Right sidebar">
+        <button class="tab-btn active" id="right-tab-file-tree" role="tab" aria-selected="true" aria-controls="panel-file-tree" tabindex="0" data-tab="file-tree" onclick="window.switchRightTab('file-tree')" onkeydown="window.handleRightTabKey(event)" title="Files"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#folder"></use></svg><span class="icon-only-label">Files</span></button>
+        <button class="tab-btn" id="right-tab-editor" role="tab" aria-selected="false" aria-controls="panel-editor" tabindex="-1" data-tab="editor" onclick="window.switchRightTab('editor')" onkeydown="window.handleRightTabKey(event)" title="Editor"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#square-pen"></use></svg><span class="icon-only-label">Editor</span></button>
+        <button class="tab-btn" id="right-tab-plan" role="tab" aria-selected="false" aria-controls="panel-plan" tabindex="-1" data-tab="plan" onclick="window.switchRightTab('plan')" onkeydown="window.handleRightTabKey(event)" title="Conversation plan"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#list-checks"></use></svg><span class="icon-only-label">Conversation plan</span></button>
+        <button class="tab-btn" id="right-tab-subagent" role="tab" aria-selected="false" aria-controls="panel-subagent" tabindex="-1" data-tab="subagent" onclick="window.switchRightTab('subagent')" onkeydown="window.handleRightTabKey(event)" title="Subagents"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#bot"></use></svg><span class="icon-only-label">Subagents</span></button>
+        <button class="tab-btn" id="right-tab-browser" role="tab" aria-selected="false" aria-controls="panel-browser" tabindex="-1" data-tab="browser" onclick="window.switchRightTab('browser')" onkeydown="window.handleRightTabKey(event)" title="Browser"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#globe"></use></svg><span class="icon-only-label">Browser</span></button>
         <div class="tab-divider"></div>
         <button class="tab-btn" onclick="window.toggleRight()" title="Close right sidebar"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#x"></use></svg><span class="icon-only-label">Close right sidebar</span></button>
       </div>
       <div id="right-content">
-        <div class="tab-panel active" id="panel-file-tree">
+        <div class="tab-panel active" id="panel-file-tree" role="tabpanel" aria-labelledby="right-tab-file-tree">
           <div style="font-size:11px;color:var(--text-dim);margin-bottom:8px;">Workspace file tree</div>
-          <div id="file-tree-container"></div>
+          <div id="file-tree-container" role="tree"></div>
         </div>
-        <div class="tab-panel" id="panel-editor">
+        <div class="tab-panel" id="panel-editor" role="tabpanel" aria-labelledby="right-tab-editor" hidden>
           <div class="editor-toolbar">
             <button class="et-btn" onclick="window.saveEditor()" title="Save" aria-label="Save"><svg class="nm-icon" aria-hidden="true" focusable="false"><use href="#save"></use></svg></button>
             <button class="et-btn editor-view-btn" id="editor-md-toggle" onclick="window.toggleEditorMarkdownPreview()" title="Markdown preview" aria-label="Markdown preview"><svg class="nm-icon" aria-hidden="true" focusable="false"><use href="#book-open"></use></svg></button>
@@ -5444,22 +5876,22 @@ html.newmark-memory-overview-viewer body {
             <div class="editor-status"><span class="editor-vim-mode" id="editor-vim-mode">INSERT</span><span id="editor-language">text</span><span id="editor-position">1:1</span><span style="margin-left:auto" id="editor-dirty"></span></div>
           </div>
         </div>
-        <div class="tab-panel" id="panel-plan">
+        <div class="tab-panel" id="panel-plan" role="tabpanel" aria-labelledby="right-tab-plan" hidden>
           <div class="right-section-head"><span class="right-section-title">Conversation plan</span><button class="archive-action-btn" onclick="window.refreshConversationPlan()">Refresh</button></div>
           <div id="conversation-plan-content"></div>
           <div class="right-section-head linked-plan-head"><span class="right-section-title">Linked plan</span><span class="right-row-meta" id="linked-plan-revision"></span></div>
           <div id="linked-plan-content" class="linked-plan-reader md-rendered" aria-live="polite"></div>
         </div>
-        <div class="tab-panel" id="panel-subagent">
+        <div class="tab-panel" id="panel-subagent" role="tabpanel" aria-labelledby="right-tab-subagent" hidden>
           <div style="font-size:11px;color:var(--text-dim);margin-bottom:8px;">Subagents</div>
           <div id="subagent-list"></div>
         </div>
-        <div class="tab-panel" id="panel-browser">
+        <div class="tab-panel" id="panel-browser" role="tabpanel" aria-labelledby="right-tab-browser" hidden>
           <div class="browser-url-bar">
             <button class="shell-btn browser-action-btn" onclick="window.browserBack()" title="Back"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#chevron-left"></use></svg><span class="icon-only-label">Back</span></button>
             <button class="shell-btn browser-action-btn" onclick="window.browserForward()" title="Forward"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#chevron-right"></use></svg><span class="icon-only-label">Forward</span></button>
             <button class="shell-btn browser-action-btn" onclick="window.browserReload()" title="Reload"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#refresh-cw"></use></svg><span class="icon-only-label">Reload</span></button>
-            <input class="browser-url-input" id="browser-url" placeholder="Enter URL..." onkeydown="if(event.key==='Enter')window.navigateBrowser(this.value)">
+            <input class="browser-url-input" id="browser-url" placeholder="Enter URL..." onkeydown="if(event.key==='Enter'&&!event.isComposing&&event.key!=='Process'&&event.keyCode!==229)window.navigateBrowser(this.value)">
             <button class="shell-btn" onclick="window.navigateBrowser(document.getElementById('browser-url').value)" title="Go"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#send"></use></svg><span class="icon-only-label">Go</span></button>
             <button class="shell-btn" id="computer-use-toggle" onclick="window.toggleComputerUse()" title="ComputerUse: enabled for this conversation" aria-pressed="true">CU</button>
           </div>
@@ -5476,7 +5908,7 @@ html.newmark-memory-overview-viewer body {
 
   <!-- ========== SUB-WINDOW OVERLAY ========== -->
   <div class="sub-win-overlay" id="sub-win-overlay" onclick="if(event.target===this)window.closeSubWin()">
-    <div class="sub-win" id="sub-win">
+    <div class="sub-win" id="sub-win" role="dialog" aria-modal="true" aria-labelledby="sub-win-title" tabindex="-1">
       <div class="sub-win-header" id="sub-win-header">
         <span class="sub-win-title" id="sub-win-title">Window</span>
         <button class="sub-win-close" onclick="window.closeSubWin()" title="Close"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#x"></use></svg><span class="icon-only-label">Close</span></button>
@@ -5484,6 +5916,21 @@ html.newmark-memory-overview-viewer body {
       <div class="sub-win-body" id="sub-win-body"></div>
     </div>
   </div>
+  <div class="command-surface-overlay" id="command-surface-overlay" onclick="if(event.target===this)window.closeCommandSurface()">
+    <section class="command-surface" id="command-surface" role="dialog" aria-modal="true" aria-labelledby="command-surface-title" tabindex="-1">
+      <header class="command-surface-header">
+        <div class="command-surface-heading">
+          <div class="command-surface-title" id="command-surface-title"></div>
+          <div class="command-surface-subtitle" id="command-surface-subtitle"></div>
+        </div>
+        <button type="button" class="command-surface-close" onclick="window.closeCommandSurface()" aria-label="Close"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#x"></use></svg></button>
+      </header>
+      <div class="command-search-wrap"><input class="command-search" id="command-search" type="search" autocomplete="off" role="combobox" aria-autocomplete="list" aria-expanded="true" aria-controls="command-list"></div>
+      <div class="command-list" id="command-list" role="listbox"></div>
+      <footer class="command-surface-footer" id="command-surface-footer"></footer>
+    </section>
+  </div>
+  <div class="shortcut-chord-hint" id="shortcut-chord-hint" role="status" aria-live="polite"></div>
 <script>
 /* ============================================================
    NEWMARK AGENT - Complete UI Controller v2.0
@@ -5579,6 +6026,8 @@ var state = {
   automationItems: [],
   contextCompression: null,
   contextWindow: null,
+  contextInspectorOpen: false,
+  contextMutationPending: false,
   flowWorks: [],
   activeAgentRunning: false,
   editorPath: '',
@@ -5596,6 +6045,9 @@ var state = {
   editorCompletionText: '',
   editorCompletionRequest: 0,
   editorCompletionAnchor: null,
+  editorCompletionCache: [],
+  editorCompletionInFlight: false,
+  editorCompletionStreamText: '',
   editorCaretSignature: '',
   editorPredictionEnabled: true,
   editorCompletionTimer: null,
@@ -5651,7 +6103,14 @@ var state = {
   githubOverviewPendingRepo: '',
   mcpServers: [],
   mcpDiscovered: [],
+  dshCompatibility: null,
   mcpEditingId: '',
+  mcpDraft: null,
+  mcpSearchQuery: '',
+  mcpMutationPending: false,
+  mcpMutationGeneration: 0,
+  mcpFormFocusRequested: false,
+  pluginPanelGeneration: 0,
   skillMarketQuery: '',
   memoryLab: null,
   memoryLabComponentContents: {},
@@ -5720,6 +6179,48 @@ var NEWMARK_I18N = {
   en: {
     'app.ready': 'Ready',
     'app.subtitle': 'Enter an instruction to begin. Enter sends. Shift+Enter inserts a newline.',
+    'shortcuts.paletteTitle': 'Command palette',
+    'shortcuts.helpTitle': 'Keyboard shortcuts',
+    'shortcuts.paletteSubtitle': 'Search every registered Newmark GUI command. Shortcuts never replace standard editing keys.',
+    'shortcuts.helpSubtitle': 'Common desktop keys plus conflict-safe Newmark command chords.',
+    'shortcuts.searchCommands': 'Search commands...',
+    'shortcuts.searchShortcuts': 'Search commands or shortcuts...',
+    'shortcuts.noResults': 'No matching commands.',
+    'shortcuts.footer': 'Up/Down navigate · Enter runs · Esc closes · Tab stays inside this dialog',
+    'shortcuts.category.general': 'General',
+    'shortcuts.category.navigation': 'Navigation',
+    'shortcuts.category.workspace': 'Workspace and chat',
+    'shortcuts.category.layout': 'Layout and focus',
+    'shortcuts.category.input': 'Input and modes',
+    'shortcuts.category.editor': 'Editor',
+    'shortcuts.category.browser': 'Browser',
+    'shortcuts.category.terminal': 'Terminal',
+    'shortcuts.category.context': 'Context controls',
+    'shortcuts.context.global': 'Application',
+    'shortcuts.context.prompt': 'Prompt',
+    'shortcuts.context.editor': 'Editor only',
+    'shortcuts.context.browser': 'Browser only',
+    'shortcuts.context.terminal': 'Terminal only',
+    'shortcuts.context.dialog': 'Dialog',
+    'shortcuts.openPalette': 'Open command palette',
+    'shortcuts.openHelp': 'Show keyboard shortcuts',
+    'shortcuts.focusPrimary': 'Focus primary input',
+    'shortcuts.focusNext': 'Focus next application region',
+    'shortcuts.focusPrevious': 'Focus previous application region',
+    'shortcuts.toggleLeft': 'Toggle left sidebar',
+    'shortcuts.toggleWorkspacePanel': 'Toggle workspace and conversation panel',
+    'shortcuts.toggleRight': 'Toggle right sidebar',
+    'shortcuts.toggleTerminal': 'Toggle terminal',
+    'shortcuts.nextConversation': 'Next conversation',
+    'shortcuts.previousConversation': 'Previous conversation',
+    'shortcuts.nextBranch': 'Next branch',
+    'shortcuts.previousBranch': 'Previous branch',
+    'shortcuts.scrollBottom': 'Scroll chat to bottom',
+    'shortcuts.newTerminal': 'New terminal',
+    'shortcuts.focusTerminal': 'Focus terminal input',
+    'shortcuts.focusBrowserAddress': 'Focus browser address',
+    'shortcuts.toggleTheme': 'Toggle light and dark theme',
+    'shortcuts.chordHint': '{prefix} waiting for: {keys}',
     'top.minimize': 'Minimize',
     'top.maximize': 'Maximize',
     'top.close': 'Close',
@@ -5731,12 +6232,14 @@ var NEWMARK_I18N = {
     'left.flow': 'Flow',
     'left.settings': 'Settings',
     'left.workspaces': 'Workspaces',
+    'left.conversations': 'Conversations',
     'left.new': 'New',
     'left.collapse': 'Collapse left sidebar',
     'left.collapseSecondary': 'Collapse workspace panel',
     'input.placeholder': 'Input instruction...',
     'input.send': 'Send',
     'input.stop': 'Stop',
+    'input.continue': 'Continue',
     'input.guide': 'Guide',
     'input.next': 'Next',
     'mode.build': 'Build',
@@ -6066,7 +6569,13 @@ var NEWMARK_I18N = {
     'flow.noAvailable': 'No workflows are available to run.',
     'flow.started': 'Flow started',
     'plugins.title': 'Plugins',
+    'plugins.tabMcp': 'MCP',
+    'plugins.tabDsh': 'DSH Plugin',
+    'plugins.tabSkills': 'Skills',
+    'plugins.tabMarket': 'Market',
+    'plugins.tabGithub': 'GitHub',
     'plugins.mcp': 'MCP Management',
+    'plugins.dsh': 'DSH Plugin',
     'plugins.management': 'Skills Management',
     'plugins.market': 'Skills Market',
     'plugins.github': 'GitHub CLI',
@@ -6124,6 +6633,74 @@ var NEWMARK_I18N = {
     'plugins.mcpNoServers': 'No user MCP servers.',
     'plugins.mcpDiscovered': 'Discovered from plugins',
     'plugins.mcpStored': 'User MCP servers',
+    'plugins.mcpConfiguredCount': '{count} configured',
+    'plugins.mcpSearch': 'Search MCP servers...',
+    'plugins.mcpNoMatch': 'No MCP servers match this search.',
+    'plugins.mcpRefresh': 'Refresh',
+    'plugins.mcpRefreshing': 'Refreshing MCP servers...',
+    'plugins.mcpLoadError': 'MCP servers could not be loaded.',
+    'plugins.mcpUnavailable': 'MCP management is unavailable in this interface.',
+    'plugins.mcpAddTitle': 'Add MCP server',
+    'plugins.mcpEditTitle': 'Edit MCP server',
+    'plugins.mcpReviewTitle': 'Review MCP candidate',
+    'plugins.mcpFormHelp': 'Review every field before saving. Imported candidates always start disabled.',
+    'plugins.mcpEnabled': 'Enable this server after saving',
+    'plugins.mcpEndpointStdio': 'Command',
+    'plugins.mcpEndpointHttp': 'Server URL',
+    'plugins.mcpCwd': 'Working directory (optional)',
+    'plugins.mcpSecretsHelp': 'When editing, leave blank to preserve saved values; enter {} to clear them. Secret values are never displayed.',
+    'plugins.mcpSavedEnvKeys': 'Saved environment keys: {keys}',
+    'plugins.mcpSavedHeaderKeys': 'Saved header keys: {keys}',
+    'plugins.mcpNoSavedKeys': 'No saved keys.',
+    'plugins.mcpInvalidArgs': 'Arguments must be a JSON array.',
+    'plugins.mcpInvalidObject': '{field} must be a JSON object.',
+    'plugins.mcpRequiredName': 'Enter a server name.',
+    'plugins.mcpRequiredCommand': 'Enter a command for this stdio server.',
+    'plugins.mcpRequiredUrl': 'Enter an http(s) URL for this server.',
+    'plugins.mcpSaving': 'Saving...',
+    'plugins.mcpSaved': 'MCP server saved.',
+    'plugins.mcpEnabledStatus': 'Enabled',
+    'plugins.mcpDisabledStatus': 'Disabled',
+    'plugins.mcpMutationFailed': 'MCP operation failed.',
+    'plugins.mcpRemoveConfirm': 'Remove MCP server "{name}"?',
+    'plugins.mcpReadonly': 'Read-only metadata',
+    'plugins.mcpDiscoveredEmpty': 'No MCP metadata was discovered from installed plugins.',
+    'plugins.mcpStoredEmpty': 'No user MCP servers yet. Add one or review a compatible DSH candidate.',
+    'plugins.mcpReviewImport': 'Review and import',
+    'plugins.mcpCandidateHelp': 'This only pre-fills the MCP form. Nothing is installed, executed, or enabled automatically.',
+    'plugins.retry': 'Retry',
+    'plugins.dshTitle': 'DSH Plugin compatibility',
+    'plugins.dshHelp': 'Developer preview: inspect the locally available official DSH CLI and package configuration. Discovery is read-only and never installs, executes, updates, or rewrites DSH.',
+    'plugins.dshPreview': 'Developer preview',
+    'plugins.dshRescan': 'Rescan',
+    'plugins.dshScanning': 'Scanning DSH compatibility...',
+    'plugins.dshLoadError': 'DSH compatibility information could not be loaded.',
+    'plugins.dshUnavailable': 'DSH discovery is unavailable in this interface.',
+    'plugins.dshCli': 'CLI and package',
+    'plugins.dshCliPath': 'CLI path',
+    'plugins.dshCliVersion': 'CLI version',
+    'plugins.dshPackageVersion': 'Package version',
+    'plugins.dshHome': 'DSH_HOME',
+    'plugins.dshHomeSource': 'Home source',
+    'plugins.dshConfigFiles': 'Configuration files',
+    'plugins.dshLayers': 'Configuration layer order',
+    'plugins.dshLayerOrder': 'Later layers override earlier rows; unknown keys remain visible and untouched.',
+    'plugins.dshHomePatches': 'Home-level patches',
+    'plugins.dshUpdateability': 'Updateability: use official DSH tooling or edit the shown patch files; Newmark never rewrites them.',
+    'plugins.dshUpdateChannel': 'Update channel',
+    'plugins.dshLatestChannel': 'latest (not locked)',
+    'plugins.dshProfiles': 'Profiles',
+    'plugins.dshBundles': 'Bundles',
+    'plugins.dshWarnings': 'Warnings',
+    'plugins.dshUnknownKeys': 'Unknown keys',
+    'plugins.dshMcpCandidates': 'MCP candidates',
+    'plugins.dshNone': 'None discovered',
+    'plugins.dshNotAvailable': 'Not available',
+    'plugins.dshOfficialRepo': 'Official repository',
+    'plugins.dshOfficialDocs': 'Documentation',
+    'plugins.dshOfficialNpm': 'npm package',
+    'plugins.dshReadonly': 'Read-only compatibility policy',
+    'plugins.dshReadonlyDetail': 'Newmark only reads local compatibility metadata. Use official DSH tooling to install, execute, update, or change DSH configuration.',
     'workspace.new': 'New workspace',
     'workspace.type': 'Type',
     'workspace.internal': 'Internal workspace',
@@ -6223,6 +6800,21 @@ var NEWMARK_I18N = {
     'status.contextModeModel': 'model',
     'status.messages': 'messages',
     'status.noCompression': 'No compression event in this conversation',
+    'status.contextInspector': 'Context management',
+    'status.contextInspectorHint': 'DSH-inspired live budget; visible chat history stays unchanged.',
+    'status.activeBuild': 'Active Build',
+    'status.longHistory': 'Long history',
+    'status.trigger': 'Trigger',
+    'status.retention': 'Retention',
+    'status.hotCache': 'Hot cache',
+    'status.coldArchive': 'Cold archive',
+    'status.lastCompression': 'Last compression',
+    'status.noCompressionShort': 'No compression yet',
+    'status.compressNow': 'Compress now',
+    'status.compressing': 'Compressing...',
+    'status.compressedNow': 'Context compressed.',
+    'status.compressionFailed': 'Context compression failed.',
+    'status.compressionBusy': 'Compression is unavailable while this conversation is running.',
     'status.recentFiles': 'Recent file changes',
     'status.noFileChanges': 'No file changes recorded for the latest run.',
     'status.pendingOptions': 'Pending options',
@@ -6243,6 +6835,8 @@ var NEWMARK_I18N = {
     'conversation.reorderFailed': 'Could not save the conversation order.',
     'conversation.pin': 'Pin conversation',
     'conversation.unpin': 'Unpin conversation',
+    'conversation.branchCommunication': 'Allow branch communication',
+    'conversation.branchCommunicationBadge': 'Branch communication',
     'conversation.loadingIsolated': 'Loading isolated conversation...',
     'conversation.locked': 'Current conversation is locked while the agent is working.',
     'queue.next': 'Next',
@@ -6286,6 +6880,48 @@ var NEWMARK_I18N = {
   zh: {
     'app.ready': '就绪',
     'app.subtitle': '输入指令开始。Enter 发送，Shift+Enter 换行。',
+    'shortcuts.paletteTitle': '命令面板',
+    'shortcuts.helpTitle': '键盘快捷键',
+    'shortcuts.paletteSubtitle': '搜索并执行所有已注册的 Newmark GUI 命令；不会覆盖标准文本编辑按键。',
+    'shortcuts.helpSubtitle': '通用桌面快捷键与避免冲突的 Newmark 命令序列。',
+    'shortcuts.searchCommands': '搜索命令...',
+    'shortcuts.searchShortcuts': '搜索命令或快捷键...',
+    'shortcuts.noResults': '没有匹配的命令。',
+    'shortcuts.footer': '上/下选择 · Enter 执行 · Esc 关闭 · Tab 保持在对话框内',
+    'shortcuts.category.general': '通用',
+    'shortcuts.category.navigation': '导航',
+    'shortcuts.category.workspace': '工作区与对话',
+    'shortcuts.category.layout': '布局与焦点',
+    'shortcuts.category.input': '输入与模式',
+    'shortcuts.category.editor': '编辑器',
+    'shortcuts.category.browser': '浏览器',
+    'shortcuts.category.terminal': '终端',
+    'shortcuts.category.context': '上下文操作',
+    'shortcuts.context.global': '应用',
+    'shortcuts.context.prompt': '输入框',
+    'shortcuts.context.editor': '仅编辑器',
+    'shortcuts.context.browser': '仅浏览器',
+    'shortcuts.context.terminal': '仅终端',
+    'shortcuts.context.dialog': '对话框',
+    'shortcuts.openPalette': '打开命令面板',
+    'shortcuts.openHelp': '显示键盘快捷键',
+    'shortcuts.focusPrimary': '聚焦主要输入框',
+    'shortcuts.focusNext': '聚焦下一个应用区域',
+    'shortcuts.focusPrevious': '聚焦上一个应用区域',
+    'shortcuts.toggleLeft': '切换左侧边栏',
+    'shortcuts.toggleWorkspacePanel': '切换工作区与对话面板',
+    'shortcuts.toggleRight': '切换右侧边栏',
+    'shortcuts.toggleTerminal': '切换终端',
+    'shortcuts.nextConversation': '下一个对话',
+    'shortcuts.previousConversation': '上一个对话',
+    'shortcuts.nextBranch': '下一个分支',
+    'shortcuts.previousBranch': '上一个分支',
+    'shortcuts.scrollBottom': '滚动到对话底部',
+    'shortcuts.newTerminal': '新建终端',
+    'shortcuts.focusTerminal': '聚焦终端输入框',
+    'shortcuts.focusBrowserAddress': '聚焦浏览器地址栏',
+    'shortcuts.toggleTheme': '切换明暗主题',
+    'shortcuts.chordHint': '{prefix} 等待：{keys}',
     'top.minimize': '最小化',
     'top.maximize': '最大化',
     'top.close': '关闭',
@@ -6297,12 +6933,14 @@ var NEWMARK_I18N = {
     'left.flow': '工作流',
     'left.settings': '设置',
     'left.workspaces': '工作区',
+    'left.conversations': '对话',
     'left.new': '新建',
     'left.collapse': '折叠左侧栏',
     'left.collapseSecondary': '折叠工作区面板',
     'input.placeholder': '输入指令...',
     'input.send': '发送',
     'input.stop': '停止',
+    'input.continue': '继续',
     'input.guide': 'Guide',
     'input.next': 'Next',
     'mode.build': 'Build',
@@ -6632,7 +7270,13 @@ var NEWMARK_I18N = {
     'flow.noAvailable': '当前没有可运行的工作流。',
     'flow.started': 'Flow 已启动',
     'plugins.title': '插件',
+    'plugins.tabMcp': 'MCP',
+    'plugins.tabDsh': 'DSH Plugin',
+    'plugins.tabSkills': 'Skills',
+    'plugins.tabMarket': 'Market',
+    'plugins.tabGithub': 'GitHub',
     'plugins.mcp': 'MCP 管理',
+    'plugins.dsh': 'DSH Plugin',
     'plugins.management': 'Skills 管理',
     'plugins.market': 'Skills Market',
     'plugins.github': 'GitHub CLI',
@@ -6690,6 +7334,74 @@ var NEWMARK_I18N = {
     'plugins.mcpNoServers': '暂无用户 MCP 服务器。',
     'plugins.mcpDiscovered': '从插件发现',
     'plugins.mcpStored': '用户 MCP 服务器',
+    'plugins.mcpConfiguredCount': '已配置 {count} 项',
+    'plugins.mcpSearch': '搜索 MCP 服务器...',
+    'plugins.mcpNoMatch': '没有符合搜索条件的 MCP 服务器。',
+    'plugins.mcpRefresh': '刷新',
+    'plugins.mcpRefreshing': '正在刷新 MCP 服务器...',
+    'plugins.mcpLoadError': '无法加载 MCP 服务器。',
+    'plugins.mcpUnavailable': '当前界面不支持 MCP 管理。',
+    'plugins.mcpAddTitle': '添加 MCP 服务器',
+    'plugins.mcpEditTitle': '编辑 MCP 服务器',
+    'plugins.mcpReviewTitle': '审核 MCP 候选项',
+    'plugins.mcpFormHelp': '保存前请审核所有字段。从候选项导入时始终默认禁用。',
+    'plugins.mcpEnabled': '保存后启用此服务器',
+    'plugins.mcpEndpointStdio': '命令',
+    'plugins.mcpEndpointHttp': '服务器 URL',
+    'plugins.mcpCwd': '工作目录（可选）',
+    'plugins.mcpSecretsHelp': '编辑时留空可保留已保存的值；输入 {} 可清空。界面绝不显示密钥值。',
+    'plugins.mcpSavedEnvKeys': '已保存环境变量键：{keys}',
+    'plugins.mcpSavedHeaderKeys': '已保存请求头键：{keys}',
+    'plugins.mcpNoSavedKeys': '没有已保存的键。',
+    'plugins.mcpInvalidArgs': '参数必须是 JSON 数组。',
+    'plugins.mcpInvalidObject': '{field} 必须是 JSON 对象。',
+    'plugins.mcpRequiredName': '请输入服务器名称。',
+    'plugins.mcpRequiredCommand': '请输入 stdio 服务器命令。',
+    'plugins.mcpRequiredUrl': '请输入 http(s) 服务器 URL。',
+    'plugins.mcpSaving': '正在保存...',
+    'plugins.mcpSaved': 'MCP 服务器已保存。',
+    'plugins.mcpEnabledStatus': '已启用',
+    'plugins.mcpDisabledStatus': '已禁用',
+    'plugins.mcpMutationFailed': 'MCP 操作失败。',
+    'plugins.mcpRemoveConfirm': '移除 MCP 服务器“{name}”？',
+    'plugins.mcpReadonly': '只读元数据',
+    'plugins.mcpDiscoveredEmpty': '未从已安装插件中发现 MCP 元数据。',
+    'plugins.mcpStoredEmpty': '暂无用户 MCP 服务器。可以添加服务器，或审核兼容的 DSH 候选项。',
+    'plugins.mcpReviewImport': '审核并导入',
+    'plugins.mcpCandidateHelp': '此操作只会预填 MCP 表单，不会安装、执行或自动启用任何内容。',
+    'plugins.retry': '重试',
+    'plugins.dshTitle': 'DSH Plugin 兼容',
+    'plugins.dshHelp': '开发者预览：检查本地官方 DSH CLI 与包配置。发现过程严格只读，绝不会安装、执行、更新或改写 DSH。',
+    'plugins.dshPreview': '开发者预览',
+    'plugins.dshRescan': '重新扫描',
+    'plugins.dshScanning': '正在扫描 DSH 兼容信息...',
+    'plugins.dshLoadError': '无法加载 DSH 兼容信息。',
+    'plugins.dshUnavailable': '当前界面不支持 DSH 发现。',
+    'plugins.dshCli': 'CLI 与软件包',
+    'plugins.dshCliPath': 'CLI 路径',
+    'plugins.dshCliVersion': 'CLI 版本',
+    'plugins.dshPackageVersion': '软件包版本',
+    'plugins.dshHome': 'DSH_HOME',
+    'plugins.dshHomeSource': '目录来源',
+    'plugins.dshConfigFiles': '配置文件',
+    'plugins.dshLayers': '配置层顺序',
+    'plugins.dshLayerOrder': '后面的层覆盖前面的条目；未知键会被展示但不会改写。',
+    'plugins.dshHomePatches': 'Home 级 patch',
+    'plugins.dshUpdateability': '可更新性：请使用官方 DSH 工具或编辑下方 patch 文件；Newmark 不会重写这些文件。',
+    'plugins.dshUpdateChannel': '更新通道',
+    'plugins.dshLatestChannel': 'latest（未锁定）',
+    'plugins.dshProfiles': 'Profiles',
+    'plugins.dshBundles': 'Bundles',
+    'plugins.dshWarnings': '警告',
+    'plugins.dshUnknownKeys': '未知配置键',
+    'plugins.dshMcpCandidates': 'MCP 候选项',
+    'plugins.dshNone': '未发现',
+    'plugins.dshNotAvailable': '不可用',
+    'plugins.dshOfficialRepo': '官方仓库',
+    'plugins.dshOfficialDocs': '官方文档',
+    'plugins.dshOfficialNpm': 'npm 软件包',
+    'plugins.dshReadonly': '只读兼容策略',
+    'plugins.dshReadonlyDetail': 'Newmark 只读取本地兼容元数据。安装、执行、更新或更改 DSH 配置请使用官方 DSH 工具。',
     'workspace.new': '新建工作区',
     'workspace.type': '类型',
     'workspace.internal': '内部工作区',
@@ -6789,6 +7501,21 @@ var NEWMARK_I18N = {
     'status.contextModeModel': '模型',
     'status.messages': '条消息',
     'status.noCompression': '当前对话暂无压缩事件',
+    'status.contextInspector': '上下文管理',
+    'status.contextInspectorHint': '借鉴 DSH 的动态预算；可见对话历史不会被改写。',
+    'status.activeBuild': '当前 Build',
+    'status.longHistory': '长期历史',
+    'status.trigger': '触发线',
+    'status.retention': '保留量',
+    'status.hotCache': '热缓存',
+    'status.coldArchive': '冷归档',
+    'status.lastCompression': '最近一次压缩',
+    'status.noCompressionShort': '尚未压缩',
+    'status.compressNow': '立即压缩',
+    'status.compressing': '正在压缩...',
+    'status.compressedNow': '上下文已压缩。',
+    'status.compressionFailed': '上下文压缩失败。',
+    'status.compressionBusy': '对话运行中，暂时无法压缩上下文。',
     'status.recentFiles': '最近文件变更',
     'status.noFileChanges': '最近一轮没有记录文件变更。',
     'status.pendingOptions': '待处理选项',
@@ -6809,6 +7536,8 @@ var NEWMARK_I18N = {
     'conversation.reorderFailed': '无法保存对话顺序。',
     'conversation.pin': '置顶对话',
     'conversation.unpin': '取消置顶对话',
+    'conversation.branchCommunication': '允许分支交流',
+    'conversation.branchCommunicationBadge': '分支交流',
     'conversation.loadingIsolated': '正在加载隔离对话...',
     'conversation.locked': 'Agent 工作中，当前对话已锁定。',
     'queue.next': '下一轮',
@@ -6933,6 +7662,10 @@ function applyLanguageToUi() {
   }
   var wsHead = document.getElementById('left-ws-header');
   if (wsHead) wsHead.textContent = t('left.workspaces');
+  var wsList = document.getElementById('left-ws-list');
+  if (wsList) wsList.setAttribute('aria-label', t('left.workspaces'));
+  var conversationList = document.getElementById('conversation-list');
+  if (conversationList) conversationList.setAttribute('aria-label', t('left.conversations'));
   var wsAdd = document.querySelector('#left-ws-add span:last-child');
   if (wsAdd) wsAdd.textContent = t('left.new');
   setTitleAndLabel('.secondary-top button[onclick="window.openWsSettings()"]', t('workspace.settingsTitle'));
@@ -6958,6 +7691,10 @@ function applyLanguageToUi() {
   if (browserUrl) browserUrl.setAttribute('placeholder', t('browser.url'));
   var terminalInputs = document.querySelectorAll('.terminal-input');
   for (var ti = 0; ti < terminalInputs.length; ti++) terminalInputs[ti].setAttribute('placeholder', t('terminal.enterCommand'));
+  var terminalTabs = document.getElementById('terminal-tabs');
+  if (terminalTabs) terminalTabs.setAttribute('aria-label', t('shortcuts.category.terminal'));
+  var fileTree = document.getElementById('file-tree-container');
+  if (fileTree) fileTree.setAttribute('aria-label', t('right.fileTree'));
   var terminalReady = document.querySelector('#terminal-pane-0 .terminal-output span');
   if (terminalReady && terminalReady.textContent === 'Terminal ready') terminalReady.textContent = t('terminal.ready');
   var terminalStatusSpans = document.querySelectorAll('.terminal-output span');
@@ -8220,6 +8957,8 @@ window.toggleWorkReview = function(head) {
   var review = head && head.closest ? head.closest('.work-review') : null;
   if (!review) return;
   review.classList.toggle('collapsed');
+  var toggle = review.querySelector('.work-review-toggle');
+  if (toggle) toggle.setAttribute('aria-expanded', review.classList.contains('collapsed') ? 'false' : 'true');
 };
 
 window.toggleWorkReviewFiles = function(button) {
@@ -8324,7 +9063,7 @@ function addWorkReview(diffs) {
   review.innerHTML = '<div class="work-review-head" onclick="window.toggleWorkReview(this)"><div class="work-review-mark">' + iconSvg('file-diff', t('review.fileChanges'), 'small') + '</div>' +
     '<div><div class="work-review-title">' + esc(editedLabel) + '</div><div class="work-review-stats"><span class="work-review-add">+' + added + '</span><span class="work-review-del">-' + deleted + '</span></div></div>' +
     '<div class="work-review-actions"><button class="work-review-btn" onclick="window.openWorkReview(this);event.stopPropagation()">' + esc(t('review.open')) + '</button>' +
-    '<span class="work-review-chevron" aria-hidden="true"></span></div></div>' +
+    '<button type="button" class="work-review-toggle" aria-expanded="false" onclick="event.stopPropagation();window.toggleWorkReview(this)" title="' + escAttr(t('queue.expand')) + '"><span class="work-review-chevron" aria-hidden="true"></span><span class="icon-only-label">' + esc(t('queue.expand')) + '</span></button></div></div>' +
     '<div class="work-review-list">' + rows + (files.length > 3 ? '<button class="work-review-more" onclick="window.toggleWorkReviewFiles(this)">' + esc(t('review.showMore').replace('{count}', files.length - 3)) + '</button>' : '') + '</div>';
   els['chat-area'].appendChild(review);
   autoScrollIfAtBottom();
@@ -8859,7 +9598,7 @@ function publicWorkEvent(event) {
   var content = String(event && event.content || '');
   var toolArgs = String(event && event.toolArgs || '');
   if (/<think(?:\s|>)/i.test(content) || /<\/think>/i.test(content) || /<\/?think\b|(?:reasoning_content|thinking_delta)\s*[:：]/i.test(toolArgs)) return false;
-  return ['start', 'text', 'response', 'final_response', 'status', 'tool_call', 'tool_result', 'guide', 'guide_accepted', 'guide_applied', 'guide_deferred', 'guide_rejected', 'done', 'error', 'interrupted', 'force_interrupted'].indexOf(type) >= 0;
+  return ['start', 'text', 'response', 'final_response', 'status', 'tool_call', 'tool_result', 'thought', 'thought_result', 'guide', 'guide_accepted', 'guide_applied', 'guide_deferred', 'guide_rejected', 'done', 'error', 'interrupted', 'force_interrupted'].indexOf(type) >= 0;
 }
 
 function publicToolNameForUi(value) {
@@ -9118,7 +9857,12 @@ function syncWorkRunsSnapshot(runs, target, branchId) {
     return item;
   });
   state.workRunsByBranch[workRunBranchKey(target, selectedBranchId)] = normalized;
-  state.workRunsByTarget[key] = normalized;
+  // 串分支修复：全局显示列表（workRunsByTarget）只在 sync 的分支就是「浏览分支」时
+  // 才更新。当运行分支（runtime）的 streaming 结果到达、而用户正在浏览另一个分支时，
+  // 只按分支存储（workRunsByBranch），不污染当前浏览分支的显示。
+  if (selectedBranchId === branchIds.viewed) {
+    state.workRunsByTarget[key] = normalized;
+  }
   return normalized;
 }
 
@@ -9410,6 +10154,23 @@ function renderWorkToolGroup(event, eventIndex) {
     activityRows + '</div></details>';
 }
 
+function renderWorkThought(event, eventIndex) {
+  var zh = currentLang() === 'zh';
+  var content = String(event.content || '').trim();
+  var completed = !!event.completed;
+  var activityDomKey = String(event.id || ('thought-' + eventIndex));
+  var label = completed ? (zh ? '进行了思考' : 'Thought') : (zh ? '思考中' : 'Thinking');
+  var detailRows = '';
+  if (content) {
+    detailRows = '<div class="conversation-work-thought-text">' + esc(content) + '</div>';
+  } else if (!completed) {
+    detailRows = '<div class="conversation-work-thought-text conversation-work-thought-pending">' + esc(zh ? '正在思考…' : 'Thinking…') + '</div>';
+  }
+  return '<details class="conversation-work-activity conversation-work-thought" data-activity-key="' + escAttr(activityDomKey) + '"><summary>' +
+    iconSvg('brain', 'thought', 'tiny') + '<span>' + esc(label) + '</span>' +
+    '<span class="conversation-work-activity-chevron" aria-hidden="true"></span></summary>' + detailRows + '</details>';
+}
+
 function workEventLabel(event) {
   var type = String(event && event.type || 'status').toLowerCase();
   var content = String(event && event.content || '').trim();
@@ -9514,6 +10275,16 @@ function renderWorkRunEvents(run, includeGuides) {
       }
       if (!rawEvent) continue;
     }
+    if (rawType === 'thought_result') {
+      for (var thoughtPriorIndex = events.length - 1; thoughtPriorIndex >= 0; thoughtPriorIndex--) {
+        var thoughtPrior = events[thoughtPriorIndex];
+        if (String(thoughtPrior && thoughtPrior.type || '').toLowerCase() !== 'thought' || thoughtPrior.completed) continue;
+        events[thoughtPriorIndex] = Object.assign({}, thoughtPrior, { completed: true, content: rawEvent.content || thoughtPrior.content });
+        rawEvent = null;
+        break;
+      }
+      if (!rawEvent) continue;
+    }
     events.push(rawEvent);
   }
   flushPublicText();
@@ -9554,6 +10325,7 @@ function renderWorkRunEvents(run, includeGuides) {
     }
     if (type.indexOf('guide') === 0 || event.guide) return renderWorkRunGuideMessage(event);
     if (type === 'tool_group') return renderWorkToolGroup(event, eventIndex);
+    if (type === 'thought') return renderWorkThought(event, eventIndex);
     var activitySummary = type.indexOf('tool_') === 0 && type !== 'tool_call' && type !== 'tool_result';
     var cls = type.indexOf('guide') === 0 ? ' guide' : (type === 'error' ? ' error' : (activitySummary ? ' activity-summary' : ''));
     var label = activitySummary ? workToolActivityLabel(event.activity, Number(event.count || 1), !!event.completed) : workEventLabel(event) + (event.completed ? (currentLang() === 'zh' ? ' · 已完成' : ' · completed') : '');
@@ -10576,7 +11348,12 @@ function applyConversationSnapshot(s, requestedConversationId) {
     if (s && s.runtimeKey) registerRuntimeKey(snapshotTarget, s.runtimeKey);
     hydrateConversationBranchState(s);
     rebindQueueToRuntimeBranch(snapshotTarget);
-    if (s && Array.isArray(s.workRuns)) syncWorkRunsSnapshot(s.workRuns, snapshotTarget, String(s.activeBranchId || ''));
+    if (s && Array.isArray(s.workRuns)) {
+      var viewedBranchIdForSync = Array.isArray(s.viewedBranchNodePath) && s.viewedBranchNodePath.length
+        ? String(s.viewedBranchNodePath[s.viewedBranchNodePath.length - 1])
+        : '';
+      syncWorkRunsSnapshot(s.workRuns, snapshotTarget, viewedBranchIdForSync || undefined);
+    }
     applyAutoRouteRatingState(s);
     if (s && s.chatMessages) {
       renderChatMessages(s.chatMessages);
@@ -10639,9 +11416,9 @@ function addShellBlock(title, content) {
   var div = document.createElement('div');
   div.className = 'chat-msg assistant';
   div.innerHTML = '<div class="shell-block collapsed">' +
-    '<div class="shell-block-header" onclick="this.parentElement.classList.toggle(\'collapsed\')">' +
+    '<button type="button" class="shell-block-header" aria-expanded="false" onclick="this.parentElement.classList.toggle(\'collapsed\');this.setAttribute(\'aria-expanded\',this.parentElement.classList.contains(\'collapsed\')?\'false\':\'true\')">' +
     '<span class="arrow">&gt;</span> ' + esc(title) +
-    '</div><div class="shell-block-body">' + esc(content) + '</div></div>';
+    '</button><div class="shell-block-body">' + esc(content) + '</div></div>';
   els['chat-area'].appendChild(div);
   autoScrollIfAtBottom();
 }
@@ -10650,10 +11427,10 @@ function addDiffBlock(title, adds, dels, linesHTML) {
   var div = document.createElement('div');
   div.className = 'chat-msg assistant';
   div.innerHTML = '<div class="diff-block collapsed">' +
-    '<div class="diff-block-header" onclick="this.parentElement.classList.toggle(\'collapsed\')">' +
+    '<button type="button" class="diff-block-header" aria-expanded="false" onclick="this.parentElement.classList.toggle(\'collapsed\');this.setAttribute(\'aria-expanded\',this.parentElement.classList.contains(\'collapsed\')?\'false\':\'true\')">' +
     '<span class="arrow">&gt;</span> ' + esc(title) +
     '<span class="diff-stat"><span class="diff-add">+' + adds + '</span><span class="diff-del">-' + dels + '</span></span>' +
-    '</div><div class="diff-block-body">' + linesHTML + '</div></div>';
+    '</button><div class="diff-block-body">' + linesHTML + '</div></div>';
   els['chat-area'].appendChild(div);
   autoScrollIfAtBottom();
 }
@@ -11135,7 +11912,7 @@ window.stopCurrentConversation = async function() {
   return true;
 };
 
-window.submitCurrentAction = function() {
+window.submitCurrentAction = function(source) {
   if (currentFlowRunning() && flowTakeoverMatchesCurrent()) {
     if (!promptHasText()) {
       window.stopFlowRun();
@@ -11170,6 +11947,8 @@ window.submitCurrentAction = function() {
     return;
   }
   if (isCurrentConversationRunning() && !promptHasText()) {
+    // 回车：运行中空输入不操作（打断仅通过 Esc 或点击打断按钮）。
+    if (source === 'enter') return;
     window.stopCurrentConversation();
     return;
   }
@@ -11211,6 +11990,98 @@ window.renderContextWindow = function() {
   ring.style.mask = 'radial-gradient(farthest-side, transparent 58%, #000 60%)';
   var status = c.warning === 'over_limit' ? t('status.contextOverLimit') : (c.warning === 'near_limit' ? t('status.contextNearLimit') : t('status.contextTokens'));
   ring.title = status + ': ' + used + ' / ' + max;
+  if (window.renderContextInspector) window.renderContextInspector();
+};
+
+function contextInspectorValue(value) {
+  var number = Number(value);
+  return Number.isFinite(number) ? Math.max(0, Math.round(number)) : 0;
+}
+
+function contextInspectorCell(label, value) {
+  return '<div class="context-inspector-cell"><span class="context-inspector-label">' + esc(label) + '</span><span class="context-inspector-value">' + esc(value) + '</span></div>';
+}
+
+window.renderContextInspector = function() {
+  var panel = document.getElementById('context-inspector');
+  var ring = els['context-token-ring'] || document.getElementById('context-token-ring');
+  if (!panel || !ring) return;
+  ring.setAttribute('aria-expanded', state.contextInspectorOpen ? 'true' : 'false');
+  panel.classList.toggle('open', state.contextInspectorOpen);
+  if (!state.contextInspectorOpen) {
+    panel.innerHTML = '';
+    return;
+  }
+  var c = state.contextWindow || {};
+  var max = Math.max(1, contextInspectorValue(c.maxTokens) || 1);
+  var used = contextInspectorValue(c.estimatedTokens);
+  var active = contextInspectorValue(c.buildBlockTokens);
+  var history = contextInspectorValue(c.longHistoryTokens);
+  var activeTrigger = contextInspectorValue(c.buildBlockTriggerTokens);
+  var historyTrigger = contextInspectorValue(c.longHistoryTriggerTokens);
+  var activeRetention = contextInspectorValue(c.buildBlockRetentionTokens);
+  var historyRetention = contextInspectorValue(c.longHistoryRetentionTokens);
+  var percent = Math.min(100, Math.round((used / max) * 100));
+  var fillColor = c.warning === 'over_limit' ? 'var(--nm-state-danger)' : (c.warning === 'near_limit' ? 'var(--nm-state-warning)' : 'var(--accent)');
+  var compression = state.contextCompression || null;
+  var last = compression
+    ? ((compression.fallback ? t('status.contextModeFallback') : t('status.contextModeModel')) + ' · ' + String(compression.originalMessages || 0) + ' → ' + String(compression.compressedMessages || 0) + ' ' + t('status.messages'))
+    : t('status.noCompressionShort');
+  var busy = !!state.contextMutationPending;
+  var running = typeof isCurrentConversationRunning === 'function' && isCurrentConversationRunning();
+  panel.innerHTML = '<div class="context-inspector-head"><div><div class="context-inspector-title">' + esc(t('status.contextInspector')) + '</div><div class="context-inspector-subtitle">' + esc(t('status.contextInspectorHint')) + '</div></div>' +
+    '<button type="button" class="context-inspector-close" onclick="window.closeContextInspector()" aria-label="' + esc(t('common.close') || 'Close') + '">×</button></div>' +
+    '<div class="context-inspector-meter"><div class="context-inspector-meter-fill" style="width:' + percent + '%;background:' + fillColor + '"></div></div>' +
+    '<div class="context-inspector-grid">' +
+      contextInspectorCell(t('status.contextTokens'), used + ' / ' + max) +
+      contextInspectorCell(t('status.activeBuild'), active + ' / ' + activeTrigger) +
+      contextInspectorCell(t('status.longHistory'), history + ' / ' + historyTrigger) +
+      contextInspectorCell(t('status.retention'), activeRetention + ' + ' + historyRetention) +
+      contextInspectorCell(t('status.hotCache'), contextInspectorValue(c.cacheEntries) + ' entries') +
+      contextInspectorCell(t('status.coldArchive'), contextInspectorValue(c.archiveEntries) + ' entries') +
+    '</div>' +
+    '<div class="context-inspector-section"><div class="context-inspector-section-title">' + esc(t('status.lastCompression')) + '</div><div class="context-inspector-meta">' + esc(last) + '</div>' +
+      (compression && compression.model ? '<div class="context-inspector-meta">' + esc(compression.model) + '</div>' : '') + '</div>' +
+    '<div class="context-inspector-actions"><button type="button" class="sec-btn primary" onclick="window.compressContextNow()"' + (busy || running ? ' disabled' : '') + '>' + esc(busy ? t('status.compressing') : t('status.compressNow')) + '</button></div>';
+};
+
+window.closeContextInspector = function() {
+  state.contextInspectorOpen = false;
+  window.renderContextInspector();
+};
+
+window.toggleContextInspector = function() {
+  state.contextInspectorOpen = !state.contextInspectorOpen;
+  window.hideContextWindowTooltip();
+  window.renderContextInspector();
+};
+
+window.compressContextNow = function() {
+  if (state.contextMutationPending) return;
+  if (typeof isCurrentConversationRunning === 'function' && isCurrentConversationRunning()) {
+    showUiNotice(t('status.compressionBusy'), 'error', 'context-compress-busy');
+    return;
+  }
+  if (!api.compressContext) {
+    showUiNotice(t('status.compressionFailed'), 'error', 'context-compress-unavailable');
+    return;
+  }
+  state.contextMutationPending = true;
+  window.renderContextInspector();
+  Promise.resolve(api.compressContext({ target: currentConversationTarget(), force: true })).then(function(result) {
+    if (!result || result.ok === false) throw new Error((result && result.error) || t('status.compressionFailed'));
+    if (result.contextWindow) state.contextWindow = result.contextWindow;
+    if (result.contextCompression !== undefined) state.contextCompression = result.contextCompression;
+    window.renderContextWindow();
+    window.renderRightStatusPanel();
+    showUiNotice(t('status.compressedNow'), 'success', 'context-compress-success');
+    return result;
+  }).catch(function(error) {
+    showUiNotice(error && error.message ? error.message : t('status.compressionFailed'), 'error', 'context-compress-error');
+  }).finally(function() {
+    state.contextMutationPending = false;
+    window.renderContextInspector();
+  });
 };
 
 window.contextWindowTooltipHtml = function() {
@@ -11831,6 +12702,7 @@ window.renderQueuePanel = function() {
   }
   var toggle = panel.querySelector('#queue-expand-btn');
   if (toggle) {
+    toggle.setAttribute('aria-expanded', state.queueCollapsed ? 'false' : 'true');
     toggle.title = state.queueCollapsed ? t('queue.expand') : t('queue.collapse');
     toggle.innerHTML = iconSvg(state.queueCollapsed ? 'chevron-up' : 'chevron-down', toggle.title, 'tiny');
   }
@@ -12120,7 +12992,14 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
   var displayText = optimisticAttachments.length
     ? rawText + (rawText ? '\n\n' : '') + '[' + optimisticAttachments.length + ' image attachment' + (optimisticAttachments.length === 1 ? '' : 's') + ']'
     : text;
-  if (!text && !optimisticAttachments.length) return;
+  if (!text && !optimisticAttachments.length) {
+    // 空输入时发送默认句段「继续 / Continue」，按界面语言切换。
+    var continuePhrase = t('input.continue');
+    rawText = continuePhrase;
+    text = continuePhrase;
+    requestMessage = continuePhrase;
+    displayText = continuePhrase;
+  }
 
   var lockedConversationId = activeConversationId();
   var lockedTarget = currentConversationTarget(lockedConversationId);
@@ -12868,19 +13747,25 @@ window.toggleBottom = function() {
 };
 
 // === Right Sidebar Tabs ===
+function rightTabButtonHtml(tab, icon, label, active) {
+  return '<button class="tab-btn' + (active ? ' active' : '') + '" id="right-tab-' + tab + '" role="tab" aria-selected="' + (active ? 'true' : 'false') + '" aria-controls="panel-' + tab + '" tabindex="' + (active ? '0' : '-1') + '" data-tab="' + tab + '" onclick="window.switchRightTab(&quot;' + tab + '&quot;)" onkeydown="window.handleRightTabKey(event)" title="' + escAttr(label) + '">' + iconOnly(icon, label) + '</button>';
+}
+
 window.upgradeRightSidebar = function() {
   var rightTabs = els['right-tabs'] || document.getElementById('right-tabs');
   var rightContent = els['right-content'] || document.getElementById('right-content');
   if (!rightTabs || !rightContent || rightTabs.getAttribute('data-upgraded') === 'true') return;
   rightTabs.setAttribute('data-upgraded', 'true');
+  rightTabs.setAttribute('role', 'tablist');
+  rightTabs.setAttribute('aria-label', t('right.files'));
   rightTabs.innerHTML =
-    '<button class="tab-btn active" data-tab="file-tree" onclick="window.switchRightTab(&quot;file-tree&quot;)" title="' + escAttr(t('right.files')) + '">' + iconOnly('folder', t('right.files')) + '</button>' +
-    '<button class="tab-btn" data-tab="editor" onclick="window.switchRightTab(&quot;editor&quot;)" title="' + escAttr(t('right.editor')) + '">' + iconOnly('square-pen', t('right.editor')) + '</button>' +
-    '<button class="tab-btn" data-tab="plan" onclick="window.switchRightTab(&quot;plan&quot;)" title="' + escAttr(t('right.plan')) + '">' + iconOnly('list-checks', t('right.plan')) + '</button>' +
-    '<button class="tab-btn" data-tab="subagent" onclick="window.switchRightTab(&quot;subagent&quot;)" title="' + escAttr(t('right.subagents')) + '">' + iconOnly('bot', t('right.subagents')) + '</button>' +
-    '<button class="tab-btn" data-tab="browser" onclick="window.switchRightTab(&quot;browser&quot;)" title="' + escAttr(t('right.browser')) + '">' + iconOnly('globe', t('right.browser')) + '</button>' +
-    '<button class="tab-btn" data-tab="status" onclick="window.switchRightTab(&quot;status&quot;)" title="' + escAttr(t('right.status')) + '">' + iconOnly('activity', t('right.status')) + '</button>' +
-    '<button class="tab-btn" data-tab="archives" onclick="window.switchRightTab(&quot;archives&quot;)" title="' + escAttr(t('right.archives')) + '">' + iconOnly('archive', t('right.archives')) + '</button>' +
+    rightTabButtonHtml('file-tree', 'folder', t('right.files'), state.rightTab === 'file-tree') +
+    rightTabButtonHtml('editor', 'square-pen', t('right.editor'), state.rightTab === 'editor') +
+    rightTabButtonHtml('plan', 'list-checks', t('right.plan'), state.rightTab === 'plan') +
+    rightTabButtonHtml('subagent', 'bot', t('right.subagents'), state.rightTab === 'subagent') +
+    rightTabButtonHtml('browser', 'globe', t('right.browser'), state.rightTab === 'browser') +
+    rightTabButtonHtml('status', 'activity', t('right.status'), state.rightTab === 'status') +
+    rightTabButtonHtml('archives', 'archive', t('right.archives'), state.rightTab === 'archives') +
     '<div class="tab-divider"></div>' +
     '<button class="tab-btn" onclick="window.toggleRight()" title="' + escAttr(t('right.close')) + '">' + iconOnly('x', t('right.close')) + '</button>';
 
@@ -12888,7 +13773,7 @@ window.upgradeRightSidebar = function() {
   if (filePanel && !filePanel.getAttribute('data-upgraded')) {
     filePanel.setAttribute('data-upgraded', 'true');
     var tree = document.getElementById('file-tree-container');
-    filePanel.innerHTML = '<div class="right-section-head"><span class="right-section-title">' + esc(t('right.fileTree')) + '</span><button class="archive-action-btn" onclick="window.loadFileTree()">' + esc(t('right.refresh')) + '</button></div><div id="file-tree-container"></div>';
+    filePanel.innerHTML = '<div class="right-section-head"><span class="right-section-title">' + esc(t('right.fileTree')) + '</span><button class="archive-action-btn" onclick="window.loadFileTree()">' + esc(t('right.refresh')) + '</button></div><div id="file-tree-container" role="tree"></div>';
     if (tree) document.getElementById('file-tree-container').innerHTML = tree.innerHTML;
   }
   var subPanel = document.getElementById('panel-subagent');
@@ -12919,6 +13804,14 @@ window.upgradeRightSidebar = function() {
     archivesPanel.innerHTML = '<div class="right-section-head"><span class="right-section-title">' + esc(t('right.archives')) + '</span><button class="archive-action-btn" onclick="window.refreshRightArchives()">' + esc(t('right.refresh')) + '</button></div><div style="display:flex;gap:6px;margin-bottom:8px;"><button class="sec-btn primary" style="flex:1;" onclick="window.archiveCurrent()">' + esc(t('archive.current')) + '</button></div><div id="right-archive-list"></div>';
     rightContent.appendChild(archivesPanel);
   }
+  var upgradedPanels = rightContent.querySelectorAll('.tab-panel');
+  for (var upgradedIndex = 0; upgradedIndex < upgradedPanels.length; upgradedIndex++) {
+    var upgradedPanel = upgradedPanels[upgradedIndex];
+    var upgradedTab = upgradedPanel.id.replace(/^panel-/, '');
+    upgradedPanel.setAttribute('role', 'tabpanel');
+    upgradedPanel.setAttribute('aria-labelledby', 'right-tab-' + upgradedTab);
+    upgradedPanel.hidden = upgradedTab !== state.rightTab;
+  }
 };
 
 window.switchRightTab = function(tab) {
@@ -12932,11 +13825,16 @@ window.switchRightTab = function(tab) {
   if (!rightTabs || !rightContent) return;
   var btns = rightTabs.querySelectorAll('.tab-btn[data-tab]');
   for (var i = 0; i < btns.length; i++) {
-    btns[i].classList.toggle('active', btns[i].getAttribute('data-tab') === tab);
+    var selected = btns[i].getAttribute('data-tab') === tab;
+    btns[i].classList.toggle('active', selected);
+    btns[i].setAttribute('aria-selected', selected ? 'true' : 'false');
+    btns[i].tabIndex = selected ? 0 : -1;
   }
   var panels = rightContent.querySelectorAll('.tab-panel');
   for (var j = 0; j < panels.length; j++) {
-    panels[j].classList.toggle('active', panels[j].id === 'panel-' + tab);
+    var panelActive = panels[j].id === 'panel-' + tab;
+    panels[j].classList.toggle('active', panelActive);
+    panels[j].hidden = !panelActive;
   }
   // Load content on first access
   if (tab === 'file-tree') window.loadFileTree();
@@ -13028,7 +13926,7 @@ window.renderConversationPlan = function() {
   var plan = normalizeConversationPlan(state.conversationPlan);
   var items = plan.items || [];
   var html = '<div class="plan-compose">' +
-    '<input id="conversation-plan-input" class="plan-input" placeholder="' + escAttr(t('plan.placeholder')) + '" onkeydown="if(event.key===&quot;Enter&quot;)window.addConversationPlanItem()">' +
+    '<input id="conversation-plan-input" class="plan-input" placeholder="' + escAttr(t('plan.placeholder')) + '" onkeydown="if(event.key===&quot;Enter&quot;&amp;&amp;!event.isComposing&amp;&amp;event.key!==&quot;Process&quot;&amp;&amp;event.keyCode!==229)window.addConversationPlanItem()">' +
     '<button class="sec-btn primary" onclick="window.addConversationPlanItem()">' + esc(t('plan.add')) + '</button>' +
     '</div>';
   if (!items.length) {
@@ -13096,7 +13994,7 @@ window.editConversationPlanItem = function(idx) {
   var rows = target.querySelectorAll('.plan-row');
   var row = rows[idx];
   if (!row) return;
-  row.querySelector('.right-row-body').innerHTML = '<input class="plan-edit-input" id="conversation-plan-edit-' + idx + '" value="' + escAttr(item.text) + '" onkeydown="if(event.key===&quot;Enter&quot;)window.saveConversationPlanEdit(' + idx + ')">';
+  row.querySelector('.right-row-body').innerHTML = '<input class="plan-edit-input" id="conversation-plan-edit-' + idx + '" value="' + escAttr(item.text) + '" onkeydown="if(event.key===&quot;Enter&quot;&amp;&amp;!event.isComposing&amp;&amp;event.key!==&quot;Process&quot;&amp;&amp;event.keyCode!==229)window.saveConversationPlanEdit(' + idx + ')">';
   var actions = row.querySelector('.plan-actions');
   if (actions) {
     actions.innerHTML = '<button class="archive-action-btn" onclick="window.saveConversationPlanEdit(' + idx + ')">' + esc(t('common.save')) + '</button>' +
@@ -13247,6 +14145,8 @@ window.renderRightStatusPanel = function() {
   if (contextWindow) {
     html += '<div class="right-row"><div class="right-row-body"><span class="right-row-title">' + esc(t('status.contextTokens')) + '</span><span class="right-row-meta">' +
       esc(String(contextWindow.estimatedTokens || 0) + ' / ' + String(contextWindow.maxTokens || 0) + ' | ' + String(contextWindow.warning || 'ok')) +
+      (contextWindow.buildBlockTokens !== undefined ? '<br>' + esc(t('status.activeBuild')) + ': ' + esc(String(contextWindow.buildBlockTokens || 0) + ' / ' + String(contextWindow.buildBlockTriggerTokens || 0)) +
+        ' · ' + esc(t('status.longHistory')) + ': ' + esc(String(contextWindow.longHistoryTokens || 0) + ' / ' + String(contextWindow.longHistoryTriggerTokens || 0)) : '') +
       '</span></div></div>';
   }
   if (compression) {
@@ -13470,6 +14370,35 @@ window.spawnTerminal = function(shellId, options) {
   return window.addTerminalTab(shellId, options);
 };
 
+window.handleTerminalTabKey = function(event) {
+  if (!event || event.defaultPrevented || event.isComposing || event.key === 'Process' || event.keyCode === 229 || event.target !== event.currentTarget) return false;
+  var tabs = Array.prototype.slice.call(document.querySelectorAll('#terminal-tabs .terminal-tab'));
+  var index = tabs.indexOf(event.currentTarget);
+  if (index < 0 || !tabs.length) return false;
+  var next = index;
+  if (event.key === 'ArrowRight') next = (index + 1) % tabs.length;
+  else if (event.key === 'ArrowLeft') next = (index - 1 + tabs.length) % tabs.length;
+  else if (event.key === 'Home') next = 0;
+  else if (event.key === 'End') next = tabs.length - 1;
+  else if (event.key === 'Enter' || event.key === ' ') next = index;
+  else if (event.key === 'Delete') {
+    event.preventDefault();
+    var closingId = parseInt(tabs[index].getAttribute('data-tab-id'), 10);
+    window.closeTerminalTab(closingId);
+    requestAnimationFrame(function() {
+      var activeTab = document.querySelector('#terminal-tabs .terminal-tab.active') || document.querySelector('#terminal-tabs .terminal-tab');
+      if (activeTab) activeTab.focus({ preventScroll:true });
+    });
+    return true;
+  }
+  else return false;
+  event.preventDefault();
+  var tabId = parseInt(tabs[next].getAttribute('data-tab-id'), 10);
+  window.switchTerminalTab(tabId);
+  tabs[next].focus({ preventScroll:true });
+  return true;
+};
+
 window.addTerminalTab = function(shellId, options) {
   options = options || {};
   shellId = normalizeTerminalShell(shellId || state._terminalShell);
@@ -13487,13 +14416,23 @@ window.addTerminalTab = function(shellId, options) {
   // Create tab button
   var tab = document.createElement('div');
   tab.className = 'terminal-tab active';
+  tab.id = 'terminal-tab-' + tabId;
+  tab.setAttribute('role', 'tab');
+  tab.setAttribute('aria-selected', 'true');
+  tab.setAttribute('aria-controls', 'terminal-pane-' + tabId);
+  tab.tabIndex = 0;
   tab.setAttribute('data-tab-id', tabId);
-  tab.innerHTML = name + '<button class="close-tab" onclick="event.stopPropagation();window.closeTerminalTab(' + tabId + ')" title="' + escAttr(t('common.closeTab')) + '">' + iconSvg('x', t('common.closeTab'), 'tiny') + '</button>';
+  tab.innerHTML = name + '<button type="button" class="close-tab" onclick="event.stopPropagation();window.closeTerminalTab(' + tabId + ')" title="' + escAttr(t('common.closeTab')) + '">' + iconSvg('x', t('common.closeTab'), 'tiny') + '</button>';
   tab.onclick = function() { window.switchTerminalTab(tabId); };
+  tab.addEventListener('keydown', window.handleTerminalTabKey);
 
   // Deactivate all other tabs
   var allTabs = tabsContainer.querySelectorAll('.terminal-tab');
-  for (var i = 0; i < allTabs.length; i++) allTabs[i].classList.remove('active');
+  for (var i = 0; i < allTabs.length; i++) {
+    allTabs[i].classList.remove('active');
+    allTabs[i].setAttribute('aria-selected', 'false');
+    allTabs[i].tabIndex = -1;
+  }
 
   tabsContainer.appendChild(tab);
 
@@ -13501,18 +14440,20 @@ window.addTerminalTab = function(shellId, options) {
   var pane = document.createElement('div');
   pane.className = 'terminal-pane active';
   pane.id = 'terminal-pane-' + tabId;
+  pane.setAttribute('role', 'tabpanel');
+  pane.setAttribute('aria-labelledby', tab.id);
   pane.setAttribute('data-tab-id', tabId);
   pane.setAttribute('data-session', '');
   pane.innerHTML =
     '<div class="terminal-output"><span style="color:var(--accent2);">Connecting ' + shellId + '...</span>\r\n</div>' +
     '<div class="terminal-input-row">' +
     '<span class="terminal-prompt">' + shellLabel + '></span>' +
-    '<input class="terminal-input" type="text" placeholder="Enter command..." onkeydown="if(event.key===\'Enter\')window.terminalSend()">' +
+    '<input class="terminal-input" type="text" placeholder="Enter command..." onkeydown="if(event.key===\'Enter\'&&!event.isComposing&&event.key!==\'Process\'&&event.keyCode!==229)window.terminalSend()">' +
     '</div>';
 
   // Deactivate all other panes
   var allPanes = body.querySelectorAll('.terminal-pane');
-  for (var j = 0; j < allPanes.length; j++) allPanes[j].classList.remove('active');
+  for (var j = 0; j < allPanes.length; j++) { allPanes[j].classList.remove('active'); allPanes[j].hidden = true; }
 
   body.appendChild(pane);
 
@@ -13563,21 +14504,33 @@ window.ensureTerminalTakeoverPane = function(session) {
 
   var tab = document.createElement('div');
   tab.className = 'terminal-tab agent-takeover marquee-border';
+  tab.id = 'terminal-tab-' + tabId;
+  tab.setAttribute('role', 'tab');
+  tab.setAttribute('aria-selected', 'true');
+  tab.setAttribute('aria-controls', 'terminal-pane-' + tabId);
+  tab.tabIndex = 0;
   tab.setAttribute('data-tab-id', tabId);
   tab.setAttribute('data-takeover-session', key);
   tab.setAttribute('data-takeover-workspace-id', session.workspaceId || '');
   tab.setAttribute('data-takeover-conversation', session.conversationId || 'default');
-  tab.innerHTML = 'Agent:' + esc(session.name || key) + '<button class="close-tab" onclick="event.stopPropagation();window.closeTerminalTab(' + tabId + ')" title="' + escAttr(t('common.closeTab')) + '">' + iconSvg('x', t('common.closeTab'), 'tiny') + '</button>';
+  tab.innerHTML = 'Agent:' + esc(session.name || key) + '<button type="button" class="close-tab" onclick="event.stopPropagation();window.closeTerminalTab(' + tabId + ')" title="' + escAttr(t('common.closeTab')) + '">' + iconSvg('x', t('common.closeTab'), 'tiny') + '</button>';
   tab.onclick = function() { window.switchTerminalTab(tabId); };
+  tab.addEventListener('keydown', window.handleTerminalTabKey);
 
   var allTabs = tabsContainer.querySelectorAll('.terminal-tab');
-  for (var i = 0; i < allTabs.length; i++) allTabs[i].classList.remove('active');
+  for (var i = 0; i < allTabs.length; i++) {
+    allTabs[i].classList.remove('active');
+    allTabs[i].setAttribute('aria-selected', 'false');
+    allTabs[i].tabIndex = -1;
+  }
   tab.classList.add('active');
   tabsContainer.appendChild(tab);
 
   var pane = document.createElement('div');
   pane.className = 'terminal-pane active agent-takeover marquee-border';
   pane.id = 'terminal-pane-' + tabId;
+  pane.setAttribute('role', 'tabpanel');
+  pane.setAttribute('aria-labelledby', tab.id);
   pane.setAttribute('data-tab-id', tabId);
   pane.setAttribute('data-session', '');
   pane.setAttribute('data-takeover-session', key);
@@ -13589,11 +14542,11 @@ window.ensureTerminalTakeoverPane = function(session) {
     '<div class="terminal-output"></div>' +
     '<div class="terminal-input-row">' +
     '<span class="terminal-prompt">Agent&gt;</span>' +
-    '<input class="terminal-input" type="text" placeholder="Enter command..." onkeydown="if(event.key===\'Enter\')window.terminalSend()">' +
+    '<input class="terminal-input" type="text" placeholder="Enter command..." onkeydown="if(event.key===\'Enter\'&&!event.isComposing&&event.key!==\'Process\'&&event.keyCode!==229)window.terminalSend()">' +
     '</div>';
 
   var allPanes = body.querySelectorAll('.terminal-pane');
-  for (var j = 0; j < allPanes.length; j++) allPanes[j].classList.remove('active');
+  for (var j = 0; j < allPanes.length; j++) { allPanes[j].classList.remove('active'); allPanes[j].hidden = true; }
   body.appendChild(pane);
   tabsContainer.scrollLeft = tabsContainer.scrollWidth;
   window.switchTerminalTab(tabId);
@@ -13688,12 +14641,17 @@ window.switchTerminalTab = function(tabId) {
   // Update tabs
   var allTabs = document.querySelectorAll('.terminal-tab');
   for (var i = 0; i < allTabs.length; i++) {
-    allTabs[i].classList.toggle('active', parseInt(allTabs[i].getAttribute('data-tab-id')) === tabId);
+    var selected = parseInt(allTabs[i].getAttribute('data-tab-id')) === tabId;
+    allTabs[i].classList.toggle('active', selected);
+    allTabs[i].setAttribute('aria-selected', selected ? 'true' : 'false');
+    allTabs[i].tabIndex = selected ? 0 : -1;
   }
   // Update panes
   var allPanes = document.querySelectorAll('.terminal-pane');
   for (var j = 0; j < allPanes.length; j++) {
-    allPanes[j].classList.toggle('active', parseInt(allPanes[j].getAttribute('data-tab-id')) === tabId);
+    var active = parseInt(allPanes[j].getAttribute('data-tab-id')) === tabId;
+    allPanes[j].classList.toggle('active', active);
+    allPanes[j].hidden = !active;
   }
   // Update active session
   var activePane = document.querySelector('.terminal-pane.active');
@@ -13879,6 +14837,7 @@ function renderTodo() {
   label.textContent = t('goal.list') + (items.length ? ' ' + items.length : '');
   var toggle = wrap.querySelector('#todo-header .stack-icon-btn');
   if (toggle) {
+    toggle.setAttribute('aria-expanded', state.todoCollapsed ? 'false' : 'true');
     var title = state.todoCollapsed ? t('queue.expand') : t('queue.collapse');
     toggle.title = title;
     toggle.innerHTML = iconSvg(state.todoCollapsed ? 'chevron-up' : 'chevron-down', title, 'tiny');
@@ -13891,10 +14850,10 @@ function renderTodo() {
   for (var i = 0; i < items.length; i++) {
     var item = items[i];
     var done = item.status === 'done';
-    html += '<div class="todo-item ' + (done ? 'done' : '') + '" onclick="window.checkTodo(' + i + ')" title="' + escAttr(item.text) + '">' +
+    html += '<button type="button" class="todo-item ' + (done ? 'done' : '') + '" onclick="window.checkTodo(' + i + ')" title="' + escAttr(item.text) + '" aria-pressed="' + (done ? 'true' : 'false') + '">' +
       '<span class="todo-check">' + (done ? iconSvg('check', 'done', 'tiny') : '') + '</span>' +
       '<span class="todo-text">' + esc(item.text) + '</span>' +
-    '</div>';
+    '</button>';
   }
   list.innerHTML = html;
 }
@@ -13995,8 +14954,61 @@ window.setInputMode = function(mode, persist) {
 };
 
 // === Sub-Window System ===
+var subWindowOriginFocus = null;
+function newmarkFocusableElements(container) {
+  if (!container || !container.querySelectorAll) return [];
+  return Array.prototype.slice.call(container.querySelectorAll('button:not([disabled]), [href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [contenteditable="true"], [tabindex]:not([tabindex="-1"])')).filter(function(element) {
+    return !element.hidden && element.getAttribute('aria-hidden') !== 'true' && element.getClientRects().length > 0;
+  });
+}
+
+function focusSubWindowInitial() {
+  var dialog = els['sub-win'];
+  if (!dialog || !els['sub-win-overlay'].classList.contains('open')) return;
+  var body = els['sub-win-body'];
+  var target = body && (body.querySelector('[autofocus]') || newmarkFocusableElements(body)[0]);
+  if (!target) target = dialog.querySelector('.sub-win-close') || dialog;
+  if (target && typeof target.focus === 'function') target.focus({ preventScroll: true });
+}
+
+function updateApplicationInertState() {
+  var commandOpen = !!(document.getElementById('command-surface-overlay') && document.getElementById('command-surface-overlay').classList.contains('open'));
+  var subWindowOpen = !!(els['sub-win-overlay'] && els['sub-win-overlay'].classList.contains('open'));
+  var topbar = document.getElementById('topbar');
+  var main = document.getElementById('main');
+  if (topbar) topbar.inert = commandOpen || subWindowOpen;
+  if (main) main.inert = commandOpen || subWindowOpen;
+  if (els['sub-win-overlay']) els['sub-win-overlay'].inert = commandOpen;
+}
+window.updateApplicationInertState = updateApplicationInertState;
+
+function trapNewmarkDialogFocus(event, container) {
+  if (!event || event.key !== 'Tab' || !container) return false;
+  var items = newmarkFocusableElements(container);
+  if (!items.length) {
+    event.preventDefault();
+    if (typeof container.focus === 'function') container.focus();
+    return true;
+  }
+  var first = items[0];
+  var last = items[items.length - 1];
+  var active = document.activeElement;
+  if (event.shiftKey && (active === first || !container.contains(active))) {
+    event.preventDefault();
+    last.focus();
+    return true;
+  }
+  if (!event.shiftKey && (active === last || !container.contains(active))) {
+    event.preventDefault();
+    first.focus();
+    return true;
+  }
+  return false;
+}
+
 window.openSubWin = function(title, html) {
   var overlayOpen = els['sub-win-overlay'].classList.contains('open');
+  if (!overlayOpen && document.activeElement && typeof document.activeElement.focus === 'function') subWindowOriginFocus = document.activeElement;
   if (overlayOpen && !state.restoringSubWindow && state.activeSubWindowView) {
     if (!state.subWindowStack) state.subWindowStack = [];
     state.subWindowStack.push({
@@ -14010,6 +15022,25 @@ window.openSubWin = function(title, html) {
   els['sub-win-body'].innerHTML = html;
   els['sub-win'].classList.toggle('memory-lab-window', !!(state.activeSubWindowView && state.activeSubWindowView.name === 'memoryLab'));
   els['sub-win-overlay'].classList.add('open');
+  updateApplicationInertState();
+  requestAnimationFrame(focusSubWindowInitial);
+};
+
+window.handleRightTabKey = function(event) {
+  if (!event) return;
+  var tabs = Array.prototype.slice.call((els['right-tabs'] || document).querySelectorAll('.tab-btn[data-tab]'));
+  var index = tabs.indexOf(event.currentTarget);
+  if (index < 0) return;
+  var next = index;
+  if (event.key === 'ArrowRight') next = (index + 1) % tabs.length;
+  else if (event.key === 'ArrowLeft') next = (index - 1 + tabs.length) % tabs.length;
+  else if (event.key === 'Home') next = 0;
+  else if (event.key === 'End') next = tabs.length - 1;
+  else return;
+  event.preventDefault();
+  var tab = tabs[next].getAttribute('data-tab');
+  window.switchRightTab(tab);
+  tabs[next].focus();
 };
 
 window.closeSubWin = function() {
@@ -14023,6 +15054,7 @@ window.closeSubWin = function() {
     requestAnimationFrame(function() {
       els['sub-win-body'].scrollTop = previous.scrollTop || 0;
       state.restoringSubWindow = false;
+      focusSubWindowInitial();
     });
     return;
   }
@@ -14030,6 +15062,12 @@ window.closeSubWin = function() {
   state.activeSubWindowView = null;
   var win = els['sub-win'];
   if (win) { win.classList.remove('memory-lab-window'); win.style.left = ''; win.style.top = ''; win.style.margin = ''; }
+  var restoreFocus = subWindowOriginFocus;
+  subWindowOriginFocus = null;
+  updateApplicationInertState();
+  requestAnimationFrame(function() {
+    if (restoreFocus && restoreFocus.isConnected && typeof restoreFocus.focus === 'function') restoreFocus.focus({ preventScroll: true });
+  });
 };
 
 function rerenderActiveSubWindowForLanguage() {
@@ -14078,19 +15116,19 @@ window.openSettings = function(tab) {
   var activeTab = tab || state.settingsActiveTab || 'general';
   var refreshingSettings = els['sub-win-overlay'].classList.contains('open') && state.activeSubWindowView && state.activeSubWindowView.name === 'settings';
   window._settingsTabCache = window._settingsTabCache || {};
-  var html = '<div class="settings-tabs">' +
-    '<button class="stab-btn" data-stab="general" onclick="window.settingsTab(\'general\')">' + esc(t('settings.general')) + '</button>' +
-    '<button class="stab-btn" data-stab="models" onclick="window.settingsTab(\'models\')">' + esc(t('settings.models')) + '</button>' +
-    '<button class="stab-btn" data-stab="tools" onclick="window.settingsTab(\'tools\')">' + esc(t('settings.tools')) + '</button>' +
-    '<button class="stab-btn" data-stab="archive" onclick="window.settingsTab(\'archive\')">' + esc(t('settings.archive')) + '</button>' +
-    '<button class="stab-btn" data-stab="updates" onclick="window.settingsTab(\'updates\')">' + esc(t('settings.updates')) + '</button>' +
+  var html = '<div class="settings-tabs" role="tablist" aria-label="' + escAttr(t('settings.title')) + '">' +
+    '<button class="stab-btn" id="settings-tab-general" role="tab" aria-controls="stab-general" data-stab="general" onclick="window.settingsTab(\'general\')" onkeydown="window.handleSettingsTabKey(event)">' + esc(t('settings.general')) + '</button>' +
+    '<button class="stab-btn" id="settings-tab-models" role="tab" aria-controls="stab-models" data-stab="models" onclick="window.settingsTab(\'models\')" onkeydown="window.handleSettingsTabKey(event)">' + esc(t('settings.models')) + '</button>' +
+    '<button class="stab-btn" id="settings-tab-tools" role="tab" aria-controls="stab-tools" data-stab="tools" onclick="window.settingsTab(\'tools\')" onkeydown="window.handleSettingsTabKey(event)">' + esc(t('settings.tools')) + '</button>' +
+    '<button class="stab-btn" id="settings-tab-archive" role="tab" aria-controls="stab-archive" data-stab="archive" onclick="window.settingsTab(\'archive\')" onkeydown="window.handleSettingsTabKey(event)">' + esc(t('settings.archive')) + '</button>' +
+    '<button class="stab-btn" id="settings-tab-updates" role="tab" aria-controls="stab-updates" data-stab="updates" onclick="window.settingsTab(\'updates\')" onkeydown="window.handleSettingsTabKey(event)">' + esc(t('settings.updates')) + '</button>' +
     '</div>' +
-    '<div class="stab-panel" id="stab-general" data-lazy="1"></div>' +
+    '<div class="stab-panel" id="stab-general" role="tabpanel" aria-labelledby="settings-tab-general" data-lazy="1"></div>' +
     // Lazy: only render active tab on open; others render on first click
-    (activeTab === 'models' ? '<div class="stab-panel" id="stab-models">' + renderModelSettings() + '</div>' : '<div class="stab-panel" id="stab-models" data-lazy="1"></div>') +
-    (activeTab === 'tools' ? '<div class="stab-panel" id="stab-tools">' + renderToolSettings() + '</div>' : '<div class="stab-panel" id="stab-tools" data-lazy="1"></div>') +
-    (activeTab === 'archive' ? '<div class="stab-panel" id="stab-archive">' + renderArchiveSettings() + '</div>' : '<div class="stab-panel" id="stab-archive" data-lazy="1"></div>') +
-    (activeTab === 'updates' ? '<div class="stab-panel" id="stab-updates">' + renderUpdateSettings() + '</div>' : '<div class="stab-panel" id="stab-updates" data-lazy="1"></div>');
+    (activeTab === 'models' ? '<div class="stab-panel" id="stab-models" role="tabpanel" aria-labelledby="settings-tab-models">' + renderModelSettings() + '</div>' : '<div class="stab-panel" id="stab-models" role="tabpanel" aria-labelledby="settings-tab-models" data-lazy="1"></div>') +
+    (activeTab === 'tools' ? '<div class="stab-panel" id="stab-tools" role="tabpanel" aria-labelledby="settings-tab-tools">' + renderToolSettings() + '</div>' : '<div class="stab-panel" id="stab-tools" role="tabpanel" aria-labelledby="settings-tab-tools" data-lazy="1"></div>') +
+    (activeTab === 'archive' ? '<div class="stab-panel" id="stab-archive" role="tabpanel" aria-labelledby="settings-tab-archive">' + renderArchiveSettings() + '</div>' : '<div class="stab-panel" id="stab-archive" role="tabpanel" aria-labelledby="settings-tab-archive" data-lazy="1"></div>') +
+    (activeTab === 'updates' ? '<div class="stab-panel" id="stab-updates" role="tabpanel" aria-labelledby="settings-tab-updates">' + renderUpdateSettings() + '</div>' : '<div class="stab-panel" id="stab-updates" role="tabpanel" aria-labelledby="settings-tab-updates" data-lazy="1"></div>');
   state.activeSubWindowView = { name: 'settings', tab: activeTab };
   if (refreshingSettings) state.restoringSubWindow = true;
   window.openSubWin(t('settings.title'), html);
@@ -14457,7 +15495,12 @@ window.settingsTab = function(name) {
   state.settingsActiveTab = name || 'general';
   var btns = document.querySelectorAll('.stab-btn');
   for (var i = 0; i < btns.length; i++) {
-    btns[i].classList.toggle('active', btns[i].getAttribute('data-stab') === name);
+    var selected = btns[i].getAttribute('data-stab') === name;
+    btns[i].classList.toggle('active', selected);
+    if (btns[i].closest('.settings-tabs:not(.plugin-tabs)')) {
+      btns[i].setAttribute('aria-selected', selected ? 'true' : 'false');
+      btns[i].tabIndex = selected ? 0 : -1;
+    }
   }
   // Render lazy panels on first access for faster initial open
   var panelId = 'stab-' + name;
@@ -14483,6 +15526,7 @@ window.settingsTab = function(name) {
   var panels = document.querySelectorAll('.stab-panel');
   for (var j = 0; j < panels.length; j++) {
     panels[j].classList.toggle('active', panels[j].id === panelId);
+    panels[j].hidden = panels[j].id !== panelId;
   }
   if (name === 'models' && panel && panel.getAttribute('data-lazy') !== '1') window.loadGlobalAgentPrompt();
 };
@@ -15290,9 +16334,26 @@ window.archiveCurrent = function() {
   return window.archiveConv(currentId);
 };
 
-window.loadArchive = function(idx, scope) {
-  var item = (scope === 'all' ? state.allArchives : state.workspaceArchives)[idx];
-  if (!item || !api.readArchive) return;
+window.handleSettingsTabKey = function(event) {
+  if (!event) return;
+  var tabs = Array.prototype.slice.call(document.querySelectorAll('.settings-tabs:not(.plugin-tabs) [role="tab"]'));
+  var index = tabs.indexOf(event.currentTarget);
+  if (index < 0) return;
+  var next = index;
+  if (event.key === 'ArrowRight') next = (index + 1) % tabs.length;
+  else if (event.key === 'ArrowLeft') next = (index - 1 + tabs.length) % tabs.length;
+  else if (event.key === 'Home') next = 0;
+  else if (event.key === 'End') next = tabs.length - 1;
+  else return;
+  event.preventDefault();
+  var name = tabs[next].getAttribute('data-stab');
+  window.settingsTab(name);
+  tabs[next].focus();
+};
+
+window.loadArchive = function(idx, scope) {
+  var item = (scope === 'all' ? state.allArchives : state.workspaceArchives)[idx];
+  if (!item || !api.readArchive) return;
   api.readArchive(item.id || item.name).then(function(content) {
     window.openSubWin(t('archive.titlePrefix') + ': ' + item.name, '<pre style="white-space:pre-wrap;word-break:break-word;background:var(--glass-bg-1);border:1px solid var(--glass-border-1);border-radius:8px;padding:12px;font-size:11px;max-height:65vh;overflow:auto;">' + esc(content || '') + '</pre>');
   }).catch(function(err) {
@@ -15624,10 +16685,10 @@ function renderFlowItem(work, idx, expanded) {
     componentsHtml += '</div>';
   }
   return '<div class="flow-item">' +
-    '<div class="flow-item-header' + (expanded ? '' : ' collapsed') + '" onclick="this.classList.toggle(\'collapsed\')">' +
+    '<button type="button" class="flow-item-header' + (expanded ? '' : ' collapsed') + '" aria-expanded="' + (expanded ? 'true' : 'false') + '" onclick="this.classList.toggle(\'collapsed\');this.setAttribute(\'aria-expanded\',this.classList.contains(\'collapsed\')?\'false\':\'true\')">' +
     '<span class="arrow">></span><span class="flow-item-name">' + esc(work.name || t('flow.untitled')) + '</span>' +
     '<span class="flow-item-type">' + (work.components ? work.components.length : 0) + ' ' + esc(t('flow.components')) + '</span>' +
-    '</div>' +
+    '</button>' +
     '<div class="flow-item-children" style="margin-bottom:4px;">' +
     '<div style="display:flex;gap:4px;padding:4px 0;">' +
     '<button class="sec-btn" style="flex:1;font-size:10px;" onclick="window.addFlowComp(' + idx + ',\'dialog\')">+ ' + esc(t('flow.dialog')) + '</button>' +
@@ -15642,7 +16703,7 @@ function renderFlowItem(work, idx, expanded) {
 window.newFlowWork = function() {
   var html = '<div style="padding:10px;">' +
     '<label style="display:block;font-size:12px;color:var(--text-dim);margin-bottom:6px;">' + esc(t('flow.workflowName')) + '</label>' +
-    '<input id="new-flow-input" style="width:100%;padding:8px 10px;border:1px solid var(--glass-border-2);border-radius:var(--radius-sm);background:var(--glass-bg-1);color:var(--text);font-size:13px;outline:none;box-sizing:border-box;" placeholder="' + escAttr(t('flow.enterName')) + '" onkeydown="if(event.key===\'Enter\')window.doNewFlowWork()">' +
+    '<input id="new-flow-input" style="width:100%;padding:8px 10px;border:1px solid var(--glass-border-2);border-radius:var(--radius-sm);background:var(--glass-bg-1);color:var(--text);font-size:13px;outline:none;box-sizing:border-box;" placeholder="' + escAttr(t('flow.enterName')) + '" onkeydown="if(event.key===\'Enter\'&&!event.isComposing&&event.key!==\'Process\'&&event.keyCode!==229)window.doNewFlowWork()">' +
     '<div style="margin-top:12px;display:flex;gap:8px;">' +
     '<button class="sec-btn primary" style="flex:1;" onclick="window.doNewFlowWork()">' + esc(t('common.create')) + '</button>' +
     '<button class="sec-btn" onclick="window.showFlowEditor()">' + esc(t('common.cancel')) + '</button>' +
@@ -16351,14 +17412,25 @@ function renderTreeNodes(nodes, parent, depth) {
     var n = nodes[i];
     var div = document.createElement('div');
     div.className = 'ft-item';
+    div.setAttribute('role', 'treeitem');
+    var treeRoot = parent.closest ? (parent.closest('[role="tree"]') || parent) : parent;
+    div.tabIndex = treeRoot.querySelector && treeRoot.querySelector('[role="treeitem"][tabindex="0"]') ? -1 : 0;
+    div.addEventListener('keydown', window.handleFileTreeKey);
+    div.addEventListener('focus', function() {
+      var root = this.closest('[role="tree"]');
+      if (!root) return;
+      Array.prototype.forEach.call(root.querySelectorAll('[role="treeitem"]'), function(item) { item.tabIndex = item === document.activeElement ? 0 : -1; });
+    });
     div.style.paddingLeft = (8 + depth * 14) + 'px';
     var icon = n.type === 'directory' ? iconSvg('folder', 'Folder', 'small') : iconSvg('file', 'File', 'small');
     if (n.type === 'directory') {
+      div.setAttribute('aria-expanded', 'false');
       div.innerHTML = '<span class="ft-toggle collapsed">' + iconSvg('chevron-right', t('fileTree.toggleFolder'), 'tiny') + '</span>' +
         '<span class="ft-icon">' + icon + '</span><span class="ft-name">' + esc(n.name) + '</span>';
       parent.appendChild(div);
       var childContainer = document.createElement('div');
       childContainer.className = 'ft-children';
+      childContainer.setAttribute('role', 'group');
       childContainer.style.display = 'none';
       parent.appendChild(childContainer);
       div.onclick = function(node, toggle, children, childDepth) {
@@ -16367,6 +17439,7 @@ function renderTreeNodes(nodes, parent, depth) {
           var opening = children.style.display === 'none';
           children.style.display = opening ? 'block' : 'none';
           toggle.classList.toggle('collapsed', !opening);
+          this.setAttribute('aria-expanded', opening ? 'true' : 'false');
           if (!opening || children.getAttribute('data-loaded') === 'true') return;
           children.setAttribute('data-loading', 'true');
           try {
@@ -16474,8 +17547,7 @@ window.renderNativeEditor = function() {
   }
   window.renderEditorGutter(code);
   if (els['editor-language']) els['editor-language'].textContent = language;
-  var before = code.slice(0, ta.selectionStart || 0).split('\n');
-  if (els['editor-position']) els['editor-position'].textContent = before.length + ':' + (before[before.length - 1].length + 1);
+  window.renderEditorCaretStatus();
   if (els['editor-dirty']) els['editor-dirty'].textContent = code !== state.editorOriginal ? 'modified' : '';
   if (els['editor-vim-mode']) els['editor-vim-mode'].textContent = state.editorVimEnabled ? state.editorVimMode.toUpperCase() : 'INSERT';
   if (state.editorPreview && els['editor-md-preview']) els['editor-md-preview'].innerHTML = renderMessageContent(code);
@@ -16517,6 +17589,7 @@ window.editorSetValue = function(value, preserveUndo) {
   if (!ta) return;
   if (!preserveUndo && ta.value !== value) { state.editorUndo.push(ta.value); if (state.editorUndo.length > 100) state.editorUndo.shift(); state.editorRedo = []; }
   ta.value = value;
+  state.editorCompletionCache = [];
   window.renderNativeEditor();
 };
 
@@ -16545,23 +17618,100 @@ window.editorReplaceSelection = function(text) {
   window.renderNativeEditor();
 };
 
-window.requestEditorCompletion = async function() {
+window.applyEditorCompletionDelta = function(payload) {
+  payload = payload || {};
+  if (String(payload.requestId || '') !== String(state.editorCompletionRequest || '')) return;
+  var delta = String(payload.text || '');
+  if (!delta || !state.editorCompletionAnchor) return;
+  state.editorCompletionStreamText = (state.editorCompletionStreamText || '') + delta;
+  state.editorCompletionText = state.editorCompletionStreamText.slice(0, 1200);
+  window.renderEditorGhostText();
+  if (els['editor-completion']) { els['editor-completion'].textContent = ''; els['editor-completion'].classList.remove('open'); }
+};
+
+function editorCompletionValueKey(value) {
+  var text = String(value || '');
+  var hash = 2166136261;
+  for (var i = 0; i < text.length; i++) hash = Math.imul(hash ^ text.charCodeAt(i), 16777619);
+  return text.length + ':' + (hash >>> 0);
+}
+
+function editorCompletionAnchorKey(anchor) {
+  return [anchor.path, anchor.start, anchor.end, editorCompletionValueKey(anchor.value)].join('\u0000');
+}
+
+function editorCompletionCacheFind(anchor) {
+  var cache = Array.isArray(state.editorCompletionCache) ? state.editorCompletionCache : [];
+  state.editorCompletionCache = cache;
+  var now = Date.now();
+  var key = editorCompletionAnchorKey(anchor);
+  for (var i = cache.length - 1; i >= 0; i--) {
+    var item = cache[i];
+    if (!item || item.expiresAt <= now) { cache.splice(i, 1); continue; }
+    if (item.key === key) {
+      cache.splice(i, 1);
+      cache.unshift(item);
+      return item;
+    }
+  }
+  return null;
+}
+
+function editorCompletionCachePut(anchor, text, ttl) {
+  var cache = Array.isArray(state.editorCompletionCache) ? state.editorCompletionCache : [];
+  var key = editorCompletionAnchorKey(anchor);
+  state.editorCompletionCache = cache.filter(function(item) { return !item || item.key !== key; });
+  state.editorCompletionCache.unshift({ key: key, text: text, expiresAt: Date.now() + ttl });
+  if (state.editorCompletionCache.length > 16) state.editorCompletionCache.length = 16;
+}
+
+window.requestEditorCompletion = async function(options) {
+  options = options || {};
+  var force = options.force === true;
   var ta = els['editor-textarea']; if (!ta || !state.editorPath || !api.editorComplete) return;
   var requestId = ++state.editorCompletionRequest;
   var pos = ta.selectionStart;
   var anchor = { path: state.editorPath, value: ta.value, start: pos, end: ta.selectionEnd };
   state.editorCompletionAnchor = anchor;
+  var cached = force ? null : editorCompletionCacheFind(anchor);
+  if (cached) {
+    state.editorCompletionInFlight = false;
+    state.editorCompletionStreamText = '';
+    state.editorCompletionText = cached.text || '';
+    state.editorCompletionAnchor = state.editorCompletionText ? anchor : null;
+    window.renderEditorGhostText();
+    if (els['editor-completion']) { els['editor-completion'].textContent = ''; els['editor-completion'].classList.remove('open'); }
+    return;
+  }
   if (els['editor-completion']) { els['editor-completion'].textContent = 'Predicting...'; els['editor-completion'].classList.add('open'); }
-  var beforeStart = Math.max(0, pos - 6000);
-  var afterEnd = Math.min(ta.value.length, pos + 1600);
-  var result = await api.editorComplete({ path: state.editorPath, before: ta.value.slice(beforeStart, pos), after: ta.value.slice(pos, afterEnd) });
+  state.editorCompletionInFlight = true;
+  state.editorCompletionStreamText = '';
+  var beforeStart = Math.max(0, pos - 3200);
+  var afterEnd = Math.min(ta.value.length, pos + 800);
+  var result;
+  try {
+    result = await api.editorComplete({ requestId: String(requestId), path: state.editorPath, before: ta.value.slice(beforeStart, pos), after: ta.value.slice(pos, afterEnd) });
+  } catch (error) {
+    result = { ok: false, text: '', error: error && error.message ? error.message : String(error) };
+  } finally {
+    if (requestId === state.editorCompletionRequest) state.editorCompletionInFlight = false;
+  }
   if (requestId !== state.editorCompletionRequest) return;
-  if (!window.editorAnchorMatches(anchor)) { window.dismissEditorCompletion(); window.scheduleEditorCompletion(); return; }
-  state.editorCompletionText = result && result.ok ? String(result.text || '') : '';
+  // Input/caret handlers already schedule the replacement request. Do not
+  // recursively schedule here: that doubled provider traffic on fast edits.
+  if (!window.editorAnchorMatches(anchor)) return;
+  var suggestion = result && result.ok ? String(result.text || '').slice(0, 1200) : '';
+  if (!suggestion.trim()) suggestion = '';
+  state.editorCompletionText = suggestion;
+  state.editorCompletionStreamText = '';
+  state.editorCompletionAnchor = suggestion ? anchor : null;
+  editorCompletionCachePut(anchor, suggestion, suggestion ? 15000 : 2000);
   window.renderEditorGhostText();
   if (els['editor-completion']) {
-    els['editor-completion'].textContent = state.editorCompletionText ? '' : (result.error || 'No completion');
-    els['editor-completion'].classList.toggle('open', !state.editorCompletionText);
+    // Empty/aborted/timeout responses are normal for an inline predictor. The
+    // editor should stay quiet instead of flashing an error on every keystroke.
+    els['editor-completion'].textContent = '';
+    els['editor-completion'].classList.remove('open');
   }
 };
 
@@ -16590,7 +17740,7 @@ window.scheduleEditorCompletion = function() {
   state.editorCompletionTimer = setTimeout(function() {
     state.editorCompletionTimer = null;
     window.requestEditorCompletion();
-  }, 180);
+  }, 300);
 };
 
 window.editorCaretSignature = function() {
@@ -16609,7 +17759,8 @@ window.handleEditorCaretChange = function() {
   var signature = window.editorCaretSignature();
   if (signature === state.editorCaretSignature) return;
   state.editorCaretSignature = signature;
-  window.renderNativeEditor();
+  window.renderEditorCaretStatus();
+  window.renderEditorGhostText();
   window.scheduleEditorCompletion();
 };
 
@@ -16617,7 +17768,24 @@ window.acceptEditorCompletion = function() {
   if (state.editorCompletionText && window.editorCompletionAnchorIsCurrent()) window.editorReplaceSelection(state.editorCompletionText);
   window.dismissEditorCompletion();
 };
-window.dismissEditorCompletion = function() { state.editorCompletionText = ''; state.editorCompletionAnchor = null; state.editorCompletionRequest++; if (els['editor-completion']) els['editor-completion'].classList.remove('open'); window.renderEditorGhostText(); };
+window.dismissEditorCompletion = function() {
+  state.editorCompletionText = '';
+  state.editorCompletionStreamText = '';
+  state.editorCompletionAnchor = null;
+  state.editorCompletionRequest++;
+  if (state.editorCompletionInFlight && api.editorCompleteCancel) {
+    try { Promise.resolve(api.editorCompleteCancel()).catch(function() {}); } catch (_) {}
+  }
+  if (els['editor-completion']) { els['editor-completion'].textContent = ''; els['editor-completion'].classList.remove('open'); }
+  window.renderEditorGhostText();
+};
+
+window.renderEditorCaretStatus = function() {
+  var ta = els['editor-textarea'];
+  if (!ta) return;
+  var before = String(ta.value || '').slice(0, ta.selectionStart || 0).split('\n');
+  if (els['editor-position']) els['editor-position'].textContent = before.length + ':' + (before[before.length - 1].length + 1);
+};
 
 window.requestEditorAssist = async function() {
   var ta = els['editor-textarea']; if (!ta || !state.editorPath || !api.editorAssist) return;
@@ -17223,6 +18391,42 @@ function rememberBrowserUrl(url, force, target) {
   }
 }
 
+window.handleFileTreeKey = function(event) {
+  if (!event || event.defaultPrevented || event.isComposing || event.key === 'Process' || event.keyCode === 229 || event.target !== event.currentTarget) return false;
+  var item = event.currentTarget;
+  var root = item.closest('[role="tree"]');
+  if (!root) return false;
+  if (event.key === 'Enter' || event.key === ' ') return window.activateButtonLike(event);
+  if (event.key === 'ArrowRight') {
+    if (item.hasAttribute('aria-expanded') && item.getAttribute('aria-expanded') !== 'true') {
+      event.preventDefault(); item.click(); return true;
+    }
+    var group = item.nextElementSibling;
+    var child = group && group.matches('[role="group"]') ? group.querySelector('[role="treeitem"]') : null;
+    if (child) { event.preventDefault(); child.focus({ preventScroll:true }); return true; }
+    return false;
+  }
+  if (event.key === 'ArrowLeft') {
+    if (item.getAttribute('aria-expanded') === 'true') { event.preventDefault(); item.click(); return true; }
+    var ownerGroup = item.parentElement && item.parentElement.matches('[role="group"]') ? item.parentElement : null;
+    var parentItem = ownerGroup && ownerGroup.previousElementSibling && ownerGroup.previousElementSibling.matches('[role="treeitem"]') ? ownerGroup.previousElementSibling : null;
+    if (parentItem) { event.preventDefault(); parentItem.focus({ preventScroll:true }); return true; }
+    return false;
+  }
+  var visible = Array.prototype.slice.call(root.querySelectorAll('[role="treeitem"]')).filter(function(node) { return node.getClientRects().length > 0; });
+  var index = visible.indexOf(item);
+  var next = index;
+  if (event.key === 'ArrowDown') next = Math.min(visible.length - 1, index + 1);
+  else if (event.key === 'ArrowUp') next = Math.max(0, index - 1);
+  else if (event.key === 'Home') next = 0;
+  else if (event.key === 'End') next = visible.length - 1;
+  else return false;
+  if (next < 0 || !visible[next]) return false;
+  event.preventDefault();
+  visible[next].focus({ preventScroll:true });
+  return true;
+};
+
 function waitForBrowserCreationFloor() {
   var remaining = NEWMARK_BROWSER_MIN_CREATE_DELAY_MS - (Date.now() - newmarkRendererStartedAt);
   if (remaining <= 0) return Promise.resolve();
@@ -17555,7 +18759,8 @@ function applyBackendConversations(items, activeId, workspaceId) {
       updatedAt: item.updatedAt || '',
       pinned: !!item.pinned,
       pinnedAt: item.pinnedAt || '',
-      order: Number(item.order || 0)
+      order: Number(item.order || 0),
+      branchCommunication: !!item.branchCommunication
     });
   }
   // A stale list response can arrive between creating a conversation locally
@@ -17682,16 +18887,22 @@ function renderConversations() {
     }
     var div = document.createElement('div');
     div.className = 'conv-item' + (conv.active ? ' active' : '');
+    div.setAttribute('role', 'listitem');
+    div.setAttribute('tabindex', conv.active ? '0' : '-1');
+    div.setAttribute('aria-current', conv.active ? 'true' : 'false');
     div.setAttribute('draggable', 'true');
     div.setAttribute('data-conversation-id', String(conv.id || ''));
     if (runtimeState && ['running', 'stopping', 'force_restarting'].indexOf(String(runtimeState.status || '')) >= 0) div.classList.add('marquee-border');
     var runtimeBadge = runtimeState && runtimeState.status && runtimeState.status !== 'idle'
       ? '<span class="conv-runtime-badge ' + escAttr(String(runtimeState.status)) + '">' + esc(String(runtimeState.status)) + '</span>' : '';
-    div.innerHTML = '<span class="conv-summary" title="' + escAttr(String(conv.id || '')) + '">' + esc(displaySummary) + (conv.messageCount ? ' (' + esc(String(conv.messageCount)) + ')' : '') + '</span>' + runtimeBadge +
+    var branchCommBadge = conv.branchCommunication
+      ? '<span class="conv-branch-comm-badge" title="' + escAttr(t('conversation.branchCommunicationBadge')) + '">' + esc(t('conversation.branchCommunicationBadge')) + '</span>' : '';
+    div.innerHTML = '<span class="conv-summary" title="' + escAttr(String(conv.id || '')) + '">' + esc(displaySummary) + (conv.messageCount ? ' (' + esc(String(conv.messageCount)) + ')' : '') + '</span>' + branchCommBadge + runtimeBadge +
       '<button class="conv-rename-btn" onclick="event.stopPropagation();window.editConversationName(' + i + ')" title="' + escAttr(t('conversation.rename')) + '">' + iconOnly('pencil', t('conversation.rename')) + '</button>' +
       '<button class="conv-archive-btn" onclick="event.stopPropagation();window.archiveConv(this.closest(&quot;.conv-item&quot;).getAttribute(&quot;data-conversation-id&quot;))" title="' + escAttr(t('conversation.archive')) + '">' + iconOnly('archive', t('conversation.archive')) + '</button>' +
       '<button class="conv-pin-btn' + (conv.pinned ? ' active' : '') + '" onclick="event.stopPropagation();window.toggleConversationPinned(' + i + ')" title="' + escAttr(conv.pinned ? t('conversation.unpin') : t('conversation.pin')) + '">' + iconOnly('pin', conv.pinned ? t('conversation.unpin') : t('conversation.pin')) + '</button>';
     div.onclick = function(idx) { return function() { window.switchConversation(idx); }; }(i);
+    div.addEventListener('keydown', window.handleConversationKey);
     div.addEventListener('dragstart', function(event) {
       this.classList.add('dragging');
       if (event.dataTransfer) { event.dataTransfer.effectAllowed = 'move'; event.dataTransfer.setData('text/plain', this.getAttribute('data-conversation-id') || ''); }
@@ -17721,6 +18932,30 @@ function renderConversations() {
   updateWorkspaceGate();
 }
 
+window.handleConversationKey = function(event) {
+  if (!event || event.defaultPrevented || event.isComposing || event.key === 'Process' || event.keyCode === 229 || event.target !== event.currentTarget) return false;
+  if (event.key === 'Enter' || event.key === ' ') return window.activateButtonLike(event);
+  var items = Array.prototype.slice.call(document.querySelectorAll('#conversation-list .conv-item'));
+  var index = items.indexOf(event.currentTarget);
+  if (index < 0 || !items.length) return false;
+  var next = index;
+  if (event.key === 'ArrowDown') next = (index + 1) % items.length;
+  else if (event.key === 'ArrowUp') next = (index - 1 + items.length) % items.length;
+  else if (event.key === 'Home') next = 0;
+  else if (event.key === 'End') next = items.length - 1;
+  else return false;
+  event.preventDefault();
+  var nextId = items[next].getAttribute('data-conversation-id');
+  items[next].click();
+  requestAnimationFrame(function() {
+    var replacement = Array.prototype.slice.call(document.querySelectorAll('#conversation-list .conv-item')).find(function(item) {
+      return item.getAttribute('data-conversation-id') === nextId;
+    });
+    if (replacement) replacement.focus({ preventScroll:true });
+  });
+  return true;
+};
+
 window.newConversationOld = function() {
   var id = 'conv-' + Date.now();
   var summary = t('left.newChat') + ' ' + (state.conversations.length + 1);
@@ -17754,7 +18989,7 @@ window.archiveConvOld = function(idx) {
   }
 };
 
-window.newConversation = function(workspaceReference) {
+window.newConversation = function(workspaceReference, branchCommunication) {
   if (workspaceReference && workspaceReference !== state.currentWorkspaceId) {
     window.selectWorkspace(workspaceReference);
   }
@@ -17784,6 +19019,13 @@ window.newConversation = function(workspaceReference) {
     if (createdWorkspaceKey !== currentWorkspaceKey() || id !== String(activeConversationId() || 'default')) return;
     state.activeBackendConversationId = String((s && s.conversationId) || id);
     if (s) applyConversationSnapshot(s, id);
+    if (branchCommunication && api.setConversationBranchCommunication) {
+      api.setConversationBranchCommunication(target, true).then(function() {
+        var convsNow = currentWorkspaceConversations();
+        var created = convsNow.find(function(item){ return String(item && item.id) === id; });
+        if (created) { created.branchCommunication = true; renderConversations(); }
+      }).catch(function(){});
+    }
   }).then(function() {
     if (createdWorkspaceKey !== currentWorkspaceKey() || id !== String(activeConversationId() || 'default')) return;
     state.foregroundConversationHoldId = '';
@@ -17810,6 +19052,7 @@ window.showNewConversationPage = function() {
   var html = '<div style="display:flex;flex-direction:column;gap:12px;padding:4px 2px;">' +
     '<div style="font-size:12px;color:var(--text-dim);line-height:1.5;">' + esc(t('workspace.newConversationDesc')) + '</div>' +
     '<div class="auto-input-group"><label>' + esc(t('status.workspace')) + '</label><select id="new-conv-ws">' + options + '</select></div>' +
+    '<div class="auto-input-group" style="flex-direction:row;align-items:center;gap:8px;"><label style="display:flex;align-items:center;gap:6px;cursor:pointer;font-size:12px;"><input type="checkbox" id="new-conv-branch-comm" style="accent-color:var(--accent);">' + esc(t('conversation.branchCommunication')) + '</label></div>' +
     '<div style="display:flex;gap:8px;">' +
     '<button class="sec-btn primary" style="flex:1;" onclick="window.doNewConversationFromPage()">' + esc(t('workspace.createConversation')) + '</button>' +
     '<button class="sec-btn" style="flex:1;" onclick="window.showNewWorkspaceDialog()">' + esc(t('workspace.createAction')) + '</button>' +
@@ -17826,11 +19069,13 @@ window.doNewConversationFromPage = function() {
     window.showNewWorkspaceDialog();
     return;
   }
+  var branchComm = document.getElementById('new-conv-branch-comm');
+  var branchCommunication = !!(branchComm && branchComm.checked);
   window.switchToWorkspace(identity).then(function(ws) {
     state.currentWorkspace = (ws && ws.name) || state.currentWorkspace;
     state.currentWorkspaceId = workspaceIdentity(ws) || state.currentWorkspaceId || identity;
     window.closeSubWin();
-    window.newConversation(state.currentWorkspaceId);
+    window.newConversation(state.currentWorkspaceId, branchCommunication);
   }).catch(function(err) {
     showUiNotice(t('workspace.selectAction') + ': ' + err.message, 'error', 'workspace-new-conversation-' + identity);
   });
@@ -17963,6 +19208,25 @@ window.archiveConv = function(conversationId) {
       state.activeBackendConversationId = nextActiveId;
       if (els['chat-area']) els['chat-area'].innerHTML = '';
     }
+    // Archiving is a destructive handoff: remove the target's Flow takeover
+    // locally at click time as well as removing its conversation row. The
+    // backend cancellation/manifest write is asynchronous; a late Flow
+    // promise must not leave a visible running bubble over the replacement
+    // conversation while the archive is already in flight.
+    if (state.flowTakeovers) {
+      var archivedFlowKey = runtimeKeyFor(targetRuntime.workspaceId, targetRuntime.conversationId);
+      var archivedFlowRecord = state.flowTakeovers[archivedFlowKey];
+      if (archivedFlowRecord) {
+        archivedFlowRecord.running = false;
+        archivedFlowRecord.paused = false;
+        archivedFlowRecord.runtimeLease = null;
+        archivedFlowRecord.queueLease = null;
+        delete state.flowTakeovers[archivedFlowKey];
+      }
+      if (priorActiveId === targetId && window.renderFlowTakeover) {
+        window.renderFlowTakeover(false, '', { target: targetRuntime });
+      }
+    }
     setConversationRuntimeState(targetRuntime, 'idle', '');
     setWorking(!!runningConversationRecord(activeConversationId()));
     renderConversations();
@@ -18809,37 +20073,117 @@ window.reindexMemoryLab = function() {
   });
 };
 
-// === Plugin List Placeholder ===
-window.showPluginList = function() {
-  window.openSubWin(t('plugins.managerTitle'), '<div style="font-size:12px;color:var(--text-dim);text-align:center;padding:20px;">' + esc(t('plugins.noPlugins')) + '<br><br><button class="sec-btn primary" onclick="window.closeSubWin()">' + esc(t('common.close')) + '</button></div>');
+// === Plugin / Skills Market ===
+var PLUGIN_TABS = ['mcp', 'dsh', 'installed', 'market', 'github'];
+
+function pluginText(key, values) {
+  var output = t(key);
+  Object.keys(values || {}).forEach(function(name) {
+    output = output.replace(new RegExp('\\{' + name + '\\}', 'g'), function() { return String(values[name]); });
+  });
+  return output;
+}
+
+function pluginRequestActive(tab, generation) {
+  return generation === state.pluginPanelGeneration
+    && state.pluginActiveTab === tab
+    && !!(state.activeSubWindowView && state.activeSubWindowView.name === 'plugins')
+    && !!(els['sub-win-overlay'] && els['sub-win-overlay'].classList.contains('open'))
+    && !!document.getElementById('plugin-panel');
+}
+
+function pluginPanelState(message, kind, retryCall) {
+  return '<div class="plugin-panel-state' + (kind === 'error' ? ' error' : '') + '" role="' + (kind === 'error' ? 'alert' : 'status') + '"' + (kind === 'loading' ? ' aria-live="polite" aria-busy="true"' : '') + '>' +
+    '<span>' + esc(message) + '</span>' +
+    (retryCall ? '<button type="button" class="sec-btn" onclick="' + retryCall + '">' + esc(t('plugins.retry')) + '</button>' : '') +
+    '</div>';
+}
+
+function pluginTabMarkup(tab, label) {
+  var selected = state.pluginActiveTab === tab;
+  return '<button type="button" class="stab-btn' + (selected ? ' active' : '') + '" id="plugin-tab-' + tab + '" role="tab" aria-selected="' + (selected ? 'true' : 'false') + '" aria-controls="plugin-panel" tabindex="' + (selected ? '0' : '-1') + '" data-plugin-tab="' + tab + '" onclick="window.selectPluginTab(\'' + tab + '\')" onkeydown="window.handlePluginTabKey(event)">' + esc(label) + '</button>';
+}
+
+window.syncPluginTabs = function(focusTab) {
+  var labels = { mcp: t('plugins.tabMcp'), dsh: t('plugins.tabDsh'), installed: t('plugins.tabSkills'), market: t('plugins.tabMarket'), github: t('plugins.tabGithub') };
+  PLUGIN_TABS.forEach(function(tab) {
+    var button = document.getElementById('plugin-tab-' + tab);
+    if (!button) return;
+    var selected = tab === state.pluginActiveTab;
+    button.classList.toggle('active', selected);
+    button.setAttribute('aria-selected', selected ? 'true' : 'false');
+    button.tabIndex = selected ? 0 : -1;
+    button.textContent = labels[tab];
+  });
+  var tablist = document.querySelector('.plugin-tabs[role="tablist"]');
+  if (tablist) tablist.setAttribute('aria-label', t('plugins.title'));
+  if (els['sub-win-title']) els['sub-win-title'].textContent = t('plugins.title');
+  var panel = document.getElementById('plugin-panel');
+  if (panel) panel.setAttribute('aria-labelledby', 'plugin-tab-' + state.pluginActiveTab);
+  if (focusTab) {
+    var activeButton = document.getElementById('plugin-tab-' + state.pluginActiveTab);
+    if (activeButton) activeButton.focus({ preventScroll: true });
+  }
 };
 
-// === Plugin / Skills Market ===
-window.showPluginList = function(tab) {
-  var activeTab = tab || state.pluginActiveTab || 'mcp';
-  var refreshingPlugins = els['sub-win-overlay'].classList.contains('open') && state.activeSubWindowView && state.activeSubWindowView.name === 'plugins';
-  state.activeSubWindowView = { name: 'plugins', tab: activeTab };
-  state.pluginActiveTab = activeTab;
-  var html = '<div class="settings-tabs">' +
-    '<button class="stab-btn' + (state.pluginActiveTab === 'mcp' ? ' active' : '') + '" onclick="window.showPluginList(\'mcp\')">' + esc(t('plugins.mcp')) + '</button>' +
-    '<button class="stab-btn' + (state.pluginActiveTab === 'installed' ? ' active' : '') + '" onclick="window.showPluginList(\'installed\')">' + esc(t('plugins.management')) + '</button>' +
-    '<button class="stab-btn' + (state.pluginActiveTab === 'market' ? ' active' : '') + '" onclick="window.showPluginList(\'market\')">' + esc(t('plugins.market')) + '</button>' +
-    '<button class="stab-btn' + (state.pluginActiveTab === 'github' ? ' active' : '') + '" onclick="window.showPluginList(\'github\')">' + esc(t('plugins.github')) + '</button>' +
-    '</div><div id="plugin-panel" style="margin-top:10px;">' + esc(t('common.loading')) + '</div>';
-  if (refreshingPlugins) state.restoringSubWindow = true;
-  window.openSubWin(t('plugins.title'), html);
-  state.restoringSubWindow = false;
-  if (state.pluginActiveTab === 'mcp') window.renderMcpManager();
-  else if (state.pluginActiveTab === 'market') window.renderSkillsMarket();
-  else if (state.pluginActiveTab === 'github') window.renderGithubCliPanel();
+window.handlePluginTabKey = function(event) {
+  if (!event || PLUGIN_TABS.indexOf(state.pluginActiveTab) < 0) return;
+  var index = PLUGIN_TABS.indexOf(state.pluginActiveTab);
+  if (event.key === 'ArrowRight') index = (index + 1) % PLUGIN_TABS.length;
+  else if (event.key === 'ArrowLeft') index = (index - 1 + PLUGIN_TABS.length) % PLUGIN_TABS.length;
+  else if (event.key === 'Home') index = 0;
+  else if (event.key === 'End') index = PLUGIN_TABS.length - 1;
+  else return;
+  event.preventDefault();
+  window.showPluginList(PLUGIN_TABS[index], { focusTab: true });
+};
+
+window.selectPluginTab = function(tab) {
+  window.showPluginList(tab, { focusTab: false });
+};
+
+window.showPluginList = function(tab, options) {
+  var requested = PLUGIN_TABS.indexOf(tab) >= 0 ? tab : (PLUGIN_TABS.indexOf(state.pluginActiveTab) >= 0 ? state.pluginActiveTab : 'mcp');
+  var overlayOpen = !!(els['sub-win-overlay'] && els['sub-win-overlay'].classList.contains('open'));
+  var pluginOpen = overlayOpen && state.activeSubWindowView && state.activeSubWindowView.name === 'plugins' && !!document.getElementById('plugin-panel');
+  state.pluginActiveTab = requested;
+  state.pluginPanelGeneration++;
+  if (!pluginOpen) {
+    var html = '<div class="settings-tabs plugin-tabs" role="tablist" aria-label="' + escAttr(t('plugins.title')) + '">' +
+      pluginTabMarkup('mcp', t('plugins.tabMcp')) +
+      pluginTabMarkup('dsh', t('plugins.tabDsh')) +
+      pluginTabMarkup('installed', t('plugins.tabSkills')) +
+      pluginTabMarkup('market', t('plugins.tabMarket')) +
+      pluginTabMarkup('github', t('plugins.tabGithub')) +
+      '</div><div id="plugin-panel" class="plugin-panel" role="tabpanel" tabindex="0" aria-labelledby="plugin-tab-' + requested + '"></div>';
+    if (overlayOpen && state.activeSubWindowView) {
+      window.openSubWin(t('plugins.title'), html);
+      state.activeSubWindowView = { name: 'plugins', tab: requested };
+    } else {
+      state.activeSubWindowView = { name: 'plugins', tab: requested };
+      window.openSubWin(t('plugins.title'), html);
+    }
+    if (els['sub-win']) els['sub-win'].classList.remove('memory-lab-window');
+  } else {
+    state.activeSubWindowView = { name: 'plugins', tab: requested };
+  }
+  window.syncPluginTabs(!pluginOpen || !!(options && options.focusTab));
+  var panel = document.getElementById('plugin-panel');
+  if (panel) panel.replaceChildren();
+  if (requested === 'mcp') window.renderMcpManager();
+  else if (requested === 'dsh') window.renderDshPlugin();
+  else if (requested === 'market') window.renderSkillsMarket();
+  else if (requested === 'github') window.renderGithubCliPanel();
   else window.renderInstalledSkills();
 };
 
 window.renderInstalledSkills = function() {
   var panel = document.getElementById('plugin-panel');
-  if (!panel) return;
+  if (!panel || state.pluginActiveTab !== 'installed') return;
+  var generation = ++state.pluginPanelGeneration;
   var render = function(items) {
     state.skills = items || [];
+    if (!pluginRequestActive('installed', generation)) return;
     if (!items || !items.length) {
       panel.innerHTML = '<div style="font-size:12px;color:var(--text-dim);padding:18px;text-align:center;">' + esc(t('plugins.noInstalled')) + '</div>';
       return;
@@ -18880,14 +20224,15 @@ window.refreshSkillsRuntime = function(next) {
 
 window.renderSkillsMarket = function() {
   var panel = document.getElementById('plugin-panel');
-  if (!panel) return;
+  if (!panel || state.pluginActiveTab !== 'market') return;
+  var generation = ++state.pluginPanelGeneration;
   panel.innerHTML = '<div class="provider-card marquee-border">' + esc(t('plugins.discovering')) + '</div>';
   state._skillMarketAll = [];
   state._skillMarketSources = [];
   var done = 0;
   var finish = function() {
     done++;
-    if (done >= 2) window.renderSkillsMarketList();
+    if (done >= 2 && pluginRequestActive('market', generation)) window.renderSkillsMarketList();
   };
   if (api.marketSkillSources) api.marketSkillSources().then(function(sources) {
     state._skillMarketSources = sources || [];
@@ -18901,88 +20246,466 @@ window.renderSkillsMarket = function() {
   else finish();
 };
 
+var DSH_OFFICIAL_URLS = {
+  repo: 'https://github.com/deepseek-ai/deepseek-harness',
+  docs: 'https://github.com/deepseek-ai/deepseek-harness/blob/master/docs/user/develop/basic/publish.md',
+  npm: 'https://www.npmjs.com/package/@deepseek-ai/dsh'
+};
+
+function dshCollection(value) {
+  if (Array.isArray(value)) return value;
+  if (value && typeof value === 'object') return Object.keys(value).map(function(key) {
+    var item = value[key];
+    if (item && typeof item === 'object' && !Array.isArray(item)) return Object.assign({ name: key }, item);
+    return { name: key, value: item };
+  });
+  return [];
+}
+
+function dshDisplayValue(value) {
+  if (value === undefined || value === null || value === '') return t('plugins.dshNotAvailable');
+  if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') return String(value);
+  try { return JSON.stringify(value); } catch (_) { return String(value); }
+}
+
+function dshUniqueStrings(values) {
+  var seen = Object.create(null);
+  return dshCollection(values).map(function(value) {
+    return typeof value === 'string' ? value : dshDisplayValue(value);
+  }).filter(function(value) {
+    var key = String(value || '');
+    if (!key || seen[key]) return false;
+    seen[key] = true;
+    return true;
+  });
+}
+
+function dshListMarkup(items, emptyText, warning) {
+  var values = dshCollection(items);
+  if (!values.length) return '<div class="plugin-empty">' + esc(emptyText || t('plugins.dshNone')) + '</div>';
+  return '<div class="dsh-list">' + values.map(function(item) {
+    var label = item && typeof item === 'object'
+      ? (item.name || item.id || item.path || item.file || item.key || dshDisplayValue(item))
+      : item;
+    var detail = item && typeof item === 'object' ? (item.version || item.source || item.value || item.reason || '') : '';
+    return '<div class="dsh-list-item' + (warning ? ' warning' : '') + '"><strong>' + esc(redactSensitiveText(dshDisplayValue(label))) + '</strong>' + (detail && String(detail) !== String(label) ? '<div class="provider-meta">' + esc(redactSensitiveText(dshDisplayValue(detail))) + '</div>' : '') + '</div>';
+  }).join('') + '</div>';
+}
+
+function dshLayerMarkup(profile) {
+  var layers = dshCollection(profile && profile.layers);
+  if (!layers.length) return '<div class="plugin-empty">' + esc(t('plugins.dshNone')) + '</div>';
+  return '<div class="dsh-list">' + layers.map(function(layer, index) {
+    var kind = layer && layer.kind ? String(layer.kind) : 'layer';
+    var order = Number.isFinite(Number(layer && layer.order)) ? Number(layer.order) + 1 : index + 1;
+    var file = layer && (layer.path || layer.file) || '';
+    return '<div class="dsh-list-item"><strong>' + esc(order + '. ' + kind + (layer && layer.name ? ' · ' + layer.name : '')) + '</strong>' +
+      (file ? '<div class="provider-meta">' + esc(redactSensitiveText(file)) + '</div>' : '') + '</div>';
+  }).join('') + '</div>';
+}
+
+window.openDshOfficial = function(kind) {
+  var url = DSH_OFFICIAL_URLS[kind];
+  if (!url || !api.openWebUrl) {
+    showUiNotice(t('plugins.dshUnavailable'), 'error', 'dsh-web-url');
+    return;
+  }
+  var generation = state.pluginPanelGeneration;
+  Promise.resolve(api.openWebUrl(url)).then(function(result) {
+    if (result && (result.ok === false || result.success === false || result.error)) throw new Error(result.error || t('plugins.dshUnavailable'));
+  }).catch(function(error) {
+    if (pluginRequestActive('dsh', generation)) showUiNotice(error && error.message ? error.message : String(error), 'error', 'dsh-web-url');
+  });
+};
+
+window.renderDshPlugin = function() {
+  var panel = document.getElementById('plugin-panel');
+  if (!panel || state.pluginActiveTab !== 'dsh') return;
+  var generation = ++state.pluginPanelGeneration;
+  panel.innerHTML = pluginPanelState(t('plugins.dshScanning'), 'loading');
+  if (!api.discoverDshCompatibility) {
+    panel.innerHTML = pluginPanelState(t('plugins.dshUnavailable'), 'error');
+    return;
+  }
+  Promise.resolve(api.discoverDshCompatibility()).then(function(snapshot) {
+    if (!pluginRequestActive('dsh', generation)) return;
+    state.dshCompatibility = snapshot && typeof snapshot === 'object' ? snapshot : {};
+    window.renderDshPluginContent();
+  }).catch(function(error) {
+    if (!pluginRequestActive('dsh', generation)) return;
+    var message = t('plugins.dshLoadError') + (error && error.message ? ' ' + error.message : '');
+    panel.innerHTML = pluginPanelState(message, 'error', 'window.renderDshPlugin()');
+  });
+};
+
+window.renderDshPluginContent = function() {
+  var panel = document.getElementById('plugin-panel');
+  if (!panel || state.pluginActiveTab !== 'dsh') return;
+  var dsh = state.dshCompatibility || {};
+  var cli = dsh.cli && typeof dsh.cli === 'object' ? dsh.cli : {};
+  var pkg = dsh.package && typeof dsh.package === 'object' ? dsh.package : {};
+  var update = dsh.update && typeof dsh.update === 'object' ? dsh.update : {};
+  var cliPath = cli.path || cli.executable || cli.commandPath || dsh.cliPath || '';
+  var cliVersion = cli.version || dsh.cliVersion || '';
+  var packageVersion = pkg.version || (cli.package && cli.package.version) || cli.packageVersion || dsh.packageVersion || '';
+  var updateChannel = update.channel || update.tag || dsh.updateChannel || '';
+  var updateLocked = update.locked === true || update.versionLocked === true || update.isLocked === true;
+  if (String(updateChannel).toLowerCase() === 'latest' && !updateLocked) updateChannel = t('plugins.dshLatestChannel');
+  var candidates = dshCollection(dsh.mcpCandidates);
+  var configFiles = dshCollection(dsh.configFiles);
+  dshCollection(dsh.profiles).forEach(function(profile) {
+    if (profile && typeof profile === 'object') configFiles = configFiles.concat(dshCollection(profile.configFiles));
+  });
+  configFiles = dshUniqueStrings(configFiles);
+  var html = '<section class="dsh-hero" id="dsh-hero" aria-labelledby="dsh-title">' +
+    '<div class="dsh-hero-head"><div class="dsh-hero-copy"><div class="dsh-title" id="dsh-title">' + esc(t('plugins.dshTitle')) + '</div>' +
+    '<div class="dsh-description">' + esc(t('plugins.dshHelp')) + '</div></div><span class="plugin-status-badge preview">' + esc(t('plugins.dshPreview')) + '</span></div>' +
+    '<div class="dsh-actions"><button type="button" class="sec-btn primary" id="dsh-rescan" onclick="window.renderDshPlugin()">' + esc(t('plugins.dshRescan')) + '</button>' +
+    '<button type="button" class="sec-btn" id="dsh-official-repo" onclick="window.openDshOfficial(\'repo\')">' + esc(t('plugins.dshOfficialRepo')) + '</button>' +
+    '<button type="button" class="sec-btn" id="dsh-official-docs" onclick="window.openDshOfficial(\'docs\')">' + esc(t('plugins.dshOfficialDocs')) + '</button>' +
+    '<button type="button" class="sec-btn" id="dsh-official-npm" onclick="window.openDshOfficial(\'npm\')">' + esc(t('plugins.dshOfficialNpm')) + '</button></div></section>';
+  html += '<div class="dsh-grid">' +
+    '<section class="dsh-card" id="dsh-cli-card"><div class="dsh-card-title">' + esc(t('plugins.dshCli')) + '</div><dl class="dsh-kv">' +
+      '<dt>' + esc(t('plugins.dshCliPath')) + '</dt><dd id="dsh-cli-path">' + esc(redactSensitiveText(dshDisplayValue(cliPath))) + '</dd>' +
+      '<dt>' + esc(t('plugins.dshCliVersion')) + '</dt><dd id="dsh-cli-version">' + esc(dshDisplayValue(cliVersion)) + '</dd>' +
+      '<dt>' + esc(t('plugins.dshPackageVersion')) + '</dt><dd id="dsh-package-version">' + esc(dshDisplayValue(packageVersion)) + '</dd></dl></section>' +
+    '<section class="dsh-card" id="dsh-runtime-card"><div class="dsh-card-title">' + esc(t('plugins.dshReadonly')) + '</div><dl class="dsh-kv">' +
+      '<dt>' + esc(t('plugins.dshHome')) + '</dt><dd id="dsh-home">' + esc(redactSensitiveText(dshDisplayValue(dsh.dshHome || dsh.home))) + '</dd>' +
+      '<dt>' + esc(t('plugins.dshHomeSource')) + '</dt><dd id="dsh-home-source">' + esc(redactSensitiveText(dshDisplayValue(dsh.dshHomeSource || dsh.homeSource || (dsh.home && dsh.home.source)))) + '</dd>' +
+      '<dt>' + esc(t('plugins.dshUpdateChannel')) + '</dt><dd id="dsh-update-channel">' + esc(dshDisplayValue(updateChannel)) + '</dd></dl>' +
+      '<div class="dsh-description">' + esc(t('plugins.dshReadonlyDetail')) + '</div></section>' +
+    '<section class="dsh-card" id="dsh-profiles-card"><div class="dsh-card-title">' + esc(t('plugins.dshProfiles')) + '</div>' + dshListMarkup(dsh.profiles) + '</section>' +
+    '<section class="dsh-card" id="dsh-bundles-card"><div class="dsh-card-title">' + esc(t('plugins.dshBundles')) + '</div>' + dshListMarkup(dsh.bundles) + '</section>' +
+    '<section class="dsh-card" id="dsh-warnings-card"><div class="dsh-card-title">' + esc(t('plugins.dshWarnings')) + '</div>' + dshListMarkup(dsh.warnings, t('plugins.dshNone'), true) + '</section>' +
+    '<section class="dsh-card" id="dsh-unknown-keys-card"><div class="dsh-card-title">' + esc(t('plugins.dshUnknownKeys')) + '</div>' + dshListMarkup(dsh.unknownKeys) + '</section></div>';
+  html += '<section class="plugin-section" id="dsh-config-files"><div class="plugin-section-head"><div class="plugin-section-title">' + esc(t('plugins.dshConfigFiles')) + '</div><span class="plugin-count-badge">' + configFiles.length + '</span></div>' + dshListMarkup(configFiles) + '</section>';
+  html += '<section class="plugin-section" id="dsh-layers"><div class="plugin-section-head"><div class="plugin-section-title">' + esc(t('plugins.dshLayers')) + '</div></div><div class="mcp-field-help">' + esc(t('plugins.dshLayerOrder')) + '</div>';
+  dshCollection(dsh.profiles).forEach(function(profile) {
+    html += '<div class="dsh-layer-profile"><div class="plugin-section-title">' + esc(profile && (profile.name || profile.source) || t('plugins.dshNotAvailable')) + '</div>' + dshLayerMarkup(profile) + '</div>';
+  });
+  var homeFiles = dshCollection(dsh.homeConfigFiles);
+  if (homeFiles.length) html += '<div class="dsh-layer-profile"><div class="plugin-section-title">' + esc(t('plugins.dshHomePatches')) + '</div>' + dshListMarkup(homeFiles) + '</div>';
+  html += '<div class="mcp-field-help">' + esc(t('plugins.dshUpdateability')) + '</div></section>';
+  html += '<section class="plugin-section" id="dsh-mcp-candidates"><div class="plugin-section-head"><div class="plugin-section-title">' + esc(t('plugins.dshMcpCandidates')) + '</div><span class="plugin-count-badge">' + candidates.length + '</span></div>' +
+    '<div class="mcp-field-help">' + esc(t('plugins.mcpCandidateHelp')) + '</div>';
+  if (!candidates.length) html += '<div class="plugin-empty">' + esc(t('plugins.dshNone')) + '</div>';
+  candidates.forEach(function(candidate, index) {
+    var name = candidate && (candidate.name || candidate.id) || ('MCP ' + (index + 1));
+    var source = candidate && (candidate.source || candidate.path) || '';
+    var reason = candidate && candidate.reason || '';
+    var importable = !!(candidate && candidate.importable && candidate.template);
+    html += '<div class="mcp-server-row" id="dsh-candidate-' + index + '" data-dsh-candidate-index="' + index + '"><div class="mcp-server-copy"><div class="mcp-server-title">' + esc(name) +
+      '<span class="plugin-status-badge">' + esc(importable ? t('plugins.mcpReviewImport') : t('plugins.mcpReadonly')) + '</span></div>' +
+      '<div class="mcp-server-meta">' + esc(redactSensitiveText(dshDisplayValue(source))) + '</div>' +
+      (reason ? '<div class="mcp-server-meta">' + esc(redactSensitiveText(dshDisplayValue(reason))) + '</div>' : '') + '</div>' +
+      (importable ? '<div class="mcp-row-actions"><button type="button" class="sec-btn" id="dsh-candidate-review-' + index + '" onclick="window.reviewDshMcpCandidate(' + index + ')">' + esc(t('plugins.mcpReviewImport')) + '</button></div>' : '') + '</div>';
+  });
+  html += '</section>';
+  panel.innerHTML = html;
+};
+
+function newMcpDraft(input, source) {
+  input = input && typeof input === 'object' ? input : {};
+  var transport = input.transport === 'http' ? 'http' : 'stdio';
+  return {
+    id: input.id || '',
+    source: source || 'add',
+    name: String(input.name || ''),
+    transport: transport,
+    command: String(input.command || ''),
+    url: String(input.url || ''),
+    argsText: JSON.stringify(Array.isArray(input.args) ? input.args : [], null, 2),
+    cwd: String(input.cwd || ''),
+    envText: input.env && typeof input.env === 'object' ? JSON.stringify(input.env, null, 2) : '',
+    headersText: input.headers && typeof input.headers === 'object' ? JSON.stringify(input.headers, null, 2) : '',
+    enabled: source === 'candidate' ? false : input.enabled !== false,
+    envKeys: Array.isArray(input.envKeys) ? input.envKeys.slice() : [],
+    headerKeys: Array.isArray(input.headerKeys) ? input.headerKeys.slice() : []
+  };
+}
+
+window.reviewDshMcpCandidate = function(index) {
+  var candidates = dshCollection(state.dshCompatibility && state.dshCompatibility.mcpCandidates);
+  var candidate = candidates[index];
+  if (!candidate || !candidate.importable || !candidate.template) return;
+  state.mcpEditingId = '';
+  state.mcpDraft = newMcpDraft(Object.assign({}, candidate.template, {
+    enabled: false,
+    envKeys: Array.isArray(candidate.envKeys) ? candidate.envKeys : [],
+    headerKeys: Array.isArray(candidate.headerKeys) ? candidate.headerKeys : []
+  }), 'candidate');
+  state.mcpFormFocusRequested = true;
+  window.showPluginList('mcp');
+};
+
 window.renderMcpManager = function() {
   var panel = document.getElementById('plugin-panel');
-  if (!panel) return;
-  panel.innerHTML = '<div class="provider-card marquee-border">' + esc(t('common.loading')) + '</div>';
+  if (!panel || state.pluginActiveTab !== 'mcp') return;
+  var generation = ++state.pluginPanelGeneration;
+  panel.innerHTML = pluginPanelState(t('plugins.mcpRefreshing'), 'loading');
   if (!api.listMcpServers) {
-    panel.innerHTML = '<div class="settings-empty">' + esc(t('plugins.ghUnavailable')) + '</div>';
+    panel.innerHTML = pluginPanelState(t('plugins.mcpUnavailable'), 'error');
     return;
   }
-  api.listMcpServers().then(function(result) {
+  Promise.resolve(api.listMcpServers()).then(function(result) {
+    if (!pluginRequestActive('mcp', generation)) return;
     state.mcpServers = Array.isArray(result && result.servers) ? result.servers : [];
     state.mcpDiscovered = Array.isArray(result && result.discovered) ? result.discovered : [];
     window.renderMcpManagerContent();
   }).catch(function(error) {
-    panel.innerHTML = '<div class="settings-empty">' + esc(String(error && error.message ? error.message : error)) + '</div>';
+    if (!pluginRequestActive('mcp', generation)) return;
+    var message = t('plugins.mcpLoadError') + (error && error.message ? ' ' + error.message : '');
+    panel.innerHTML = pluginPanelState(message, 'error', 'window.renderMcpManager()');
   });
 };
 
+function mcpSearchMatch(server, query) {
+  server = server || {};
+  if (!query) return true;
+  var text = [server.name, server.transport, server.command, server.url, server.plugin, server.ecosystem, server.root]
+    .concat(server.args || []).join(' ').toLowerCase();
+  return text.indexOf(query) >= 0;
+}
+
+function mcpSecretHelp(keys, keyName) {
+  return keys && keys.length
+    ? pluginText(keyName, { keys: keys.join(', ') })
+    : t('plugins.mcpNoSavedKeys');
+}
+
+function renderMcpForm() {
+  var draft = state.mcpDraft;
+  if (!draft) return '';
+  var pending = !!state.mcpMutationPending;
+  var titleKey = draft.source === 'candidate' ? 'plugins.mcpReviewTitle' : (draft.id ? 'plugins.mcpEditTitle' : 'plugins.mcpAddTitle');
+  var stdio = draft.transport !== 'http';
+  return '<section class="mcp-form-card" id="mcp-form" aria-labelledby="mcp-form-title" aria-busy="' + (pending ? 'true' : 'false') + '">' +
+    '<div class="mcp-form-head"><div class="mcp-form-copy"><div class="mcp-form-title" id="mcp-form-title">' + esc(t(titleKey)) + '</div><div class="mcp-form-subtitle">' + esc(t('plugins.mcpFormHelp')) + '</div></div></div>' +
+    '<div class="mcp-field-grid"><div class="mcp-field"><label for="mcp-name">' + esc(t('plugins.mcpName')) + '</label><input class="mcp-input" id="mcp-name" value="' + escAttr(draft.name) + '" autocomplete="off"></div>' +
+    '<div class="mcp-field"><label for="mcp-transport">' + esc(t('plugins.mcpTransport')) + '</label><select class="mcp-input" id="mcp-transport" onchange="window.updateMcpTransportForm()"><option value="stdio"' + (stdio ? ' selected' : '') + '>stdio</option><option value="http"' + (!stdio ? ' selected' : '') + '>http</option></select></div></div>' +
+    '<div id="mcp-stdio-fields"' + (stdio ? '' : ' hidden') + '><div class="mcp-field"><label for="mcp-command">' + esc(t('plugins.mcpEndpointStdio')) + '</label><input class="mcp-input" id="mcp-command" value="' + escAttr(draft.command) + '" autocomplete="off"></div>' +
+    '<div class="mcp-field"><label for="mcp-args">' + esc(t('plugins.mcpArgs')) + '</label><textarea class="mcp-input" id="mcp-args" spellcheck="false">' + esc(draft.argsText) + '</textarea></div>' +
+    '<div class="mcp-field"><label for="mcp-cwd">' + esc(t('plugins.mcpCwd')) + '</label><input class="mcp-input" id="mcp-cwd" value="' + escAttr(draft.cwd) + '" autocomplete="off"></div>' +
+    '<div class="mcp-field"><label for="mcp-env">' + esc(t('plugins.mcpEnv')) + '</label><textarea class="mcp-input" id="mcp-env" spellcheck="false" placeholder="{}">' + esc(draft.envText) + '</textarea><div class="mcp-field-help">' + esc(mcpSecretHelp(draft.envKeys, 'plugins.mcpSavedEnvKeys')) + ' ' + esc(t('plugins.mcpSecretsHelp')) + '</div></div></div>' +
+    '<div id="mcp-http-fields"' + (!stdio ? '' : ' hidden') + '><div class="mcp-field"><label for="mcp-url">' + esc(t('plugins.mcpEndpointHttp')) + '</label><input class="mcp-input" id="mcp-url" value="' + escAttr(draft.url) + '" inputmode="url" autocomplete="url"></div>' +
+    '<div class="mcp-field"><label for="mcp-headers">' + esc(t('plugins.mcpHeaders')) + '</label><textarea class="mcp-input" id="mcp-headers" spellcheck="false" placeholder="{}">' + esc(draft.headersText) + '</textarea><div class="mcp-field-help">' + esc(mcpSecretHelp(draft.headerKeys, 'plugins.mcpSavedHeaderKeys')) + ' ' + esc(t('plugins.mcpSecretsHelp')) + '</div></div></div>' +
+    '<label class="mcp-enabled-check" for="mcp-enabled"><input id="mcp-enabled" type="checkbox"' + (draft.enabled ? ' checked' : '') + (pending ? ' disabled' : '') + '> ' + esc(t('plugins.mcpEnabled')) + '</label>' +
+    '<div class="mcp-form-actions"><button type="button" class="sec-btn" id="mcp-cancel" onclick="window.cancelMcpForm()"' + (pending ? ' disabled' : '') + '>' + esc(t('common.cancel')) + '</button>' +
+    '<button type="button" class="sec-btn primary" id="mcp-save" onclick="window.saveMcpServer()"' + (pending ? ' disabled' : '') + '>' + esc(pending ? t('plugins.mcpSaving') : t('plugins.mcpSave')) + '</button></div></section>';
+}
+
 window.renderMcpManagerContent = function() {
   var panel = document.getElementById('plugin-panel');
-  if (!panel) return;
-  var servers = state.mcpServers || [];
-  var discovered = state.mcpDiscovered || [];
-  var editing = servers.find(function(server) { return server.id === state.mcpEditingId; }) || {};
-  var transport = editing.transport === 'http' ? 'http' : 'stdio';
-  var html = '<div style="font-size:11px;color:var(--text-dim);margin-bottom:10px;">' + esc(t('plugins.mcpHelp')) + '</div>' +
-    '<div class="provider-card" style="margin-bottom:12px;">' +
-    '<div style="display:grid;grid-template-columns:1fr 120px;gap:8px;margin-bottom:8px;">' +
-    '<input id="mcp-name" value="' + escAttr(editing.name || '') + '" placeholder="' + escAttr(t('plugins.mcpName')) + '" class="github-repo-select">' +
-    '<select id="mcp-transport" class="github-repo-select" onchange="window.updateMcpTransportForm()"><option value="stdio"' + (transport === 'stdio' ? ' selected' : '') + '>stdio</option><option value="http"' + (transport === 'http' ? ' selected' : '') + '>http</option></select></div>' +
-    '<input id="mcp-command" value="' + escAttr(transport === 'http' ? (editing.url || '') : (editing.command || '')) + '" placeholder="' + escAttr(t('plugins.mcpCommand')) + '" class="github-repo-select" style="margin-bottom:8px;">' +
-    '<textarea id="mcp-args" placeholder="' + escAttr(transport === 'http' ? t('plugins.mcpHeaders') : t('plugins.mcpArgs')) + '" style="width:100%;min-height:72px;border:1px solid var(--glass-border-2);border-radius:var(--radius-md);background:var(--control-bg);color:var(--text);padding:9px;font:11px var(--font-mono);resize:vertical;">' + esc(transport === 'http' ? '' : JSON.stringify(editing.args || [], null, 2)) + '</textarea>' +
-    '<textarea id="mcp-env" placeholder="' + escAttr(t('plugins.mcpEnv')) + '" style="display:' + (transport === 'stdio' ? 'block' : 'none') + ';width:100%;min-height:72px;margin-top:8px;border:1px solid var(--glass-border-2);border-radius:var(--radius-md);background:var(--control-bg);color:var(--text);padding:9px;font:11px var(--font-mono);resize:vertical;"></textarea>' +
-    '<div style="display:flex;justify-content:flex-end;gap:8px;margin-top:8px;"><button class="sec-btn" onclick="window.resetMcpForm()">' + esc(t('common.clear')) + '</button><button class="sec-btn primary" onclick="window.saveMcpServer()">' + esc(editing.id ? t('plugins.mcpSave') : t('plugins.mcpAdd')) + '</button></div></div>' +
-    '<h4 style="margin:0 0 8px;">' + esc(t('plugins.mcpStored')) + '</h4>';
-  if (!servers.length) html += '<div class="settings-empty">' + esc(t('plugins.mcpNoServers')) + '</div>';
+  if (!panel || state.pluginActiveTab !== 'mcp') return;
+  var allServers = state.mcpServers || [];
+  var allDiscovered = state.mcpDiscovered || [];
+  var query = String(state.mcpSearchQuery || '').trim().toLowerCase();
+  var servers = allServers.filter(function(server) { return mcpSearchMatch(server, query); });
+  var discovered = allDiscovered.filter(function(server) { return mcpSearchMatch(server, query); });
+  var pending = !!state.mcpMutationPending;
+  var html = '<div class="plugin-toolbar"><div class="plugin-toolbar-copy"><div class="plugin-toolbar-title">' + esc(t('plugins.mcp')) + '</div><div class="plugin-toolbar-meta">' + esc(t('plugins.mcpHelp')) + '</div></div>' +
+    '<input class="plugin-search" id="mcp-search" type="search" value="' + escAttr(state.mcpSearchQuery || '') + '" placeholder="' + escAttr(t('plugins.mcpSearch')) + '" aria-label="' + escAttr(t('plugins.mcpSearch')) + '" oninput="window.updateMcpSearch(this.value)">' +
+    '<button type="button" class="sec-btn" id="mcp-refresh" onclick="window.renderMcpManager()"' + (pending ? ' disabled' : '') + '>' + esc(t('plugins.mcpRefresh')) + '</button>' +
+    '<button type="button" class="sec-btn primary" id="mcp-add" onclick="window.openMcpAddForm()"' + (pending ? ' disabled' : '') + '>' + esc(t('plugins.mcpAdd')) + '</button></div>';
+  html += renderMcpForm();
+  html += '<section class="plugin-section" id="mcp-stored-section"><div class="plugin-section-head"><div class="plugin-section-title">' + esc(t('plugins.mcpStored')) + '</div><span class="plugin-count-badge">' + esc(pluginText('plugins.mcpConfiguredCount', { count: allServers.length })) + '</span></div>';
+  if (!allServers.length) html += '<div class="plugin-empty">' + esc(t('plugins.mcpStoredEmpty')) + '</div>';
+  else if (!servers.length) html += '<div class="plugin-empty">' + esc(t('plugins.mcpNoMatch')) + '</div>';
   servers.forEach(function(server) {
-    var endpoint = server.transport === 'http' ? server.url : [server.command].concat(server.args || []).join(' ');
-    html += '<div class="provider-card" style="display:flex;align-items:center;gap:8px;"><div style="flex:1;min-width:0;"><div style="font-weight:650;">' + esc(server.name) + ' <span class="settings-badge">' + esc(server.transport) + '</span></div><div class="provider-meta">' + esc(endpoint || '') + '</div></div>' +
-      '<button class="sec-btn" onclick="window.editMcpServer(\'' + escAttr(server.id) + '\')">' + esc(t('common.edit')) + '</button>' +
-      '<button class="sec-btn" onclick="window.toggleMcpServer(\'' + escAttr(server.id) + '\',' + (!server.enabled) + ')">' + esc(server.enabled ? t('common.disable') : t('common.enable')) + '</button>' +
-      '<button class="sec-btn" onclick="window.removeMcpServerFromUi(\'' + escAttr(server.id) + '\')">' + esc(t('common.remove')) + '</button></div>';
+    var index = allServers.indexOf(server);
+    var endpoint = server.transport === 'http' ? server.url : [server.command].concat(server.args || []).filter(Boolean).join(' ');
+    html += '<div class="mcp-server-row" data-mcp-index="' + index + '"><div class="mcp-server-copy"><div class="mcp-server-title">' + esc(server.name || '') +
+      '<span class="plugin-status-badge">' + esc(server.transport || 'stdio') + '</span><span class="plugin-status-badge' + (server.enabled ? ' enabled' : '') + '">' + esc(server.enabled ? t('plugins.mcpEnabledStatus') : t('plugins.mcpDisabledStatus')) + '</span></div>' +
+      '<div class="mcp-server-meta">' + esc(endpoint || '') + '</div></div><div class="mcp-row-actions">' +
+      '<button type="button" class="sec-btn" onclick="window.editMcpServerAt(' + index + ')"' + (pending ? ' disabled' : '') + '>' + esc(t('common.edit')) + '</button>' +
+      '<button type="button" class="sec-btn" onclick="window.toggleMcpServerAt(' + index + ',' + (!server.enabled) + ')"' + (pending ? ' disabled' : '') + '>' + esc(server.enabled ? t('common.disable') : t('common.enable')) + '</button>' +
+      '<button type="button" class="sec-btn" onclick="window.removeMcpServerAt(' + index + ')"' + (pending ? ' disabled' : '') + '>' + esc(t('common.remove')) + '</button></div></div>';
   });
-  html += '<h4 style="margin:14px 0 8px;">' + esc(t('plugins.mcpDiscovered')) + '</h4>';
-  if (!discovered.length) html += '<div class="settings-empty">' + esc(t('plugins.noItems')) + '</div>';
+  html += '</section><section class="plugin-section" id="mcp-discovered-section"><div class="plugin-section-head"><div class="plugin-section-title">' + esc(t('plugins.mcpDiscovered')) + '</div><span class="plugin-count-badge">' + allDiscovered.length + '</span></div>';
+  if (!allDiscovered.length) html += '<div class="plugin-empty">' + esc(t('plugins.mcpDiscoveredEmpty')) + '</div>';
+  else if (!discovered.length) html += '<div class="plugin-empty">' + esc(t('plugins.mcpNoMatch')) + '</div>';
   discovered.forEach(function(server) {
-    html += '<div class="provider-card"><div style="font-weight:650;">' + esc(server.name) + ' <span class="settings-badge">' + esc(server.ecosystem || '') + '</span></div><div class="provider-meta">' + esc((server.plugin || '') + ' · ' + (server.root || '')) + '</div></div>';
+    html += '<div class="mcp-server-row"><div class="mcp-server-copy"><div class="mcp-server-title">' + esc(server.name || '') +
+      '<span class="plugin-status-badge">' + esc(server.ecosystem || t('plugins.mcpReadonly')) + '</span>' +
+      '<span class="plugin-status-badge' + (server.enabled ? ' enabled' : '') + '">' + esc(server.enabled ? t('plugins.mcpEnabledStatus') : t('plugins.mcpDisabledStatus')) + '</span></div><div class="mcp-server-meta">' +
+      esc([server.plugin, server.root].filter(Boolean).join(' · ')) + '</div></div><span class="plugin-status-badge">' + esc(t('plugins.mcpReadonly')) + '</span></div>';
   });
+  html += '</section>';
   panel.innerHTML = html;
+  window.updateMcpTransportForm(false);
+  if (state.mcpFormFocusRequested) {
+    state.mcpFormFocusRequested = false;
+    requestAnimationFrame(function() {
+      var form = document.getElementById('mcp-form');
+      var input = document.getElementById('mcp-name');
+      if (form) form.scrollIntoView({ block: 'nearest' });
+      if (input) input.focus({ preventScroll: true });
+    });
+  }
+};
+
+window.captureMcpDraftFromForm = function() {
+  if (!state.mcpDraft || !document.getElementById('mcp-form')) return state.mcpDraft;
+  var value = function(id) { var element = document.getElementById(id); return element ? element.value : ''; };
+  state.mcpDraft.name = value('mcp-name');
+  state.mcpDraft.transport = value('mcp-transport') === 'http' ? 'http' : 'stdio';
+  state.mcpDraft.command = value('mcp-command');
+  state.mcpDraft.url = value('mcp-url');
+  state.mcpDraft.argsText = value('mcp-args');
+  state.mcpDraft.cwd = value('mcp-cwd');
+  state.mcpDraft.envText = value('mcp-env');
+  state.mcpDraft.headersText = value('mcp-headers');
+  var enabled = document.getElementById('mcp-enabled');
+  state.mcpDraft.enabled = !!(enabled && enabled.checked);
+  return state.mcpDraft;
+};
+
+window.updateMcpTransportForm = function(capture) {
+  if (capture !== false) window.captureMcpDraftFromForm();
+  var transport = document.getElementById('mcp-transport');
+  var stdio = document.getElementById('mcp-stdio-fields');
+  var http = document.getElementById('mcp-http-fields');
+  var isHttp = !!(transport && transport.value === 'http');
+  if (state.mcpDraft) state.mcpDraft.transport = isHttp ? 'http' : 'stdio';
+  if (stdio) stdio.hidden = isHttp;
+  if (http) http.hidden = !isHttp;
+};
+
+window.openMcpAddForm = function() {
+  if (state.mcpMutationPending) return;
+  state.mcpEditingId = '';
+  state.mcpDraft = newMcpDraft({ enabled: false, transport: 'stdio', args: [] }, 'add');
+  state.mcpFormFocusRequested = true;
+  window.renderMcpManagerContent();
+};
+
+window.editMcpServerAt = function(index) {
+  if (state.mcpMutationPending) return;
+  var server = (state.mcpServers || [])[index];
+  if (!server) return;
+  state.mcpEditingId = server.id || '';
+  state.mcpDraft = newMcpDraft(server, 'edit');
+  state.mcpFormFocusRequested = true;
+  window.renderMcpManagerContent();
+};
+
+window.cancelMcpForm = function() {
+  if (state.mcpMutationPending) return;
+  state.mcpEditingId = '';
+  state.mcpDraft = null;
+  window.renderMcpManagerContent();
+  var addButton = document.getElementById('mcp-add');
+  if (addButton) addButton.focus({ preventScroll: true });
 };
 
-window.updateMcpTransportForm = function() {
-  var transport = document.getElementById('mcp-transport').value;
-  var args = document.getElementById('mcp-args');
-  var env = document.getElementById('mcp-env');
-  if (args) { args.value = ''; args.placeholder = transport === 'http' ? t('plugins.mcpHeaders') : t('plugins.mcpArgs'); }
-  if (env) env.style.display = transport === 'stdio' ? 'block' : 'none';
+window.updateMcpSearch = function(value) {
+  window.captureMcpDraftFromForm();
+  state.mcpSearchQuery = String(value || '');
+  window.renderMcpManagerContent();
+  var search = document.getElementById('mcp-search');
+  if (search) {
+    search.focus({ preventScroll: true });
+    search.setSelectionRange(search.value.length, search.value.length);
+  }
 };
-window.resetMcpForm = function() { state.mcpEditingId = ''; window.renderMcpManagerContent(); };
-window.editMcpServer = function(id) { state.mcpEditingId = id; window.renderMcpManagerContent(); };
+
+function parseMcpObject(text, fieldLabel) {
+  if (!String(text || '').trim()) return undefined;
+  var parsed = JSON.parse(text);
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error(pluginText('plugins.mcpInvalidObject', { field: fieldLabel }));
+  return parsed;
+}
+
+function mcpMutationUiActive(generation) {
+  return generation === state.mcpMutationGeneration
+    && state.pluginActiveTab === 'mcp'
+    && !!(state.activeSubWindowView && state.activeSubWindowView.name === 'plugins')
+    && !!document.getElementById('plugin-panel');
+}
+
 window.saveMcpServer = function() {
-  if (!api.upsertMcpServer) return;
-  var name = document.getElementById('mcp-name').value.trim();
-  var transport = document.getElementById('mcp-transport').value;
-  var endpoint = document.getElementById('mcp-command').value.trim();
-  var argsText = document.getElementById('mcp-args').value.trim();
-  var envText = document.getElementById('mcp-env').value.trim();
-  var input = { id: state.mcpEditingId || undefined, name: name, transport: transport };
+  if (!api.upsertMcpServer || state.mcpMutationPending) return;
+  var draft = window.captureMcpDraftFromForm();
+  if (!draft) return;
+  var name = String(draft.name || '').trim();
+  var transport = draft.transport === 'http' ? 'http' : 'stdio';
+  if (!name) { showUiNotice(t('plugins.mcpRequiredName'), 'error', 'mcp-save'); return; }
+  var input = { id: draft.id || state.mcpEditingId || undefined, name: name, transport: transport, enabled: !!draft.enabled };
   try {
-    if (transport === 'http') { input.url = endpoint; if (argsText) input.headers = JSON.parse(argsText); }
-    else { input.command = endpoint; input.args = argsText ? JSON.parse(argsText) : []; if (envText) input.env = JSON.parse(envText); }
+    if (transport === 'http') {
+      var url = String(draft.url || '').trim();
+      if (!/^https?:\/\//i.test(url)) throw new Error(t('plugins.mcpRequiredUrl'));
+      input.url = url;
+      var headers = parseMcpObject(draft.headersText, t('plugins.mcpHeaders'));
+      if (headers !== undefined) input.headers = headers;
+    } else {
+      var command = String(draft.command || '').trim();
+      if (!command) throw new Error(t('plugins.mcpRequiredCommand'));
+      var args = String(draft.argsText || '').trim() ? JSON.parse(draft.argsText) : [];
+      if (!Array.isArray(args)) throw new Error(t('plugins.mcpInvalidArgs'));
+      input.command = command;
+      input.args = args;
+      input.cwd = String(draft.cwd || '').trim() || undefined;
+      var env = parseMcpObject(draft.envText, t('plugins.mcpEnv'));
+      if (env !== undefined) input.env = env;
+    }
   } catch (error) {
-    showUiNotice(error.message || String(error), 'error', 'mcp-json');
+    showUiNotice(error && error.message ? error.message : String(error), 'error', 'mcp-save');
     return;
   }
-  api.upsertMcpServer(input).then(function(result) {
-    if (!result || !result.ok) throw new Error(result && result.error || 'MCP update failed');
+  var generation = ++state.mcpMutationGeneration;
+  state.mcpMutationPending = true;
+  window.renderMcpManagerContent();
+  Promise.resolve(api.upsertMcpServer(input)).then(function(result) {
+    if (!result || result.ok !== true) throw new Error(result && result.error || t('plugins.mcpMutationFailed'));
+    if (Array.isArray(result.servers)) state.mcpServers = result.servers;
     state.mcpEditingId = '';
-    window.renderMcpManager();
-  }).catch(function(error) { showUiNotice(error.message || String(error), 'error', 'mcp-save'); });
+    state.mcpDraft = null;
+    if (mcpMutationUiActive(generation)) showUiNotice(t('plugins.mcpSaved'), 'success', 'mcp-save');
+  }).catch(function(error) {
+    if (mcpMutationUiActive(generation)) showUiNotice(error && error.message ? error.message : String(error), 'error', 'mcp-save');
+  }).finally(function() {
+    state.mcpMutationPending = false;
+    if (mcpMutationUiActive(generation)) window.renderMcpManager();
+  });
+};
+
+window.toggleMcpServerAt = function(index, enabled) {
+  if (!api.setMcpServerEnabled || state.mcpMutationPending) return;
+  var server = (state.mcpServers || [])[index];
+  if (!server) return;
+  var generation = ++state.mcpMutationGeneration;
+  state.mcpMutationPending = true;
+  window.renderMcpManagerContent();
+  Promise.resolve(api.setMcpServerEnabled(server.id, !!enabled)).then(function(result) {
+    if (!result || result.ok !== true) throw new Error(result && result.error || t('plugins.mcpMutationFailed'));
+    if (Array.isArray(result.servers)) state.mcpServers = result.servers;
+  }).catch(function(error) {
+    if (mcpMutationUiActive(generation)) showUiNotice(error && error.message ? error.message : String(error), 'error', 'mcp-toggle');
+  }).finally(function() {
+    state.mcpMutationPending = false;
+    if (mcpMutationUiActive(generation)) window.renderMcpManager();
+  });
+};
+
+window.removeMcpServerAt = function(index) {
+  if (!api.removeMcpServer || state.mcpMutationPending) return;
+  var server = (state.mcpServers || [])[index];
+  if (!server || !confirm(pluginText('plugins.mcpRemoveConfirm', { name: server.name || '' }))) return;
+  var generation = ++state.mcpMutationGeneration;
+  state.mcpMutationPending = true;
+  window.renderMcpManagerContent();
+  Promise.resolve(api.removeMcpServer(server.id)).then(function(result) {
+    if (!result || result.ok !== true) throw new Error(result && result.error || t('plugins.mcpMutationFailed'));
+    if (Array.isArray(result.servers)) state.mcpServers = result.servers;
+    if (state.mcpEditingId === server.id) { state.mcpEditingId = ''; state.mcpDraft = null; }
+  }).catch(function(error) {
+    if (mcpMutationUiActive(generation)) showUiNotice(error && error.message ? error.message : String(error), 'error', 'mcp-remove');
+  }).finally(function() {
+    state.mcpMutationPending = false;
+    if (mcpMutationUiActive(generation)) window.renderMcpManager();
+  });
 };
-window.toggleMcpServer = function(id, enabled) { if (api.setMcpServerEnabled) api.setMcpServerEnabled(id, enabled).then(window.renderMcpManager); };
-window.removeMcpServerFromUi = function(id) { if (api.removeMcpServer) api.removeMcpServer(id).then(window.renderMcpManager); };
 
 window.filteredSkillMarket = function() {
   var market = state._skillMarketAll || [];
@@ -19003,7 +20726,7 @@ window.filteredSkillMarket = function() {
 
 window.renderSkillsMarketList = function() {
   var panel = document.getElementById('plugin-panel');
-  if (!panel) return;
+  if (!panel || state.pluginActiveTab !== 'market' || !state.activeSubWindowView || state.activeSubWindowView.name !== 'plugins') return;
   var market = window.filteredSkillMarket();
   var total = (state._skillMarketAll || []).length;
   var query = state.skillMarketQuery || '';
@@ -19272,13 +20995,14 @@ window.renderLeftWsList = function() {
   var container = document.getElementById('left-ws-list');
   if (!container) return;
   var workspaces = state.workspaces || [];
+  var hasActiveWorkspace = workspaces.some(function(item) { return workspaceIdentity(item) === String(state.currentWorkspaceId || ''); });
   var html = '';
   for (var i = 0; i < workspaces.length; i++) {
     var ws = workspaces[i];
     var identity = workspaceIdentity(ws);
     var active = identity === String(state.currentWorkspaceId || '');
     var runtimeStatus = workspaceRuntimeStatus(ws);
-    html += '<div class="left-ws-item' + (active ? ' active' : '') + '" onclick="window.switchToWorkspace(\'' + escAttr(identity) + '\')">' +
+    html += '<div class="left-ws-item' + (active ? ' active' : '') + '" role="listitem" tabindex="' + (active || (!hasActiveWorkspace && i === 0) ? '0' : '-1') + '" aria-current="' + (active ? 'true' : 'false') + '" onclick="window.switchToWorkspace(\'' + escAttr(identity) + '\')" onkeydown="window.handleWorkspaceKey(event)">' +
       '<span class="ws-icon">' + esc((ws.name || '?')[0].toUpperCase()) + '</span>' +
       '<span class="ws-label">' + esc(ws.name || t('workspace.untitled')) + '</span>' +
       (runtimeStatus ? '<span class="ws-runtime-dot ' + escAttr(runtimeStatus) + '" title="' + escAttr(runtimeStatus) + '"></span>' : '') +
@@ -19291,6 +21015,24 @@ window.renderLeftWsList = function() {
   appendDomNodesInBatches(container, Array.from(holder.children), 'workspace-list', 24);
 };
 
+window.handleWorkspaceKey = function(event) {
+  if (!event || event.defaultPrevented || event.isComposing || event.key === 'Process' || event.keyCode === 229 || event.target !== event.currentTarget) return false;
+  if (event.key === 'Enter' || event.key === ' ') return window.activateButtonLike(event);
+  var items = Array.prototype.slice.call(document.querySelectorAll('#left-ws-list .left-ws-item'));
+  var index = items.indexOf(event.currentTarget);
+  if (index < 0 || !items.length) return false;
+  var next = index;
+  if (event.key === 'ArrowDown' || event.key === 'ArrowRight') next = (index + 1) % items.length;
+  else if (event.key === 'ArrowUp' || event.key === 'ArrowLeft') next = (index - 1 + items.length) % items.length;
+  else if (event.key === 'Home') next = 0;
+  else if (event.key === 'End') next = items.length - 1;
+  else return false;
+  event.preventDefault();
+  items[next].focus({ preventScroll:true });
+  items[next].click();
+  return true;
+};
+
 window.toggleWorkspacePinned = function(identity) {
   if (!identity || !api.setWorkspacePinned) return;
   var nextPinned = false;
@@ -19395,7 +21137,7 @@ window.showNewWorkspaceDialog = function() {
     '<label style="display:flex;align-items:center;gap:4px;font-size:12px;cursor:pointer;"><input type="radio" name="ws-type" value="ssh" onchange="window.toggleWsType()"> ' + esc(t('workspace.ssh')) + '</label>' +
     '</div>' +
     '<label id="ws-name-label-dlg" style="display:block;font-size:12px;color:var(--text-dim);margin-bottom:8px;">' + esc(t('workspace.name')) + '</label>' +
-    '<input id="new-ws-input" style="width:100%;padding:8px 10px;border:1px solid var(--glass-border-2);border-radius:var(--radius-sm);background:var(--glass-bg-1);color:var(--text);font-size:13px;outline:none;box-sizing:border-box;" placeholder="' + escAttr(t('workspace.enterName')) + '" onkeydown="if(event.key===\'Enter\')window.doCreateWorkspace()">' +
+    '<input id="new-ws-input" style="width:100%;padding:8px 10px;border:1px solid var(--glass-border-2);border-radius:var(--radius-sm);background:var(--glass-bg-1);color:var(--text);font-size:13px;outline:none;box-sizing:border-box;" placeholder="' + escAttr(t('workspace.enterName')) + '" onkeydown="if(event.key===\'Enter\'&&!event.isComposing&&event.key!==\'Process\'&&event.keyCode!==229)window.doCreateWorkspace()">' +
     '<div id="ws-ext-path" style="display:none;margin-top:8px;">' +
     '<label style="display:block;font-size:12px;color:var(--text-dim);margin-bottom:6px;">' + esc(t('workspace.folderPath')) + '</label>' +
     '<div style="display:flex;gap:6px;">' +
@@ -19651,7 +21393,7 @@ window.openWorkspaceManager = async function() {
       var ws = workspaces[i];
       var identity = workspaceIdentity(ws);
       var isActive = identity === String(state.currentWorkspaceId || '');
-      listHtml += '<div style="display:flex;align-items:center;gap:8px;padding:8px 10px;margin:2px 0;border-radius:var(--radius-sm);background:' + (isActive ? 'var(--accent-glow)' : 'var(--glass-bg-1)') + ';cursor:pointer;" onclick="window.switchToWorkspace(\'' + escAttr(identity) + '\')">' +
+      listHtml += '<div role="button" tabindex="0" style="display:flex;align-items:center;gap:8px;padding:8px 10px;margin:2px 0;border-radius:var(--radius-sm);background:' + (isActive ? 'var(--accent-glow)' : 'var(--glass-bg-1)') + ';cursor:pointer;" onclick="window.switchToWorkspace(\'' + escAttr(identity) + '\')" onkeydown="window.activateButtonLike(event)">' +
         '<span style="width:24px;height:24px;border-radius:var(--radius-sm);background:linear-gradient(135deg,var(--accent),#7b93ff);color:#fff;font-size:11px;font-weight:700;display:flex;align-items:center;justify-content:center;flex-shrink:0;">' + esc((ws.name || '?')[0].toUpperCase()) + '</span>' +
         '<span style="flex:1;font-size:12px;color:var(--text);">' + esc(ws.name || t('workspace.untitled')) + '</span>' +
         (isActive ? '<span style="font-size:10px;color:var(--accent2);">' + esc(t('workspace.current')) + '</span>' : '') +
@@ -19888,6 +21630,549 @@ function stopMarqueeJS() {
   if (marqueeRAF) { cancelAnimationFrame(marqueeRAF); marqueeRAF = null; }
 }
 
+// === Unified GUI Command Registry & Keyboard Routing ===
+function guiCommand(id, titleKey, category, options) {
+  return Object.assign({ id: id, titleKey: titleKey, category: category, bindings: [], scope: 'palette', keywords: [] }, options || {});
+}
+
+function guiIsMac() {
+  return String(state.platform || navigator.platform || '').toLowerCase().indexOf('mac') >= 0;
+}
+
+function guiBindingRecord(command, input) {
+  return typeof input === 'string'
+    ? { keys: input, scope: command.scope || 'palette' }
+    : { keys: String((input && input.keys) || ''), scope: String((input && input.scope) || command.scope || 'palette') };
+}
+
+function guiDisplayBinding(binding) {
+  var keys = typeof binding === 'string' ? binding : String((binding && binding.keys) || '');
+  return keys.replace(/\bMod\b/g, guiIsMac() ? 'Cmd' : 'Ctrl').replace(/ /g, '  then  ');
+}
+
+function guiSetSelectValue(id, value) {
+  var select = document.getElementById(id);
+  if (!select) return false;
+  select.value = value;
+  select.dispatchEvent(new Event('change', { bubbles: true }));
+  return true;
+}
+
+function guiSubWindowOpen() {
+  return !!(els['sub-win-overlay'] && els['sub-win-overlay'].classList.contains('open'));
+}
+
+function guiFocusPrompt() {
+  if (guiSubWindowOpen()) return false;
+  if (els.prompt) {
+    els.prompt.focus({ preventScroll: true });
+    return true;
+  }
+  return false;
+}
+
+function guiFocusTerminal() {
+  if (guiSubWindowOpen()) return false;
+  if (state.bottomCollapsed) window.toggleBottom();
+  var input = document.querySelector('#terminal-body .terminal-pane.active .terminal-input') || document.querySelector('#terminal-body .terminal-input');
+  if (input) {
+    input.focus({ preventScroll: true });
+    return true;
+  }
+  return false;
+}
+
+function guiFocusBrowserAddress() {
+  if (guiSubWindowOpen()) return false;
+  window.switchRightTab('browser');
+  requestAnimationFrame(function() {
+    var input = document.getElementById('browser-url');
+    if (input) { input.focus({ preventScroll: true }); input.select(); }
+  });
+  return true;
+}
+
+function guiCycleConversation(direction) {
+  var conversations = currentWorkspaceConversations ? currentWorkspaceConversations() : [];
+  if (!conversations.length) return false;
+  var current = Math.max(0, Math.min(conversations.length - 1, Number(state.activeConversation) || 0));
+  var next = (current + direction + conversations.length) % conversations.length;
+  window.switchConversation(next);
+  return true;
+}
+
+function guiHasSwitchableBranch() {
+  var groups = state.conversationBranchGroups || [];
+  var branches = state.conversationBranches || [];
+  if (groups.length) return groups.some(function(group) { return (group.branches || []).length > 1; });
+  return branches.length > 1;
+}
+
+function guiToggleTheme() {
+  var current = state.theme === 'light' ? 'light' : 'dark';
+  window.setTheme(current === 'light' ? 'dark' : 'light');
+}
+
+var NEWMARK_GUI_COMMANDS = [
+  guiCommand('app.commandPalette', 'shortcuts.openPalette', 'general', { bindings: [{ keys:'Mod+Shift+P', scope:'global' }], run:function(){ window.openCommandSurface('palette'); } }),
+  guiCommand('help.keyboardShortcuts', 'shortcuts.openHelp', 'general', { bindings: [{ keys:'F1', scope:'global' }], run:function(){ window.openCommandSurface('help'); } }),
+  guiCommand('settings.open', 'settings.title', 'general', { bindings: [{ keys:'Mod+,', scope:'global' }, { keys:'Mod+K S', scope:'whenNotEditing' }], run:function(){ window.openSettings(); } }),
+  guiCommand('window.minimize', 'top.minimize', 'general', { run:function(){ api.minimize(); } }),
+  guiCommand('window.maximize', 'top.maximize', 'general', { run:function(){ api.maximize(); } }),
+  guiCommand('view.toggleTheme', 'shortcuts.toggleTheme', 'general', { bindings:[{ keys:'Mod+K Q', scope:'whenNotEditing' }], run:guiToggleTheme }),
+
+  guiCommand('conversation.new', 'left.newChat', 'workspace', { bindings:[{ keys:'Mod+K N', scope:'whenNotEditing' }], run:function(){ if (state.currentWorkspaceId) window.newConversation(); else window.showNewConversationPage(); } }),
+  guiCommand('conversation.next', 'shortcuts.nextConversation', 'workspace', { bindings:[{ keys:'Mod+Shift+ArrowRight', scope:'whenNotEditing' }], run:function(){ guiCycleConversation(1); }, available:function(){ return currentWorkspaceConversations().length > 1; } }),
+  guiCommand('conversation.previous', 'shortcuts.previousConversation', 'workspace', { bindings:[{ keys:'Mod+Shift+ArrowLeft', scope:'whenNotEditing' }], run:function(){ guiCycleConversation(-1); }, available:function(){ return currentWorkspaceConversations().length > 1; } }),
+  guiCommand('conversation.archive', 'archive.current', 'workspace', { run:function(){ window.archiveCurrent(); }, available:function(){ return !!state.currentWorkspaceId; } }),
+  guiCommand('branch.previous', 'shortcuts.previousBranch', 'workspace', { bindings:[{ keys:'Alt+ArrowUp', scope:'whenNotEditing' }], run:function(){ window.switchConversationBranch(-1); }, available:function(){ return guiHasSwitchableBranch(); } }),
+  guiCommand('branch.next', 'shortcuts.nextBranch', 'workspace', { bindings:[{ keys:'Alt+ArrowDown', scope:'whenNotEditing' }], run:function(){ window.switchConversationBranch(1); }, available:function(){ return guiHasSwitchableBranch(); } }),
+  guiCommand('workspace.manager', 'workspace.manager', 'workspace', { bindings:[{ keys:'Mod+K W', scope:'whenNotEditing' }], run:function(){ window.openWorkspaceManager(); } }),
+  guiCommand('workspace.new', 'workspace.new', 'workspace', { run:function(){ window.showNewWorkspaceDialog(); } }),
+  guiCommand('workspace.settings', 'workspace.settingsTitle', 'workspace', { run:function(){ window.openWsSettings(); }, available:function(){ return !!state.currentWorkspaceId; } }),
+
+  guiCommand('view.plugins', 'plugins.title', 'navigation', { bindings:[{ keys:'Mod+K P', scope:'whenNotEditing' }], run:function(){ window.showPluginList(); } }),
+  guiCommand('view.plugins.mcp', 'plugins.mcp', 'navigation', { run:function(){ window.showPluginList('mcp'); } }),
+  guiCommand('view.plugins.dsh', 'plugins.dsh', 'navigation', { bindings:[{ keys:'Mod+K D', scope:'whenNotEditing' }], run:function(){ window.showPluginList('dsh'); } }),
+  guiCommand('view.plugins.skills', 'plugins.management', 'navigation', { run:function(){ window.showPluginList('installed'); } }),
+  guiCommand('view.plugins.market', 'plugins.market', 'navigation', { run:function(){ window.showPluginList('market'); } }),
+  guiCommand('view.plugins.github', 'plugins.github', 'navigation', { run:function(){ window.showPluginList('github'); } }),
+  guiCommand('view.memoryLab', 'memoryLab.title', 'navigation', { bindings:[{ keys:'Mod+K M', scope:'whenNotEditing' }], run:function(){ window.showMemoryLab(); } }),
+  guiCommand('view.automation', 'automation.title', 'navigation', { bindings:[{ keys:'Mod+K A', scope:'whenNotEditing' }], run:function(){ window.showAutomationWindow(); } }),
+  guiCommand('automation.new', 'automation.new', 'navigation', { run:function(){ window.showNewAutomationForm(); } }),
+  guiCommand('view.flowEditor', 'flow.title', 'navigation', { bindings:[{ keys:'Mod+K F', scope:'whenNotEditing' }], run:function(){ window.showFlowEditor(); } }),
+  guiCommand('flow.new', 'flow.new', 'navigation', { run:function(){ window.newFlowWork(); } }),
+
+  guiCommand('focus.primaryInput', 'shortcuts.focusPrimary', 'layout', { bindings:[{ keys:'Mod+K C', scope:'whenNotEditing' }], run:guiFocusPrompt, available:function(){ return !guiSubWindowOpen(); } }),
+  guiCommand('focus.nextRegion', 'shortcuts.focusNext', 'layout', { bindings:[{ keys:'F6', scope:'global' }], run:function(){ window.cycleGuiRegionFocus(1); }, available:function(){ return !guiSubWindowOpen() && !window.commandSurfaceIsOpen(); } }),
+  guiCommand('focus.previousRegion', 'shortcuts.focusPrevious', 'layout', { bindings:[{ keys:'Shift+F6', scope:'global' }], run:function(){ window.cycleGuiRegionFocus(-1); }, available:function(){ return !guiSubWindowOpen() && !window.commandSurfaceIsOpen(); } }),
+  guiCommand('view.toggleLeft', 'shortcuts.toggleLeft', 'layout', { bindings:[{ keys:'Mod+B', scope:'whenNotEditing' }], run:function(){ window.toggleLeft(); } }),
+  guiCommand('view.toggleWorkspacePanel', 'shortcuts.toggleWorkspacePanel', 'layout', { run:function(){ window.toggleSecondarySidebar(); } }),
+  guiCommand('view.toggleRight', 'shortcuts.toggleRight', 'layout', { run:function(){ window.toggleRight(); } }),
+  guiCommand('view.toggleTerminal', 'shortcuts.toggleTerminal', 'layout', { bindings:[{ keys:'Mod+`', scope:'whenNotEditing' }], run:function(){ window.toggleBottom(); } }),
+  guiCommand('chat.scrollBottom', 'shortcuts.scrollBottom', 'layout', { bindings:[{ keys:'Mod+End', scope:'whenNotEditing' }], run:function(){ window.scrollToBottom(); } }),
+
+  guiCommand('right.files', 'right.files', 'navigation', { bindings:[{ keys:'Mod+K 1', scope:'whenNotEditing' }], run:function(){ window.switchRightTab('file-tree'); } }),
+  guiCommand('right.editor', 'right.editor', 'navigation', { bindings:[{ keys:'Mod+K 2', scope:'whenNotEditing' }], run:function(){ window.switchRightTab('editor'); } }),
+  guiCommand('right.plan', 'right.plan', 'navigation', { bindings:[{ keys:'Mod+K 3', scope:'whenNotEditing' }], run:function(){ window.switchRightTab('plan'); } }),
+  guiCommand('right.subagents', 'right.subagents', 'navigation', { run:function(){ window.switchRightTab('subagent'); } }),
+  guiCommand('right.browser', 'right.browser', 'navigation', { bindings:[{ keys:'Mod+K 4', scope:'whenNotEditing' }], run:function(){ window.switchRightTab('browser'); } }),
+  guiCommand('right.status', 'right.status', 'navigation', { run:function(){ window.switchRightTab('status'); } }),
+  guiCommand('right.archives', 'right.archives', 'navigation', { run:function(){ window.switchRightTab('archives'); } }),
+
+  guiCommand('mode.build', 'mode.build', 'input', { bindings:[{ keys:'Mod+1', scope:'whenNotEditing' }], run:function(){ guiSetSelectValue('mode-select','build'); } }),
+  guiCommand('mode.plan', 'mode.plan', 'input', { bindings:[{ keys:'Mod+2', scope:'whenNotEditing' }], run:function(){ guiSetSelectValue('mode-select','plan'); } }),
+  guiCommand('mode.goal', 'mode.goal', 'input', { bindings:[{ keys:'Mod+3', scope:'whenNotEditing' }], run:function(){ guiSetSelectValue('mode-select','goal'); } }),
+  guiCommand('mode.flow', 'mode.flow', 'input', { bindings:[{ keys:'Mod+4', scope:'whenNotEditing' }], run:function(){ guiSetSelectValue('mode-select','flow'); } }),
+  guiCommand('input.guide', 'input.guide', 'input', { bindings:[{ keys:'Mod+K G', scope:'whenNotEditing' }], run:function(){ window.setInputMode('guide'); } }),
+  guiCommand('input.next', 'input.next', 'input', { bindings:[{ keys:'Mod+K E', scope:'whenNotEditing' }], run:function(){ window.setInputMode('next'); } }),
+  guiCommand('goal.edit', 'goal.edit', 'input', { run:function(){ window.editGoal(); } }),
+  guiCommand('goal.pauseResume', 'goal.pause', 'input', { bindings:[{ keys:'Mod+K Shift+G', scope:'whenNotEditing' }], run:function(){ window.toggleGoalPause(); }, available:function(){ return !!state.goalVisible; } }),
+
+  guiCommand('editor.save', 'common.save', 'editor', { bindings:[{ keys:'Mod+S', scope:'editor' }], run:function(){ window.saveEditor(); }, available:function(){ return !!state.editorPath; } }),
+  guiCommand('editor.close', 'common.close', 'editor', { run:function(){ window.closeEditor(); }, available:function(){ return !!state.editorPath; } }),
+  guiCommand('editor.markdownPreview', 'right.md', 'editor', { run:function(){ window.toggleEditorMarkdownPreview(); }, available:function(){ return !!state.editorPath; } }),
+  guiCommand('editor.prediction', 'model.thinking', 'editor', { run:function(){ window.toggleEditorPrediction(); }, available:function(){ return !!state.editorPath; } }),
+  guiCommand('editor.completion', 'model.validationCurrent', 'editor', { run:function(){ window.requestEditorCompletion({ force:true }); }, available:function(){ return !!state.editorPath; } }),
+
+  guiCommand('terminal.focus', 'shortcuts.focusTerminal', 'terminal', { bindings:[{ keys:'Mod+K T', scope:'whenNotEditing' }], run:guiFocusTerminal, available:function(){ return !guiSubWindowOpen(); } }),
+  guiCommand('terminal.new', 'shortcuts.newTerminal', 'terminal', { run:function(){ window.addTerminalTab(); } }),
+  guiCommand('terminal.clear', 'terminal.clear', 'terminal', { run:function(){ window.clearTerminal(); } }),
+
+  guiCommand('browser.focusAddress', 'shortcuts.focusBrowserAddress', 'browser', { bindings:[{ keys:'Mod+L', scope:'browser' }, { keys:'Mod+K B', scope:'whenNotEditing' }], run:guiFocusBrowserAddress, available:function(){ return !guiSubWindowOpen(); } }),
+  guiCommand('browser.back', 'browser.back', 'browser', { bindings:[{ keys:'Alt+ArrowLeft', scope:'browser' }], run:function(){ window.browserBack(); } }),
+  guiCommand('browser.forward', 'browser.forward', 'browser', { bindings:[{ keys:'Alt+ArrowRight', scope:'browser' }], run:function(){ window.browserForward(); } }),
+  guiCommand('browser.reload', 'browser.reload', 'browser', { bindings:[{ keys:'Mod+R', scope:'browser' }, { keys:'F5', scope:'browser' }], run:function(){ window.browserReload(); } }),
+  guiCommand('browser.computerUse', 'right.browser', 'browser', { run:function(){ window.toggleComputerUse(); } }),
+
+  guiCommand('settings.general', 'settings.general', 'context', { run:function(){ window.openSettings('general'); } }),
+  guiCommand('settings.models', 'settings.models', 'context', { run:function(){ window.openSettings('models'); } }),
+  guiCommand('settings.tools', 'settings.tools', 'context', { run:function(){ window.openSettings('tools'); } }),
+  guiCommand('settings.archive', 'settings.archive', 'context', { run:function(){ window.openSettings('archive'); } }),
+  guiCommand('settings.updates', 'settings.updates', 'context', { run:function(){ window.openSettings('updates'); } })
+];
+window.NEWMARK_GUI_COMMANDS = NEWMARK_GUI_COMMANDS;
+
+window.activateButtonLike = function(event) {
+  if (!event || event.defaultPrevented || event.isComposing || event.key === 'Process' || event.keyCode === 229) return false;
+  if (event.key !== 'Enter' && event.key !== ' ') return false;
+  if (event.target !== event.currentTarget) return false;
+  event.preventDefault();
+  event.currentTarget.click();
+  return true;
+};
+
+function guiCommandTitle(command) {
+  return t(command.titleKey || command.id);
+}
+
+function guiCommandCategory(command) {
+  return t('shortcuts.category.' + (command.category || 'general'));
+}
+
+function guiCommandAvailable(command) {
+  try { return !command.available || command.available() !== false; }
+  catch(e) { return false; }
+}
+
+function guiKeyboardContext(event) {
+  var target = event && event.target && event.target.nodeType === 1 ? event.target : document.activeElement;
+  var closest = function(selector) { return target && target.closest ? target.closest(selector) : null; };
+  var editable = !!(target && ((target.matches && target.matches('input, textarea, select, [role="textbox"], [role="combobox"]')) || target.isContentEditable || closest('[contenteditable]:not([contenteditable="false"])')));
+  return {
+    target: target,
+    editable: editable,
+    editor: !!closest('#native-editor, #panel-editor'),
+    terminal: !!closest('#bottom, .terminal-pane'),
+    browser: !!closest('#panel-browser, .browser-url-bar') || state.rightTab === 'browser' && !!closest('#right'),
+    prompt: !!(els.prompt && (target === els.prompt || (els.prompt.contains && els.prompt.contains(target)))),
+    dialog: !!closest('[role="dialog"]')
+  };
+}
+
+function guiBindingScopeMatches(scope, context) {
+  if (scope === 'global') return true;
+  if (scope === 'whenNotEditing') return !context.editable && !context.editor && !context.terminal && !context.browser && !context.dialog;
+  if (scope === 'editor') return context.editor;
+  if (scope === 'terminal') return context.terminal;
+  if (scope === 'browser') return context.browser;
+  if (scope === 'prompt') return context.prompt;
+  if (scope === 'dialog') return context.dialog;
+  return false;
+}
+
+function guiEventSegment(event) {
+  var key = String(event.key || '');
+  if (!key || ['Control','Shift','Alt','Meta','AltGraph'].indexOf(key) >= 0) return '';
+  var parts = [];
+  var mac = guiIsMac();
+  if ((mac && event.metaKey) || (!mac && event.ctrlKey)) parts.push('Mod');
+  if ((mac && event.ctrlKey) || (!mac && event.metaKey)) parts.push(mac ? 'Ctrl' : 'Meta');
+  if (event.altKey) parts.push('Alt');
+  if (event.shiftKey) parts.push('Shift');
+  var named = { ' ':'Space', 'Esc':'Escape', 'Left':'ArrowLeft', 'Right':'ArrowRight', 'Up':'ArrowUp', 'Down':'ArrowDown' };
+  key = named[key] || key;
+  if (key.length === 1 && /[a-z]/i.test(key)) key = key.toUpperCase();
+  parts.push(key);
+  return parts.join('+');
+}
+
+var guiCommandSurfaceOriginFocus = null;
+var guiCommandSurfaceMode = 'palette';
+var guiCommandSurfaceMatches = [];
+var guiCommandSurfaceSelection = 0;
+var guiPendingChord = null;
+var guiPendingChordTimer = 0;
+
+window.commandSurfaceIsOpen = function() {
+  var overlay = document.getElementById('command-surface-overlay');
+  return !!(overlay && overlay.classList.contains('open'));
+};
+
+function guiClearChord() {
+  guiPendingChord = null;
+  if (guiPendingChordTimer) clearTimeout(guiPendingChordTimer);
+  guiPendingChordTimer = 0;
+  var hint = document.getElementById('shortcut-chord-hint');
+  if (hint) hint.classList.remove('open');
+}
+
+function guiShowChord(prefix, candidates) {
+  guiClearChord();
+  guiPendingChord = { prefix:prefix, candidates:candidates };
+  var seconds = candidates.map(function(item){ return item.binding.keys.split(' ')[1]; }).filter(function(key,index,array){ return array.indexOf(key) === index; });
+  var hint = document.getElementById('shortcut-chord-hint');
+  if (hint) {
+    hint.textContent = t('shortcuts.chordHint').replace('{prefix}', guiDisplayBinding(prefix)).replace('{keys}', seconds.join(' · '));
+    hint.classList.add('open');
+  }
+  guiPendingChordTimer = setTimeout(guiClearChord, 1800);
+}
+
+function guiNormalizeCommandSearchText(value) {
+  return String(value || '')
+    .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+    .replace(/[._:/\\-]+/g, ' ')
+    .replace(/\s+/g, ' ')
+    .trim()
+    .toLocaleLowerCase(uiLocale());
+}
+
+function guiCommandSearchText(command) {
+  var bindings = (command.bindings || []).map(guiDisplayBinding).join(' ');
+  return guiNormalizeCommandSearchText([command.id, guiCommandTitle(command), guiCommandCategory(command), bindings].concat(command.keywords || []).join(' '));
+}
+
+function guiCommandContextLabel(command) {
+  var scopes = (command.bindings || []).map(function(binding){ return guiBindingRecord(command,binding).scope; });
+  var scope = scopes[0] || command.scope || 'palette';
+  if (scope === 'editor') return t('shortcuts.context.editor');
+  if (scope === 'browser') return t('shortcuts.context.browser');
+  if (scope === 'terminal') return t('shortcuts.context.terminal');
+  if (scope === 'prompt') return t('shortcuts.context.prompt');
+  if (scope === 'dialog') return t('shortcuts.context.dialog');
+  return t('shortcuts.context.global');
+}
+
+window.renderCommandSurface = function() {
+  var list = document.getElementById('command-list');
+  var search = document.getElementById('command-search');
+  if (!list || !search) return;
+  var query = guiNormalizeCommandSearchText(search.value);
+  guiCommandSurfaceMatches = NEWMARK_GUI_COMMANDS.filter(function(command){ return !query || guiCommandSearchText(command).indexOf(query) >= 0; });
+  if (guiCommandSurfaceSelection >= guiCommandSurfaceMatches.length) guiCommandSurfaceSelection = Math.max(0, guiCommandSurfaceMatches.length - 1);
+  if (!guiCommandSurfaceMatches.length) {
+    list.innerHTML = '<div class="command-empty">' + esc(t('shortcuts.noResults')) + '</div>';
+    search.removeAttribute('aria-activedescendant');
+    return;
+  }
+  var html = '';
+  var priorCategory = '';
+  for (var i = 0; i < guiCommandSurfaceMatches.length; i++) {
+    var command = guiCommandSurfaceMatches[i];
+    var category = guiCommandCategory(command);
+    if (category !== priorCategory) {
+      html += '<div class="command-category">' + esc(category) + '</div>';
+      priorCategory = category;
+    }
+    var available = guiCommandAvailable(command);
+    var keys = (command.bindings || []).map(function(binding){ return '<span class="command-key">' + esc(guiDisplayBinding(binding)) + '</span>'; }).join('');
+    html += '<button type="button" class="command-option' + (i === guiCommandSurfaceSelection ? ' active' : '') + '" id="command-option-' + i + '" role="option" aria-selected="' + (i === guiCommandSurfaceSelection ? 'true' : 'false') + '" aria-disabled="' + (available ? 'false' : 'true') + '" tabindex="-1" onclick="window.executeCommandSurfaceIndex(' + i + ')">' +
+      '<span><span class="command-option-title">' + esc(guiCommandTitle(command)) + '</span><span class="command-option-context">' + esc(guiCommandContextLabel(command)) + '</span></span>' +
+      '<span class="command-shortcuts">' + keys + '</span></button>';
+  }
+  list.innerHTML = html;
+  search.setAttribute('aria-activedescendant', 'command-option-' + guiCommandSurfaceSelection);
+  var active = document.getElementById('command-option-' + guiCommandSurfaceSelection);
+  if (active) active.scrollIntoView({ block:'nearest' });
+};
+
+function guiMoveCommandSelection(delta, edge) {
+  if (!guiCommandSurfaceMatches.length) return;
+  if (edge === 'start') guiCommandSurfaceSelection = 0;
+  else if (edge === 'end') guiCommandSurfaceSelection = guiCommandSurfaceMatches.length - 1;
+  else guiCommandSurfaceSelection = (guiCommandSurfaceSelection + delta + guiCommandSurfaceMatches.length) % guiCommandSurfaceMatches.length;
+  window.renderCommandSurface();
+}
+
+window.openCommandSurface = function(mode) {
+  var overlay = document.getElementById('command-surface-overlay');
+  var search = document.getElementById('command-search');
+  if (!overlay || !search) return;
+  guiClearChord();
+  if (!window.commandSurfaceIsOpen() && document.activeElement && typeof document.activeElement.focus === 'function') guiCommandSurfaceOriginFocus = document.activeElement;
+  guiCommandSurfaceMode = mode === 'help' ? 'help' : 'palette';
+  document.getElementById('command-surface-title').textContent = t(guiCommandSurfaceMode === 'help' ? 'shortcuts.helpTitle' : 'shortcuts.paletteTitle');
+  document.getElementById('command-surface-subtitle').textContent = t(guiCommandSurfaceMode === 'help' ? 'shortcuts.helpSubtitle' : 'shortcuts.paletteSubtitle');
+  document.getElementById('command-surface-footer').textContent = t('shortcuts.footer');
+  search.setAttribute('placeholder', t(guiCommandSurfaceMode === 'help' ? 'shortcuts.searchShortcuts' : 'shortcuts.searchCommands'));
+  search.value = '';
+  guiCommandSurfaceSelection = 0;
+  overlay.classList.add('open');
+  updateApplicationInertState();
+  window.renderCommandSurface();
+  requestAnimationFrame(function(){ search.focus({ preventScroll:true }); });
+};
+
+window.closeCommandSurface = function(options) {
+  options = options || {};
+  var overlay = document.getElementById('command-surface-overlay');
+  if (!overlay || !overlay.classList.contains('open')) return;
+  overlay.classList.remove('open');
+  updateApplicationInertState();
+  var restore = guiCommandSurfaceOriginFocus;
+  guiCommandSurfaceOriginFocus = null;
+  if (options.restoreFocus !== false) requestAnimationFrame(function(){ if (restore && restore.isConnected && typeof restore.focus === 'function') restore.focus({ preventScroll:true }); });
+  return restore;
+};
+
+window.executeGuiCommand = function(id, options) {
+  var command = NEWMARK_GUI_COMMANDS.find(function(item){ return item.id === id; });
+  if (!command || !guiCommandAvailable(command) || typeof command.run !== 'function') return false;
+  try {
+    var result = command.run(options || {});
+    if (result && typeof result.catch === 'function') result.catch(function(error){ showUiNotice(error && error.message ? error.message : String(error), 'error', 'gui-command-' + id); });
+    return true;
+  } catch(error) {
+    showUiNotice(error && error.message ? error.message : String(error), 'error', 'gui-command-' + id);
+    return false;
+  }
+};
+
+window.executeCommandSurfaceIndex = function(index) {
+  var command = guiCommandSurfaceMatches[index];
+  if (!command || !guiCommandAvailable(command)) return false;
+  var restore = window.closeCommandSurface({ restoreFocus:false });
+  setTimeout(function(){
+    window.executeGuiCommand(command.id, { source:'commandSurface' });
+    requestAnimationFrame(function() {
+      if (!guiSubWindowOpen() && !window.commandSurfaceIsOpen() && restore && restore.isConnected && typeof restore.focus === 'function') restore.focus({ preventScroll:true });
+    });
+  }, 0);
+  return true;
+};
+
+function guiVisible(element) {
+  return !!(element && element.isConnected && element.getClientRects().length && !element.closest('[inert]'));
+}
+
+function guiRegionTargets() {
+  var activeTerminalInput = document.querySelector('#terminal-body .terminal-pane.active .terminal-input') || document.getElementById('bottom-toggle-btn');
+  var activeRightTab = document.querySelector('#right-tabs .tab-btn[data-tab].active') || document.querySelector('#right-tabs .tab-btn[data-tab]');
+  return [
+    { container:document.getElementById('left'), target:document.querySelector('#left-content .left-nav-icon') || document.querySelector('#left-thumb .lt-item') },
+    { container:document.getElementById('left-secondary'), target:document.querySelector('#left-secondary button, #conversation-list button, #conversation-list [tabindex="0"]') },
+    { container:document.getElementById('center'), target:els.prompt },
+    { container:document.getElementById('bottom'), target:activeTerminalInput },
+    { container:document.getElementById('right'), target:activeRightTab }
+  ].filter(function(region){ return guiVisible(region.container) && guiVisible(region.target); });
+}
+
+window.cycleGuiRegionFocus = function(direction) {
+  var regions = guiRegionTargets();
+  if (!regions.length) return false;
+  var active = document.activeElement;
+  var current = regions.findIndex(function(region){ return region.container === active || region.container.contains(active); });
+  var next = current < 0 ? (direction > 0 ? 0 : regions.length - 1) : (current + direction + regions.length) % regions.length;
+  regions[next].target.focus({ preventScroll:true });
+  return true;
+};
+
+window.validateGuiCommandRegistry = function() {
+  var errors = [];
+  var ids = Object.create(null);
+  var bindings = Object.create(null);
+  for (var i = 0; i < NEWMARK_GUI_COMMANDS.length; i++) {
+    var command = NEWMARK_GUI_COMMANDS[i];
+    if (!command.id || ids[command.id]) errors.push('duplicate command id: ' + command.id);
+    ids[command.id] = true;
+    if (typeof command.run !== 'function') errors.push('missing command handler: ' + command.id);
+    for (var j = 0; j < (command.bindings || []).length; j++) {
+      var binding = guiBindingRecord(command, command.bindings[j]);
+      if (!binding.keys) { errors.push('empty binding: ' + command.id); continue; }
+      var identity = binding.scope + '::' + binding.keys;
+      if (bindings[identity]) errors.push('binding conflict: ' + binding.keys + ' (' + binding.scope + ')');
+      bindings[identity] = command.id;
+      if (/\bMeta\b/.test(binding.keys) || /(?:^|\+)Mod\+Alt\+/.test(binding.keys)) errors.push('reserved modifier: ' + binding.keys);
+      if (/^(Alt\+F4|Alt\+Tab|Mod\+Alt\+Delete|Mod\+Shift\+Escape)$/.test(binding.keys)) errors.push('reserved shortcut: ' + binding.keys);
+    }
+  }
+  return errors;
+};
+
+function guiManifestHash(value) {
+  var input = String(value || '');
+  var hash = 2166136261;
+  for (var i = 0; i < input.length; i++) {
+    hash ^= input.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return ('00000000' + (hash >>> 0).toString(16)).slice(-8);
+}
+
+window.getGuiCommandManifest = function() {
+  var commands = NEWMARK_GUI_COMMANDS.map(function(command) {
+    return {
+      id: command.id,
+      category: command.category || 'general',
+      bindings: (command.bindings || []).map(function(binding) {
+        var record = guiBindingRecord(command, binding);
+        return { keys: record.keys, scope: record.scope };
+      })
+    };
+  });
+  var serialized = JSON.stringify(commands);
+  return {
+    schemaVersion: 1,
+    revision: 'fnv1a-' + guiManifestHash(serialized),
+    commands: commands,
+    errors: window.validateGuiCommandRegistry()
+  };
+};
+
+function guiHandleCommandKeydown(event) {
+  if (!event || event.defaultPrevented || event.isComposing || event.key === 'Process' || event.keyCode === 229) return false;
+  if (window.commandSurfaceIsOpen()) {
+    if (event.key === 'Escape' && !event.repeat) { event.preventDefault(); event.stopPropagation(); window.closeCommandSurface(); return true; }
+    if (event.key === 'Tab') return trapNewmarkDialogFocus(event, document.getElementById('command-surface'));
+    return false;
+  }
+  if (event.repeat) return false;
+  var segment = guiEventSegment(event);
+  if (!segment) return false;
+  if (guiPendingChord) {
+    var match = guiPendingChord.candidates.find(function(item){ return item.binding.keys.split(' ')[1] === segment; });
+    guiClearChord();
+    event.preventDefault();
+    event.stopPropagation();
+    if (match) window.executeGuiCommand(match.command.id, { source:'shortcut' });
+    return true;
+  }
+  var context = guiKeyboardContext(event);
+  var direct = [];
+  var chords = [];
+  for (var i = 0; i < NEWMARK_GUI_COMMANDS.length; i++) {
+    var command = NEWMARK_GUI_COMMANDS[i];
+    if (!guiCommandAvailable(command)) continue;
+    for (var j = 0; j < (command.bindings || []).length; j++) {
+      var binding = guiBindingRecord(command, command.bindings[j]);
+      if (!guiBindingScopeMatches(binding.scope, context)) continue;
+      var pieces = binding.keys.split(' ');
+      if (pieces[0] !== segment) continue;
+      if (pieces.length === 1) direct.push({ command:command, binding:binding });
+      else if (pieces.length === 2) chords.push({ command:command, binding:binding });
+    }
+  }
+  if (direct.length) {
+    event.preventDefault();
+    event.stopPropagation();
+    window.executeGuiCommand(direct[0].command.id, { source:'shortcut' });
+    return true;
+  }
+  if (chords.length) {
+    event.preventDefault();
+    event.stopPropagation();
+    guiShowChord(segment, chords);
+    return true;
+  }
+  return false;
+}
+
+function setupGuiKeyboard() {
+  if (state._guiKeyboardReady) return;
+  state._guiKeyboardReady = true;
+  var errors = window.validateGuiCommandRegistry();
+  if (errors.length) console.error('[Keyboard] command registry conflicts:', errors);
+  var search = document.getElementById('command-search');
+  if (search) {
+    search.addEventListener('input', function(){ guiCommandSurfaceSelection = 0; window.renderCommandSurface(); });
+    search.addEventListener('keydown', function(event){
+      if (event.isComposing || event.key === 'Process' || event.keyCode === 229) return;
+      if (event.key === 'ArrowDown') { event.preventDefault(); guiMoveCommandSelection(1); }
+      else if (event.key === 'ArrowUp') { event.preventDefault(); guiMoveCommandSelection(-1); }
+      else if (event.key === 'Home' && !event.ctrlKey && !event.metaKey) { event.preventDefault(); guiMoveCommandSelection(0,'start'); }
+      else if (event.key === 'End' && !event.ctrlKey && !event.metaKey) { event.preventDefault(); guiMoveCommandSelection(0,'end'); }
+      else if (event.key === 'Enter') { event.preventDefault(); window.executeCommandSurfaceIndex(guiCommandSurfaceSelection); }
+    });
+  }
+  document.addEventListener('keydown', guiHandleCommandKeydown, true);
+  if (api.onKeyboardCommand) api.onKeyboardCommand(function(payload){ if (payload && payload.id) window.executeGuiCommand(String(payload.id), { source:'browserGuest' }); });
+  var attributes = [
+    ['#left-collapse-btn','view.toggleLeft'],
+    ['#bottom-toggle-btn','view.toggleTerminal'],
+    ['.sub-win-close','common.close']
+  ];
+  for (var i = 0; i < attributes.length; i++) {
+    var element = document.querySelector(attributes[i][0]);
+    var command = NEWMARK_GUI_COMMANDS.find(function(item){ return item.id === attributes[i][1]; });
+    if (!element || !command || !command.bindings.length) continue;
+    var direct = guiBindingRecord(command,command.bindings[0]).keys;
+    if (direct.indexOf(' ') < 0) element.setAttribute('aria-keyshortcuts', direct.replace(/\bMod\b/g, guiIsMac() ? 'Meta' : 'Control'));
+  }
+  var manifest = window.getGuiCommandManifest();
+  document.documentElement.dataset.keyboardRegistry = manifest.errors.length ? 'invalid' : manifest.revision;
+}
+
 function schedulePostStartupUiRendering() {
   if (state._postStartupUiRendering && state._postStartupUiRendering.cancel) state._postStartupUiRendering.cancel();
   var tasks = [
@@ -19936,8 +22221,33 @@ function schedulePostStartupUiRendering() {
 (function initResize() {
   var handles = document.querySelectorAll('.resize-handle');
   for (var i = 0; i < handles.length; i++) {
+    var resizeTarget = handles[i].getAttribute('data-target');
+    if (resizeTarget === 'left') { handles[i].setAttribute('aria-valuemin', '220'); handles[i].setAttribute('aria-valuemax', '460'); }
+    if (resizeTarget === 'right') { handles[i].setAttribute('aria-valuemin', '340'); handles[i].setAttribute('aria-valuemax', '680'); }
+    handles[i].addEventListener('keydown', function(e) {
+      if (!e || e.defaultPrevented || e.isComposing || e.key === 'Process' || e.keyCode === 229 || e.ctrlKey || e.metaKey || e.altKey) return;
+      var target = this.getAttribute('data-target');
+      var side = this.getAttribute('data-side');
+      var el = target === 'left' ? (els.left || document.getElementById('left')) : (target === 'right' ? (els.right || document.getElementById('right')) : null);
+      if (!el || (target === 'left' && state.leftCollapsed) || (target === 'right' && state.rightCollapsed)) return;
+      var min = target === 'left' ? 220 : 340;
+      var max = target === 'left' ? 460 : 680;
+      var size = el.offsetWidth;
+      var delta = e.shiftKey ? 32 : 12;
+      if (e.key === 'Home') size = min;
+      else if (e.key === 'End') size = max;
+      else if (e.key === 'ArrowLeft') size += side === 'left' ? delta : -delta;
+      else if (e.key === 'ArrowRight') size += side === 'left' ? -delta : delta;
+      else return;
+      e.preventDefault();
+      size = Math.max(min, Math.min(max, size));
+      if (target === 'left') { setLeftWidthPx(size); state.leftWidth = size; }
+      else window.setRightWidthPx(size);
+      this.setAttribute('aria-valuenow', String(Math.round(size)));
+    });
     handles[i].addEventListener('mousedown', function(e) {
       e.preventDefault();
+      var handle = this;
       var target = this.getAttribute('data-target');
       var side = this.getAttribute('data-side');
       var el = target === 'left' ? els.left : (target === 'right' ? els.right : null);
@@ -19957,10 +22267,12 @@ function schedulePostStartupUiRendering() {
           var leftSize = Math.max(220, Math.min(460, newSize));
           setLeftWidthPx(leftSize);
           state.leftWidth = leftSize;
+          handle.setAttribute('aria-valuenow', String(Math.round(leftSize)));
         } else if (side === 'left') {
           var newSize2 = startSize - dx;
           var rightSize = Math.max(340, Math.min(680, newSize2));
           window.setRightWidthPx(rightSize);
+          handle.setAttribute('aria-valuenow', String(Math.round(rightSize)));
         } else if (side === 'top') {
           var newSize3 = startSize - dy;
           el.style.height = Math.max(0, Math.min(400, newSize3)) + 'px';
@@ -20059,6 +22371,10 @@ function schedulePostStartupUiRendering() {
   var startupHydrationError = null;
   cacheEls();
   setupAgentWorkEvents();
+  if (api.onEditorCompletionDelta && !state._editorCompletionDeltaReady) {
+    state._editorCompletionDeltaReady = true;
+    api.onEditorCompletionDelta(function(payload) { window.applyEditorCompletionDelta(payload); });
+  }
   if (api.onBrowserEnsureGuest) {
     api.onBrowserEnsureGuest(function(target) {
       cancelBrowserGuestIdleDestroy();
@@ -20171,6 +22487,7 @@ function schedulePostStartupUiRendering() {
     startupHydrationError = e;
   }
   applyUiAppearance();
+  setupGuiKeyboard();
   window.renderContextWindow();
   if (api.onAutomationUpdated) {
     api.onAutomationUpdated(function() {
@@ -20216,12 +22533,12 @@ function schedulePostStartupUiRendering() {
 
   function stopRunningFromEscape(event) {
     if (!event || event.key !== 'Escape' || event.defaultPrevented || escapeBelongsToFocusedControl(event)) return false;
-    if (currentFlowRunning() && flowTakeoverMatchesCurrent() && !promptHasText()) {
+    if (currentFlowRunning() && flowTakeoverMatchesCurrent()) {
       event.preventDefault();
       window.stopFlowRun();
       return true;
     }
-    if (isCurrentConversationRunning() && !promptHasText()) {
+    if (isCurrentConversationRunning()) {
       event.preventDefault();
       window.stopCurrentConversation();
       return true;
@@ -20234,22 +22551,30 @@ function schedulePostStartupUiRendering() {
   // after focus moved to the chat, title bar, button, or another non-editor
   // surface. Modal/editor/select Escape behavior remains owned by that UI.
   document.addEventListener('keydown', function(event) {
+    if (!event || event.defaultPrevented || event.repeat || event.isComposing || event.key === 'Process' || event.keyCode === 229) return;
+    if (event.key === 'Escape' && !event.defaultPrevented && els['sub-win-overlay'] && els['sub-win-overlay'].classList.contains('open')) {
+      event.preventDefault();
+      event.stopPropagation();
+      window.closeSubWin();
+      return;
+    }
     if (stopRunningFromEscape(event)) event.stopPropagation();
   });
 
   if (els.prompt) {
     els.prompt.addEventListener('keydown', function(e) {
-      if (e.key === 'Escape' && currentFlowRunning() && flowTakeoverMatchesCurrent() && !promptHasText()) {
+      if (e.isComposing || e.key === 'Process' || e.keyCode === 229) return;
+      if (e.key === 'Escape' && currentFlowRunning() && flowTakeoverMatchesCurrent()) {
         e.preventDefault();
         window.stopFlowRun();
         return;
       }
-      if (e.key === 'Escape' && isCurrentConversationRunning() && !promptHasText()) {
+      if (e.key === 'Escape' && isCurrentConversationRunning()) {
         e.preventDefault();
         window.stopCurrentConversation();
         return;
       }
-      if (e.key === 'Enter' && e.ctrlKey) {
+      if (e.key === 'Enter' && (e.ctrlKey || e.metaKey) && !e.altKey && !e.shiftKey) {
         e.preventDefault();
         if (state.mode === 'flow' || (currentFlowRunning() && flowTakeoverMatchesCurrent())) {
           window.submitCurrentAction();
@@ -20259,9 +22584,9 @@ function schedulePostStartupUiRendering() {
         window.sendMessage(opposite);
         return;
       }
-      if (e.key === 'Enter' && !e.shiftKey) {
+      if (e.key === 'Enter' && !e.shiftKey && !e.ctrlKey && !e.metaKey && !e.altKey) {
         e.preventDefault();
-        window.submitCurrentAction();
+        window.submitCurrentAction('enter');
       }
     });
     els.prompt.addEventListener('input', function() {
@@ -20356,10 +22681,10 @@ function schedulePostStartupUiRendering() {
     els['editor-textarea'].addEventListener('select', window.handleEditorCaretChange);
     els['editor-textarea'].addEventListener('keyup', window.handleEditorCaretChange);
     els['editor-textarea'].addEventListener('keydown', function(e) {
+      if (e.isComposing || e.key === 'Process' || e.keyCode === 229) return;
       if (state.editorCompletionText && e.key === 'Tab') { e.preventDefault(); window.acceptEditorCompletion(); return; }
       if (e.key === 'Escape' && (state.editorCompletionText || (els['editor-completion'] && els['editor-completion'].classList.contains('open')))) { e.preventDefault(); window.dismissEditorCompletion(); return; }
       if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 's') { e.preventDefault(); window.saveEditor(); return; }
-      if ((e.ctrlKey && e.key === ' ') || (e.altKey && e.key === '\\')) { e.preventDefault(); window.requestEditorCompletion(); return; }
       if (state.editorVimEnabled && e.key === 'Escape') { state.editorVimMode = 'normal'; state.editorVimPending = ''; e.preventDefault(); window.renderNativeEditor(); return; }
       if (window.handleEditorVimKey(e)) return;
     });