create-walle 0.9.21 → 0.9.22

package/template/claude-task-manager/public/index.html

@@ -4310,6 +4310,38 @@
     .update-wizard-actions { flex-wrap: wrap; }
     .update-wizard-actions .btn { flex: 1 1 auto; }
   }
+  .app-reload-banner {
+    display: none;
+    align-items: center;
+    gap: 10px;
+    padding: 8px 16px;
+    border-bottom: 1px solid var(--border);
+    background: color-mix(in srgb, var(--warning, #e5b567) 12%, var(--bg-elevated, #1f2335));
+    color: var(--fg);
+    font-size: 12px;
+    line-height: 1.4;
+  }
+  .app-reload-banner.active { display: flex; }
+  .app-reload-banner strong {
+    color: var(--fg);
+    font-weight: 700;
+  }
+  .app-reload-banner span {
+    color: var(--fg-dim);
+  }
+  .app-reload-banner .btn {
+    min-height: 28px;
+    padding: 4px 10px;
+    font-size: 12px;
+  }
+  .app-reload-banner .reload-copy {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px 8px;
+    align-items: baseline;
+    min-width: 0;
+    flex: 1 1 auto;
+  }
 
   /* Agent Picker Grid */
   .ns-agent-grid {
@@ -5072,6 +5104,13 @@
     <button id="update-apply-btn" onclick="applyUpdate('banner')" style="background:#7aa2f7;color:#1a1b26;border:none;padding:3px 10px;border-radius:4px;font-size:11px;cursor:pointer;font-weight:600;">Update Now</button>
     <button onclick="dismissUpdate('banner')" style="background:none;border:none;color:var(--fg-dim);cursor:pointer;margin-left:auto;opacity:0.6;font-size:14px;">&times;</button>
   </div>
+  <div id="app-reload-banner" class="app-reload-banner" role="status" aria-live="polite" aria-atomic="true">
+    <div class="reload-copy">
+      <strong>Update installed.</strong>
+      <span id="app-reload-msg">Reload this page to use the latest CTM / Wall-E UI.</span>
+    </div>
+    <button class="btn primary" id="app-reload-now-btn" onclick="reloadForInstalledUpdate('banner')">Reload now</button>
+  </div>
   <div class="modal-overlay update-wizard-overlay hidden" id="update-wizard" role="dialog" aria-modal="true" aria-labelledby="update-wizard-heading">
     <div class="modal update-wizard-modal">
       <div class="update-wizard-head">
@@ -5859,7 +5898,10 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
                           <div id="setup-ms-summary">Checking Microsoft tunnel...</div>
                           <div id="setup-ms-account" class="setup-tunnel-account"></div>
                         </div>
-                        <button class="setup-btn setup-btn-primary setup-tunnel-primary" id="setup-ms-setup" onclick="SETUP.setupMicrosoftTunnel()">Set Up</button>
+                        <div class="setup-tunnel-actions">
+                          <button class="setup-btn setup-btn-primary setup-tunnel-primary" id="setup-ms-setup" onclick="SETUP.setupMicrosoftTunnel()">Set Up</button>
+                          <button class="setup-btn setup-btn-secondary setup-tunnel-secondary" id="setup-ms-switch-login" onclick="SETUP.switchMicrosoftTunnelLogin()" style="display:none;">Use Different Account</button>
+                        </div>
                       </div>
                       <ol class="setup-tunnel-steps" aria-label="Microsoft tunnel setup progress">
                         <li id="setup-ms-step-install"><span>1</span><strong>Install</strong></li>
@@ -6351,6 +6393,7 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
           <div class="models-panel-scroll models-scroll">
             <div class="models-panel-content models-content">
               <div id="models-header"></div>
+              <div id="models-gateways-section"></div>
               <div id="models-providers-grid"></div>
               <div id="models-shadow-config" style="margin-top:20px;"></div>
               <div id="models-tier-matrix" style="margin-top:20px;"></div>
@@ -7083,6 +7126,7 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
 <script src="js/terminal-restore-state.js"></script>
 <script src="js/image-normalize.js"></script>
 <script src="js/walle-session.js"></script>
+<script src="js/document-review-links.js"></script>
 <script src="js/message-renderer.js"></script>
 <script src="js/stream-view.js"></script>
 <script>
@@ -7560,6 +7604,12 @@ const state = window._ctmState = {
   rulesFiles: [],
   currentRule: null,
   queuePanelOpen: false,
+  appRuntime: {
+    loaded: null,
+    latest: null,
+    reloadRequired: false,
+    reloadReason: '',
+  },
   splitRoot: null,       // Binary tree of panes (null = single-pane mode)
   savedSplitLayout: null, // Suspended split tree (saved when switching to non-split tab)
   focusedPaneId: null,   // ID of focused leaf pane
@@ -7569,6 +7619,134 @@ const TERMINAL_HOT_CACHE_LIMIT = 3;
 const DEFAULT_SNAPSHOT_SCROLLBACK_ROWS = 300;
 const MAX_SNAPSHOT_SCROLLBACK_ROWS = 10000;
 const SNAPSHOT_SCROLLBACK_ROW_OPTIONS = Object.freeze([0, 100, 300, 1000, 2000, 10000]);
+const APP_RELOAD_CHANNEL_NAME = 'ctm-app-update';
+let _appReloadChannel = null;
+
+function normalizeAppVersionInfo(info) {
+  if (!info || typeof info !== 'object') return null;
+  const version = String(info.version || '').trim();
+  const buildId = String(info.buildId || '').trim();
+  const product = String(info.product || 'create-walle').trim();
+  const components = info.components && typeof info.components === 'object' ? {
+    ctm: String(info.components.ctm || '').trim(),
+    wallE: String(info.components.wallE || '').trim(),
+  } : {};
+  if (!version && !buildId) return null;
+  return { version, buildId, product, components };
+}
+
+function appVersionIdentity(info) {
+  const normalized = normalizeAppVersionInfo(info);
+  if (!normalized) return '';
+  return normalized.buildId || `${normalized.product}:${normalized.version}:${normalized.components.ctm || ''}:${normalized.components.wallE || ''}`;
+}
+
+function sameAppVersionIdentity(a, b) {
+  const aid = appVersionIdentity(a);
+  const bid = appVersionIdentity(b);
+  return !!aid && !!bid && aid === bid;
+}
+
+function initAppReloadChannel() {
+  if (_appReloadChannel || typeof BroadcastChannel === 'undefined') return _appReloadChannel;
+  try {
+    _appReloadChannel = new BroadcastChannel(APP_RELOAD_CHANNEL_NAME);
+    _appReloadChannel.onmessage = (event) => {
+      const data = event && event.data;
+      if (!data || data.type !== 'reload-required') return;
+      requestInstalledUpdateReload({
+        server: data.server,
+        reason: data.reason || 'peer-detected',
+        source: 'broadcast',
+        rebroadcast: false,
+      });
+    };
+  } catch (_) {
+    _appReloadChannel = null;
+  }
+  return _appReloadChannel;
+}
+
+function broadcastInstalledUpdateReload(server, reason) {
+  const channel = initAppReloadChannel();
+  if (!channel) return;
+  try {
+    channel.postMessage({ type: 'reload-required', server, reason, at: Date.now() });
+  } catch (_) {}
+}
+
+function handleServerHello(msg) {
+  if (msg && msg.clientId) state._clientId = msg.clientId;
+  const server = normalizeAppVersionInfo(msg && msg.appVersion);
+  if (!server) return;
+  if (!state.appRuntime.loaded) {
+    state.appRuntime.loaded = server;
+    state.appRuntime.latest = server;
+    setAppVersion(server.version, { ...server, latestVersion: server.version });
+    return;
+  }
+  state.appRuntime.latest = server;
+  if (!sameAppVersionIdentity(state.appRuntime.loaded, server)) {
+    requestInstalledUpdateReload({ server, reason: 'server-version-changed', source: 'hello' });
+  }
+}
+
+function isAppReloadUnsafe() {
+  if (shouldPreserveFocusForUpdatePrompt()) return true;
+  if (state.queuePanelOpen) return true;
+  const screenshotEditor = document.getElementById('screenshot-editor');
+  if (screenshotEditor && screenshotEditor.classList.contains('active')) return true;
+  const openModal = document.querySelector('.modal-overlay:not(.hidden)');
+  if (openModal) return true;
+  return false;
+}
+
+function showInstalledUpdateReloadBanner(server) {
+  const banner = document.getElementById('app-reload-banner');
+  const msg = document.getElementById('app-reload-msg');
+  if (!banner) return;
+  const loaded = state.appRuntime.loaded || {};
+  const latest = normalizeAppVersionInfo(server) || state.appRuntime.latest || {};
+  if (msg) {
+    const from = loaded.version ? `v${loaded.version}` : 'old UI';
+    const to = latest.version ? `v${latest.version}` : 'the installed update';
+    msg.textContent = `Reload this page to use ${to}. Current tab is still running ${from}.`;
+  }
+  banner.classList.add('active');
+}
+
+function requestInstalledUpdateReload(opts = {}) {
+  const server = normalizeAppVersionInfo(opts.server) || state.appRuntime.latest;
+  state.appRuntime.latest = server || state.appRuntime.latest;
+  state.appRuntime.reloadRequired = true;
+  state.appRuntime.reloadReason = opts.reason || 'app-updated';
+  if (opts.rebroadcast !== false) broadcastInstalledUpdateReload(server, state.appRuntime.reloadReason);
+  if (!isAppReloadUnsafe()) {
+    reloadForInstalledUpdate(opts.source || 'auto');
+    return;
+  }
+  showInstalledUpdateReloadBanner(server);
+}
+
+function reloadForInstalledUpdate(source = 'button') {
+  const detail = {
+    source,
+    reason: state.appRuntime.reloadReason || 'app-updated',
+    loaded: state.appRuntime.loaded,
+    latest: state.appRuntime.latest,
+  };
+  try { sessionStorage.setItem('ctm_app_update_reload', JSON.stringify({ ...detail, at: Date.now() })); } catch (_) {}
+  if (typeof window.__ctmAppReload === 'function') {
+    window.__ctmAppReload(detail);
+    return;
+  }
+  location.reload();
+}
+
+window.__ctmHandleServerHello = handleServerHello;
+window.__ctmRequestInstalledUpdateReload = requestInstalledUpdateReload;
+window.__ctmIsAppReloadUnsafe = isAppReloadUnsafe;
+initAppReloadChannel();
 
 function normalizeSnapshotScrollbackRows(value, fallback = DEFAULT_SNAPSHOT_SCROLLBACK_ROWS) {
   if (value == null || value === '') return normalizeSnapshotScrollbackRows(fallback, DEFAULT_SNAPSHOT_SCROLLBACK_ROWS);
@@ -8010,7 +8188,7 @@ function connect() {
   ws.onmessage = (e) => {
     const msg = JSON.parse(e.data);
     switch (msg.type) {
-      case 'hello': state._clientId = msg.clientId; break;
+      case 'hello': handleServerHello(msg); break;
       case 'ui-prefs-changed': onUiPrefsChanged(msg); break;
       case 'created': onCreated(msg); break;
       case 'output': onOutput(msg); break;
@@ -11356,6 +11534,10 @@ function _disposeTerminalRenderer(s) {
     try { s._helperAlignDisposer.dispose(); } catch {}
     s._helperAlignDisposer = null;
   }
+  if (s._docReviewLinkProvider) {
+    try { s._docReviewLinkProvider.dispose(); } catch {}
+    s._docReviewLinkProvider = null;
+  }
   if (s._webglAddon) {
     try { s._webglAddon.dispose(); } catch {}
     s._webglAddon = null;
@@ -12510,6 +12692,78 @@ function createTerminal(id, opts) {
     return ' [' + label + ': ' + paths.map(p => '"' + p.replace(/"/g, '\\"') + '"').join(', ') + '] ';
   }
 
+  function _terminalImageSubmitKey(att) {
+    return String(att && (att.path || att.url || att.filename) || '').trim();
+  }
+
+  function _terminalPendingImageSubmitAttachments(id) {
+    if (!_terminalProviderAcceptsImagePathPaste(id)) return [];
+    const list = _terminalImageAttachmentState(id) || [];
+    const seen = new Set();
+    const pending = [];
+    for (const att of list) {
+      const key = _terminalImageSubmitKey(att);
+      if (!key || seen.has(key)) continue;
+      seen.add(key);
+      if (att._terminalSubmitAcknowledgedAt || att._terminalSubmitDiscardedAt) continue;
+      pending.push(att);
+    }
+    return pending;
+  }
+
+  function _terminalMarkImageSubmitState(attachments, field) {
+    const now = Date.now();
+    for (const att of attachments || []) {
+      if (!att) continue;
+      att[field] = now;
+    }
+  }
+
+  function _terminalSubmittedPromptText(id, s, attachments) {
+    const labels = (attachments || []).map(att => att && att.label).filter(Boolean).join(' ');
+    const draft = String(_terminalInputDraftPreview(s, '') || '').trim();
+    return [labels, draft].filter(Boolean).join(' ').trim();
+  }
+
+  function _terminalRecordSessionImageRefs(id, attachments, promptText) {
+    const list = (attachments || []).filter(Boolean).map(att => ({
+      id: att.id || null,
+      label: att.label || '',
+      filename: att.filename || '',
+      path: att.path || '',
+      url: att.url || '',
+    }));
+    if (!list.length) return;
+    fetch('/api/session/image-refs?token=' + encodeURIComponent(state.token || ''), {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      keepalive: true,
+      body: JSON.stringify({
+        sessionId: id,
+        submittedAt: Date.now(),
+        promptText: String(promptText || '').slice(0, 4096),
+        images: list,
+      }),
+    }).catch(err => {
+      console.warn('[terminal] session image ref recording failed:', err && err.message ? err.message : err);
+    });
+  }
+
+  function _terminalAcknowledgePendingImageSubmit(id, promptText) {
+    const pending = _terminalPendingImageSubmitAttachments(id);
+    if (!pending.length) return false;
+    _terminalRecordSessionImageRefs(id, pending, promptText);
+    _terminalMarkImageSubmitState(pending, '_terminalSubmitAcknowledgedAt');
+    return true;
+  }
+
+  function _terminalDiscardPendingImageSubmit(id) {
+    const pending = _terminalPendingImageSubmitAttachments(id);
+    if (!pending.length) return false;
+    _terminalMarkImageSubmitState(pending, '_terminalSubmitDiscardedAt');
+    return true;
+  }
+
   function _terminalProviderAcceptsImagePathPaste(id) {
     const s = state.sessions.get(id);
     const agentType = _clientAgentTypeForSession(s);
@@ -12784,6 +13038,12 @@ function createTerminal(id, opts) {
     if (!isSinglePrintableChar && data === _lastSentData && now - _lastSentTs < 10) return;
     _lastSentData = data;
     _lastSentTs = now;
+    if (_terminalInputSubmitsComposer(data)) {
+      const submitSession = state.sessions.get(id);
+      const pending = _terminalPendingImageSubmitAttachments(id);
+      _terminalAcknowledgePendingImageSubmit(id, _terminalSubmittedPromptText(id, submitSession, pending));
+    }
+    else if (String(data || '').includes('\x03') || String(data || '').includes('\x15')) _terminalDiscardPendingImageSubmit(id);
     _forwardTerminalInput(id, data);
     _terminalInputDraftObserve(id, data);
     _terminalSkillObserveInput(id, data);
@@ -12918,6 +13178,9 @@ function createTerminal(id, opts) {
   _sessionViewState(sessionEntry, id);
   _markTerminalRendererChanged(sessionEntry, 'terminal-created');
   state.sessions.set(id, sessionEntry);
+  if (window.CTMDocLinks && typeof window.CTMDocLinks.registerTerminalLinkProvider === 'function') {
+    try { sessionEntry._docReviewLinkProvider = window.CTMDocLinks.registerTerminalLinkProvider(term, id); } catch {}
+  }
   if (typeof term.onWriteParsed === 'function') {
     sessionEntry._helperAlignDisposer = term.onWriteParsed(() => {
       const current = state.sessions.get(id);
@@ -14053,7 +14316,7 @@ function activateTab(id) {
 
   // Hide all
   for (const [sid, s] of state.sessions) {
-    s.container.classList.remove('active');
+    if (s && s.container && s.container.classList) s.container.classList.remove('active');
   }
   document.getElementById('welcome').style.display = 'none';
   document.getElementById('rules-panel').classList.remove('active');
@@ -15392,7 +15655,7 @@ function navTo(target, opts) {
   } else if (target === 'permissions') {
     showPermissionsPanel();
   } else if (target === 'codereview') {
-    showCodeReviewPanel();
+    showCodeReviewPanel(opts || {});
   } else if (target === 'walle') {
     showWallePanel();
   } else if (target === 'models') {
@@ -15406,14 +15669,16 @@ function navTo(target, opts) {
   }
 }
 
-function showCodeReviewPanel() {
+function showCodeReviewPanel(opts) {
+  opts = opts || {};
   if (!state.tabOrder.includes('codereview')) {
     state.tabOrder.push('codereview');
   }
   activateTab('codereview');
   renderTabs();
   // Always show/refresh project list (unless in an active diff review)
-  if (window.CR && (!window.crState || !window.crState.reviewId)) {
+  const reviewIsBusy = window.crState && (window.crState._view === 'review' || window.crState.reviewType === 'doc');
+  if (!opts.suppressProjectList && window.CR && (!window.crState || (!window.crState.reviewId && !reviewIsBusy))) {
     CR.showProjectList();
   }
 }
@@ -15429,6 +15694,7 @@ function showWallePanel() {
 // === Models Tab ===
 var _modelsRegistryFilter = '';
 var _modelsExpandedProviders = new Set();
+var _modelsCatalogExpanded = false;
 var _modelsRetryTimer = null;
 var _modelsRetryCount = 0;
 var _modelsHasRenderedCatalog = false;
@@ -15530,6 +15796,7 @@ function _scheduleModelsRetry(delayMs) {
 
 function renderModelsLoadState(kind, message, detail, retryDelayMs) {
   var header = document.getElementById('models-header');
+  var gateways = document.getElementById('models-gateways-section');
   var grid = document.getElementById('models-providers-grid');
   if (!header || !grid) return;
   var isError = kind === 'error';
@@ -15551,6 +15818,7 @@ function renderModelsLoadState(kind, message, detail, retryDelayMs) {
     '<button id="models-retry-btn" style="padding:6px 12px;border-radius:6px;border:1px solid var(--border,#414868);background:transparent;color:var(--fg,#c0caf5);cursor:pointer;font-size:12px;">Retry now</button>' +
   '</div>';
   header.innerHTML = DOMPurify.sanitize(h, { ADD_ATTR: ['style'] });
+  if (gateways) gateways.innerHTML = '';
   grid.innerHTML = DOMPurify.sanitize(body, { ADD_ATTR: ['style'] });
   var addBtn = document.getElementById('models-add-provider-btn');
   if (addBtn) addBtn.addEventListener('click', function() { showAddProviderDialog(); });
@@ -15570,9 +15838,10 @@ async function showModelsPanel(options) {
     renderModelsLoadState('loading', 'Loading model catalog...', 'CTM is reading model providers and registry data from Wall-E.', 0);
   }
   try {
-    const [provRes, regRes, scRes, healthRes, tierRes, promoRes, reviewRes, shadowRes] = await Promise.all([
+    const [provRes, regRes, gatewayRes, scRes, healthRes, tierRes, promoRes, reviewRes, shadowRes] = await Promise.all([
       _fetchModelsJson('/api/models/providers', { listKey: 'providers' }),
       _fetchModelsJson('/api/models/registry', { listKey: 'models' }),
+      _fetchModelsJson('/api/models/gateways', { listKey: 'gateways' }).catch(function() { return { gateways: [] }; }),
       _fetchModelsJson('/api/models/scorecard?days=' + encodeURIComponent(_scorecardDaysParam())).catch(function() { return { scorecard: [], benchmarks: [], benchmarkCoverage: null }; }),
       _fetchModelsJson('/api/models/health').catch(function() { return {}; }),
       _fetchModelsJson('/api/models/tier-defaults').catch(function() { return {}; }),
@@ -15582,9 +15851,11 @@ async function showModelsPanel(options) {
     ]);
     var providers = _modelsPayloadList(provRes, 'providers') || [];
     var models = _modelsPayloadList(regRes, 'models') || [];
+    var gateways = _modelsPayloadList(gatewayRes, 'gateways') || [];
     _modelsRetryCount = 0;
     _modelsHasRenderedCatalog = true;
     renderModelsHeader(providers, models);
+    renderModelGateways(gateways, providers, models);
     renderModelProviders(providers, models, healthRes);
     renderShadowConfig(shadowRes, models);
     renderTierMatrix(tierRes, providers);
@@ -15689,6 +15960,124 @@ function _portkeyDefaultBaseUrl(type) {
   return type === 'anthropic' ? 'https://api.portkey.ai' : 'https://api.portkey.ai/v1';
 }
 
+function _providerRoutePolicyLabel(policy) {
+  if (policy === 'portkey') return 'Prefer Portkey';
+  if (policy === 'direct') return 'Prefer Direct';
+  return 'Auto';
+}
+
+function _formatModelSyncTime(value) {
+  if (!value) return 'Not synced yet';
+  var t = Date.parse(value);
+  if (!Number.isFinite(t)) return value;
+  var seconds = Math.max(0, Math.round((Date.now() - t) / 1000));
+  if (seconds < 60) return seconds + 's ago';
+  var minutes = Math.round(seconds / 60);
+  if (minutes < 60) return minutes + 'm ago';
+  var hours = Math.round(minutes / 60);
+  if (hours < 48) return hours + 'h ago';
+  return new Date(t).toLocaleString();
+}
+
+function _modelProviderSupportsPortkey(type) {
+  return ['anthropic', 'openai', 'google', 'deepseek', 'moonshot'].indexOf(type) >= 0;
+}
+
+function _modelProviderRoutePolicy(providers, type) {
+  var row = (providers || []).find(function(p) { return p.type === type && p.route_policy; });
+  return row ? row.route_policy : 'auto';
+}
+
+async function setProviderRoutePolicy(type, policy) {
+  await fetch('/api/models/provider-route-policy?token=' + state.token, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ type: type, policy: policy }),
+  });
+  showModelsPanel();
+}
+
+async function syncPortkeyModels(providerId) {
+  await fetch('/api/models/portkey/sync?token=' + state.token, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(providerId ? { provider_id: providerId } : {}),
+  });
+  showModelsPanel();
+}
+
+async function applyPortkeyToAllProviders() {
+  await fetch('/api/models/portkey/apply-all?token=' + state.token, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({}),
+  });
+  showModelsPanel();
+}
+
+async function disablePortkeyDefault() {
+  await fetch('/api/models/portkey/disable-default?token=' + state.token, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({}),
+  });
+  showModelsPanel();
+}
+
+async function removePortkeyGateway() {
+  if (!confirm('Remove all Portkey gateway connections and their imported gateway models? Direct provider API access will remain.')) return;
+  await fetch('/api/models/gateways/portkey?token=' + state.token, { method: 'DELETE' });
+  showModelsPanel();
+}
+
+function renderModelGateways(gateways, providers, models) {
+  var el = document.getElementById('models-gateways-section');
+  if (!el) return;
+  var portkey = (gateways || []).find(function(g) { return g.type === 'portkey'; }) || { type: 'portkey', name: 'Portkey Gateway', routes: [], route_count: 0, provider_count: 0, model_count: 0, provider_types: [] };
+  var hasRoutes = (portkey.routes || []).length > 0;
+  var routeSummary = hasRoutes
+    ? portkey.provider_count + ' provider' + (portkey.provider_count !== 1 ? 's' : '') + ' · ' + portkey.model_count + ' imported model' + (portkey.model_count !== 1 ? 's' : '')
+    : 'No Portkey gateway configured';
+  var lastSync = portkey.last_success_at || portkey.last_run_at || '';
+  var h = '<section style="margin-bottom:14px;border:1px solid var(--border,#414868);background:var(--bg-card,#24283b);border-radius:8px;padding:14px;">' +
+    '<div style="display:flex;justify-content:space-between;gap:12px;align-items:flex-start;flex-wrap:wrap;">' +
+      '<div>' +
+        '<div style="font-size:11px;color:var(--fg-dim,#565f89);text-transform:uppercase;letter-spacing:0.5px;margin-bottom:4px;">Gateways</div>' +
+        '<div style="font-size:15px;color:var(--fg,#c0caf5);font-weight:600;">Portkey Gateway</div>' +
+        '<div style="font-size:12px;color:var(--fg-dim,#565f89);margin-top:3px;">' + escHtml(routeSummary) + '</div>' +
+        '<div style="font-size:11px;color:' + (portkey.last_error ? '#f7768e' : '#7dcfff') + ';margin-top:5px;">' +
+          (portkey.last_error ? 'Last sync error: ' + escHtml(String(portkey.last_error).slice(0, 120)) : 'Last sync: ' + escHtml(_formatModelSyncTime(lastSync))) +
+        '</div>' +
+      '</div>' +
+      '<div style="display:flex;gap:6px;flex-wrap:wrap;justify-content:flex-end;">' +
+        '<button data-connect-portkey style="padding:5px 10px;border-radius:5px;border:1px solid var(--border,#414868);background:' + (hasRoutes ? 'transparent' : 'var(--accent,#7aa2f7)') + ';color:' + (hasRoutes ? 'var(--fg,#c0caf5)' : '#1a1b26') + ';cursor:pointer;font-size:11px;font-weight:600;">' + (hasRoutes ? 'Add Route' : 'Connect Portkey') + '</button>' +
+        '<button data-sync-portkey style="padding:5px 10px;border-radius:5px;border:1px solid var(--border,#414868);background:transparent;color:var(--fg,#c0caf5);cursor:pointer;font-size:11px;">Sync now</button>' +
+        '<button data-apply-portkey-all style="padding:5px 10px;border-radius:5px;border:1px solid var(--border,#414868);background:transparent;color:#7dcfff;cursor:pointer;font-size:11px;">Apply to all providers</button>' +
+        '<button data-disable-portkey-default style="padding:5px 10px;border-radius:5px;border:1px solid var(--border,#414868);background:transparent;color:var(--fg-dim,#565f89);cursor:pointer;font-size:11px;">Disable as default</button>' +
+        (hasRoutes ? '<button data-remove-portkey style="padding:5px 10px;border-radius:5px;border:none;background:transparent;color:#f7768e;cursor:pointer;font-size:11px;">Remove</button>' : '') +
+      '</div>' +
+    '</div>';
+  if (hasRoutes) {
+    h += '<div style="display:flex;gap:6px;flex-wrap:wrap;margin-top:10px;">' + (portkey.routes || []).map(function(route) {
+      return '<span style="font-size:10px;color:var(--fg-dim,#565f89);background:var(--bg,#1a1b26);border:1px solid var(--border,#414868);border-radius:4px;padding:3px 7px;">' +
+        escHtml(_providerTypeName(route.type)) + ' · ' + escHtml(_providerRoutePolicyLabel(route.route_policy || 'auto')) + ' · ' + route.model_count + ' model' + (route.model_count !== 1 ? 's' : '') +
+      '</span>';
+    }).join('') + '</div>';
+  }
+  h += '</section>';
+  el.innerHTML = DOMPurify.sanitize(h, { ADD_ATTR: ['style', 'data-connect-portkey', 'data-sync-portkey', 'data-apply-portkey-all', 'data-disable-portkey-default', 'data-remove-portkey'] });
+  var connect = el.querySelector('[data-connect-portkey]');
+  if (connect) connect.addEventListener('click', function() { showAddProviderDialog('', 'portkey'); });
+  var sync = el.querySelector('[data-sync-portkey]');
+  if (sync) sync.addEventListener('click', function() { sync.textContent = 'Syncing...'; syncPortkeyModels(); });
+  var applyAll = el.querySelector('[data-apply-portkey-all]');
+  if (applyAll) applyAll.addEventListener('click', applyPortkeyToAllProviders);
+  var disableDefault = el.querySelector('[data-disable-portkey-default]');
+  if (disableDefault) disableDefault.addEventListener('click', disablePortkeyDefault);
+  var remove = el.querySelector('[data-remove-portkey]');
+  if (remove) remove.addEventListener('click', removePortkeyGateway);
+}
+
 function renderModelsHeader(providers, models) {
   var el = document.getElementById('models-header');
   var activeProviders = providers.filter(function(p) { return p.enabled; }).length;
@@ -15769,6 +16158,9 @@ function renderModelProviders(providers, models, healthData) {
 
     var anyEnabled = instances.some(function(p) { return p.enabled; });
     var instanceCountLabel = instances.length > 1 ? ' (' + instances.length + ' routes)' : '';
+    var portkeyInstances = instances.filter(function(p) { return _providerConnectionKind(p) === 'portkey'; });
+    var directInstances = instances.filter(function(p) { return _providerConnectionKind(p) !== 'portkey'; });
+    var routePolicy = _modelProviderRoutePolicy(instances, type);
 
     // Brand mark next to the provider name. Falls back to a tinted dot when
     // brandIconSvg() doesn't recognise the type (custom / unknown).
@@ -15800,6 +16192,27 @@ function renderModelProviders(providers, models, healthData) {
         '</div>' +
       '</div>';
 
+    if (!isLocal && _modelProviderSupportsPortkey(type)) {
+      h += '<div style="margin-top:10px;background:var(--bg,#1a1b26);border-radius:6px;padding:9px 10px;">' +
+        '<div style="display:flex;justify-content:space-between;gap:8px;align-items:center;flex-wrap:wrap;">' +
+          '<div>' +
+            '<div style="font-size:10px;color:var(--fg-dim,#565f89);text-transform:uppercase;letter-spacing:0.5px;">Access Route</div>' +
+            '<div style="font-size:12px;color:var(--fg,#c0caf5);margin-top:2px;">' + escHtml(_providerRoutePolicyLabel(routePolicy)) + '</div>' +
+            '<div style="font-size:10px;color:var(--fg-dim,#565f89);margin-top:2px;">' +
+              directInstances.length + ' direct · ' + portkeyInstances.length + ' Portkey' +
+            '</div>' +
+          '</div>' +
+          '<div style="display:flex;gap:5px;flex-wrap:wrap;justify-content:flex-end;">' +
+            (portkeyInstances.length
+              ? '<button data-route-policy-type="' + escHtml(type) + '" data-route-policy="portkey" style="padding:4px 8px;border-radius:4px;border:1px solid ' + (routePolicy === 'portkey' ? '#7dcfff' : 'var(--border,#414868)') + ';background:' + (routePolicy === 'portkey' ? '#7dcfff22' : 'transparent') + ';color:#7dcfff;cursor:pointer;font-size:10px;">Use Portkey</button>'
+              : '<button data-enable-portkey-type="' + escHtml(type) + '" style="padding:4px 8px;border-radius:4px;border:1px solid var(--border,#414868);background:transparent;color:#7dcfff;cursor:pointer;font-size:10px;">Enable Portkey</button>') +
+            '<button data-route-policy-type="' + escHtml(type) + '" data-route-policy="direct" style="padding:4px 8px;border-radius:4px;border:1px solid ' + (routePolicy === 'direct' ? '#9ece6a' : 'var(--border,#414868)') + ';background:' + (routePolicy === 'direct' ? '#9ece6a22' : 'transparent') + ';color:#9ece6a;cursor:pointer;font-size:10px;">Prefer Direct</button>' +
+            '<button data-route-policy-type="' + escHtml(type) + '" data-route-policy="auto" style="padding:4px 8px;border-radius:4px;border:1px solid ' + (routePolicy === 'auto' ? '#7aa2f7' : 'var(--border,#414868)') + ';background:' + (routePolicy === 'auto' ? '#7aa2f722' : 'transparent') + ';color:#7aa2f7;cursor:pointer;font-size:10px;">Auto</button>' +
+          '</div>' +
+        '</div>' +
+      '</div>';
+    }
+
     // Instance sub-rows (shown when multiple keys exist OR always for clarity)
     if (instances.length > 0) {
       h += '<div style="margin-top:12px;border-top:1px solid var(--border,#414868);padding-top:10px;">';
@@ -15843,9 +16256,17 @@ function renderModelProviders(providers, models, healthData) {
     h += '</div>';
   });
   h += '</div>';
-  el.innerHTML = DOMPurify.sanitize(h, { ADD_ATTR: ['style', 'data-rescan-provider', 'data-delete-provider', 'data-type', 'data-test-instance', 'data-add-key-type', 'title'] });
+  el.innerHTML = DOMPurify.sanitize(h, { ADD_ATTR: ['style', 'data-rescan-provider', 'data-delete-provider', 'data-type', 'data-test-instance', 'data-add-key-type', 'data-route-policy-type', 'data-route-policy', 'data-enable-portkey-type', 'title'] });
 
   // Wire up event handlers
+  el.querySelectorAll('[data-route-policy-type]').forEach(function(btn) {
+    btn.addEventListener('click', function() {
+      setProviderRoutePolicy(btn.dataset.routePolicyType, btn.dataset.routePolicy || 'auto');
+    });
+  });
+  el.querySelectorAll('[data-enable-portkey-type]').forEach(function(btn) {
+    btn.addEventListener('click', function() { showAddProviderDialog(btn.dataset.enablePortkeyType, 'portkey'); });
+  });
   el.querySelectorAll('[data-delete-provider]').forEach(function(btn) {
     btn.addEventListener('click', function() { deleteModelProvider(btn.dataset.deleteProvider); });
   });
@@ -15963,10 +16384,17 @@ function renderModelRegistry(models) {
     groups[key].push(m);
   });
 
-  var h = '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;">' +
-    '<span style="font-size:13px;font-weight:600;color:var(--fg,#c0caf5);">Model Registry</span>' +
-    '<span style="font-size:11px;color:var(--fg-dim,#565f89);">' + models.length + ' models</span>' +
-  '</div>';
+  if (_modelsRegistryFilter) _modelsCatalogExpanded = true;
+  var h = '<div style="border:1px solid var(--border,#414868);border-radius:8px;overflow:hidden;background:var(--bg-card,#24283b);">' +
+    '<div data-toggle-model-catalog style="display:flex;justify-content:space-between;align-items:center;padding:10px 14px;cursor:pointer;user-select:none;">' +
+      '<div style="display:flex;align-items:center;gap:8px;">' +
+        '<span style="color:#7dcfff;font-size:11px;transition:transform 0.2s;display:inline-block;' + (_modelsCatalogExpanded ? 'transform:rotate(90deg)' : '') + ';">\u25B6</span>' +
+        '<span style="font-size:13px;font-weight:600;color:var(--fg,#c0caf5);">Model Catalog</span>' +
+        '<span style="font-size:11px;color:var(--fg-dim,#565f89);">' + models.length + ' models</span>' +
+      '</div>' +
+      '<span style="font-size:11px;color:var(--fg-dim,#565f89);">' + (_modelsCatalogExpanded ? 'Collapse' : 'Expand') + '</span>' +
+    '</div>' +
+    '<div class="models-catalog-body" style="display:' + (_modelsCatalogExpanded ? 'block' : 'none') + ';border-top:1px solid var(--border,#414868);padding:8px;">';
 
   groupOrder.forEach(function(provName) {
     var pModels = groups[provName];
@@ -16019,7 +16447,17 @@ function renderModelRegistry(models) {
     h += '</div>';
   });
 
-  el.innerHTML = DOMPurify.sanitize(h, { ADD_ATTR: ['style', 'data-toggle-provider', 'data-provider', 'data-name'] });
+  h += '</div></div>';
+
+  el.innerHTML = DOMPurify.sanitize(h, { ADD_ATTR: ['style', 'data-toggle-model-catalog', 'data-toggle-provider', 'data-provider', 'data-name'] });
+  var catalogToggle = el.querySelector('[data-toggle-model-catalog]');
+  if (catalogToggle) {
+    catalogToggle.addEventListener('click', function() {
+      _modelsCatalogExpanded = !_modelsCatalogExpanded;
+      renderModelRegistry(models);
+      _filterModelCards();
+    });
+  }
   // Bind toggle
   el.querySelectorAll('[data-toggle-provider]').forEach(function(hdr) {
     hdr.addEventListener('click', function() {
@@ -16041,6 +16479,11 @@ function renderModelRegistry(models) {
 
 function _filterModelCards() {
   var q = (_modelsRegistryFilter || '').toLowerCase();
+  var catalogBody = document.querySelector('#models-registry-table .models-catalog-body');
+  if (catalogBody && q) {
+    catalogBody.style.display = 'block';
+    _modelsCatalogExpanded = true;
+  }
   document.querySelectorAll('.models-provider-group').forEach(function(group) {
     var rows = group.querySelectorAll('.model-row');
     var visibleCount = 0;
@@ -17610,8 +18053,9 @@ async function deleteModelProvider(id) {
   showModelsPanel();
 }
 
-async function showAddProviderDialog(preselectedType) {
+async function showAddProviderDialog(preselectedType, preferredConnection) {
   if (typeof preselectedType !== 'string') preselectedType = '';
+  if (typeof preferredConnection !== 'string') preferredConnection = '';
   var existing = document.getElementById('add-provider-dialog');
   if (existing) existing.remove();
 
@@ -17733,6 +18177,10 @@ async function showAddProviderDialog(preselectedType) {
   }
   document.getElementById('new-provider-type').addEventListener('change', updateProviderPlaceholders);
   document.getElementById('new-provider-connection').addEventListener('change', updateProviderPlaceholders);
+  if (preferredConnection === 'portkey') {
+    var connectionEl = document.getElementById('new-provider-connection');
+    if (connectionEl) connectionEl.value = 'portkey';
+  }
   updateProviderPlaceholders();
 
   // Only scan for env keys when adding a new provider type, not when adding a key to existing type
@@ -17984,12 +18432,25 @@ async function saveNewProvider() {
           body: JSON.stringify({
             id: id + ':' + m.id, providerId: id, modelId: m.id,
             displayName: m.name, capabilities: m.capabilities || ['code'],
+            source: payload.connection === 'portkey' ? 'portkey' : 'catalog',
+            gatewayType: payload.connection === 'portkey' ? 'portkey' : null,
+            verificationStatus: payload.connection === 'portkey' ? 'unverified' : 'verified',
+            lastSeenAt: payload.connection === 'portkey' ? new Date().toISOString() : null,
             speedTier: 3, enabled: 1,
           })
         });
       }
     }
   } catch (e) { /* ignore auto-detect failures */ }
+  if (payload.connection === 'portkey') {
+    try {
+      await fetch('/api/models/provider-route-policy?token=' + state.token, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ type: type, policy: 'portkey' }),
+      });
+    } catch (e) { /* route policy is optional; provider was saved */ }
+  }
   var dlg = document.getElementById('add-provider-dialog');
   if (dlg) dlg.remove();
   showModelsPanel();
@@ -18302,12 +18763,22 @@ function _wtRecommendedButton(wt) {
   return btn;
 }
 
+function _wtTrackedDirty(wt) {
+  if (!wt) return 0;
+  if (wt.trackedDirtyFiles != null) return Number(wt.trackedDirtyFiles || 0);
+  return Math.max(0, Number(wt.dirtyFiles || 0) - Number(wt.untrackedFiles || 0));
+}
+
+function _wtUntrackedOnly(wt) {
+  return !!wt && Number(wt.dirtyFiles || 0) > 0 && _wtTrackedDirty(wt) === 0;
+}
+
 function _wtSyncBlockReason(wt) {
   if (!wt || wt.isMain) return '';
   if (wt.sessionId && !wt.activeSyncEligible) {
     return wt.activeSyncBlockReason || 'Close the active session before syncing from main.';
   }
-  if ((wt.dirtyFiles || 0) > 0) return 'Commit or stash dirty files before syncing from main.';
+  if (_wtTrackedDirty(wt) > 0) return 'Commit or stash tracked dirty files before syncing from main.';
   if (!wt.branch || wt.branch === 'HEAD' || wt.state === 'detached') return 'Recover this worktree onto a branch before syncing from main.';
   if (wt.isGhost || wt.state === 'ghost') return 'Prune or recover this ghost worktree before syncing from main.';
   return '';
@@ -18346,7 +18817,7 @@ function _wtSyncAllEligible(wts) {
       && ['behind', 'diverged'].indexOf(wt.state) !== -1
       && !wt.isGhost
       && (inactiveEligible || activeIdleEligible)
-      && (wt.dirtyFiles || 0) === 0
+      && _wtTrackedDirty(wt) === 0
       && (wt.behind || 0) > 0;
   });
 }
@@ -18430,8 +18901,8 @@ async function loadWorktreesPanel(opts) {
       syncAllBtn.textContent = '↓ Sync all' + (syncTargets.length > 0 ? ' (' + syncTargets.length + ')' : '');
       syncAllBtn.disabled = false;
       syncAllBtn.title = syncTargets.length > 0
-        ? 'Sync ' + syncTargets.length + ' clean inactive or idle active branch(es) that are behind main'
-        : 'No clean inactive or idle active branches are behind main';
+        ? 'Sync ' + syncTargets.length + ' tracked-clean inactive or idle active branch(es) that are behind main'
+        : 'No tracked-clean inactive or idle active branches are behind main';
     }
 
     _wtRenderFilterChips(d.counts || {}, wts);
@@ -18711,9 +19182,9 @@ function _wtRenderCard(frag, wt) {
         prBtn.className = 'btn';
         prBtn.style.cssText = 'font-size:11px;padding:4px 10px;background:rgba(122,162,247,0.12);color:#7aa2f7;border:1px solid rgba(122,162,247,0.3);';
         prBtn.textContent = 'PR ▶';
-        prBtn.disabled = !!wt.sessionId || wt.dirtyFiles > 0;
+        prBtn.disabled = !!wt.sessionId || _wtTrackedDirty(wt) > 0;
         if (wt.sessionId) prBtn.title = 'Close the active session before pushing';
-        else if (wt.dirtyFiles > 0) prBtn.title = 'Commit or stash dirty files before pushing';
+        else if (_wtTrackedDirty(wt) > 0) prBtn.title = 'Commit or stash tracked dirty files before pushing';
         prBtn.onclick = function() { openCreatePRModal(wt); };
         actions.appendChild(prBtn);
       }
@@ -18763,7 +19234,8 @@ function _wtRenderCard(frag, wt) {
   metrics.style.cssText = 'font-size:11px;color:var(--fg-dim,#565f89);display:flex;flex-wrap:wrap;gap:6px;margin:0 0 8px;';
   if (!wt.isMain && wt.state !== 'ghost') {
     metrics.appendChild(_wtMetric('vs main', '+' + (wt.ahead || 0) + ' / -' + (wt.behind || 0), (wt.ahead || wt.behind) ? 'warn' : 'good'));
-    metrics.appendChild(_wtMetric('dirty', String(wt.dirtyFiles || 0), wt.dirtyFiles ? 'bad' : 'good'));
+    metrics.appendChild(_wtMetric('dirty', String(_wtTrackedDirty(wt)), _wtTrackedDirty(wt) ? 'bad' : 'good'));
+    if ((wt.untrackedFiles || 0) > 0) metrics.appendChild(_wtMetric('untracked', String(wt.untrackedFiles || 0), 'neutral'));
     metrics.appendChild(_wtMetric('unmerged', String(wt.unmergedCommits || 0), wt.unmergedCommits ? 'warn' : 'good'));
     metrics.appendChild(_wtMetric('cleanup', wt.safeCleanup ? 'safe' : 'blocked', wt.safeCleanup ? 'good' : 'warn'));
   }
@@ -18815,9 +19287,12 @@ function openSyncModal(wt) {
   };
   var sum = document.getElementById('wt-sync-summary');
   if (sum) {
-    sum.textContent = activeSync
+    var untrackedNote = (wt.untrackedFiles || 0) > 0 && _wtTrackedDirty(wt) === 0
+      ? ' Untracked files will be kept local; CTM will stop if main would overwrite one.'
+      : '';
+    sum.textContent = (activeSync
       ? 'Pull main into idle active session "' + (wt.sessionLabel || wt.branch) + '" (' + wt.behind + ' commits behind).'
-      : 'Pull main into "' + wt.branch + '" (' + wt.behind + ' commits behind).';
+      : 'Pull main into "' + wt.branch + '" (' + wt.behind + ' commits behind).') + untrackedNote;
   }
   var strategy = document.getElementById('wt-sync-strategy');
   if (strategy) {
@@ -18882,11 +19357,11 @@ async function submitSyncWorktree() {
 async function submitSyncAllWorktrees() {
   var targets = _wtSyncAllEligible((_wtCache && _wtCache.items) || []);
   if (targets.length === 0) {
-    toast('No clean inactive or idle active branches are behind main', { type: 'info' });
+    toast('No tracked-clean inactive or idle active branches are behind main', { type: 'info' });
     return;
   }
   var activeIdleCount = targets.filter(function(wt) { return !!wt.sessionId; }).length;
-  var confirmMsg = 'Sync ' + targets.length + ' clean branch(es) from main? Dirty, running/waiting active-session, detached, and ghost worktrees will be skipped.';
+  var confirmMsg = 'Sync ' + targets.length + ' tracked-clean branch(es) from main? Tracked-dirty, running/waiting active-session, detached, and ghost worktrees will be skipped.';
   if (activeIdleCount) confirmMsg += ' ' + activeIdleCount + ' idle active session(s) will use merge with a pre-sync checkpoint.';
   if (!confirm(confirmMsg)) return;
   var btn = document.getElementById('wt-sync-all-btn');
@@ -19076,6 +19551,8 @@ function _wtGateWorktree(msg, wt) {
     if (msg.ahead != null) merged.ahead = msg.ahead || 0;
     if (msg.behind != null) merged.behind = msg.behind || 0;
     if (msg.dirtyFiles != null) merged.dirtyFiles = msg.dirtyFiles || 0;
+    if (msg.trackedDirtyFiles != null) merged.trackedDirtyFiles = msg.trackedDirtyFiles || 0;
+    if (msg.untrackedFiles != null) merged.untrackedFiles = msg.untrackedFiles || 0;
     if (msg.unmergedCommits != null) merged.unmergedCommits = msg.unmergedCommits || 0;
     if (msg.summary) merged.summary = msg.summary;
     if (msg.worktreePath) merged.path = msg.worktreePath;
@@ -19091,6 +19568,8 @@ function _wtGateWorktree(msg, wt) {
     ahead: msg.ahead || msg.unmergedCommits || 0,
     behind: msg.behind || 0,
     dirtyFiles: msg.dirtyFiles || 0,
+    trackedDirtyFiles: msg.trackedDirtyFiles || 0,
+    untrackedFiles: msg.untrackedFiles || 0,
     unmergedCommits: msg.unmergedCommits || 0,
     summary: msg.summary || msg.message || '',
   };
@@ -19101,8 +19580,8 @@ function _wtGateLabel(wt) {
 }
 
 function _wtGateHint(wt) {
-  if ((wt.dirtyFiles || 0) > 0) {
-    return 'This worktree has uncommitted files. Commit, stash, or inspect them before merging or opening a PR.';
+  if (_wtTrackedDirty(wt) > 0) {
+    return 'This worktree has tracked dirty files. Commit, stash, or inspect them before merging or opening a PR.';
   }
   if ((wt.behind || 0) > 0 && (wt.ahead || 0) > 0) {
     return 'This branch has work and is behind main. Sync from main first if you want the cleanest finish path.';
@@ -19126,14 +19605,15 @@ function openWorktreeFinishGate(msg, wt) {
     _wtClearChildren(metrics);
     metrics.appendChild(_wtMetric('state', gateWt.state || 'unknown', 'neutral'));
     metrics.appendChild(_wtMetric('vs main', '+' + (gateWt.ahead || 0) + ' / -' + (gateWt.behind || 0), (gateWt.ahead || gateWt.behind) ? 'warn' : 'good'));
-    metrics.appendChild(_wtMetric('dirty', String(gateWt.dirtyFiles || 0), gateWt.dirtyFiles ? 'bad' : 'good'));
+    metrics.appendChild(_wtMetric('dirty', String(_wtTrackedDirty(gateWt)), _wtTrackedDirty(gateWt) ? 'bad' : 'good'));
+    if ((gateWt.untrackedFiles || 0) > 0) metrics.appendChild(_wtMetric('untracked', String(gateWt.untrackedFiles || 0), 'neutral'));
     metrics.appendChild(_wtMetric('unmerged', String(gateWt.unmergedCommits || 0), gateWt.unmergedCommits ? 'warn' : 'good'));
   }
 
   var hint = document.getElementById('wt-finish-hint');
   if (hint) hint.textContent = _wtGateHint(gateWt);
 
-  var hasDirty = (gateWt.dirtyFiles || 0) > 0;
+  var hasDirty = _wtTrackedDirty(gateWt) > 0;
   var hasCommittedWork = (gateWt.unmergedCommits || 0) > 0 || (gateWt.ahead || 0) > 0;
   var canFinish = !hasDirty && hasCommittedWork && gateWt.branch && gateWt.branch !== 'HEAD';
   var mergeBtn = document.getElementById('wt-finish-merge-btn');
@@ -19274,7 +19754,7 @@ function _wtMergeBlockReason(wt) {
   wt = wt || {};
   if (!wt.branch || wt.branch === 'HEAD') return 'Recover this worktree onto a branch before merging.';
   if (wt.sessionId) return 'Close the active session before merging: ' + (wt.sessionLabel || wt.branch) + '.';
-  if ((wt.dirtyFiles || 0) > 0) return 'Commit or stash dirty files before merging.';
+  if (_wtTrackedDirty(wt) > 0) return 'Commit or stash tracked dirty files before merging.';
   if ((wt.behind || 0) > 0) return 'Sync from main before merging.';
   if ((wt.unmergedCommits || 0) === 0 && (wt.ahead || 0) === 0) return 'Nothing to merge — this branch is already integrated with main.';
   return '';
@@ -22043,7 +22523,7 @@ async function onSessionsList(msg) {
       if (s._outputIdleTimer) clearTimeout(s._outputIdleTimer);
       if (s._snapshotRetryTimer) clearTimeout(s._snapshotRetryTimer);
       if (s._blankCheckTimer) clearTimeout(s._blankCheckTimer);
-      _detachZerolag(s);
+      _disposeTerminalRenderer(s);
       try { if (s.term) s.term.dispose(); } catch {}
       try { s.container.remove(); } catch {}
       state.sessions.delete(id);
@@ -22414,14 +22894,17 @@ function worktreeAttentionBadge(s) {
   const branch = wt.branch || s?.meta?.branch || '';
   if (!branch || branch === 'main' || branch === 'master') return '';
   const dirtyFiles = Number(wt.dirtyFiles || 0);
+  const trackedDirtyFiles = wt.trackedDirtyFiles != null
+    ? Number(wt.trackedDirtyFiles || 0)
+    : Math.max(0, dirtyFiles - Number(wt.untrackedFiles || 0));
   const unmergedCommits = Number(wt.unmergedCommits || 0);
-  if (dirtyFiles <= 0 && unmergedCommits <= 0) return '';
+  if (trackedDirtyFiles <= 0 && unmergedCommits <= 0) return '';
 
   const parts = [];
   const titleParts = [];
-  if (dirtyFiles > 0) {
-    parts.push(`<span class="wt-part" aria-hidden="true">&#9998;${dirtyFiles}</span>`);
-    titleParts.push(`${dirtyFiles} uncommitted file${dirtyFiles === 1 ? '' : 's'}`);
+  if (trackedDirtyFiles > 0) {
+    parts.push(`<span class="wt-part" aria-hidden="true">&#9998;${trackedDirtyFiles}</span>`);
+    titleParts.push(`${trackedDirtyFiles} tracked dirty file${trackedDirtyFiles === 1 ? '' : 's'}`);
   }
   if (unmergedCommits > 0) {
     parts.push(`<span class="wt-part" aria-hidden="true">&#8593;${unmergedCommits}</span>`);
@@ -24235,8 +24718,8 @@ async function _maybeRecommendWorktreeForNewSession(force) {
     var repoRoot = _nsNormalizeCwdForCompare(d.cwd || '');
     var mainWt = (d.worktrees || []).find(function(wt) { return wt.isMain; });
     var isPrimaryRepo = repoRoot && cwd === repoRoot;
-    if (!reason && isPrimaryRepo && mainWt && (mainWt.dirtyFiles || 0) > 0) {
-      reason = 'Recommended: main has uncommitted files';
+    if (!reason && isPrimaryRepo && mainWt && _wtTrackedDirty(mainWt) > 0) {
+      reason = 'Recommended: main has tracked uncommitted files';
     }
     if (!reason && isPrimaryRepo) {
       reason = 'Recommended: code agent in the primary checkout';
@@ -24455,7 +24938,7 @@ function killSession(id, opts) {
     if (s._outputIdleTimer) clearTimeout(s._outputIdleTimer);
     if (s._snapshotRetryTimer) clearTimeout(s._snapshotRetryTimer);
     if (s._blankCheckTimer) clearTimeout(s._blankCheckTimer);
-    _detachZerolag(s);
+    _disposeTerminalRenderer(s);
     if (s.term) s.term.dispose();
     s.container.remove();
     state.sessions.delete(id);
@@ -24497,7 +24980,7 @@ function _killTabSilent(id) {
   if (s._outputIdleTimer) clearTimeout(s._outputIdleTimer);
   if (s._snapshotRetryTimer) clearTimeout(s._snapshotRetryTimer);
   if (s._blankCheckTimer) clearTimeout(s._blankCheckTimer);
-  _detachZerolag(s);
+  _disposeTerminalRenderer(s);
   if (s.term) s.term.dispose();
   s.container.remove();
   state.sessions.delete(id);
@@ -27345,6 +27828,15 @@ function openFolder(folderPath) {
   });
 }
 
+function linkReviewDocumentReferences(root, sessionId) {
+  if (!root || !window.CTMDocLinks || typeof window.CTMDocLinks.linkifyElement !== 'function') return;
+  try {
+    window.CTMDocLinks.linkifyElement(root, window.CTMDocLinks.contextForSession(sessionId));
+  } catch (e) {
+    console.warn('[review] document linkification failed:', e && e.message ? e.message : e);
+  }
+}
+
 async function reviewSession(sessionId, projectEntry, title, sessionData, opts) {
   const explicitAgentType = _clientNormalizeAgentType(sessionData?.agent || sessionData?.agentType);
   if (explicitAgentType && !_clientAgentCaps(explicitAgentType).structuredTranscript) {
@@ -27456,6 +27948,7 @@ async function reviewSession(sessionId, projectEntry, title, sessionData, opts)
 	    // internally via formatMsgText); sanitize the wrapper before insertion.
 	    const firstHtml = turns.slice(0, FIRST_BATCH).map(renderReviewTurn).join('');
 	    container.innerHTML = DOMPurify.sanitize(firstHtml, { ADD_ATTR: ['style', 'data-idx', 'data-role', 'data-turn-id', 'data-msg-idx', 'data-parent-uuid', 'role', 'tabindex', 'aria-expanded'] });
+    linkReviewDocumentReferences(container, sessionId);
     _updateReviewLoadOlderBar(container, fetchId, projectEntry, page);
 
     // Show partial load indicator if backend couldn't load all files
@@ -27485,6 +27978,7 @@ async function reviewSession(sessionId, projectEntry, title, sessionData, opts)
 	        const end = Math.min(offset + CHUNK_SIZE, turns.length);
 	        const chunkHtml = turns.slice(offset, end).map(renderReviewTurn).join('');
 	        container.insertAdjacentHTML('beforeend', DOMPurify.sanitize(chunkHtml, { ADD_ATTR: ['style', 'data-idx', 'data-role', 'data-turn-id', 'data-msg-idx', 'data-parent-uuid', 'role', 'tabindex', 'aria-expanded'] }));
+	        linkReviewDocumentReferences(container, sessionId);
 	        offset = end;
 	        requestAnimationFrame(renderNextChunk);
 	      };
@@ -31098,7 +31592,7 @@ function _parseHashRoute() {
   const params = {};
   for (const part of (isNav ? parts.slice(1) : parts)) {
     const eq = part.indexOf('=');
-    if (eq > 0) params[part.slice(0, eq)] = decodeURIComponent(part.slice(eq + 1));
+    if (eq > 0) params[part.slice(0, eq)] = decodeURIComponent(part.slice(eq + 1).replace(/\+/g, '%20'));
   }
   return { hash, firstPart, isNav, params };
 }
@@ -31189,13 +31683,14 @@ function handleHashRoute() {
     return;
   }
 
-  // #review&type=doc&path=<absolute-path>&line=<line> — open document review workspace.
+  // #review&type=doc&path=<path>&line=<line>&cwd=<session cwd> — open document review workspace.
   if (firstPart === 'review' && params.type === 'doc' && params.path) {
-    navTo('codereview', { skipHash: true });
+    navTo('codereview', { skipHash: true, suppressProjectList: true });
+    const docOpts = { cwd: params.cwd || '', sessionId: params.session || '' };
     if (window.CR && typeof CR.openDocumentReview === 'function') {
-      setTimeout(() => CR.openDocumentReview(params.path, params.line || 1), 100);
+      setTimeout(() => CR.openDocumentReview(params.path, params.line || 1, docOpts), 100);
     } else {
-      state.pendingDocumentReview = { path: params.path, line: params.line || 1 };
+      state.pendingDocumentReview = { path: params.path, line: params.line || 1, cwd: docOpts.cwd, sessionId: docOpts.sessionId };
     }
     return;
   }