trickle-observe 0.2.69 → 0.2.71

package/dist/vite-plugin.js

@@ -480,6 +480,334 @@ function extractDestructuredNames(pattern) {
     }
     return names;
 }
+/**
+ * Find variable reassignments (not declarations) and return insertions for tracing.
+ * Handles: x = newValue; x += 1; x ||= fallback; etc.
+ * Only matches standalone reassignment statements at the start of a line.
+ * Skips: property assignments (obj.x = ...), indexed (arr[i] = ...),
+ *        comparisons (===, !==), arrow functions (=>), declarations (const/let/var).
+ */
+function findReassignments(source) {
+    const results = [];
+    // Match: <identifier> <assignOp>= <value> at the start of a line
+    // Compound operators: +=, -=, *=, /=, %=, **=, &&=, ||=, ??=, <<=, >>=, >>>=, &=, |=, ^=
+    // Plain: = (but not ==, ===, =>, !=)
+    const reassignRegex = /^([ \t]*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*(?:\+|-|\*\*?|\/|%|&&|\|\||<<|>>>?|&|\||\^|\?\?)?=[^=>]/gm;
+    let match;
+    while ((match = reassignRegex.exec(source)) !== null) {
+        const varName = match[2];
+        // Skip trickle internals
+        if (varName.startsWith('__trickle') || varName.startsWith('_$'))
+            continue;
+        // Skip common non-variable patterns
+        if (varName === '_a' || varName === '_b' || varName === '_c')
+            continue;
+        // Skip 'this', 'self', 'super' (not reassignable in practice)
+        if (varName === 'this' || varName === 'super')
+            continue;
+        // Skip keywords that could look like identifiers
+        if (['if', 'else', 'while', 'for', 'do', 'switch', 'case', 'default', 'return', 'throw',
+            'break', 'continue', 'try', 'catch', 'finally', 'new', 'delete', 'typeof', 'void',
+            'yield', 'await', 'class', 'extends', 'import', 'export', 'from', 'as', 'of', 'in',
+            'const', 'let', 'var', 'function', 'true', 'false', 'null', 'undefined'].includes(varName))
+            continue;
+        // Check that this line doesn't start with const/let/var (would be a declaration, already handled)
+        const lineStart = source.lastIndexOf('\n', match.index) + 1;
+        const linePrefix = source.slice(lineStart, match.index + match[1].length).trim();
+        if (/^(export\s+)?(const|let|var)\s/.test(source.slice(lineStart).trimStart()))
+            continue;
+        // Skip if this looks like a property in an object literal (preceded by a key: pattern on same line)
+        // or if it's a label (label: ...)
+        const beforeOnLine = source.slice(lineStart, match.index).trim();
+        if (beforeOnLine.endsWith(':') || beforeOnLine.endsWith(','))
+            continue;
+        // Calculate line number
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        // Find end of statement (same logic as findVarDeclarations)
+        const startPos = match.index + match[0].length - 1;
+        let pos = startPos;
+        let depth = 0;
+        let foundEnd = -1;
+        while (pos < source.length) {
+            const ch = source[pos];
+            if (ch === '(' || ch === '[' || ch === '{') {
+                depth++;
+            }
+            else if (ch === ')' || ch === ']' || ch === '}') {
+                depth--;
+                if (depth < 0)
+                    break;
+            }
+            else if (ch === ';' && depth === 0) {
+                foundEnd = pos;
+                break;
+            }
+            else if (ch === '\n' && depth === 0) {
+                const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
+                if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+                    foundEnd = pos;
+                    break;
+                }
+            }
+            else if (ch === '"' || ch === "'" || ch === '`') {
+                const quote = ch;
+                pos++;
+                while (pos < source.length) {
+                    if (source[pos] === '\\') {
+                        pos++;
+                    }
+                    else if (source[pos] === quote)
+                        break;
+                    pos++;
+                }
+            }
+            else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
+                while (pos < source.length && source[pos] !== '\n')
+                    pos++;
+                continue;
+            }
+            else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '*') {
+                pos += 2;
+                while (pos < source.length - 1 && !(source[pos] === '*' && source[pos + 1] === '/'))
+                    pos++;
+                pos++;
+            }
+            pos++;
+        }
+        if (foundEnd === -1)
+            continue;
+        results.push({ lineEnd: foundEnd + 1, varName, lineNo });
+    }
+    return results;
+}
+/**
+ * Find for-loop variable declarations and return insertions for tracing.
+ * Handles:
+ *   for (const item of items) { ... }         → trace item
+ *   for (const [key, val] of entries) { ... }  → trace key, val
+ *   for (const { a, b } of items) { ... }      → trace a, b
+ *   for (const key in obj) { ... }             → trace key
+ *   for (let i = 0; i < n; i++) { ... }        → trace i
+ * Inserts trace calls at the start of the loop body.
+ */
+function findForLoopVars(source) {
+    const results = [];
+    // Match: for (const/let/var ...
+    const forRegex = /\bfor\s*\(/g;
+    let match;
+    while ((match = forRegex.exec(source)) !== null) {
+        const afterParen = match.index + match[0].length;
+        // Skip whitespace
+        let pos = afterParen;
+        while (pos < source.length && /\s/.test(source[pos]))
+            pos++;
+        // Expect const/let/var
+        const declMatch = source.slice(pos).match(/^(const|let|var)\s+/);
+        if (!declMatch)
+            continue;
+        pos += declMatch[0].length;
+        // Now we have the variable pattern — could be identifier, {destructure}, or [destructure]
+        const varNames = [];
+        const patternStart = pos;
+        if (source[pos] === '{' || source[pos] === '[') {
+            // Destructured: find matching brace/bracket
+            const open = source[pos];
+            const close = open === '{' ? '}' : ']';
+            let depth = 1;
+            let end = pos + 1;
+            while (end < source.length && depth > 0) {
+                if (source[end] === open)
+                    depth++;
+                else if (source[end] === close)
+                    depth--;
+                end++;
+            }
+            const pattern = source.slice(pos, end);
+            const names = extractDestructuredNames(pattern);
+            varNames.push(...names);
+            pos = end;
+        }
+        else {
+            // Simple identifier
+            const idMatch = source.slice(pos).match(/^([a-zA-Z_$][a-zA-Z0-9_$]*)/);
+            if (!idMatch)
+                continue;
+            varNames.push(idMatch[1]);
+            pos += idMatch[0].length;
+        }
+        if (varNames.length === 0)
+            continue;
+        // Skip trickle internals
+        if (varNames.every(n => n.startsWith('__trickle') || n === '_a' || n === '_b' || n === '_c'))
+            continue;
+        // Now find the opening `{` of the loop body
+        // Skip everything until the `)` that closes the for(...)
+        let parenDepth = 1; // We're inside the for(
+        while (pos < source.length && parenDepth > 0) {
+            const ch = source[pos];
+            if (ch === '(')
+                parenDepth++;
+            else if (ch === ')')
+                parenDepth--;
+            else if (ch === '"' || ch === "'" || ch === '`') {
+                const q = ch;
+                pos++;
+                while (pos < source.length && source[pos] !== q) {
+                    if (source[pos] === '\\')
+                        pos++;
+                    pos++;
+                }
+            }
+            pos++;
+        }
+        // Now find the `{` after the closing `)`
+        while (pos < source.length && /\s/.test(source[pos]))
+            pos++;
+        if (pos >= source.length || source[pos] !== '{')
+            continue;
+        const bodyBrace = pos;
+        // Calculate line number
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ bodyStart: bodyBrace + 1, varNames: varNames.filter(n => !n.startsWith('__trickle')), lineNo });
+    }
+    return results;
+}
+/**
+ * Find function parameter names and return insertions for tracing at the start
+ * of function bodies. Traces the runtime values of all parameters.
+ * Handles: function declarations, arrow functions, method definitions.
+ * Skips: React components (already tracked via __trickle_rc with props).
+ */
+function findFunctionParams(source, isReactFile) {
+    const results = [];
+    // Match function declarations: function name(params) {
+    const funcDeclRegex = /\b(?:async\s+)?function\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\(/g;
+    let match;
+    while ((match = funcDeclRegex.exec(source)) !== null) {
+        const name = match[1];
+        if (name === 'require' || name === 'exports' || name === 'module')
+            continue;
+        if (name.startsWith('__trickle'))
+            continue;
+        // Skip React components (uppercase) in React files — already tracked
+        if (isReactFile && /^[A-Z]/.test(name))
+            continue;
+        const afterParen = match.index + match[0].length;
+        const bodyBrace = findFunctionBodyBrace(source, afterParen);
+        if (bodyBrace === -1)
+            continue;
+        // Extract parameter names from between ( and )
+        const paramStr = source.slice(afterParen, bodyBrace);
+        const closeParen = paramStr.indexOf(')');
+        if (closeParen === -1)
+            continue;
+        const rawParams = paramStr.slice(0, closeParen).trim();
+        const paramNames = extractParamNames(rawParams);
+        if (paramNames.length === 0)
+            continue;
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ bodyStart: bodyBrace + 1, paramNames, lineNo });
+    }
+    // Match arrow functions: const name = (params) => {
+    const arrowFuncRegex = /(?:const|let|var)\s+([a-zA-Z_$][a-zA-Z0-9_$]*)(?:\s*:\s*[^=]+?)?\s*=\s*(?:async\s+)?\(([^)]*)\)\s*(?::\s*[^=]+?)?\s*=>\s*\{/g;
+    while ((match = arrowFuncRegex.exec(source)) !== null) {
+        const name = match[1];
+        if (name.startsWith('__trickle'))
+            continue;
+        // Skip React components in React files
+        if (isReactFile && /^[A-Z]/.test(name))
+            continue;
+        const rawParams = match[2].trim();
+        const paramNames = extractParamNames(rawParams);
+        if (paramNames.length === 0)
+            continue;
+        // Find the { position
+        const bracePos = match.index + match[0].length - 1;
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ bodyStart: bracePos + 1, paramNames, lineNo });
+    }
+    return results;
+}
+/**
+ * Extract parameter names from a function parameter string.
+ * Handles: simple names, destructured { a, b }, defaults (a = 1), rest (...args).
+ * Skips type annotations.
+ */
+function extractParamNames(rawParams) {
+    if (!rawParams)
+        return [];
+    const names = [];
+    // Split by commas at depth 0
+    const parts = [];
+    let depth = 0;
+    let current = '';
+    for (const ch of rawParams) {
+        if (ch === '{' || ch === '[' || ch === '(' || ch === '<')
+            depth++;
+        else if (ch === '}' || ch === ']' || ch === ')' || ch === '>')
+            depth--;
+        else if (ch === ',' && depth === 0) {
+            parts.push(current.trim());
+            current = '';
+            continue;
+        }
+        current += ch;
+    }
+    if (current.trim())
+        parts.push(current.trim());
+    for (const part of parts) {
+        const trimmed = part.trim();
+        if (!trimmed)
+            continue;
+        // Destructured params — extract individual names
+        if (trimmed.startsWith('{')) {
+            const closeBrace = trimmed.indexOf('}');
+            if (closeBrace !== -1) {
+                const destructNames = extractDestructuredNames(trimmed.slice(0, closeBrace + 1));
+                names.push(...destructNames);
+            }
+            continue;
+        }
+        if (trimmed.startsWith('[')) {
+            const closeBracket = trimmed.indexOf(']');
+            if (closeBracket !== -1) {
+                const destructNames = extractDestructuredNames(trimmed.slice(0, closeBracket + 1));
+                names.push(...destructNames);
+            }
+            continue;
+        }
+        // Rest parameter: ...args
+        if (trimmed.startsWith('...')) {
+            const restName = trimmed.slice(3).split(/[\s:=]/)[0].trim();
+            if (/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(restName)) {
+                names.push(restName);
+            }
+            continue;
+        }
+        // Simple param: name or name: Type or name = default
+        const paramName = trimmed.split(/[\s:=]/)[0].trim();
+        if (/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(paramName)) {
+            names.push(paramName);
+        }
+    }
+    return names;
+}
 /**
  * Transform ESM source code to wrap function declarations and trace variables.
  *
@@ -887,7 +1215,13 @@ function transformEsmSource(source, filename, moduleName, backendUrl, debug, tra
     const varInsertions = traceVars ? findVarDeclarations(source) : [];
     // Find destructured variable declarations for tracing
     const destructInsertions = traceVars ? findDestructuredDeclarations(source) : [];
-    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
+    // Find variable reassignments for tracing
+    const reassignInsertions = traceVars ? findReassignments(source) : [];
+    // Find for-loop variable declarations for tracing
+    const forLoopInsertions = traceVars ? findForLoopVars(source) : [];
+    // Find function parameter names for tracing
+    const funcParamInsertions = traceVars ? findFunctionParams(source, isReactFile) : [];
+    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && funcParamInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
         return source;
     // Fix line numbers: Vite transforms (TypeScript stripping) may change line numbers.
     // Map transformed line numbers to original source line numbers.
@@ -907,9 +1241,56 @@ function transformEsmSource(source, filename, moduleName, backendUrl, debug, tra
                     di.lineNo = origLine;
             }
         }
+        // Fix reassignment line numbers
+        for (const ri of reassignInsertions) {
+            const origLine = findOriginalLine(origLines, ri.varName, ri.lineNo);
+            if (origLine !== -1)
+                ri.lineNo = origLine;
+        }
+        // Fix for-loop var line numbers
+        for (const fi of forLoopInsertions) {
+            if (fi.varNames.length > 0) {
+                // Search for 'for' keyword near the expected line
+                const pattern = /\bfor\s*\(/;
+                for (let delta = 0; delta <= 80; delta++) {
+                    const fwd = fi.lineNo - 1 + delta;
+                    if (fwd >= 0 && fwd < origLines.length && pattern.test(origLines[fwd])) {
+                        fi.lineNo = fwd + 1;
+                        break;
+                    }
+                    if (delta > 0 && delta <= 10) {
+                        const bwd = fi.lineNo - 1 - delta;
+                        if (bwd >= 0 && bwd < origLines.length && pattern.test(origLines[bwd])) {
+                            fi.lineNo = bwd + 1;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        // Fix function param line numbers
+        for (const fp of funcParamInsertions) {
+            if (fp.paramNames.length > 0) {
+                const pattern = /\bfunction\s+\w+\s*\(|=>\s*\{/;
+                for (let delta = 0; delta <= 80; delta++) {
+                    const fwd = fp.lineNo - 1 + delta;
+                    if (fwd >= 0 && fwd < origLines.length && pattern.test(origLines[fwd])) {
+                        fp.lineNo = fwd + 1;
+                        break;
+                    }
+                    if (delta > 0 && delta <= 10) {
+                        const bwd = fp.lineNo - 1 - delta;
+                        if (bwd >= 0 && bwd < origLines.length && pattern.test(origLines[bwd])) {
+                            fp.lineNo = bwd + 1;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
     }
     // Build prefix — ALL imports first (ESM requires imports before any statements)
-    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
+    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || funcParamInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
     const importLines = [
         `import { wrapFunction as __trickle_wrapFn, configure as __trickle_configure } from 'trickle-observe';`,
     ];
@@ -947,7 +1328,7 @@ function transformEsmSource(source, filename, moduleName, backendUrl, debug, tra
         }
     }
     // Add variable tracing if needed — inlined to avoid import resolution issues in Vite SSR.
-    if (varInsertions.length > 0 || destructInsertions.length > 0) {
+    if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || funcParamInsertions.length > 0) {
         prefixLines.push(`if (!globalThis.__trickle_var_tracer) {`, `  const _cache = new Set();`, `  function _inferType(v, d) {`, `    if (d <= 0) return { kind: 'primitive', name: 'unknown' };`, `    if (v === null) return { kind: 'primitive', name: 'null' };`, `    if (v === undefined) return { kind: 'primitive', name: 'undefined' };`, `    const t = typeof v;`, `    if (t === 'string' || t === 'number' || t === 'boolean' || t === 'bigint' || t === 'symbol') return { kind: 'primitive', name: t };`, `    if (t === 'function') return { kind: 'function' };`, `    if (Array.isArray(v)) { return v.length === 0 ? { kind: 'array', element: { kind: 'primitive', name: 'unknown' } } : { kind: 'array', element: _inferType(v[0], d-1) }; }`, `    if (t === 'object') {`, `      if (v instanceof Date) return { kind: 'object', properties: { __date: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof RegExp) return { kind: 'object', properties: { __regexp: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Error) return { kind: 'object', properties: { __error: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Promise) return { kind: 'promise', resolved: { kind: 'primitive', name: 'unknown' } };`, `      const props = {}; const keys = Object.keys(v).slice(0, 20);`, `      for (const k of keys) { try { props[k] = _inferType(v[k], d-1); } catch(e) { props[k] = { kind: 'primitive', name: 'unknown' }; } }`, `      return { kind: 'object', properties: props };`, `    }`, `    return { kind: 'primitive', name: 'unknown' };`, `  }`, `  function _sanitize(v, d) {`, `    if (d <= 0) return '[truncated]'; if (v === null || v === undefined) return v; const t = typeof v;`, `    if (t === 'string') return v.length > 100 ? v.substring(0, 100) + '...' : v;`, `    if (t === 'number' || t === 'boolean') return v; if (t === 'bigint') return String(v);`, `    if (t === 'function') return '[Function: ' + (v.name || 'anonymous') + ']';`, `    if (Array.isArray(v)) return v.slice(0, 3).map(i => _sanitize(i, d-1));`, `    if (t === 'object') { if (v instanceof Date) return v.toISOString(); if (v instanceof RegExp) return String(v); if (v instanceof Error) return { error: v.message }; if (v instanceof Promise) return '[Promise]';`, `      const r = {}; const keys = Object.keys(v).slice(0, 10); for (const k of keys) { try { r[k] = _sanitize(v[k], d-1); } catch(e) { r[k] = '[unreadable]'; } } return r; }`, `    return String(v);`, `  }`, `  globalThis.__trickle_var_tracer = function(v, n, l, mod, file) {`, `    try {`, `      const type = _inferType(v, 3);`, `      const th = JSON.stringify(type).substring(0, 32);`, `      const ck = file + ':' + l + ':' + n + ':' + th;`, `      if (_cache.has(ck)) return;`, `      _cache.add(ck);`, `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: _sanitize(v, 2) }));`, `    } catch(e) {}`, `  };`, `}`, `function __trickle_tv(v, n, l) { try { globalThis.__trickle_var_tracer(v, n, l, ${JSON.stringify(moduleName)}, ${JSON.stringify(filename)}); } catch(e) {} }`);
     }
     // Add React component render tracker if needed
@@ -985,6 +1366,29 @@ function transformEsmSource(source, filename, moduleName, backendUrl, debug, tra
             code: `\n;try{${calls}}catch(__e){}\n`,
         });
     }
+    // Reassignment insertions: trace after the reassignment statement
+    for (const { lineEnd, varName, lineNo } of reassignInsertions) {
+        allInsertions.push({
+            position: lineEnd,
+            code: `\n;try{__trickle_tv(${varName},${JSON.stringify(varName)},${lineNo})}catch(__e){}\n`,
+        });
+    }
+    // For-loop variable insertions: insert trace at start of loop body
+    for (const { bodyStart, varNames, lineNo } of forLoopInsertions) {
+        const calls = varNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
+        allInsertions.push({
+            position: bodyStart,
+            code: `\ntry{${calls}}catch(__e){}\n`,
+        });
+    }
+    // Function parameter insertions: insert trace at start of function body
+    for (const { bodyStart, paramNames, lineNo } of funcParamInsertions) {
+        const calls = paramNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
+        allInsertions.push({
+            position: bodyStart,
+            code: `\ntry{${calls}}catch(__e){}\n`,
+        });
+    }
     for (const { position, name, lineNo, propsExpr } of bodyInsertions) {
         allInsertions.push({
             position,

package/dist-esm/vite-plugin.js

@@ -473,6 +473,334 @@ function extractDestructuredNames(pattern) {
     }
     return names;
 }
+/**
+ * Find variable reassignments (not declarations) and return insertions for tracing.
+ * Handles: x = newValue; x += 1; x ||= fallback; etc.
+ * Only matches standalone reassignment statements at the start of a line.
+ * Skips: property assignments (obj.x = ...), indexed (arr[i] = ...),
+ *        comparisons (===, !==), arrow functions (=>), declarations (const/let/var).
+ */
+function findReassignments(source) {
+    const results = [];
+    // Match: <identifier> <assignOp>= <value> at the start of a line
+    // Compound operators: +=, -=, *=, /=, %=, **=, &&=, ||=, ??=, <<=, >>=, >>>=, &=, |=, ^=
+    // Plain: = (but not ==, ===, =>, !=)
+    const reassignRegex = /^([ \t]*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*(?:\+|-|\*\*?|\/|%|&&|\|\||<<|>>>?|&|\||\^|\?\?)?=[^=>]/gm;
+    let match;
+    while ((match = reassignRegex.exec(source)) !== null) {
+        const varName = match[2];
+        // Skip trickle internals
+        if (varName.startsWith('__trickle') || varName.startsWith('_$'))
+            continue;
+        // Skip common non-variable patterns
+        if (varName === '_a' || varName === '_b' || varName === '_c')
+            continue;
+        // Skip 'this', 'self', 'super' (not reassignable in practice)
+        if (varName === 'this' || varName === 'super')
+            continue;
+        // Skip keywords that could look like identifiers
+        if (['if', 'else', 'while', 'for', 'do', 'switch', 'case', 'default', 'return', 'throw',
+            'break', 'continue', 'try', 'catch', 'finally', 'new', 'delete', 'typeof', 'void',
+            'yield', 'await', 'class', 'extends', 'import', 'export', 'from', 'as', 'of', 'in',
+            'const', 'let', 'var', 'function', 'true', 'false', 'null', 'undefined'].includes(varName))
+            continue;
+        // Check that this line doesn't start with const/let/var (would be a declaration, already handled)
+        const lineStart = source.lastIndexOf('\n', match.index) + 1;
+        const linePrefix = source.slice(lineStart, match.index + match[1].length).trim();
+        if (/^(export\s+)?(const|let|var)\s/.test(source.slice(lineStart).trimStart()))
+            continue;
+        // Skip if this looks like a property in an object literal (preceded by a key: pattern on same line)
+        // or if it's a label (label: ...)
+        const beforeOnLine = source.slice(lineStart, match.index).trim();
+        if (beforeOnLine.endsWith(':') || beforeOnLine.endsWith(','))
+            continue;
+        // Calculate line number
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        // Find end of statement (same logic as findVarDeclarations)
+        const startPos = match.index + match[0].length - 1;
+        let pos = startPos;
+        let depth = 0;
+        let foundEnd = -1;
+        while (pos < source.length) {
+            const ch = source[pos];
+            if (ch === '(' || ch === '[' || ch === '{') {
+                depth++;
+            }
+            else if (ch === ')' || ch === ']' || ch === '}') {
+                depth--;
+                if (depth < 0)
+                    break;
+            }
+            else if (ch === ';' && depth === 0) {
+                foundEnd = pos;
+                break;
+            }
+            else if (ch === '\n' && depth === 0) {
+                const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
+                if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+                    foundEnd = pos;
+                    break;
+                }
+            }
+            else if (ch === '"' || ch === "'" || ch === '`') {
+                const quote = ch;
+                pos++;
+                while (pos < source.length) {
+                    if (source[pos] === '\\') {
+                        pos++;
+                    }
+                    else if (source[pos] === quote)
+                        break;
+                    pos++;
+                }
+            }
+            else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
+                while (pos < source.length && source[pos] !== '\n')
+                    pos++;
+                continue;
+            }
+            else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '*') {
+                pos += 2;
+                while (pos < source.length - 1 && !(source[pos] === '*' && source[pos + 1] === '/'))
+                    pos++;
+                pos++;
+            }
+            pos++;
+        }
+        if (foundEnd === -1)
+            continue;
+        results.push({ lineEnd: foundEnd + 1, varName, lineNo });
+    }
+    return results;
+}
+/**
+ * Find for-loop variable declarations and return insertions for tracing.
+ * Handles:
+ *   for (const item of items) { ... }         → trace item
+ *   for (const [key, val] of entries) { ... }  → trace key, val
+ *   for (const { a, b } of items) { ... }      → trace a, b
+ *   for (const key in obj) { ... }             → trace key
+ *   for (let i = 0; i < n; i++) { ... }        → trace i
+ * Inserts trace calls at the start of the loop body.
+ */
+function findForLoopVars(source) {
+    const results = [];
+    // Match: for (const/let/var ...
+    const forRegex = /\bfor\s*\(/g;
+    let match;
+    while ((match = forRegex.exec(source)) !== null) {
+        const afterParen = match.index + match[0].length;
+        // Skip whitespace
+        let pos = afterParen;
+        while (pos < source.length && /\s/.test(source[pos]))
+            pos++;
+        // Expect const/let/var
+        const declMatch = source.slice(pos).match(/^(const|let|var)\s+/);
+        if (!declMatch)
+            continue;
+        pos += declMatch[0].length;
+        // Now we have the variable pattern — could be identifier, {destructure}, or [destructure]
+        const varNames = [];
+        const patternStart = pos;
+        if (source[pos] === '{' || source[pos] === '[') {
+            // Destructured: find matching brace/bracket
+            const open = source[pos];
+            const close = open === '{' ? '}' : ']';
+            let depth = 1;
+            let end = pos + 1;
+            while (end < source.length && depth > 0) {
+                if (source[end] === open)
+                    depth++;
+                else if (source[end] === close)
+                    depth--;
+                end++;
+            }
+            const pattern = source.slice(pos, end);
+            const names = extractDestructuredNames(pattern);
+            varNames.push(...names);
+            pos = end;
+        }
+        else {
+            // Simple identifier
+            const idMatch = source.slice(pos).match(/^([a-zA-Z_$][a-zA-Z0-9_$]*)/);
+            if (!idMatch)
+                continue;
+            varNames.push(idMatch[1]);
+            pos += idMatch[0].length;
+        }
+        if (varNames.length === 0)
+            continue;
+        // Skip trickle internals
+        if (varNames.every(n => n.startsWith('__trickle') || n === '_a' || n === '_b' || n === '_c'))
+            continue;
+        // Now find the opening `{` of the loop body
+        // Skip everything until the `)` that closes the for(...)
+        let parenDepth = 1; // We're inside the for(
+        while (pos < source.length && parenDepth > 0) {
+            const ch = source[pos];
+            if (ch === '(')
+                parenDepth++;
+            else if (ch === ')')
+                parenDepth--;
+            else if (ch === '"' || ch === "'" || ch === '`') {
+                const q = ch;
+                pos++;
+                while (pos < source.length && source[pos] !== q) {
+                    if (source[pos] === '\\')
+                        pos++;
+                    pos++;
+                }
+            }
+            pos++;
+        }
+        // Now find the `{` after the closing `)`
+        while (pos < source.length && /\s/.test(source[pos]))
+            pos++;
+        if (pos >= source.length || source[pos] !== '{')
+            continue;
+        const bodyBrace = pos;
+        // Calculate line number
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ bodyStart: bodyBrace + 1, varNames: varNames.filter(n => !n.startsWith('__trickle')), lineNo });
+    }
+    return results;
+}
+/**
+ * Find function parameter names and return insertions for tracing at the start
+ * of function bodies. Traces the runtime values of all parameters.
+ * Handles: function declarations, arrow functions, method definitions.
+ * Skips: React components (already tracked via __trickle_rc with props).
+ */
+function findFunctionParams(source, isReactFile) {
+    const results = [];
+    // Match function declarations: function name(params) {
+    const funcDeclRegex = /\b(?:async\s+)?function\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\(/g;
+    let match;
+    while ((match = funcDeclRegex.exec(source)) !== null) {
+        const name = match[1];
+        if (name === 'require' || name === 'exports' || name === 'module')
+            continue;
+        if (name.startsWith('__trickle'))
+            continue;
+        // Skip React components (uppercase) in React files — already tracked
+        if (isReactFile && /^[A-Z]/.test(name))
+            continue;
+        const afterParen = match.index + match[0].length;
+        const bodyBrace = findFunctionBodyBrace(source, afterParen);
+        if (bodyBrace === -1)
+            continue;
+        // Extract parameter names from between ( and )
+        const paramStr = source.slice(afterParen, bodyBrace);
+        const closeParen = paramStr.indexOf(')');
+        if (closeParen === -1)
+            continue;
+        const rawParams = paramStr.slice(0, closeParen).trim();
+        const paramNames = extractParamNames(rawParams);
+        if (paramNames.length === 0)
+            continue;
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ bodyStart: bodyBrace + 1, paramNames, lineNo });
+    }
+    // Match arrow functions: const name = (params) => {
+    const arrowFuncRegex = /(?:const|let|var)\s+([a-zA-Z_$][a-zA-Z0-9_$]*)(?:\s*:\s*[^=]+?)?\s*=\s*(?:async\s+)?\(([^)]*)\)\s*(?::\s*[^=]+?)?\s*=>\s*\{/g;
+    while ((match = arrowFuncRegex.exec(source)) !== null) {
+        const name = match[1];
+        if (name.startsWith('__trickle'))
+            continue;
+        // Skip React components in React files
+        if (isReactFile && /^[A-Z]/.test(name))
+            continue;
+        const rawParams = match[2].trim();
+        const paramNames = extractParamNames(rawParams);
+        if (paramNames.length === 0)
+            continue;
+        // Find the { position
+        const bracePos = match.index + match[0].length - 1;
+        let lineNo = 1;
+        for (let i = 0; i < match.index; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ bodyStart: bracePos + 1, paramNames, lineNo });
+    }
+    return results;
+}
+/**
+ * Extract parameter names from a function parameter string.
+ * Handles: simple names, destructured { a, b }, defaults (a = 1), rest (...args).
+ * Skips type annotations.
+ */
+function extractParamNames(rawParams) {
+    if (!rawParams)
+        return [];
+    const names = [];
+    // Split by commas at depth 0
+    const parts = [];
+    let depth = 0;
+    let current = '';
+    for (const ch of rawParams) {
+        if (ch === '{' || ch === '[' || ch === '(' || ch === '<')
+            depth++;
+        else if (ch === '}' || ch === ']' || ch === ')' || ch === '>')
+            depth--;
+        else if (ch === ',' && depth === 0) {
+            parts.push(current.trim());
+            current = '';
+            continue;
+        }
+        current += ch;
+    }
+    if (current.trim())
+        parts.push(current.trim());
+    for (const part of parts) {
+        const trimmed = part.trim();
+        if (!trimmed)
+            continue;
+        // Destructured params — extract individual names
+        if (trimmed.startsWith('{')) {
+            const closeBrace = trimmed.indexOf('}');
+            if (closeBrace !== -1) {
+                const destructNames = extractDestructuredNames(trimmed.slice(0, closeBrace + 1));
+                names.push(...destructNames);
+            }
+            continue;
+        }
+        if (trimmed.startsWith('[')) {
+            const closeBracket = trimmed.indexOf(']');
+            if (closeBracket !== -1) {
+                const destructNames = extractDestructuredNames(trimmed.slice(0, closeBracket + 1));
+                names.push(...destructNames);
+            }
+            continue;
+        }
+        // Rest parameter: ...args
+        if (trimmed.startsWith('...')) {
+            const restName = trimmed.slice(3).split(/[\s:=]/)[0].trim();
+            if (/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(restName)) {
+                names.push(restName);
+            }
+            continue;
+        }
+        // Simple param: name or name: Type or name = default
+        const paramName = trimmed.split(/[\s:=]/)[0].trim();
+        if (/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(paramName)) {
+            names.push(paramName);
+        }
+    }
+    return names;
+}
 /**
  * Transform ESM source code to wrap function declarations and trace variables.
  *
@@ -880,7 +1208,13 @@ export function transformEsmSource(source, filename, moduleName, backendUrl, deb
     const varInsertions = traceVars ? findVarDeclarations(source) : [];
     // Find destructured variable declarations for tracing
     const destructInsertions = traceVars ? findDestructuredDeclarations(source) : [];
-    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
+    // Find variable reassignments for tracing
+    const reassignInsertions = traceVars ? findReassignments(source) : [];
+    // Find for-loop variable declarations for tracing
+    const forLoopInsertions = traceVars ? findForLoopVars(source) : [];
+    // Find function parameter names for tracing
+    const funcParamInsertions = traceVars ? findFunctionParams(source, isReactFile) : [];
+    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && funcParamInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
         return source;
     // Fix line numbers: Vite transforms (TypeScript stripping) may change line numbers.
     // Map transformed line numbers to original source line numbers.
@@ -900,9 +1234,56 @@ export function transformEsmSource(source, filename, moduleName, backendUrl, deb
                     di.lineNo = origLine;
             }
         }
+        // Fix reassignment line numbers
+        for (const ri of reassignInsertions) {
+            const origLine = findOriginalLine(origLines, ri.varName, ri.lineNo);
+            if (origLine !== -1)
+                ri.lineNo = origLine;
+        }
+        // Fix for-loop var line numbers
+        for (const fi of forLoopInsertions) {
+            if (fi.varNames.length > 0) {
+                // Search for 'for' keyword near the expected line
+                const pattern = /\bfor\s*\(/;
+                for (let delta = 0; delta <= 80; delta++) {
+                    const fwd = fi.lineNo - 1 + delta;
+                    if (fwd >= 0 && fwd < origLines.length && pattern.test(origLines[fwd])) {
+                        fi.lineNo = fwd + 1;
+                        break;
+                    }
+                    if (delta > 0 && delta <= 10) {
+                        const bwd = fi.lineNo - 1 - delta;
+                        if (bwd >= 0 && bwd < origLines.length && pattern.test(origLines[bwd])) {
+                            fi.lineNo = bwd + 1;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        // Fix function param line numbers
+        for (const fp of funcParamInsertions) {
+            if (fp.paramNames.length > 0) {
+                const pattern = /\bfunction\s+\w+\s*\(|=>\s*\{/;
+                for (let delta = 0; delta <= 80; delta++) {
+                    const fwd = fp.lineNo - 1 + delta;
+                    if (fwd >= 0 && fwd < origLines.length && pattern.test(origLines[fwd])) {
+                        fp.lineNo = fwd + 1;
+                        break;
+                    }
+                    if (delta > 0 && delta <= 10) {
+                        const bwd = fp.lineNo - 1 - delta;
+                        if (bwd >= 0 && bwd < origLines.length && pattern.test(origLines[bwd])) {
+                            fp.lineNo = bwd + 1;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
     }
     // Build prefix — ALL imports first (ESM requires imports before any statements)
-    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
+    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || funcParamInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
     const importLines = [
         `import { wrapFunction as __trickle_wrapFn, configure as __trickle_configure } from 'trickle-observe';`,
     ];
@@ -940,7 +1321,7 @@ export function transformEsmSource(source, filename, moduleName, backendUrl, deb
         }
     }
     // Add variable tracing if needed — inlined to avoid import resolution issues in Vite SSR.
-    if (varInsertions.length > 0 || destructInsertions.length > 0) {
+    if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || funcParamInsertions.length > 0) {
         prefixLines.push(`if (!globalThis.__trickle_var_tracer) {`, `  const _cache = new Set();`, `  function _inferType(v, d) {`, `    if (d <= 0) return { kind: 'primitive', name: 'unknown' };`, `    if (v === null) return { kind: 'primitive', name: 'null' };`, `    if (v === undefined) return { kind: 'primitive', name: 'undefined' };`, `    const t = typeof v;`, `    if (t === 'string' || t === 'number' || t === 'boolean' || t === 'bigint' || t === 'symbol') return { kind: 'primitive', name: t };`, `    if (t === 'function') return { kind: 'function' };`, `    if (Array.isArray(v)) { return v.length === 0 ? { kind: 'array', element: { kind: 'primitive', name: 'unknown' } } : { kind: 'array', element: _inferType(v[0], d-1) }; }`, `    if (t === 'object') {`, `      if (v instanceof Date) return { kind: 'object', properties: { __date: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof RegExp) return { kind: 'object', properties: { __regexp: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Error) return { kind: 'object', properties: { __error: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Promise) return { kind: 'promise', resolved: { kind: 'primitive', name: 'unknown' } };`, `      const props = {}; const keys = Object.keys(v).slice(0, 20);`, `      for (const k of keys) { try { props[k] = _inferType(v[k], d-1); } catch(e) { props[k] = { kind: 'primitive', name: 'unknown' }; } }`, `      return { kind: 'object', properties: props };`, `    }`, `    return { kind: 'primitive', name: 'unknown' };`, `  }`, `  function _sanitize(v, d) {`, `    if (d <= 0) return '[truncated]'; if (v === null || v === undefined) return v; const t = typeof v;`, `    if (t === 'string') return v.length > 100 ? v.substring(0, 100) + '...' : v;`, `    if (t === 'number' || t === 'boolean') return v; if (t === 'bigint') return String(v);`, `    if (t === 'function') return '[Function: ' + (v.name || 'anonymous') + ']';`, `    if (Array.isArray(v)) return v.slice(0, 3).map(i => _sanitize(i, d-1));`, `    if (t === 'object') { if (v instanceof Date) return v.toISOString(); if (v instanceof RegExp) return String(v); if (v instanceof Error) return { error: v.message }; if (v instanceof Promise) return '[Promise]';`, `      const r = {}; const keys = Object.keys(v).slice(0, 10); for (const k of keys) { try { r[k] = _sanitize(v[k], d-1); } catch(e) { r[k] = '[unreadable]'; } } return r; }`, `    return String(v);`, `  }`, `  globalThis.__trickle_var_tracer = function(v, n, l, mod, file) {`, `    try {`, `      const type = _inferType(v, 3);`, `      const th = JSON.stringify(type).substring(0, 32);`, `      const ck = file + ':' + l + ':' + n + ':' + th;`, `      if (_cache.has(ck)) return;`, `      _cache.add(ck);`, `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: _sanitize(v, 2) }));`, `    } catch(e) {}`, `  };`, `}`, `function __trickle_tv(v, n, l) { try { globalThis.__trickle_var_tracer(v, n, l, ${JSON.stringify(moduleName)}, ${JSON.stringify(filename)}); } catch(e) {} }`);
     }
     // Add React component render tracker if needed
@@ -978,6 +1359,29 @@ export function transformEsmSource(source, filename, moduleName, backendUrl, deb
             code: `\n;try{${calls}}catch(__e){}\n`,
         });
     }
+    // Reassignment insertions: trace after the reassignment statement
+    for (const { lineEnd, varName, lineNo } of reassignInsertions) {
+        allInsertions.push({
+            position: lineEnd,
+            code: `\n;try{__trickle_tv(${varName},${JSON.stringify(varName)},${lineNo})}catch(__e){}\n`,
+        });
+    }
+    // For-loop variable insertions: insert trace at start of loop body
+    for (const { bodyStart, varNames, lineNo } of forLoopInsertions) {
+        const calls = varNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
+        allInsertions.push({
+            position: bodyStart,
+            code: `\ntry{${calls}}catch(__e){}\n`,
+        });
+    }
+    // Function parameter insertions: insert trace at start of function body
+    for (const { bodyStart, paramNames, lineNo } of funcParamInsertions) {
+        const calls = paramNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
+        allInsertions.push({
+            position: bodyStart,
+            code: `\ntry{${calls}}catch(__e){}\n`,
+        });
+    }
     for (const { position, name, lineNo, propsExpr } of bodyInsertions) {
         allInsertions.push({
             position,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trickle-observe",
-  "version": "0.2.69",
+  "version": "0.2.71",
   "description": "Runtime type observability for JavaScript applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/vite-plugin.ts

@@ -461,6 +461,331 @@ function extractDestructuredNames(pattern: string): string[] {
   return names;
 }
 
+/**
+ * Find variable reassignments (not declarations) and return insertions for tracing.
+ * Handles: x = newValue; x += 1; x ||= fallback; etc.
+ * Only matches standalone reassignment statements at the start of a line.
+ * Skips: property assignments (obj.x = ...), indexed (arr[i] = ...),
+ *        comparisons (===, !==), arrow functions (=>), declarations (const/let/var).
+ */
+function findReassignments(source: string): Array<{ lineEnd: number; varName: string; lineNo: number }> {
+  const results: Array<{ lineEnd: number; varName: string; lineNo: number }> = [];
+
+  // Match: <identifier> <assignOp>= <value> at the start of a line
+  // Compound operators: +=, -=, *=, /=, %=, **=, &&=, ||=, ??=, <<=, >>=, >>>=, &=, |=, ^=
+  // Plain: = (but not ==, ===, =>, !=)
+  const reassignRegex = /^([ \t]*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*(?:\+|-|\*\*?|\/|%|&&|\|\||<<|>>>?|&|\||\^|\?\?)?=[^=>]/gm;
+  let match;
+
+  while ((match = reassignRegex.exec(source)) !== null) {
+    const varName = match[2];
+
+    // Skip trickle internals
+    if (varName.startsWith('__trickle') || varName.startsWith('_$')) continue;
+    // Skip common non-variable patterns
+    if (varName === '_a' || varName === '_b' || varName === '_c') continue;
+    // Skip 'this', 'self', 'super' (not reassignable in practice)
+    if (varName === 'this' || varName === 'super') continue;
+    // Skip keywords that could look like identifiers
+    if (['if', 'else', 'while', 'for', 'do', 'switch', 'case', 'default', 'return', 'throw',
+         'break', 'continue', 'try', 'catch', 'finally', 'new', 'delete', 'typeof', 'void',
+         'yield', 'await', 'class', 'extends', 'import', 'export', 'from', 'as', 'of', 'in',
+         'const', 'let', 'var', 'function', 'true', 'false', 'null', 'undefined'].includes(varName)) continue;
+
+    // Check that this line doesn't start with const/let/var (would be a declaration, already handled)
+    const lineStart = source.lastIndexOf('\n', match.index) + 1;
+    const linePrefix = source.slice(lineStart, match.index + match[1].length).trim();
+    if (/^(export\s+)?(const|let|var)\s/.test(source.slice(lineStart).trimStart())) continue;
+
+    // Skip if this looks like a property in an object literal (preceded by a key: pattern on same line)
+    // or if it's a label (label: ...)
+    const beforeOnLine = source.slice(lineStart, match.index).trim();
+    if (beforeOnLine.endsWith(':') || beforeOnLine.endsWith(',')) continue;
+
+    // Calculate line number
+    let lineNo = 1;
+    for (let i = 0; i < match.index; i++) {
+      if (source[i] === '\n') lineNo++;
+    }
+
+    // Find end of statement (same logic as findVarDeclarations)
+    const startPos = match.index + match[0].length - 1;
+    let pos = startPos;
+    let depth = 0;
+    let foundEnd = -1;
+
+    while (pos < source.length) {
+      const ch = source[pos];
+      if (ch === '(' || ch === '[' || ch === '{') {
+        depth++;
+      } else if (ch === ')' || ch === ']' || ch === '}') {
+        depth--;
+        if (depth < 0) break;
+      } else if (ch === ';' && depth === 0) {
+        foundEnd = pos;
+        break;
+      } else if (ch === '\n' && depth === 0) {
+        const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
+        if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+          foundEnd = pos;
+          break;
+        }
+      } else if (ch === '"' || ch === "'" || ch === '`') {
+        const quote = ch;
+        pos++;
+        while (pos < source.length) {
+          if (source[pos] === '\\') { pos++; }
+          else if (source[pos] === quote) break;
+          pos++;
+        }
+      } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
+        while (pos < source.length && source[pos] !== '\n') pos++;
+        continue;
+      } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '*') {
+        pos += 2;
+        while (pos < source.length - 1 && !(source[pos] === '*' && source[pos + 1] === '/')) pos++;
+        pos++;
+      }
+      pos++;
+    }
+
+    if (foundEnd === -1) continue;
+    results.push({ lineEnd: foundEnd + 1, varName, lineNo });
+  }
+
+  return results;
+}
+
+/**
+ * Find for-loop variable declarations and return insertions for tracing.
+ * Handles:
+ *   for (const item of items) { ... }         → trace item
+ *   for (const [key, val] of entries) { ... }  → trace key, val
+ *   for (const { a, b } of items) { ... }      → trace a, b
+ *   for (const key in obj) { ... }             → trace key
+ *   for (let i = 0; i < n; i++) { ... }        → trace i
+ * Inserts trace calls at the start of the loop body.
+ */
+function findForLoopVars(source: string): Array<{ bodyStart: number; varNames: string[]; lineNo: number }> {
+  const results: Array<{ bodyStart: number; varNames: string[]; lineNo: number }> = [];
+
+  // Match: for (const/let/var ...
+  const forRegex = /\bfor\s*\(/g;
+  let match;
+
+  while ((match = forRegex.exec(source)) !== null) {
+    const afterParen = match.index + match[0].length;
+
+    // Skip whitespace
+    let pos = afterParen;
+    while (pos < source.length && /\s/.test(source[pos])) pos++;
+
+    // Expect const/let/var
+    const declMatch = source.slice(pos).match(/^(const|let|var)\s+/);
+    if (!declMatch) continue;
+    pos += declMatch[0].length;
+
+    // Now we have the variable pattern — could be identifier, {destructure}, or [destructure]
+    const varNames: string[] = [];
+    const patternStart = pos;
+
+    if (source[pos] === '{' || source[pos] === '[') {
+      // Destructured: find matching brace/bracket
+      const open = source[pos];
+      const close = open === '{' ? '}' : ']';
+      let depth = 1;
+      let end = pos + 1;
+      while (end < source.length && depth > 0) {
+        if (source[end] === open) depth++;
+        else if (source[end] === close) depth--;
+        end++;
+      }
+      const pattern = source.slice(pos, end);
+      const names = extractDestructuredNames(pattern);
+      varNames.push(...names);
+      pos = end;
+    } else {
+      // Simple identifier
+      const idMatch = source.slice(pos).match(/^([a-zA-Z_$][a-zA-Z0-9_$]*)/);
+      if (!idMatch) continue;
+      varNames.push(idMatch[1]);
+      pos += idMatch[0].length;
+    }
+
+    if (varNames.length === 0) continue;
+
+    // Skip trickle internals
+    if (varNames.every(n => n.startsWith('__trickle') || n === '_a' || n === '_b' || n === '_c')) continue;
+
+    // Now find the opening `{` of the loop body
+    // Skip everything until the `)` that closes the for(...)
+    let parenDepth = 1; // We're inside the for(
+    while (pos < source.length && parenDepth > 0) {
+      const ch = source[pos];
+      if (ch === '(') parenDepth++;
+      else if (ch === ')') parenDepth--;
+      else if (ch === '"' || ch === "'" || ch === '`') {
+        const q = ch; pos++;
+        while (pos < source.length && source[pos] !== q) {
+          if (source[pos] === '\\') pos++;
+          pos++;
+        }
+      }
+      pos++;
+    }
+
+    // Now find the `{` after the closing `)`
+    while (pos < source.length && /\s/.test(source[pos])) pos++;
+    if (pos >= source.length || source[pos] !== '{') continue;
+
+    const bodyBrace = pos;
+
+    // Calculate line number
+    let lineNo = 1;
+    for (let i = 0; i < match.index; i++) {
+      if (source[i] === '\n') lineNo++;
+    }
+
+    results.push({ bodyStart: bodyBrace + 1, varNames: varNames.filter(n => !n.startsWith('__trickle')), lineNo });
+  }
+
+  return results;
+}
+
+/**
+ * Find function parameter names and return insertions for tracing at the start
+ * of function bodies. Traces the runtime values of all parameters.
+ * Handles: function declarations, arrow functions, method definitions.
+ * Skips: React components (already tracked via __trickle_rc with props).
+ */
+function findFunctionParams(source: string, isReactFile: boolean): Array<{ bodyStart: number; paramNames: string[]; lineNo: number }> {
+  const results: Array<{ bodyStart: number; paramNames: string[]; lineNo: number }> = [];
+
+  // Match function declarations: function name(params) {
+  const funcDeclRegex = /\b(?:async\s+)?function\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\(/g;
+  let match;
+
+  while ((match = funcDeclRegex.exec(source)) !== null) {
+    const name = match[1];
+    if (name === 'require' || name === 'exports' || name === 'module') continue;
+    if (name.startsWith('__trickle')) continue;
+
+    // Skip React components (uppercase) in React files — already tracked
+    if (isReactFile && /^[A-Z]/.test(name)) continue;
+
+    const afterParen = match.index + match[0].length;
+    const bodyBrace = findFunctionBodyBrace(source, afterParen);
+    if (bodyBrace === -1) continue;
+
+    // Extract parameter names from between ( and )
+    const paramStr = source.slice(afterParen, bodyBrace);
+    const closeParen = paramStr.indexOf(')');
+    if (closeParen === -1) continue;
+    const rawParams = paramStr.slice(0, closeParen).trim();
+    const paramNames = extractParamNames(rawParams);
+    if (paramNames.length === 0) continue;
+
+    let lineNo = 1;
+    for (let i = 0; i < match.index; i++) {
+      if (source[i] === '\n') lineNo++;
+    }
+
+    results.push({ bodyStart: bodyBrace + 1, paramNames, lineNo });
+  }
+
+  // Match arrow functions: const name = (params) => {
+  const arrowFuncRegex = /(?:const|let|var)\s+([a-zA-Z_$][a-zA-Z0-9_$]*)(?:\s*:\s*[^=]+?)?\s*=\s*(?:async\s+)?\(([^)]*)\)\s*(?::\s*[^=]+?)?\s*=>\s*\{/g;
+
+  while ((match = arrowFuncRegex.exec(source)) !== null) {
+    const name = match[1];
+    if (name.startsWith('__trickle')) continue;
+    // Skip React components in React files
+    if (isReactFile && /^[A-Z]/.test(name)) continue;
+
+    const rawParams = match[2].trim();
+    const paramNames = extractParamNames(rawParams);
+    if (paramNames.length === 0) continue;
+
+    // Find the { position
+    const bracePos = match.index + match[0].length - 1;
+
+    let lineNo = 1;
+    for (let i = 0; i < match.index; i++) {
+      if (source[i] === '\n') lineNo++;
+    }
+
+    results.push({ bodyStart: bracePos + 1, paramNames, lineNo });
+  }
+
+  return results;
+}
+
+/**
+ * Extract parameter names from a function parameter string.
+ * Handles: simple names, destructured { a, b }, defaults (a = 1), rest (...args).
+ * Skips type annotations.
+ */
+function extractParamNames(rawParams: string): string[] {
+  if (!rawParams) return [];
+  const names: string[] = [];
+
+  // Split by commas at depth 0
+  const parts: string[] = [];
+  let depth = 0;
+  let current = '';
+  for (const ch of rawParams) {
+    if (ch === '{' || ch === '[' || ch === '(' || ch === '<') depth++;
+    else if (ch === '}' || ch === ']' || ch === ')' || ch === '>') depth--;
+    else if (ch === ',' && depth === 0) {
+      parts.push(current.trim());
+      current = '';
+      continue;
+    }
+    current += ch;
+  }
+  if (current.trim()) parts.push(current.trim());
+
+  for (const part of parts) {
+    const trimmed = part.trim();
+    if (!trimmed) continue;
+
+    // Destructured params — extract individual names
+    if (trimmed.startsWith('{')) {
+      const closeBrace = trimmed.indexOf('}');
+      if (closeBrace !== -1) {
+        const destructNames = extractDestructuredNames(trimmed.slice(0, closeBrace + 1));
+        names.push(...destructNames);
+      }
+      continue;
+    }
+    if (trimmed.startsWith('[')) {
+      const closeBracket = trimmed.indexOf(']');
+      if (closeBracket !== -1) {
+        const destructNames = extractDestructuredNames(trimmed.slice(0, closeBracket + 1));
+        names.push(...destructNames);
+      }
+      continue;
+    }
+
+    // Rest parameter: ...args
+    if (trimmed.startsWith('...')) {
+      const restName = trimmed.slice(3).split(/[\s:=]/)[0].trim();
+      if (/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(restName)) {
+        names.push(restName);
+      }
+      continue;
+    }
+
+    // Simple param: name or name: Type or name = default
+    const paramName = trimmed.split(/[\s:=]/)[0].trim();
+    if (/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(paramName)) {
+      names.push(paramName);
+    }
+  }
+
+  return names;
+}
+
 /**
  * Transform ESM source code to wrap function declarations and trace variables.
  *
@@ -878,7 +1203,16 @@ export function transformEsmSource(
   // Find destructured variable declarations for tracing
   const destructInsertions = traceVars ? findDestructuredDeclarations(source) : [];
 
-  if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0) return source;
+  // Find variable reassignments for tracing
+  const reassignInsertions = traceVars ? findReassignments(source) : [];
+
+  // Find for-loop variable declarations for tracing
+  const forLoopInsertions = traceVars ? findForLoopVars(source) : [];
+
+  // Find function parameter names for tracing
+  const funcParamInsertions = traceVars ? findFunctionParams(source, isReactFile) : [];
+
+  if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && funcParamInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0) return source;
 
   // Fix line numbers: Vite transforms (TypeScript stripping) may change line numbers.
   // Map transformed line numbers to original source line numbers.
@@ -897,10 +1231,56 @@ export function transformEsmSource(
         if (origLine !== -1) di.lineNo = origLine;
       }
     }
+    // Fix reassignment line numbers
+    for (const ri of reassignInsertions) {
+      const origLine = findOriginalLine(origLines, ri.varName, ri.lineNo);
+      if (origLine !== -1) ri.lineNo = origLine;
+    }
+    // Fix for-loop var line numbers
+    for (const fi of forLoopInsertions) {
+      if (fi.varNames.length > 0) {
+        // Search for 'for' keyword near the expected line
+        const pattern = /\bfor\s*\(/;
+        for (let delta = 0; delta <= 80; delta++) {
+          const fwd = fi.lineNo - 1 + delta;
+          if (fwd >= 0 && fwd < origLines.length && pattern.test(origLines[fwd])) {
+            fi.lineNo = fwd + 1;
+            break;
+          }
+          if (delta > 0 && delta <= 10) {
+            const bwd = fi.lineNo - 1 - delta;
+            if (bwd >= 0 && bwd < origLines.length && pattern.test(origLines[bwd])) {
+              fi.lineNo = bwd + 1;
+              break;
+            }
+          }
+        }
+      }
+    }
+    // Fix function param line numbers
+    for (const fp of funcParamInsertions) {
+      if (fp.paramNames.length > 0) {
+        const pattern = /\bfunction\s+\w+\s*\(|=>\s*\{/;
+        for (let delta = 0; delta <= 80; delta++) {
+          const fwd = fp.lineNo - 1 + delta;
+          if (fwd >= 0 && fwd < origLines.length && pattern.test(origLines[fwd])) {
+            fp.lineNo = fwd + 1;
+            break;
+          }
+          if (delta > 0 && delta <= 10) {
+            const bwd = fp.lineNo - 1 - delta;
+            if (bwd >= 0 && bwd < origLines.length && pattern.test(origLines[bwd])) {
+              fp.lineNo = bwd + 1;
+              break;
+            }
+          }
+        }
+      }
+    }
   }
 
   // Build prefix — ALL imports first (ESM requires imports before any statements)
-  const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
+  const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || funcParamInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
   const importLines: string[] = [
     `import { wrapFunction as __trickle_wrapFn, configure as __trickle_configure } from 'trickle-observe';`,
   ];
@@ -970,7 +1350,7 @@ export function transformEsmSource(
   }
 
   // Add variable tracing if needed — inlined to avoid import resolution issues in Vite SSR.
-  if (varInsertions.length > 0 || destructInsertions.length > 0) {
+  if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || funcParamInsertions.length > 0) {
     prefixLines.push(
       `if (!globalThis.__trickle_var_tracer) {`,
       `  const _cache = new Set();`,
@@ -1141,6 +1521,32 @@ export function transformEsmSource(
     });
   }
 
+  // Reassignment insertions: trace after the reassignment statement
+  for (const { lineEnd, varName, lineNo } of reassignInsertions) {
+    allInsertions.push({
+      position: lineEnd,
+      code: `\n;try{__trickle_tv(${varName},${JSON.stringify(varName)},${lineNo})}catch(__e){}\n`,
+    });
+  }
+
+  // For-loop variable insertions: insert trace at start of loop body
+  for (const { bodyStart, varNames, lineNo } of forLoopInsertions) {
+    const calls = varNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
+    allInsertions.push({
+      position: bodyStart,
+      code: `\ntry{${calls}}catch(__e){}\n`,
+    });
+  }
+
+  // Function parameter insertions: insert trace at start of function body
+  for (const { bodyStart, paramNames, lineNo } of funcParamInsertions) {
+    const calls = paramNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
+    allInsertions.push({
+      position: bodyStart,
+      code: `\ntry{${calls}}catch(__e){}\n`,
+    });
+  }
+
   for (const { position, name, lineNo, propsExpr } of bodyInsertions) {
     allInsertions.push({
       position,