@goodandready/dsh-context-lens 0.1.10 → 0.1.12

package/README.md

@@ -147,3 +147,21 @@ dsh-context-lens:
 ## 📄 License
 
 MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
+
+
+## Changed in v0.1.11
+
+Audit fixes (#33–#47, #18):
+
+- Auto-compress no longer forces `balanced`; uses configured `compressionMode`.
+- `budgetLimit` stops token counting after the limit (matches settings description).
+- Focus state is per-session (`sessionId`), not process-global.
+- Settings card exposes `budgetLimit`, `autoCollapse`, `autoCompressThreshold`; low-budget shows a warning instead of force-closing the card.
+- Client `betterSidebar` inject is optional; preview uses server `/dsh-context-lens/compress-preview`.
+- Python imports kept in skeletons; Java locals no longer mistaken for signatures.
+- Shared `estimateTokens` helper; unused `dsh-credentials` peer removed.
+
+
+## Changed in v0.1.12
+
+#43: extract shared `StatusPanel` used by LensTab and HeaderChip popover (budget bar, history, refresh).

package/README.ru.md

@@ -144,3 +144,13 @@ dsh-context-lens:
 ## 📄 Лицензия
 
 MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
+
+
+## Changed in v0.1.11
+
+Исправления audit #33–#47 / #18: режим auto-compress не форсирует balanced; budgetLimit останавливает подсчёт; focus per-session; поля settings card; optional betterSidebar; серверный preview; Python imports / Java locals; общий estimateTokens; удалён unused peer dsh-credentials.
+
+
+## Changed in v0.1.12
+
+#43: extract shared `StatusPanel` used by LensTab and HeaderChip popover (budget bar, history, refresh).

package/lib/ast/skeletonizer.js

@@ -3,7 +3,7 @@ const JS_FUNC_RE = /^\s*(export\s+)?(async\s+)?(function\s+(\w+)|const\s+(\w+)\s
 const PY_RE = /^\s*(def\s+(\w+)\s*\([^)]*\)|class\s+(\w+).*?:|async def\s+(\w+)\s*\([^)]*\))/;
 const GO_RE = /^\s*(func\s+(\([^)]+\)\s+)?(\w+)\s*\([^)]*\)|type\s+(\w+)\s+(struct|interface))/;
 const RUST_RE = /^\s*(pub(\([^)]+\))?\s+)?(async\s+)?(fn|struct|enum|impl|trait|type|const|static)\s+\w+/;
-const IMPORT_RE = /^\s*import\s+.*from\s+['"].*['"]|^\s*import\s+['"].*['"]|^\s*export\s+.*from\s+['"]|^\s*use\s+[a-zA-Z0-9_:]+/;
+const IMPORT_RE = /^\s*import\s+.*from\s+['"].*['"]|^\s*import\s+['"].*['"]|^\s*export\s+.*from\s+['"]|^\s*use\s+[a-zA-Z0-9_:]+|^\s*(from\s+\S+\s+)?import\s+\S+|^\s*from\s+\S+\s+import\s+/;
 const COMMENT_RE = /^\s*(\/\/.*|\/\*.*\*\/|\/\*.*|\*.*|#.*)/;
 
 function indentDepth(line) {
@@ -77,7 +77,9 @@ export function skeletonize(text, { maxDepth = 3, language, includeImports = tru
       if (RUST_RE.test(line)) sig = line.trim();
     }
     if (!sig && (!language || language === 'java')) {
-      if (/^\s*(public|protected|private|static|\s)+\s+(class|interface|enum|record|\w+)\s+\w+/.test(line)) sig = line.trim();
+      if (/^\s*(?:(?:public|protected|private|static|final|abstract|synchronized|native|default)\s+)+(?:class|interface|enum|record)\s+\w+/.test(line)
+        || /^\s*(?:(?:public|protected|private|static|final|abstract|synchronized|native|default)\s+)+[\w.<>,\[\]?]+\s+\w+\s*\(/.test(line)
+        || /^\s*(class|interface|enum|record)\s+\w+/.test(line)) sig = line.trim();
     }
     // generic fallback: if no specific language, try all
     if (!sig && !language) {

package/lib/auto-compress.js

@@ -0,0 +1,7 @@
+/** Decide whether auto-compress should trigger for a log blob. */
+export function shouldAutoCompress(text, threshold) {
+  if (!threshold || threshold <= 0) return false;
+  return (text || '').length > threshold || (text || '').split('\n').length > 100;
+}
+
+export default { shouldAutoCompress };

package/lib/client.js

@@ -20,7 +20,16 @@ window.__ModuleLoader__.load({
       ready: 'Ready',
       budget: 'Budget',
       history: 'Recent ops',
-      lowBudget: 'Budget nearly exhausted'
+      lowBudget: 'Budget nearly exhausted',
+      threshold: 'Auto-compress threshold (chars)',
+      autoCollapse: 'Warn when budget is nearly exhausted',
+      previewApprox: 'Server preview',
+      noData: 'No data yet',
+      refresh: 'Refresh',
+      ops: 'ops',
+      active: 'Active',
+      readyState: 'Ready',
+      lowBudgetBadge: 'Low Budget ⚠'
     };
     const ru = {
       title: 'Context Lens & Token Guard',
@@ -37,47 +46,135 @@ window.__ModuleLoader__.load({
       ready: 'Готово',
       budget: 'Бюджет',
       history: 'Последние операции',
-      lowBudget: 'Бюджет почти исчерпан'
+      lowBudget: 'Бюджет почти исчерпан',
+      threshold: 'Порог авто-сжатия (символы)',
+      autoCollapse: 'Предупреждать при почти исчерпанном бюджете',
+      previewApprox: 'Серверный предпросмотр',
+      noData: 'Пока нет данных',
+      refresh: 'Обновить',
+      ops: 'оп.',
+      active: 'Активен',
+      readyState: 'Готов',
+      lowBudgetBadge: 'Мало бюджета ⚠'
     };
 
-    // ponytail: client-side replica of compressor for preview (no import)
-    function compressPreview(text, mode) {
-      if (!text) return '';
-      const KEEP = /(FAIL|FAILED|Error|AssertionError|Exception|Traceback|panic|npm ERR!|Expected|Received|at\s+.*:\d+:\d+)/i;
-      const lines = text.split(/\r?\n/);
-      const keep = new Array(lines.length).fill(false);
-      const ctx = mode === 'aggressive' ? 1 : 2;
-      for (let i = 0; i < lines.length; i++) if (KEEP.test(lines[i])) {
-        for (let j = Math.max(0, i - ctx); j <= Math.min(lines.length - 1, i + ctx); j++) keep[j] = true;
+    // #45: preview uses POST /dsh-context-lens/compress-preview (server compressor)
+
+    // #43: shared status UI for LensTab + HeaderChip popover
+    function StatusPanel({ stats, history, labels, onRefresh, title, showBadge, compact }) {
+      const L = labels || en;
+      const warn = !!(stats && stats.lowBudget);
+      const hasSavings = !!(stats && stats.savedTokens > 0);
+      const barColor = warn ? '#d73a4a' : 'var(--dsw-alias-label-primary)';
+      const previewLen = compact ? 28 : 40;
+      const barH = compact ? 5 : 6;
+      const children = [];
+      if (title || showBadge) {
+        children.push(React.createElement('div', {
+          key: 'head',
+          style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 8 }
+        },
+          title
+            ? React.createElement('div', { style: { fontWeight: 600, fontSize: 13, display: 'flex', alignItems: 'center', gap: 6, color: 'var(--dsw-alias-label-primary)' } },
+                React.createElement('span', { style: { opacity: 0.8 } }, '◐'),
+                title
+              )
+            : React.createElement('span'),
+          showBadge
+            ? React.createElement('span', {
+                style: {
+                  fontSize: 11, padding: '1px 6px', borderRadius: 4,
+                  background: warn ? 'rgba(215, 58, 74, 0.15)' : 'var(--dsw-alias-bg-layer-2)',
+                  color: warn ? '#d73a4a' : 'var(--dsw-alias-label-tertiary)',
+                  border: '1px solid ' + (warn ? 'rgba(215, 58, 74, 0.3)' : 'var(--dsw-alias-border-l2)')
+                }
+              }, warn ? L.lowBudgetBadge : (stats ? L.active : L.readyState))
+            : null
+        ));
       }
-      if (!keep.some(Boolean)) return lines.slice(0, 20).join('\n');
-      return lines.filter((_, i) => keep[i]).slice(0, 200).join('\n');
+      children.push(
+        hasSavings
+          ? React.createElement('div', { key: 'sum', style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary)', marginBottom: compact ? 8 : 0 } },
+              `${L.saved} ${stats.savedTokens} ${L.tokens} (${stats.savedPercent}%) · ${stats.calls} ${L.ops}`)
+          : React.createElement('div', { key: 'sum', style: { fontSize: 12, color: compact ? 'var(--dsw-alias-label-tertiary)' : 'var(--dsw-alias-label-secondary)', marginBottom: compact ? 8 : 0 } }, L.noData)
+      );
+      if (stats && stats.lowBudget && !showBadge) {
+        children.push(React.createElement('div', { key: 'warn', style: { marginTop: 6, fontSize: 11, color: '#d73a4a' } }, '⚠ ' + L.lowBudget));
+      }
+      if (stats && stats.budgetLimit) {
+        children.push(React.createElement('div', { key: 'budget', style: { marginTop: compact ? 6 : 8, marginBottom: compact ? 8 : 0 } },
+          React.createElement('div', {
+            style: {
+              display: compact ? 'flex' : 'block',
+              justifyContent: 'space-between',
+              fontSize: 11,
+              color: warn ? '#d73a4a' : 'var(--dsw-alias-label-secondary)',
+              marginBottom: 4
+            }
+          },
+            compact
+              ? React.createElement(React.Fragment, null,
+                  React.createElement('span', null, L.budget),
+                  React.createElement('span', null, `${stats.budgetUsed || 0} / ${stats.budgetLimit} (${stats.budgetPercent || 0}%)`)
+                )
+              : `${L.budget} ${stats.budgetUsed}/${stats.budgetLimit} ${L.tokens} (${stats.budgetPercent}%)${warn ? ' ⚠' : ''}`
+          ),
+          React.createElement('div', { style: { height: barH, borderRadius: 3, background: compact ? 'var(--dsw-alias-bg-layer-1)' : 'var(--dsw-alias-bg-layer-2, var(--dsw-alias-bg-layer-3))', overflow: 'hidden' } },
+            React.createElement('div', { style: { height: '100%', width: Math.min(100, stats.budgetPercent || 0) + '%', background: barColor, transition: 'width .2s' } })
+          )
+        ));
+      }
+      if (history && history.length) {
+        children.push(React.createElement('div', {
+          key: 'hist',
+          style: { marginTop: compact ? 8 : 10, paddingTop: compact ? 8 : 0, borderTop: compact ? '1px solid var(--dsw-alias-border-l3)' : undefined }
+        },
+          React.createElement('div', { style: { fontSize: 11, color: 'var(--dsw-alias-label-tertiary)', marginBottom: 4 } }, L.history),
+          ...history.slice(0, 3).map((h) => React.createElement('div', {
+            key: h.id,
+            style: { fontSize: 11, color: 'var(--dsw-alias-label-secondary)', padding: '2px 0', overflow: compact ? 'hidden' : undefined, textOverflow: compact ? 'ellipsis' : undefined, whiteSpace: compact ? 'nowrap' : undefined }
+          }, `−${h.savedTokens} tk (${h.savedPercent}%) · ${(h.preview || '').slice(0, previewLen)}`))
+        ));
+      }
+      if (onRefresh) {
+        children.push(React.createElement('div', {
+          key: 'act',
+          style: { marginTop: compact ? 10 : 12, display: 'flex', gap: 8, justifyContent: compact ? 'flex-end' : undefined }
+        },
+          React.createElement('button', {
+            type: 'button',
+            onClick: onRefresh,
+            style: {
+              appearance: 'none', cursor: 'pointer', fontSize: compact ? 11 : 12,
+              padding: compact ? '3px 8px' : '4px 10px', borderRadius: 6,
+              border: '1px solid var(--dsw-alias-border-l2)',
+              background: compact ? 'var(--dsw-alias-bg-layer-2)' : 'var(--dsw-alias-bg-layer-3)',
+              color: compact ? 'var(--dsw-alias-label-secondary)' : 'var(--dsw-alias-label-primary)'
+            }
+          }, L.refresh)
+        ));
+      }
+      return React.createElement(React.Fragment, null, ...children);
+    }
+
+    function fetchLensStatus() {
+      return fetch('/dsh-context-lens/status', { headers: { accept: 'application/json' } })
+        .then((r) => r.ok ? r.json() : null);
     }
 
     function LensTab({ ctx: _ctx, scope }) {
       const [stats, setStats] = React.useState(null);
       const [history, setHistory] = React.useState([]);
-      React.useEffect(() => {
-        fetch('/dsh-context-lens/status').then(r => r.ok ? r.json() : null).then(j => { if (j && j.stats) { setStats(j.stats); setHistory(j.history || []); } }).catch(() => {});
-      }, []);
-      const refresh = () => fetch('/dsh-context-lens/status').then(r=>r.json()).then(j=>{ if (j && j.stats) { setStats(j.stats); setHistory(j.history || []); } }).catch(()=>{});
-      const barColor = stats && stats.lowBudget ? '#d73a4a' : 'var(--dsw-alias-label-primary)';
+      const apply = (j) => {
+        if (j && j.stats) setStats(j.stats);
+        if (j && j.history) setHistory(j.history || []);
+      };
+      const refresh = () => fetchLensStatus().then(apply).catch(() => {});
+      React.useEffect(() => { refresh(); }, []);
       return React.createElement('div', { style: { padding: 12 } },
-        React.createElement('div', { style: { fontSize: 13, fontWeight: 600, marginBottom: 8, color: 'var(--dsw-alias-label-primary)' } }, 'Context Lens'),
-        stats ? React.createElement('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary)' } }, `Saved ${stats.savedTokens} tokens (${stats.savedPercent}%) · ${stats.calls} ops`) : React.createElement('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary)' } }, 'No data yet'),
-        stats && stats.budgetLimit ? React.createElement('div', { style: { marginTop: 8 } },
-          React.createElement('div', { style: { fontSize: 11, color: stats.lowBudget ? '#d73a4a' : 'var(--dsw-alias-label-secondary)', marginBottom: 4 } }, `Budget ${stats.budgetUsed}/${stats.budgetLimit} tokens (${stats.budgetPercent}%)${stats.lowBudget ? ' ⚠' : ''}`),
-          React.createElement('div', { style: { height: 6, borderRadius: 3, background: 'var(--dsw-alias-bg-layer-2, var(--dsw-alias-bg-layer-3))', overflow: 'hidden' } },
-            React.createElement('div', { style: { height: '100%', width: Math.min(100, stats.budgetPercent) + '%', background: barColor, transition: 'width .2s' } })
-          )
-        ) : null,
-        history.length ? React.createElement('div', { style: { marginTop: 10 } },
-          React.createElement('div', { style: { fontSize: 11, color: 'var(--dsw-alias-label-tertiary)', marginBottom: 4 } }, 'Recent ops'),
-          ...history.slice(0, 3).map((h) => React.createElement('div', { key: h.id, style: { fontSize: 11, color: 'var(--dsw-alias-label-secondary)', padding: '2px 0' } }, `−${h.savedTokens} tk (${h.savedPercent}%) · ${(h.preview || '').slice(0, 40)}`))
-        ) : null,
-        React.createElement('div', { style: { marginTop: 12, display: 'flex', gap: 8 } },
-          React.createElement('button', { onClick: refresh, style: { fontSize: 12, padding: '4px 10px', borderRadius: 6, border: '1px solid var(--dsw-alias-border-l2)', background: 'var(--dsw-alias-bg-layer-3)', color: 'var(--dsw-alias-label-primary)', cursor: 'pointer' } }, 'Refresh')
-        )
+        React.createElement(StatusPanel, {
+          stats, history, labels: en, onRefresh: refresh, title: 'Context Lens', showBadge: false, compact: false
+        })
       );
     }
 
@@ -87,15 +184,10 @@ window.__ModuleLoader__.load({
       const [open, setOpen] = React.useState(false);
       const ref = React.useRef(null);
 
-      const fetchStatus = () => {
-        fetch('/dsh-context-lens/status', { headers: { accept: 'application/json' } })
-          .then(r => r.ok ? r.json() : null)
-          .then(j => {
-            if (j && j.stats) setStats(j.stats);
-            if (j && j.history) setHistory(j.history);
-          })
-          .catch(() => {});
-      };
+      const fetchStatus = () => fetchLensStatus().then((j) => {
+        if (j && j.stats) setStats(j.stats);
+        if (j && j.history) setHistory(j.history || []);
+      }).catch(() => {});
 
       React.useEffect(() => {
         let alive = true;
@@ -121,115 +213,28 @@ window.__ModuleLoader__.load({
 
       const popover = open ? React.createElement('div', {
         style: {
-          position: 'absolute',
-          top: 'calc(100% + 6px)',
-          right: 0,
-          width: 270,
-          background: 'var(--dsw-alias-bg-layer-3)',
-          border: '1px solid var(--dsw-alias-border-l2)',
-          borderRadius: 10,
-          boxShadow: '0 8px 24px rgba(0, 0, 0, 0.28)',
-          padding: '12px 14px',
-          zIndex: 1000,
-          fontSize: 12,
-          color: 'var(--dsw-alias-label-primary)',
-          cursor: 'default',
-          textAlign: 'left'
+          position: 'absolute', top: 'calc(100% + 6px)', right: 0, width: 270,
+          background: 'var(--dsw-alias-bg-layer-3)', border: '1px solid var(--dsw-alias-border-l2)',
+          borderRadius: 10, boxShadow: '0 8px 24px rgba(0, 0, 0, 0.28)', padding: '12px 14px',
+          zIndex: 1000, fontSize: 12, color: 'var(--dsw-alias-label-primary)', cursor: 'default', textAlign: 'left'
         },
         onClick: (e) => e.stopPropagation()
       },
-        React.createElement('div', { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 8 } },
-          React.createElement('div', { style: { fontWeight: 600, fontSize: 13, display: 'flex', alignItems: 'center', gap: 6 } },
-            React.createElement('span', { style: { opacity: 0.8 } }, '◐'),
-            'Context Lens'
-          ),
-          React.createElement('span', {
-            style: {
-              fontSize: 11,
-              padding: '1px 6px',
-              borderRadius: 4,
-              background: warn ? 'rgba(215, 58, 74, 0.15)' : 'var(--dsw-alias-bg-layer-2)',
-              color: warn ? '#d73a4a' : 'var(--dsw-alias-label-tertiary)',
-              border: '1px solid ' + (warn ? 'rgba(215, 58, 74, 0.3)' : 'var(--dsw-alias-border-l2)')
-            }
-          }, warn ? 'Low Budget ⚠' : (stats ? 'Active' : 'Ready'))
-        ),
-        hasSavings
-          ? React.createElement('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary)', marginBottom: 8 } },
-              `Saved ${stats.savedTokens} tokens (${stats.savedPercent}%) · ${stats.calls} ops`
-            )
-          : React.createElement('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-tertiary)', marginBottom: 8 } },
-              'No compression yet · Monitoring active'
-            ),
-        stats && stats.budgetLimit ? React.createElement('div', { style: { marginTop: 6, marginBottom: 8 } },
-          React.createElement('div', {
-            style: {
-              display: 'flex',
-              justifyContent: 'space-between',
-              fontSize: 11,
-              color: warn ? '#d73a4a' : 'var(--dsw-alias-label-tertiary)',
-              marginBottom: 4
-            }
-          },
-            React.createElement('span', null, 'Budget'),
-            React.createElement('span', null, `${stats.budgetUsed || 0} / ${stats.budgetLimit} (${stats.budgetPercent || 0}%)`)
-          ),
-          React.createElement('div', { style: { height: 5, borderRadius: 3, background: 'var(--dsw-alias-bg-layer-1)', overflow: 'hidden' } },
-            React.createElement('div', {
-              style: {
-                height: '100%',
-                width: Math.min(100, stats.budgetPercent || 0) + '%',
-                background: warn ? '#d73a4a' : 'var(--dsw-alias-label-primary)',
-                transition: 'width .2s'
-              }
-            })
-          )
-        ) : null,
-        history && history.length ? React.createElement('div', { style: { marginTop: 8, paddingTop: 8, borderTop: '1px solid var(--dsw-alias-border-l3)' } },
-          React.createElement('div', { style: { fontSize: 11, color: 'var(--dsw-alias-label-tertiary)', marginBottom: 4 } }, 'Recent operations'),
-          ...history.slice(0, 3).map((h) => React.createElement('div', {
-            key: h.id,
-            style: { fontSize: 11, color: 'var(--dsw-alias-label-secondary)', padding: '2px 0', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }
-          }, `−${h.savedTokens} tk (${h.savedPercent}%) · ${(h.preview || '').slice(0, 28)}`))
-        ) : null,
-        React.createElement('div', { style: { marginTop: 10, display: 'flex', justifyContent: 'flex-end' } },
-          React.createElement('button', {
-            type: 'button',
-            onClick: fetchStatus,
-            style: {
-              appearance: 'none',
-              cursor: 'pointer',
-              fontSize: 11,
-              padding: '3px 8px',
-              borderRadius: 6,
-              border: '1px solid var(--dsw-alias-border-l2)',
-              background: 'var(--dsw-alias-bg-layer-2)',
-              color: 'var(--dsw-alias-label-secondary)'
-            }
-          }, 'Refresh')
-        )
+        React.createElement(StatusPanel, {
+          stats, history, labels: en, onRefresh: fetchStatus, title: 'Context Lens', showBadge: true, compact: true
+        })
       ) : null;
 
       return React.createElement('div', { ref, style: { position: 'relative', display: 'inline-flex', alignItems: 'center' } },
         React.createElement('button', {
           type: 'button',
-          title: hasSavings ? `Context Lens: Saved ${stats.savedTokens} tk (${stats.savedPercent}%)` : 'Context Lens: Active',
+          title: hasSavings ? `Context Lens: ${en.saved} ${stats.savedTokens} tk (${stats.savedPercent}%)` : 'Context Lens: Active',
           onClick: () => setOpen((v) => !v),
           style: {
-            appearance: 'none',
-            font: 'inherit',
-            cursor: 'pointer',
-            display: 'inline-flex',
-            alignItems: 'center',
-            gap: 4,
-            padding: '2px 8px',
-            borderRadius: 999,
-            fontSize: 11,
-            lineHeight: '16px',
+            appearance: 'none', font: 'inherit', cursor: 'pointer', display: 'inline-flex', alignItems: 'center', gap: 4,
+            padding: '2px 8px', borderRadius: 999, fontSize: 11, lineHeight: '16px',
             background: open ? 'var(--dsw-alias-bg-layer-3)' : 'var(--dsw-alias-bg-layer-2)',
-            color,
-            border: '1px solid ' + borderColor,
-            marginLeft: 6
+            color, border: '1px solid ' + borderColor, marginLeft: 6
           }
         },
           React.createElement('span', { style: { fontSize: 10, opacity: 0.8 } }, '◐'),
@@ -243,13 +248,14 @@ window.__ModuleLoader__.load({
     function PluginCard({ ctx: _ctx, t }) {
       const [expanded, setExpanded] = React.useState(false);
       // hooks must be before any return — React 310
-      const [draft, setDraft] = React.useState({ compressionMode: 'balanced', astSkeletonMaxDepth: 3, tokenSavingsTracking: true, budgetLimit: 100000, autoCollapse: true });
+      const [draft, setDraft] = React.useState({ compressionMode: 'balanced', astSkeletonMaxDepth: 3, tokenSavingsTracking: true, budgetLimit: 100000, autoCollapse: true, autoCompressThreshold: 4000 });
       const [status, setStatus] = React.useState('loading');
       const [saving, setSaving] = React.useState(false);
       const [saveErr, setSaveErr] = React.useState('');
       const [previewIn, setPreviewIn] = React.useState('FAIL  src/app.test.js\n  ● should handle\n    Expected 1 got 2\n    at Object.<anonymous> (src/app.test.js:10:5)\nPASS  src/ok.test.js\n');
       const [previewOut, setPreviewOut] = React.useState('');
       const [stats, setStats] = React.useState(null);
+      const [budgetWarn, setBudgetWarn] = React.useState(false);
 
       const scopeRef = React.useRef(null);
       if (!scopeRef.current && _ctx && _ctx.settingsScope) {
@@ -283,16 +289,15 @@ window.__ModuleLoader__.load({
       }, [scope]);
 
       React.useEffect(() => {
-        if (expanded) {
-          fetch('/dsh-context-lens/status').then((r) => r.ok ? r.json() : null).then((j) => {
-            if (j && j.stats) {
-              setStats(j.stats);
-              // Budget guard (#16): auto-collapse when nearly exhausted
-              if (j.stats.lowBudget && draft.autoCollapse !== false) setExpanded(false);
-            }
-          }).catch(() => {});
-        }
-      }, [expanded]);
+        if (!expanded) return;
+        fetch('/dsh-context-lens/status').then((r) => r.ok ? r.json() : null).then((j) => {
+          if (j && j.stats) {
+            setStats(j.stats);
+            // #41: warn instead of force-closing the card
+            setBudgetWarn(!!(j.stats.lowBudget && draft.autoCollapse !== false));
+          }
+        }).catch(() => {});
+      }, [expanded, draft.autoCollapse]);
 
       const tt = t || ((k) => (en[k] || k));
 
@@ -320,9 +325,18 @@ window.__ModuleLoader__.load({
         if (errs.length) setSaveErr(errs.join('; '));
       }
 
-      function onPreview() {
-        const mode = draft.compressionMode || 'balanced';
-        setPreviewOut(compressPreview(previewIn, mode));
+      async function onPreview() {
+        try {
+          const res = await fetch('/dsh-context-lens/compress-preview', {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ text: previewIn, mode: draft.compressionMode || 'balanced' })
+          });
+          const j = await res.json();
+          setPreviewOut((j && j.compressed) || (j && j.error) || '');
+        } catch (e) {
+          setPreviewOut(String(e && e.message || e));
+        }
       }
 
       // styles: ponytail minimal, theme vars only
@@ -340,6 +354,7 @@ window.__ModuleLoader__.load({
           React.createElement(Chevron, { open: expanded })
         ),
         expanded ? React.createElement('div', { className: 'cl-body', style: { borderTop: '1px solid var(--dsw-alias-border-l2)', margin: '0 16px', paddingBottom: 8 } },
+          budgetWarn ? React.createElement('div', { style: { marginTop: 10, padding: '8px 10px', borderRadius: 8, background: 'rgba(215,58,74,0.12)', color: '#d73a4a', fontSize: 12 } }, '⚠ ' + tt('lowBudget')) : null,
           status === 'loading' ? React.createElement('div', { style: { padding: 12, color: 'var(--dsw-alias-label-secondary)' } }, 'Loading…') :
           status === 'unavailable' ? React.createElement('div', { style: { padding: 12, color: 'var(--dsw-alias-label-secondary)' } }, 'Settings unavailable — plugin not registered on host yet') :
           React.createElement(React.Fragment, null,
@@ -375,8 +390,35 @@ window.__ModuleLoader__.load({
               }),
               React.createElement('label', { htmlFor: 'cl-tracking', style: { fontSize: 13 } }, tt('tracking'))
             ),
+            React.createElement('div', { className: 'cl-field', style: { display: 'flex', flexDirection: 'row', alignItems: 'center', gap: 8, padding: '12px 0' } },
+              React.createElement('input', {
+                type: 'checkbox',
+                checked: !!draft.autoCollapse,
+                onChange: (e) => setDraft((d) => ({ ...d, autoCollapse: e.target.checked })),
+                id: 'cl-autocollapse'
+              }),
+              React.createElement('label', { htmlFor: 'cl-autocollapse', style: { fontSize: 13 } }, tt('autoCollapse'))
+            ),
+            React.createElement('div', { className: 'cl-field', style: { display: 'flex', flexDirection: 'column', gap: 6, padding: '12px 0' } },
+              React.createElement('label', { style: { fontSize: 13, color: 'var(--dsw-alias-label-secondary)' } }, tt('budget') + ' (tokens)'),
+              React.createElement('input', {
+                className: 'cl-input', type: 'number', min: 1000, step: 1000,
+                value: draft.budgetLimit,
+                onChange: (e) => setDraft((d) => ({ ...d, budgetLimit: parseInt(e.target.value, 10) || 100000 })),
+                style: { height: 34, border: '1px solid var(--dsw-alias-border-l2)', background: 'var(--dsw-alias-bg-layer-3)', color: 'var(--dsw-alias-label-primary)', borderRadius: 8, padding: '0 12px', fontSize: 13 }
+              })
+            ),
+            React.createElement('div', { className: 'cl-field', style: { display: 'flex', flexDirection: 'column', gap: 6, padding: '12px 0' } },
+              React.createElement('label', { style: { fontSize: 13, color: 'var(--dsw-alias-label-secondary)' } }, tt('threshold')),
+              React.createElement('input', {
+                className: 'cl-input', type: 'number', min: 0, step: 500,
+                value: draft.autoCompressThreshold,
+                onChange: (e) => setDraft((d) => ({ ...d, autoCompressThreshold: parseInt(e.target.value, 10) || 0 })),
+                style: { height: 34, border: '1px solid var(--dsw-alias-border-l2)', background: 'var(--dsw-alias-bg-layer-3)', color: 'var(--dsw-alias-label-primary)', borderRadius: 8, padding: '0 12px', fontSize: 13 }
+              })
+            ),
             React.createElement('div', { className: 'cl-field', style: { display: 'flex', flexDirection: 'column', gap: 6, padding: '12px 0' } },
-              React.createElement('label', { style: { fontSize: 13, color: 'var(--dsw-alias-label-secondary)' } }, tt('preview')),
+              React.createElement('label', { style: { fontSize: 13, color: 'var(--dsw-alias-label-secondary)' } }, tt('preview') + ' (' + tt('previewApprox') + ')'),
               React.createElement('textarea', {
                 value: previewIn,
                 onChange: (e) => setPreviewIn(e.target.value),
@@ -404,7 +446,7 @@ window.__ModuleLoader__.load({
       );
     }
 
-    module.exports.inject = ['slots', 'locale', 'betterSidebar'];
+    module.exports.inject = ['slots', 'locale'];
     module.exports.apply = function apply(ctx) {
       try { ctx.locale.register(NS, { en, ru }); } catch (e) { console.warn('[dsh-context-lens] locale register failed', e && e.message || e); }
       if (!ctx.slots) return;

package/lib/compression/log-compressor.js

@@ -1,3 +1,4 @@
+import { estimateTokens } from '../tokens/estimate.js';
 // ponytail: heuristic line filter, not ML — O(n) scan, no deps
 const ANSI_RE = /\u001b\[[0-9;]*[a-zA-Z]/g;
 const KEEP_RE = /(FAIL|FAILED|Error|AssertionError|Exception|Traceback|panic|npm ERR!|ERR!|Expected|Received|missing|×|●|✕|FAIL:|--- FAIL|not ok|at\s+.*:\d+:\d+|stack|Caused by|test result:\s*FAILED|running \d+ test|test .* \.\.\. FAILED|BUILD FAILED|Tests run:|FAILURE:|cargo:.*error|error\[E\d+\]|thread '.*' panicked)/i;
@@ -15,10 +16,6 @@ function keepLine(line) {
   return false;
 }
 
-export function estimateTokens(text) {
-  return Math.ceil((text || '').length / 4);
-}
-
 export function compressLog(text, { mode = 'balanced', maxLines = 400 } = {}) {
   if (!text || typeof text !== 'string') return { compressed: '', originalTokens: 0, compressedTokens: 0, savedTokens: 0, savedPercent: 0, keptLines: 0, totalLines: 0 };
   const lines = text.split(/\r?\n/);
@@ -91,4 +88,5 @@ export function compressLog(text, { mode = 'balanced', maxLines = 400 } = {}) {
   return { compressed, originalTokens, compressedTokens, savedTokens: Math.max(0, originalTokens - compressedTokens), savedPercent: originalTokens ? Math.round((1 - compressedTokens / originalTokens) * 100) : 0, keptLines: out.length, totalLines };
 }
 
+export { estimateTokens };
 export default { compressLog, estimateTokens };

package/lib/index.js

@@ -2,6 +2,7 @@ import z from '@deepseek-ai/schemastery';
 import { compressLog, estimateTokens as estLog } from './compression/log-compressor.js';
 import { skeletonize } from './ast/skeletonizer.js';
 import * as tracker from './tokens/tracker.js';
+import { shouldAutoCompress } from './auto-compress.js';
 
 export const name = '@goodandready/dsh-context-lens';
 export const inject = ['tools', 'settings', 'webServer'];
@@ -11,23 +12,31 @@ export const Config = z.object({
   astSkeletonMaxDepth: z.number().default(3).description('Max depth for AST skeleton generation'),
   tokenSavingsTracking: z.boolean().default(true).description('Track and display token budget savings'),
   autoCompressThreshold: z.number().default(4000).description('Auto-compress threshold in chars (0 to disable)'),
-  budgetLimit: z.number().default(100000).description('Session token budget (compressions stop counting after this)'),
-  autoCollapse: z.boolean().default(true).description('Auto-collapse UI when budget is nearly exhausted')
+  budgetLimit: z.number().default(100000).description('Session token budget; compressions stop counting after this limit'),
+  autoCollapse: z.boolean().default(true).description('Warn in UI when budget is nearly exhausted (does not force-close the settings card)')
 });
 
 const NS = '@goodandready/dsh-context-lens';
 
-// in-memory focus state
-let focusState = { paths: [], updatedAt: null };
+// #37/#18: focus keyed by session id (not process-global singleton)
+const focusBySession = new Map();
 
-const OUTPUT_SCHEMA = { type: 'object', properties: { success: { type: 'boolean' } }, additionalProperties: true };
-const renderOutput = (_args, result) => JSON.stringify(result, null, 2);
+function sessionKey(params, meta) {
+  return (
+    (params && (params.sessionId || params.session_id)) ||
+    (meta && (meta.sessionId || meta.session_id || (meta.session && meta.session.id))) ||
+    '__default__'
+  );
+}
 
-function shouldAutoCompress(text, threshold) {
-  if (!threshold || threshold <= 0) return false;
-  return (text || '').length > threshold || (text || '').split('\n').length > 100;
+function getFocus(key) {
+  if (!focusBySession.has(key)) focusBySession.set(key, { paths: [], updatedAt: null });
+  return focusBySession.get(key);
 }
 
+const OUTPUT_SCHEMA = { type: 'object', properties: { success: { type: 'boolean' } }, additionalProperties: true };
+const renderOutput = (_args, result) => JSON.stringify(result, null, 2);
+
 export function apply(ctx, config) {
   let getConfig = () => config;
 
@@ -36,32 +45,38 @@ export function apply(ctx, config) {
     getConfig = () => scope.get() ?? config;
   });
 
-  // helper to record savings if enabled
   function maybeTrack(original, compressed) {
     try {
       const cfg = getConfig();
       if (cfg && cfg.tokenSavingsTracking === false) return null;
+      if (cfg && typeof cfg.budgetLimit === 'number') tracker.setBudgetLimit(cfg.budgetLimit);
       return tracker.record(original, compressed);
-    } catch { return tracker.record(original, compressed); }
+    } catch {
+      // #39: never record on config/read errors
+      return null;
+    }
   }
 
   if (ctx.tools) {
     ctx.tools.register({
       name: 'context_lens_focus',
-      description: 'Set focus files/folders; other context will be auto-collapsed via skeletonizer',
+      description: 'Set focus files/folders for a session; other context will be auto-collapsed via skeletonizer',
       parameters: {
         type: 'object',
         properties: {
           paths: { type: 'array', items: { type: 'string' }, description: 'Focused file/folder paths' },
-          maxDepth: { type: 'number', description: 'Max skeleton depth (overrides settings)' }
+          maxDepth: { type: 'number', description: 'Max skeleton depth (overrides settings)' },
+          sessionId: { type: 'string', description: 'Session id (defaults to host session when available)' }
         },
         required: ['paths']
       },
       output: { schema: OUTPUT_SCHEMA, render: renderOutput },
-      execute: async (params) => {
+      execute: async (params, meta) => {
+        const key = sessionKey(params, meta);
         const paths = Array.isArray(params.paths) ? params.paths : [];
-        focusState = { paths, updatedAt: new Date().toISOString() };
-        return { success: true, focus: focusState, hint: 'Use skeletonize helper via compress or read files with focus set' };
+        const focus = { paths, updatedAt: new Date().toISOString() };
+        focusBySession.set(key, focus);
+        return { success: true, sessionId: key, focus, hint: 'Use skeletonize helper via compress or read files with focus set' };
       }
     });
 
@@ -75,7 +90,7 @@ export function apply(ctx, config) {
           log: { type: 'string', description: 'Alias for text' },
           mode: { type: 'string', enum: ['raw', 'balanced', 'aggressive'], description: 'Compression aggressiveness' },
           maxLines: { type: 'number', description: 'Max output lines' },
-          auto: { type: 'boolean', description: 'Auto-compress if large (uses threshold)' }
+          auto: { type: 'boolean', description: 'Auto-compress if large (uses threshold); keeps configured compressionMode' }
         }
       },
       output: { schema: OUTPUT_SCHEMA, render: renderOutput },
@@ -84,10 +99,10 @@ export function apply(ctx, config) {
         const inputText = params.text || params.log || '';
         const mode = params.mode || cfg.compressionMode || 'balanced';
         const maxLines = params.maxLines || 400;
-        // Auto-compress check (#15)
         const threshold = cfg.autoCompressThreshold ?? 4000;
         const useAuto = params.auto !== false && shouldAutoCompress(inputText, threshold);
-        const effectiveMode = (useAuto && !params.mode) ? 'balanced' : mode;
+        // #33: never force balanced — keep configured/explicit mode
+        const effectiveMode = mode;
         const res = compressLog(inputText, { mode: effectiveMode, maxLines });
         maybeTrack(inputText, res.compressed);
         return { success: true, mode: effectiveMode, autoCompressed: useAuto, ...res };
@@ -103,51 +118,100 @@ export function apply(ctx, config) {
           code: { type: 'string', description: 'Source code to skeletonize' },
           language: { type: 'string', enum: ['js', 'ts', 'py', 'python', 'go', 'rust', 'java'], description: 'Language hint' },
           maxDepth: { type: 'number', description: 'Max depth' },
-          filePath: { type: 'string', description: 'File path to check focus (if in focus, returns full code)' }
+          filePath: { type: 'string', description: 'File path to check focus (if in focus, returns full code)' },
+          sessionId: { type: 'string', description: 'Session id for focus lookup' }
         },
         required: ['code']
       },
       output: { schema: OUTPUT_SCHEMA, render: renderOutput },
-      execute: async (params) => {
+      execute: async (params, meta) => {
         const cfg = getConfig();
         const maxDepth = params.maxDepth ?? cfg.astSkeletonMaxDepth ?? 3;
-        // Focus mode (#18): if file is in focus, return full code, else skeleton
-        const isFocused = params.filePath && focusState.paths.length > 0 ? focusState.paths.some(p => params.filePath.includes(p) || p.includes(params.filePath)) : false;
+        const key = sessionKey(params, meta);
+        const focusState = getFocus(key);
+        const isFocused = params.filePath && focusState.paths.length > 0
+          ? focusState.paths.some(p => params.filePath.includes(p) || p.includes(params.filePath))
+          : false;
         if (isFocused) {
           maybeTrack(params.code, params.code);
-          return { success: true, skeleton: params.code, originalTokens: estLog(params.code), skeletonTokens: estLog(params.code), maxDepth, focused: true, hint: 'File is in focus, returned full code' };
+          return { success: true, skeleton: params.code, originalTokens: estLog(params.code), skeletonTokens: estLog(params.code), maxDepth, focused: true, sessionId: key, hint: 'File is in focus, returned full code' };
         }
         const skeleton = skeletonize(params.code, { maxDepth, language: params.language });
         maybeTrack(params.code, skeleton);
-        return { success: true, skeleton, originalTokens: estLog(params.code), skeletonTokens: estLog(skeleton), maxDepth, focused: false };
+        return { success: true, skeleton, originalTokens: estLog(params.code), skeletonTokens: estLog(skeleton), maxDepth, focused: false, sessionId: key };
       }
     });
 
     ctx.tools.register({
       name: 'context_lens_stats',
       description: 'Show session token savings stats for context-lens',
-      parameters: { type: 'object', properties: {} },
+      parameters: {
+        type: 'object',
+        properties: {
+          sessionId: { type: 'string', description: 'Session id for focus snapshot' }
+        }
+      },
       output: { schema: OUTPUT_SCHEMA, render: renderOutput },
-      execute: async () => {
+      execute: async (params, meta) => {
         const cfg = getConfig();
+        if (typeof cfg.budgetLimit === 'number') tracker.setBudgetLimit(cfg.budgetLimit);
         const stats = tracker.getStats(cfg.budgetLimit);
         const history = tracker.getHistory();
-        return { success: true, ...stats, history, trackingEnabled: cfg.tokenSavingsTracking !== false, autoCollapse: cfg.autoCollapse !== false, focus: focusState, autoCompressThreshold: cfg.autoCompressThreshold };
+        const key = sessionKey(params || {}, meta);
+        return {
+          success: true,
+          ...stats,
+          history,
+          trackingEnabled: cfg.tokenSavingsTracking !== false,
+          autoCollapse: cfg.autoCollapse !== false,
+          focus: getFocus(key),
+          sessionId: key,
+          autoCompressThreshold: cfg.autoCompressThreshold
+        };
       }
     });
   }
 
-  // optional status route
   if (ctx.webServer) {
     ctx.effect(() => ctx.webServer.register({
       kind: 'exact',
       path: '/dsh-context-lens/status',
       handler: (req, res) => {
         const cfg = getConfig();
+        if (typeof cfg.budgetLimit === 'number') tracker.setBudgetLimit(cfg.budgetLimit);
         res.setHeader('content-type', 'application/json');
-        res.end(JSON.stringify({ ok: true, plugin: 'dsh-context-lens', stats: tracker.getStats(cfg.budgetLimit), history: tracker.getHistory(), focus: focusState }));
+        res.end(JSON.stringify({
+          ok: true,
+          plugin: 'dsh-context-lens',
+          stats: tracker.getStats(cfg.budgetLimit),
+          history: tracker.getHistory(),
+          focus: getFocus('__default__')
+        }));
       }
     }), 'dsh-context-lens status route');
+
+    // #45: server-backed preview (same compressor as tools)
+    ctx.effect(() => ctx.webServer.register({
+      kind: 'exact',
+      path: '/dsh-context-lens/compress-preview',
+      handler: async (req, res) => {
+        try {
+          const chunks = [];
+          for await (const c of req) chunks.push(c);
+          const body = JSON.parse(Buffer.concat(chunks).toString('utf8') || '{}');
+          const cfg = getConfig();
+          const mode = body.mode || cfg.compressionMode || 'balanced';
+          const text = body.text || '';
+          const out = compressLog(text, { mode, maxLines: body.maxLines || 400 });
+          res.setHeader('content-type', 'application/json');
+          res.end(JSON.stringify({ ok: true, mode, ...out }));
+        } catch (e) {
+          res.statusCode = 400;
+          res.setHeader('content-type', 'application/json');
+          res.end(JSON.stringify({ ok: false, error: e && e.message || String(e) }));
+        }
+      }
+    }), 'dsh-context-lens compress-preview route');
   }
 }
 

package/lib/tokens/estimate.js

@@ -0,0 +1,6 @@
+// shared token estimate (~chars/4)
+export function estimateTokens(text) {
+  return Math.ceil((text || '').length / 4);
+}
+
+export default { estimateTokens };

package/lib/tokens/tracker.js

@@ -1,14 +1,14 @@
 // ponytail: in-memory per-process tracker + history, no DB
+import { estimateTokens } from './estimate.js';
+
 let totalOriginal = 0;
 let totalCompressed = 0;
 let calls = 0;
 const history = []; // last 10
 const MAX_HISTORY = 10;
-let defaultBudgetLimit = 100000; // tokens, ~100k default budget
+let defaultBudgetLimit = 100000; // tokens
 
-export function estimateTokens(text) {
-  return Math.ceil((text || '').length / 4);
-}
+export { estimateTokens };
 
 export function setBudgetLimit(limit) {
   if (typeof limit === 'number' && limit > 0) {
@@ -20,6 +20,10 @@ export function record(originalText, compressedText) {
   const o = estimateTokens(originalText);
   const c = estimateTokens(compressedText);
   const saved = Math.max(0, o - c);
+  // #34: stop counting after budgetLimit (description promised this)
+  if (totalCompressed >= defaultBudgetLimit) {
+    return { originalTokens: o, compressedTokens: c, savedTokens: 0, stopped: true };
+  }
   totalOriginal += o;
   totalCompressed += c;
   calls++;
@@ -57,7 +61,8 @@ export function getStats(budgetLimitOverride) {
     budgetRemaining,
     budgetPercent,
     lowBudget,
-    budgetLimit: limit
+    budgetLimit: limit,
+    countingStopped: budgetUsed >= limit
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-context-lens",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "DSH plugin for AST context compression, test log filtering, and token budget guard",
   "type": "module",
   "main": "lib/index.js",
@@ -50,7 +50,6 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",