@goodandready/dsh-context-lens 0.1.13 → 0.1.14

package/README.md

@@ -172,3 +172,12 @@ Audit fixes (#33–#47, #18):
 - **Fix (#50)**: Guard optional `betterSidebar` tab registration via `ctx.inject(['betterSidebar'], ...)` instead of direct property access on Cordis context proxy, resolving `cannot get property "betterSidebar" without inject` on client boot.
 - **Fix (#50)**: Safely guard `_ctx.settingsScope` access in `PluginCard` with try/catch to prevent proxy property errors.
 - **Test**: Added regression test suite simulating strict Cordis Context Proxy behavior.
+
+
+## Changed in v0.1.14
+
+- **Fix (#52)**: Multiline AST signature parsing in `skeletonizer.js` for TypeScript, JavaScript, Rust, and Go with complex parameter types and return annotations.
+- **Feature (#52)**: Registered `context_lens_reset` tool to allow resetting tracker statistics and history at the start of new tasks.
+- **Quality & UX (#52)**: Dynamic RU/EN locale detection in `HeaderChip`, `LensTab`, and `StatusPanel` via `ctx.locale` for seamless UI integration.
+- **Perf & Stability (#52)**: Adaptive polling in `HeaderChip` pausing on hidden tabs (`visibilitychange`) and polling actively (4s) only when popover is open.
+- **Reliability (#52)**: Atomic settings save (`scope.patch` / `scope.setAll`) in `PluginCard` with graceful fallback.

package/README.ru.md

@@ -161,3 +161,12 @@ MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
 - **Fix (#50)**: Безопасная регистрация вкладки BetterSidebar через `ctx.inject(['betterSidebar'], ...)` вместо прямого чтения свойства из Cordis Context Proxy. Устранена ошибка `cannot get property "betterSidebar" without inject` при загрузке клиентской половины в DSH.
 - **Fix (#50)**: Безопасное обращение к `_ctx.settingsScope` в `PluginCard` через try/catch.
 - **Тесты**: Добавлены регрессионные тесты со строгим Cordis Context Proxy.
+
+
+## Changed in v0.1.14
+
+- **Исправление (#52)**: Поддержка многострочных сигнатур функций и методов в `skeletonizer.js` (TypeScript, JavaScript, Rust, Go) со сложными типами параметров и аннотациями возвращаемых значений.
+- **Функция (#52)**: Добавлен инструмент `context_lens_reset` для сброса собранной статистики токенов и истории сжатий перед запуском новой задачи.
+- **Качество и локализация (#52)**: Динамическое переключение языка интерфейса (RU/EN) в чипе шапки (`HeaderChip`), боковой вкладке (`LensTab`) и панели статуса (`StatusPanel`) через `ctx.locale`.
+- **Производительность (#52)**: Адаптивный поллинг в `HeaderChip` с паузой при неактивной вкладке браузера (`document.visibilityState`) и учащённым опросом (4 сек) только при открытом поповере.
+- **Стабильность (#52)**: Атомарное сохранение конфигурации в карточке настроек (`scope.patch` / `scope.setAll`) без риска частичной записи.

package/lib/ast/skeletonizer.js

@@ -1,4 +1,4 @@
-// ponytail: regex skeletons, no tree-sitter — handles JS/TS/Python/Go/Rust/Java signatures + imports/comments
+// ponytail: regex skeletons, no tree-sitter — handles JS/TS/Python/Go/Rust/Java signatures + imports/comments + multiline signatures
 const JS_FUNC_RE = /^\s*(export\s+)?(async\s+)?(function\s+(\w+)|const\s+(\w+)\s*=\s*(async\s+)?\([^)]*\)\s*=>|(\w+)\s*:\s*\([^)]*\)\s*=>|class\s+(\w+)|interface\s+(\w+)|type\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))/;
@@ -6,6 +6,9 @@ const RUST_RE = /^\s*(pub(\([^)]+\))?\s+)?(async\s+)?(fn|struct|enum|impl|trait|
 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*(\/\/.*|\/\*.*\*\/|\/\*.*|\*.*|#.*)/;
 
+// Multiline signature starters
+const MULTILINE_START_RE = /^\s*(export\s+)?(async\s+)?(function\b|const\s+\w+\s*=|\w+\s*:\s*(async\s+)?\(|def\b|async\s+def\b|func\b|(pub(\([^)]+\))?\s+)?(async\s+)?fn\b|(?:(?:public|protected|private|static|final|abstract|synchronized|native|default)\s+)+[\w.<>,\[\]?]+\s+\w+\s*\()/;
+
 function indentDepth(line) {
   const m = line.match(/^(\s*)/);
   return m ? Math.floor(m[1].replace(/\t/g, '  ').length / 2) : 0;
@@ -17,12 +20,14 @@ export function skeletonize(text, { maxDepth = 3, language, includeImports = tru
   const out = [];
   let seen = new Set();
   let pendingComment = null;
+
   for (let idx = 0; idx < lines.length; idx++) {
     const raw = lines[idx];
     const line = raw.trimEnd();
     if (!line.trim()) { pendingComment = null; continue; }
     const d = indentDepth(raw);
     if (d > maxDepth) { pendingComment = null; continue; }
+
     // Handle imports
     if (includeImports && IMPORT_RE.test(line)) {
       const sig = line.trim().slice(0, 120);
@@ -33,14 +38,14 @@ export function skeletonize(text, { maxDepth = 3, language, includeImports = tru
       pendingComment = null;
       continue;
     }
+
     // Handle comments (keep JSDoc or line comments directly above a definition)
     if (includeComments && COMMENT_RE.test(line)) {
-      // Keep comment if next non-empty line is a definition
       let nextIdx = idx + 1;
       while (nextIdx < lines.length && !lines[nextIdx].trim()) nextIdx++;
       if (nextIdx < lines.length) {
         const nextLine = lines[nextIdx];
-        if (JS_FUNC_RE.test(nextLine) || PY_RE.test(nextLine) || GO_RE.test(nextLine) || RUST_RE.test(nextLine) || /^\s*(class|function|interface|type|def |func |pub |fn )/.test(nextLine)) {
+        if (JS_FUNC_RE.test(nextLine) || PY_RE.test(nextLine) || GO_RE.test(nextLine) || RUST_RE.test(nextLine) || MULTILINE_START_RE.test(nextLine) || /^\s*(class|function|interface|type|def |func |pub |fn )/.test(nextLine)) {
           pendingComment = line.trim().slice(0, 120);
           continue;
         }
@@ -56,36 +61,61 @@ export function skeletonize(text, { maxDepth = 3, language, includeImports = tru
       pendingComment = null;
       continue;
     }
+
+    // Multiline signature detection: if line starts a signature but doesn't finish with '{', '=>', or ':'
+    let candidateLine = line;
+    let accumulatedIdx = idx;
+    const isComplete = (s) => (s.includes('{') && s.includes(')')) || (s.includes('=>') && s.includes(')')) || (s.endsWith(':') && s.includes(')'));
+    if (MULTILINE_START_RE.test(candidateLine) && !isComplete(candidateLine)) {
+      let buffer = candidateLine.trim();
+      let scanIdx = idx + 1;
+      while (scanIdx < lines.length && scanIdx <= idx + 12) {
+        const nextRaw = lines[scanIdx].trim();
+        if (!nextRaw) { scanIdx++; continue; }
+        buffer += ' ' + nextRaw;
+        if ((nextRaw.includes('{') || nextRaw.includes('=>') || nextRaw.endsWith(':')) && buffer.includes(')')) {
+          candidateLine = buffer;
+          accumulatedIdx = scanIdx;
+          break;
+        }
+        scanIdx++;
+      }
+    }
+
     let sig = null;
     // try JS/TS
     if (!language || language === 'js' || language === 'ts') {
-      const m = line.match(/^\s*(export\s+)?(async\s+)?(function\s+\w+[^\n]*|const\s+\w+\s*=.*=>.*|class\s+\w+.*|interface\s+\w+.*|type\s+\w+\s*=.*|(?:public|private|protected)?\s*(async\s+)?\w+\s*\([^)]*\)\s*[:{]|import\s+.*|export\s+.*)/);
-      if (m) sig = line.trim().replace(/\s*\{.*$/, '').replace(/\s+$/, '');
-      if (!sig && /^\s*(export\s+)?(async\s+)?function\s+\w+/.test(line)) sig = line.trim();
-      if (!sig && /^\s*class\s+\w+/.test(line)) sig = line.trim();
-      if (!sig && /^\s*import\s+/.test(line)) sig = line.trim().slice(0, 120);
+      const m = candidateLine.match(/^\s*(export\s+)?(async\s+)?(function\s+\w+[^\n]*|const\s+\w+\s*=.*=>.*|class\s+\w+.*|interface\s+\w+.*|type\s+\w+\s*=.*|(?:public|private|protected)?\s*(async\s+)?\w+\s*\([^)]*\)\s*[:{]|import\s+.*|export\s+.*)/);
+      if (m) sig = candidateLine.trim().replace(/\s*\{\s*$/, '').replace(/\s+$/, '');
+      if (!sig && /^\s*(export\s+)?(async\s+)?function\s+\w+/.test(candidateLine)) sig = candidateLine.trim();
+      if (!sig && /^\s*class\s+\w+/.test(candidateLine)) sig = candidateLine.trim();
+      if (!sig && /^\s*import\s+/.test(candidateLine)) sig = candidateLine.trim().slice(0, 120);
     }
     if (!sig && (!language || language === 'py' || language === 'python')) {
-      const m = line.match(PY_RE);
-      if (m) sig = line.trim();
+      const m = candidateLine.match(PY_RE);
+      if (m) sig = candidateLine.trim();
     }
     if (!sig && (!language || language === 'go')) {
-      const m = line.match(GO_RE);
-      if (m) sig = line.trim();
+      const m = candidateLine.match(GO_RE);
+      if (m) sig = candidateLine.trim();
     }
     if (!sig && (!language || language === 'rust')) {
-      if (RUST_RE.test(line)) sig = line.trim();
+      if (RUST_RE.test(candidateLine)) sig = candidateLine.trim();
     }
     if (!sig && (!language || language === 'java')) {
-      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();
+      if (/^\s*(?:(?:public|protected|private|static|final|abstract|synchronized|native|default)\s+)+(?:class|interface|enum|record)\s+\w+/.test(candidateLine)
+        || /^\s*(?:(?:public|protected|private|static|final|abstract|synchronized|native|default)\s+)+[\w.<>,\[\]?]+\s+\w+\s*\(/.test(candidateLine)
+        || /^\s*(class|interface|enum|record)\s+\w+/.test(candidateLine)) sig = candidateLine.trim();
     }
     // generic fallback: if no specific language, try all
     if (!sig && !language) {
-      if (JS_FUNC_RE.test(line) || PY_RE.test(line) || GO_RE.test(line) || RUST_RE.test(line)) sig = line.trim();
+      if (JS_FUNC_RE.test(candidateLine) || PY_RE.test(candidateLine) || GO_RE.test(candidateLine) || RUST_RE.test(candidateLine)) sig = candidateLine.trim();
     }
+
     if (sig) {
+      if (accumulatedIdx > idx) {
+        idx = accumulatedIdx; // advance loop past multiline signature lines
+      }
       // If we have a pending comment, prepend it
       if (pendingComment) {
         const commentSig = pendingComment;
@@ -97,7 +127,7 @@ export function skeletonize(text, { maxDepth = 3, language, includeImports = tru
       }
       // normalize: trim trailing { : etc, keep signature short
       sig = sig.replace(/\s*\{\s*$/, '').replace(/:\s*$/, '').trim();
-      if (sig.length > 120) sig = sig.slice(0, 117) + '...';
+      if (sig.length > 180) sig = sig.slice(0, 177) + '...';
       const key = sig;
       if (!seen.has(key)) {
         seen.add(key);
@@ -107,6 +137,7 @@ export function skeletonize(text, { maxDepth = 3, language, includeImports = tru
       pendingComment = null;
     }
   }
+
   // if nothing found, fallback to first N non-empty lines truncated
   if (out.length === 0) {
     const fallback = lines.filter((l) => l.trim()).slice(0, Math.min(20, maxDepth * 6)).map((l) => l.trim().slice(0, 120));

package/lib/client.js

@@ -61,6 +61,16 @@ window.__ModuleLoader__.load({
     // #45: preview uses POST /dsh-context-lens/compress-preview (server compressor)
 
     // #43: shared status UI for LensTab + HeaderChip popover
+        function getActiveLocale(ctx) {
+      try {
+        if (ctx && ctx.locale && typeof ctx.locale.getSnapshot === 'function') {
+          const snap = ctx.locale.getSnapshot();
+          if (snap && snap.active && snap.active.startsWith('ru')) return ru;
+        }
+      } catch {}
+      return en;
+    }
+
     function StatusPanel({ stats, history, labels, onRefresh, title, showBadge, compact }) {
       const L = labels || en;
       const warn = !!(stats && stats.lowBudget);
@@ -165,6 +175,7 @@ window.__ModuleLoader__.load({
     function LensTab({ ctx: _ctx, scope }) {
       const [stats, setStats] = React.useState(null);
       const [history, setHistory] = React.useState([]);
+      const L = React.useMemo(() => getActiveLocale(_ctx), [_ctx]);
       const apply = (j) => {
         if (j && j.stats) setStats(j.stats);
         if (j && j.history) setHistory(j.history || []);
@@ -173,7 +184,7 @@ window.__ModuleLoader__.load({
       React.useEffect(() => { refresh(); }, []);
       return React.createElement('div', { style: { padding: 12 } },
         React.createElement(StatusPanel, {
-          stats, history, labels: en, onRefresh: refresh, title: 'Context Lens', showBadge: false, compact: false
+          stats, history, labels: L, onRefresh: refresh, title: 'Context Lens', showBadge: false, compact: false
         })
       );
     }
@@ -183,6 +194,7 @@ window.__ModuleLoader__.load({
       const [history, setHistory] = React.useState([]);
       const [open, setOpen] = React.useState(false);
       const ref = React.useRef(null);
+      const L = React.useMemo(() => getActiveLocale(_ctx), [_ctx]);
 
       const fetchStatus = () => fetchLensStatus().then((j) => {
         if (j && j.stats) setStats(j.stats);
@@ -192,9 +204,30 @@ window.__ModuleLoader__.load({
       React.useEffect(() => {
         let alive = true;
         fetchStatus();
-        const id = setInterval(() => { if (alive) fetchStatus(); }, 5000);
-        return () => { alive = false; clearInterval(id); };
-      }, []);
+        // Adaptive polling: poll every 4s when popover is open, 15s when closed, pause when tab hidden
+        const pollInterval = open ? 4000 : 15000;
+        const id = setInterval(() => {
+          if (!alive) return;
+          if (typeof document !== 'undefined' && document.visibilityState === 'hidden') return;
+          fetchStatus();
+        }, pollInterval);
+
+        const onVisChange = () => {
+          if (typeof document !== 'undefined' && document.visibilityState === 'visible' && alive) {
+            fetchStatus();
+          }
+        };
+        if (typeof document !== 'undefined') {
+          document.addEventListener('visibilitychange', onVisChange);
+        }
+        return () => {
+          alive = false;
+          clearInterval(id);
+          if (typeof document !== 'undefined') {
+            document.removeEventListener('visibilitychange', onVisChange);
+          }
+        };
+      }, [open]);
 
       React.useEffect(() => {
         if (!open) return;
@@ -221,14 +254,14 @@ window.__ModuleLoader__.load({
         onClick: (e) => e.stopPropagation()
       },
         React.createElement(StatusPanel, {
-          stats, history, labels: en, onRefresh: fetchStatus, title: 'Context Lens', showBadge: true, compact: true
+          stats, history, labels: L, 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: ${en.saved} ${stats.savedTokens} tk (${stats.savedPercent}%)` : 'Context Lens: Active',
+          title: hasSavings ? `Context Lens: ${L.saved} ${stats.savedTokens} ${L.tokens} (${stats.savedPercent}%)` : `Context Lens: ${L.active}`,
           onClick: () => setOpen((v) => !v),
           style: {
             appearance: 'none', font: 'inherit', cursor: 'pointer', display: 'inline-flex', alignItems: 'center', gap: 4,
@@ -320,13 +353,24 @@ window.__ModuleLoader__.load({
       async function onSave() {
         if (!scope) { setSaveErr('Settings unavailable'); return; }
         setSaving(true); setSaveErr('');
-        const keys = Object.keys(draft);
-        const errs = [];
-        for (const k of keys) {
-          try { await scope.set(k, draft[k]); } catch (e) { errs.push(k + ': ' + (e && e.message || String(e))); }
+        try {
+          if (typeof scope.patch === 'function') {
+            await scope.patch(draft);
+          } else if (typeof scope.setAll === 'function') {
+            await scope.setAll(draft);
+          } else {
+            const keys = Object.keys(draft);
+            const errs = [];
+            for (const k of keys) {
+              try { await scope.set(k, draft[k]); } catch (e) { errs.push(k + ': ' + (e && e.message || String(e))); }
+            }
+            if (errs.length) throw new Error(errs.join('; '));
+          }
+        } catch (e) {
+          setSaveErr(e && e.message || String(e));
+        } finally {
+          setSaving(false);
         }
-        setSaving(false);
-        if (errs.length) setSaveErr(errs.join('; '));
       }
 
       async function onPreview() {
@@ -493,19 +537,17 @@ window.__ModuleLoader__.load({
             const svc = sctx && sctx.betterSidebar;
             if (!svc || typeof svc.registerTab !== 'function') return;
             try {
-              const register = () => svc.registerTab({
+              const tabDef = {
                 id: 'dsh-context-lens:tab',
                 title: () => 'Lens',
                 icon: () => React.createElement('span', null, '◐'),
                 order: 50,
                 component: ({ scope }) => React.createElement(LensTab, { ctx, scope })
-              });
+              };
               if (typeof sctx.effect === 'function') {
-                sctx.effect(register);
-              } else if (typeof ctx.effect === 'function') {
-                ctx.effect(register);
+                sctx.effect(() => svc.registerTab(tabDef));
               } else {
-                register();
+                svc.registerTab(tabDef);
               }
             } catch (e) {
               console.warn('[dsh-context-lens] betterSidebar registerTab failed', e && e.message || e);

package/lib/index.js

@@ -20,13 +20,16 @@ const NS = '@goodandready/dsh-context-lens';
 
 // #37/#18: focus keyed by session id (not process-global singleton)
 const focusBySession = new Map();
+let lastActiveSession = '__default__';
 
 function sessionKey(params, meta) {
-  return (
+  const k = (
     (params && (params.sessionId || params.session_id)) ||
     (meta && (meta.sessionId || meta.session_id || (meta.session && meta.session.id))) ||
     '__default__'
   );
+  if (k !== '__default__') lastActiveSession = k;
+  return k;
 }
 
 function getFocus(key) {
@@ -142,6 +145,26 @@ export function apply(ctx, config) {
       }
     });
 
+    ctx.tools.register({
+      name: 'context_lens_reset',
+      description: 'Reset context-lens savings stats and history (e.g. at the start of a new task)',
+      parameters: {
+        type: 'object',
+        properties: {
+          sessionId: { type: 'string', description: 'Optional session id to also reset session focus' }
+        }
+      },
+      output: { schema: OUTPUT_SCHEMA, render: renderOutput },
+      execute: async (params, meta) => {
+        tracker.reset();
+        const key = sessionKey(params || {}, meta);
+        if (params && params.sessionId) {
+          focusBySession.delete(key);
+        }
+        return { success: true, message: 'Context lens stats and history reset', sessionId: key };
+      }
+    });
+
     ctx.tools.register({
       name: 'context_lens_stats',
       description: 'Show session token savings stats for context-lens',
@@ -179,13 +202,19 @@ export function apply(ctx, config) {
       handler: (req, res) => {
         const cfg = getConfig();
         if (typeof cfg.budgetLimit === 'number') tracker.setBudgetLimit(cfg.budgetLimit);
+        let sId = '__default__';
+        try {
+          const u = new URL(req.url, 'http://127.0.0.1');
+          sId = u.searchParams.get('sessionId') || u.searchParams.get('session_id') || lastActiveSession || '__default__';
+        } catch {}
         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: getFocus('__default__')
+          focus: getFocus(sId),
+          sessionId: sId
         }));
       }
     }), 'dsh-context-lens status route');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-context-lens",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "DSH plugin for AST context compression, test log filtering, and token budget guard",
   "type": "module",
   "main": "lib/index.js",