@goodandready/dsh-context-lens 0.1.24 → 0.1.26

package/lib/compression/log-compressor.js

@@ -1,12 +1,12 @@
-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;
 const PASS_RE = /^(PASS|\s*✓|\s*✔|\s*ok\s|…+\s*$|\s*\.\s*$|test result:\s*ok|running \d+ test.*ok)/i;
 const NOISE_RE = /^\s*(npm (notice|warn|info)|Browserslist|cached|Downloading|Done in|Compiling\s|cargo:.*Finished)/i;
 const STACK_RE = /^\s*(at\s+|File ".*", line \d+|#\d+\s+0x|goroutine \d+ \[|thread '.*' panicked|note: run with)/;
+const SUMMARY_RE = /(tests?\s+(passed|failed|run)|test result:|suites?\s+\d+|\d+\s+passed|BUILD (SUCCESS|FAILED)|===.*passed.*===|passed in \d+|built in|modules transformed|Finished.*release|Finished.*dev)/i;
 
-function cleanAnsi(str) {
+export function cleanAnsi(str) {
   if (!str || !str.includes('\u001b')) return str || '';
   return str.replace(ANSI_RE, '');
 }
@@ -15,8 +15,14 @@ function keepLine(clean) {
   return KEEP_RE.test(clean) || STACK_RE.test(clean);
 }
 
+function isSummaryLine(clean) {
+  return SUMMARY_RE.test(clean);
+}
+
 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 };
+  if (!text || typeof text !== 'string') {
+    return { compressed: '', keptLines: 0, totalLines: 0 };
+  }
   const lines = text.split(/\r?\n/);
   const totalLines = lines.length;
   if (mode === 'raw') {
@@ -27,53 +33,70 @@ export function compressLog(text, { mode = 'balanced', maxLines = 400 } = {}) {
       if (NOISE_RE.test(clean)) return false;
       return true;
     });
-    const truncated = filtered.length > maxLines ? [...filtered.slice(0, maxLines - 1), `… truncated ${filtered.length - maxLines + 1} lines`] : filtered;
+    const truncated = filtered.length > maxLines
+      ? [...filtered.slice(0, maxLines - 1), `… truncated ${filtered.length - maxLines + 1} lines`]
+      : filtered;
     const compressed = truncated.join('\n');
-    const originalTokens = estimateTokens(text);
-    const compressedTokens = estimateTokens(compressed);
-    return { compressed, originalTokens, compressedTokens, savedTokens: Math.max(0, originalTokens - compressedTokens), savedPercent: originalTokens ? Math.round((1 - compressedTokens / originalTokens) * 100) : 0, keptLines: truncated.length, totalLines };
+    return { compressed, keptLines: truncated.length, totalLines };
   }
 
   const keep = new Array(lines.length).fill(false);
   const cleanLines = new Array(lines.length);
   const context = mode === 'aggressive' ? 1 : 2;
+  let hasFailure = false;
+
   for (let i = 0; i < lines.length; i++) {
     const clean = cleanAnsi(lines[i]);
     cleanLines[i] = clean;
     if (keepLine(clean)) {
+      hasFailure = true;
       const s = Math.max(0, i - context);
       const e = Math.min(lines.length - 1, i + context);
       for (let j = s; j <= e; j++) keep[j] = true;
     }
   }
-  // if nothing matched, keep first/last few lines as hint
-  if (!keep.some(Boolean)) {
-    const head = Math.min(6, lines.length);
+
+  // If no failure was detected (e.g. successful test or build run),
+  // collapse into summary: keep first few lines and summary lines
+  if (!hasFailure) {
+    const head = Math.min(3, lines.length);
     for (let i = 0; i < head; i++) keep[i] = true;
-    if (lines.length > head) {
-      keep[lines.length - 1] = true;
+    for (let i = head; i < lines.length; i++) {
+      if (isSummaryLine(cleanLines[i])) {
+        keep[i] = true;
+      }
     }
+    if (lines.length > 0) keep[lines.length - 1] = true;
   }
-  // drop pure PASS/noise unless within keep window already marked via context
+
+  // drop pure PASS/noise unless marked
   let out = [];
-  for (let i = 0; i < lines.length; i++) if (keep[i]) {
-    const l = lines[i];
-    const clean = cleanLines[i];
-    // aggressive drops more noise even inside window
-    if (mode === 'aggressive' && (PASS_RE.test(clean) || NOISE_RE.test(clean)) && !keepLine(clean)) continue;
-    out.push(l);
+  for (let i = 0; i < lines.length; i++) {
+    if (keep[i]) {
+      const l = lines[i];
+      const clean = cleanLines[i];
+      if (mode === 'aggressive' && (PASS_RE.test(clean) || NOISE_RE.test(clean)) && !keepLine(clean) && !isSummaryLine(clean)) {
+        continue;
+      }
+      out.push(l);
+    }
   }
 
   // collapse consecutive empty lines
   const collapsed = [];
   let emptyStreak = 0;
   for (const l of out) {
-    if (l.trim() === '') { emptyStreak++; if (emptyStreak <= 1) collapsed.push(l); }
-    else { emptyStreak = 0; collapsed.push(l); }
+    if (l.trim() === '') {
+      emptyStreak++;
+      if (emptyStreak <= 1) collapsed.push(l);
+    } else {
+      emptyStreak = 0;
+      collapsed.push(l);
+    }
   }
   out = collapsed;
 
-  // deduplicate repeated progress dots lines like "................"
+  // deduplicate repeated progress dots lines like '................'
   out = out.filter((l, idx, arr) => {
     if (/^[.\s]+$/.test(l) && l.length > 20) return false;
     if (idx > 0 && l === arr[idx - 1] && l.trim() !== '') return false;
@@ -82,13 +105,15 @@ export function compressLog(text, { mode = 'balanced', maxLines = 400 } = {}) {
 
   if (out.length > maxLines) {
     const half = Math.floor((maxLines - 1) / 2);
-    out = [...out.slice(0, half), `… truncated ${out.length - maxLines + 1} lines …`, ...out.slice(out.length - half)];
+    out = [
+      ...out.slice(0, half),
+      `… truncated ${out.length - maxLines + 1} lines …`,
+      ...out.slice(out.length - half)
+    ];
   }
+
   const compressed = out.join('\n');
-  const originalTokens = estimateTokens(text);
-  const compressedTokens = estimateTokens(compressed);
-  return { compressed, originalTokens, compressedTokens, savedTokens: Math.max(0, originalTokens - compressedTokens), savedPercent: originalTokens ? Math.round((1 - compressedTokens / originalTokens) * 100) : 0, keptLines: out.length, totalLines };
+  return { compressed, keptLines: out.length, totalLines };
 }
 
-export { cleanAnsi, estimateTokens };
-export default { compressLog, cleanAnsi, estimateTokens };
+export default { compressLog, cleanAnsi };

package/lib/index.js

@@ -1,27 +1,13 @@
 import z from '@deepseek-ai/schemastery';
-import * as tracker from './tokens/tracker.js';
-import { compressLog } from './compression/log-compressor.js';
-import { writeJson, readBody, isTrustedRequest } from './http.js';
-import { registerPluginUpdater } from './updater.js';
-import {
-  renderOutput,
-  registerTools,
-  getFocus,
-  clearFocus,
-  getLastActiveSession
-} from './tools.js';
+import { renderOutput, registerTools } from './tools.js';
 
 export const name = '@goodandready/dsh-context-lens';
-export const inject = ['tools', 'settings', 'webServer'];
+export const inject = ['tools', 'settings'];
 
 export const Config = z.object({
   compressionMode: z.string().default('balanced').description('Log compression aggressiveness (raw/balanced/aggressive)'),
   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 limit'),
-  budgetAlertPercent: z.number().default(90).description('Budget percentage threshold (50-99%) for warning alert'),
-  autoCollapse: z.boolean().default(true).description('Warn in UI when budget is nearly exhausted (does not force-close the settings card)')
+  autoCompressThreshold: z.number().default(4000).description('Auto-compress threshold in chars for test/build logs (0 to disable)')
 });
 
 const NS = '@goodandready/dsh-context-lens';
@@ -29,175 +15,74 @@ const NS = '@goodandready/dsh-context-lens';
 export { renderOutput };
 
 export function apply(ctx, config) {
-  let getConfig = () => config;
+  let readConfig = () => config;
+  const getConfig = () => readConfig();
 
   ctx.inject(['settings'], (sctx) => {
-    if (typeof sctx.effect === 'function') {
-      sctx.effect(() => {
-        const scope = sctx.settings.register(NS, Config, { base: config });
-        getConfig = () => scope.get() ?? config;
-        return () => {
-          if (typeof scope?.dispose === 'function') scope.dispose();
-          getConfig = () => config;
-        };
-      }, 'dsh-context-lens: settings');
-    } else {
-      const scope = sctx.settings.register(NS, Config, { base: config });
-      getConfig = () => scope.get() ?? config;
-    }
-  });
-
-  function maybeTrack(original, compressed) {
-    const cfg = getConfig();
-    if (cfg.tokenSavingsTracking === false) return;
-    tracker.record(original, compressed);
-  }
+    if (!sctx?.settings) return;
 
-  // Register AI agent tools
-  if (ctx.tools) {
-    registerTools(ctx, { getConfig, maybeTrack });
-  }
-
-  if (ctx.webServer) {
-    // #61: One-click plugin updater endpoint (/api/dsh-context-lens/update)
-    const mountUpdater = () => registerPluginUpdater(ctx, {
-      packageName: '@goodandready/dsh-context-lens',
-      manifestUrl: new URL('../package.json', import.meta.url),
-      endpoint: '/api/dsh-context-lens/update'
-    });
-    if (typeof ctx.effect === 'function') {
-      ctx.effect(mountUpdater, 'dsh-context-lens: updater');
-    } else {
-      mountUpdater();
+    let disposeConfigure;
+    try {
+      if (typeof sctx.settings.configure === 'function') {
+        disposeConfigure = sctx.settings.configure({ auto: false }, ctx.fiber);
+      }
+    } catch (error) {
+      ctx.logger?.warn?.('dsh-context-lens: settings configure failed: ' + (error instanceof Error ? error.message : String(error)));
     }
 
-    // Status route (#70: explicit URL parsing and validation; #87: GET only, trusted source check)
-    ctx.effect(() => ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-context-lens/status',
-      handler: (req, res) => {
-        if (req.method !== 'GET') {
-          res.writeHead(405, { Allow: 'GET', 'Content-Type': 'application/json' });
-          res.end(JSON.stringify({ ok: false, error: 'Method Not Allowed: GET required' }));
-          return;
-        }
-        if (!isTrustedRequest(req)) {
-          writeJson(res, 403, { ok: false, error: 'Forbidden: untrusted request origin' });
-          return;
-        }
-
-        const cfg = getConfig();
-        if (typeof cfg.budgetLimit === 'number') tracker.setBudgetLimit(cfg.budgetLimit);
-        if (typeof cfg.budgetAlertPercent === 'number') tracker.setBudgetAlertPercent(cfg.budgetAlertPercent);
-        let sId = getLastActiveSession() || '__default__';
-        try {
-          const u = new URL(req.url, 'http://127.0.0.1');
-          const qId = u.searchParams.get('sessionId') || u.searchParams.get('session_id');
-          if (qId !== null) {
-            if (!qId || typeof qId !== 'string' || qId.trim() === '') {
-              writeJson(res, 400, { ok: false, error: 'Invalid sessionId parameter' });
-              return;
-            }
-            sId = qId.trim();
+    const readLiveSettings = () => {
+      try {
+        if (typeof sctx.settings.describe === 'function') {
+          const desc = sctx.settings.describe()?.find?.((row) => row.ns === NS);
+          if (desc && desc.value && typeof desc.value === 'object') {
+            return Config(desc.value);
           }
-        } catch (err) {
-          ctx.logger?.warn?.('dsh-context-lens: failed to parse request url in status', err);
-          writeJson(res, 400, { ok: false, error: 'Malformed request URL' });
-          return;
-        }
-
-        writeJson(res, 200, {
-          ok: true,
-          plugin: 'dsh-context-lens',
-          stats: tracker.getStats(cfg.budgetLimit, cfg.budgetAlertPercent),
-          history: tracker.getHistory(),
-          focus: getFocus(sId),
-          sessionId: sId
-        });
-      }
-    }), 'dsh-context-lens status route');
-
-    // Quick clear-focus API route (#62: POST only, trusted origin check; #70: clean URL error handling)
-    ctx.effect(() => ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-context-lens/clear-focus',
-      handler: async (req, res) => {
-        if (req.method !== 'POST') {
-          res.writeHead(405, { Allow: 'POST', 'Content-Type': 'application/json' });
-          res.end(JSON.stringify({ ok: false, error: 'Method Not Allowed: POST required' }));
-          return;
-        }
-        if (!isTrustedRequest(req)) {
-          writeJson(res, 403, { ok: false, error: 'Forbidden: untrusted request origin' });
-          return;
-        }
-
-        let sId = getLastActiveSession() || '__default__';
-        try {
-          const u = new URL(req.url, 'http://127.0.0.1');
-          const qId = u.searchParams.get('sessionId') || u.searchParams.get('session_id');
-          if (qId !== null) {
-            if (!qId || typeof qId !== 'string' || qId.trim() === '') {
-              writeJson(res, 400, { ok: false, error: 'Invalid sessionId parameter' });
-              return;
-            }
-            sId = qId.trim();
+        } else if (typeof sctx.settings.get === 'function') {
+          const val = sctx.settings.get(NS);
+          if (val && typeof val === 'object') {
+            return Config(val);
           }
-        } catch (err) {
-          ctx.logger?.warn?.('dsh-context-lens: failed to parse request url in clear-focus', err);
-          writeJson(res, 400, { ok: false, error: 'Malformed request URL' });
-          return;
         }
-
-        clearFocus(sId);
-        writeJson(res, 200, { ok: true, sessionId: sId, focus: getFocus(sId) });
+      } catch (error) {
+        ctx.logger?.warn?.('dsh-context-lens: settings describe failed: ' + (error instanceof Error ? error.message : String(error)));
       }
-    }), 'dsh-context-lens clear-focus route');
+      return null;
+    };
 
-    // Server-backed preview (#63: POST only, trusted origin, bounded body size, clamped maxLines)
-    ctx.effect(() => ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-context-lens/compress-preview',
-      handler: async (req, res) => {
-        if (req.method !== 'POST') {
-          res.writeHead(405, { Allow: 'POST', 'Content-Type': 'application/json' });
-          res.end(JSON.stringify({ ok: false, error: 'Method Not Allowed: POST required' }));
-          return;
-        }
-        if (!isTrustedRequest(req)) {
-          writeJson(res, 403, { ok: false, error: 'Forbidden: untrusted request origin' });
-          return;
-        }
+    readConfig = () => readLiveSettings() ?? Config(ctx.fiber?.config ?? config) ?? config;
 
-        let body;
-        try {
-          const raw = await readBody(req, 256 * 1024);
-          body = JSON.parse(raw.toString('utf8') || '{}');
-        } catch (e) {
-          if (e?.message === 'body too large') {
-            writeJson(res, 413, { ok: false, error: 'Payload Too Large: maximum 256KB allowed' });
-            return;
+    if (typeof sctx.effect === 'function') {
+      sctx.effect(() => {
+        const disposeDocUpdated = typeof sctx.on === 'function'
+          ? sctx.on('settings/document-updated', (updatedNs) => {
+              if (updatedNs === NS) {
+                // Live settings refreshed on next readLiveSettings call
+              }
+            })
+          : null;
+        return () => {
+          if (typeof disposeConfigure === 'function') {
+            try {
+              disposeConfigure();
+            } catch (err) {
+              ctx.logger?.debug?.('dsh-context-lens: disposeConfigure failed', err);
+            }
           }
-          writeJson(res, 400, { ok: false, error: 'Malformed JSON body' });
-          return;
-        }
-
-        let maxLines = 400;
-        if (body.maxLines !== undefined) {
-          const parsed = Number(body.maxLines);
-          if (Number.isNaN(parsed) || parsed < 1 || parsed > 5000) {
-            writeJson(res, 400, { ok: false, error: 'maxLines must be a number between 1 and 5000' });
-            return;
+          if (typeof disposeDocUpdated === 'function') {
+            try {
+              disposeDocUpdated();
+            } catch (err) {
+              ctx.logger?.debug?.('dsh-context-lens: disposeDocUpdated failed', err);
+            }
           }
-          maxLines = Math.floor(parsed);
-        }
+          readConfig = () => config;
+        };
+      }, 'dsh-context-lens: settings');
+    }
+  });
 
-        const cfg = getConfig();
-        const mode = body.mode || cfg.compressionMode || 'balanced';
-        const text = typeof body.text === 'string' ? body.text : '';
-        const out = compressLog(text, { mode, maxLines });
-        writeJson(res, 200, { ok: true, mode, ...out });
-      }
-    }), 'dsh-context-lens compress-preview route');
+  // Register consolidated AI agent tools (context_lens_code, context_lens_log)
+  if (ctx.tools) {
+    registerTools(ctx, { getConfig });
   }
 }