@tracecode/harness 0.6.2 → 0.6.5

package/workers/java/java-worker.js

@@ -16,6 +16,10 @@ const DEFAULT_MAX_STORED_EVENTS = 50_000;
 const IDLE_TIMEOUT_MS = 90_000;
 const SCRIPT_METHOD_NAME = '__tracecodeScript';
 
+if (typeof self.importScripts === 'function') {
+  self.importScripts('java-source-augmentations.cjs');
+}
+
 let workerReadyPromise = null;
 let idleTimer = null;
 let queue = Promise.resolve();
@@ -30,6 +34,72 @@ function postMessageResponse(message) {
   self.postMessage(message);
 }
 
+function formatWorkerErrorMessage(error) {
+  if (error instanceof Error && typeof error.message === 'string' && error.message.length > 0) {
+    return error.message;
+  }
+  if (typeof error === 'string' && error.length > 0) {
+    return error;
+  }
+  if (error && typeof error === 'object') {
+    const directKeys = ['message', 'detail', 'reason', 'cause', 'stack', 'name', 'className'];
+    for (const key of directKeys) {
+      try {
+        const value = error[key];
+        if (typeof value === 'string' && value.length > 0) {
+          return value;
+        }
+        if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
+          return String(value);
+        }
+      } catch {}
+    }
+    try {
+      const propertyNames = Object.getOwnPropertyNames(error);
+      for (const key of propertyNames) {
+        const value = error[key];
+        if (typeof value === 'string' && value.length > 0) {
+          return `${key}: ${value}`;
+        }
+        if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
+          return `${key}: ${String(value)}`;
+        }
+      }
+    } catch {}
+    try {
+      const tag = Object.prototype.toString.call(error);
+      if (tag && tag !== '[object Object]') {
+        return tag;
+      }
+    } catch {}
+    try {
+      if (typeof error.toString === 'function' && error.toString !== Object.prototype.toString) {
+        const value = error.toString();
+        if (typeof value === 'string' && value.length > 0 && value !== '[object Object]') {
+          return value;
+        }
+      }
+    } catch {}
+  }
+  try {
+    const stringified = String(error);
+    if (stringified && stringified !== '[object Object]') {
+      return stringified;
+    }
+  } catch {}
+  try {
+    const json = JSON.stringify(error);
+    if (json && json !== '{}') {
+      return json;
+    }
+  } catch {}
+  return 'Unknown Java worker error';
+}
+
+function makeWorkerStageError(stage, error) {
+  return new Error(`Java worker ${stage} failed: ${formatWorkerErrorMessage(error)}`);
+}
+
 function resetIdleTimer() {
   idleGeneration += 1;
   const generation = idleGeneration;
@@ -348,6 +418,414 @@ function indentBlock(source, spaces = 2) {
     .join('\n');
 }
 
+function isJavaIdentifierPart(ch) {
+  return /[A-Za-z0-9_$]/.test(ch);
+}
+
+function scanJavaCode(source, start, end, onNormalChar) {
+  let state = 'normal';
+  for (let index = start; index < end; index += 1) {
+    const ch = source[index];
+    const next = index + 1 < end ? source[index + 1] : '';
+
+    if (state === 'line-comment') {
+      if (ch === '\n') state = 'normal';
+      continue;
+    }
+    if (state === 'block-comment') {
+      if (ch === '*' && next === '/') {
+        state = 'normal';
+        index += 1;
+      }
+      continue;
+    }
+    if (state === 'string') {
+      if (ch === '\\') {
+        index += 1;
+        continue;
+      }
+      if (ch === '"') state = 'normal';
+      continue;
+    }
+    if (state === 'char') {
+      if (ch === '\\') {
+        index += 1;
+        continue;
+      }
+      if (ch === "'") state = 'normal';
+      continue;
+    }
+    if (ch === '/' && next === '/') {
+      state = 'line-comment';
+      index += 1;
+      continue;
+    }
+    if (ch === '/' && next === '*') {
+      state = 'block-comment';
+      index += 1;
+      continue;
+    }
+    if (ch === '"') {
+      state = 'string';
+      continue;
+    }
+    if (ch === "'") {
+      state = 'char';
+      continue;
+    }
+
+    const result = onNormalChar(index, ch);
+    if (result === false) return index;
+    if (typeof result === 'number') index = result;
+  }
+  return end;
+}
+
+function findMatchingParen(source, openIndex) {
+  let depth = 0;
+  let closeIndex = -1;
+  scanJavaCode(source, openIndex, source.length, (index, ch) => {
+    if (ch === '(') depth += 1;
+    if (ch === ')') {
+      depth -= 1;
+      if (depth === 0) {
+        closeIndex = index;
+        return false;
+      }
+    }
+    return undefined;
+  });
+  return closeIndex;
+}
+
+function findSingleStatementEnd(source, bodyStart) {
+  let parenDepth = 0;
+  let bracketDepth = 0;
+  let braceDepth = 0;
+  let statementEnd = -1;
+  scanJavaCode(source, bodyStart, source.length, (index, ch) => {
+    if (ch === '(') parenDepth += 1;
+    if (ch === ')') parenDepth = Math.max(0, parenDepth - 1);
+    if (ch === '[') bracketDepth += 1;
+    if (ch === ']') bracketDepth = Math.max(0, bracketDepth - 1);
+    if (ch === '{') braceDepth += 1;
+    if (ch === '}') {
+      if (braceDepth === 0) return false;
+      braceDepth -= 1;
+    }
+    if (ch === ';' && parenDepth === 0 && bracketDepth === 0 && braceDepth === 0) {
+      statementEnd = index;
+      return false;
+    }
+    return undefined;
+  });
+  return statementEnd;
+}
+
+function startsWithJavaKeyword(source, index, keyword) {
+  if (!source.startsWith(keyword, index)) return false;
+  const after = source[index + keyword.length] ?? '';
+  return !after || !isJavaIdentifierPart(after);
+}
+
+function wrapSingleStatementLoopBodies(source) {
+  const inserts = [];
+  scanJavaCode(source, 0, source.length, (index) => {
+    const keyword = source.startsWith('for', index)
+      ? 'for'
+      : source.startsWith('while', index)
+        ? 'while'
+        : null;
+    if (!keyword) return undefined;
+
+    const before = index > 0 ? source[index - 1] : '';
+    const after = source[index + keyword.length] ?? '';
+    if ((before && isJavaIdentifierPart(before)) || (after && isJavaIdentifierPart(after))) {
+      return undefined;
+    }
+
+    let cursor = index + keyword.length;
+    while (/\s/.test(source[cursor] ?? '')) cursor += 1;
+    if (source[cursor] !== '(') return undefined;
+
+    const closeParen = findMatchingParen(source, cursor);
+    if (closeParen < 0) return undefined;
+
+    let bodyStart = closeParen + 1;
+    while (/\s/.test(source[bodyStart] ?? '')) bodyStart += 1;
+    const bodyChar = source[bodyStart];
+    if (!bodyChar || bodyChar === '{' || bodyChar === ';') return closeParen;
+    if (
+      startsWithJavaKeyword(source, bodyStart, 'if') ||
+      startsWithJavaKeyword(source, bodyStart, 'switch') ||
+      startsWithJavaKeyword(source, bodyStart, 'synchronized') ||
+      startsWithJavaKeyword(source, bodyStart, 'try')
+    ) {
+      return closeParen;
+    }
+
+    const bodyEnd = findSingleStatementEnd(source, bodyStart);
+    if (bodyEnd < 0) return closeParen;
+
+    inserts.push({ index: bodyStart, text: '{ ' });
+    inserts.push({ index: bodyEnd + 1, text: ' }' });
+    return bodyEnd;
+  });
+
+  if (inserts.length === 0) return source;
+
+  const insertsByIndex = new Map();
+  for (const insert of inserts) {
+    insertsByIndex.set(insert.index, `${insertsByIndex.get(insert.index) ?? ''}${insert.text}`);
+  }
+
+  let output = '';
+  for (let index = 0; index <= source.length; index += 1) {
+    output += insertsByIndex.get(index) ?? '';
+    if (index < source.length) output += source[index];
+  }
+  return output;
+}
+
+function splitTopLevelJavaList(value) {
+  const parts = [];
+  let start = 0;
+  let parenDepth = 0;
+  let bracketDepth = 0;
+  let braceDepth = 0;
+  let angleDepth = 0;
+  let quote = null;
+
+  for (let index = 0; index < value.length; index += 1) {
+    const ch = value[index];
+    const previous = index > 0 ? value[index - 1] : '';
+    if (quote) {
+      if (ch === quote && previous !== '\\') quote = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      continue;
+    }
+    if (ch === '(') parenDepth += 1;
+    if (ch === ')') parenDepth = Math.max(0, parenDepth - 1);
+    if (ch === '[') bracketDepth += 1;
+    if (ch === ']') bracketDepth = Math.max(0, bracketDepth - 1);
+    if (ch === '{') braceDepth += 1;
+    if (ch === '}') braceDepth = Math.max(0, braceDepth - 1);
+    if (ch === '<') angleDepth += 1;
+    if (ch === '>') angleDepth = Math.max(0, angleDepth - 1);
+    if (
+      ch === ',' &&
+      parenDepth === 0 &&
+      bracketDepth === 0 &&
+      braceDepth === 0 &&
+      angleDepth === 0
+    ) {
+      parts.push(value.slice(start, index).trim());
+      start = index + 1;
+    }
+  }
+
+  const tail = value.slice(start).trim();
+  if (tail.length > 0) {
+    parts.push(tail);
+  }
+  return parts;
+}
+
+function parseJavaParameters(parametersSource) {
+  return splitTopLevelJavaList(parametersSource)
+    .map((parameter) => parameter.replace(/@\w+(?:\([^)]*\))?/g, '').replace(/\bfinal\b/g, '').trim())
+    .map((parameter) => {
+      const match = parameter.match(/([A-Za-z_][A-Za-z0-9_]*)\s*(?:\.\.\.)?$/);
+      const name = match?.[1] ?? '';
+      return {
+        name,
+        isArray: parameter.includes('[]') || parameter.includes('...'),
+      };
+    })
+    .filter((parameter) => parameter.name.length > 0);
+}
+
+function parseJavaParameterNames(parametersSource) {
+  return parseJavaParameters(parametersSource).map((parameter) => parameter.name);
+}
+
+function collectJavaArrayDeclarations(line) {
+  const names = [];
+  const declarationPattern =
+    /\b(?:boolean|byte|char|short|int|long|float|double|String|[A-Za-z_][A-Za-z0-9_<>.?]*)\s*(?:\[\s*\])+\s+([A-Za-z_][A-Za-z0-9_]*)\b/g;
+  for (const match of line.matchAll(declarationPattern)) {
+    if (match[1]) names.push(match[1]);
+  }
+  return names;
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function augmentTraceCallArgumentSnapshots(source) {
+  const lines = source.split('\n');
+  const methodStack = [];
+  const methodStartPattern =
+    /^(\s*)(?:(?:public|private|protected|static|final|synchronized)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>\[\], ?]*\s+)+([A-Za-z_][A-Za-z0-9_]*)\s*\(([^)]*)\)\s*\{\s*$/;
+
+  return lines.map((line) => {
+    const methodMatch = line.match(methodStartPattern);
+    if (methodMatch) {
+      methodStack.push({
+        name: methodMatch[2],
+        params: parseJavaParameterNames(methodMatch[3] ?? ''),
+        depth: 1,
+        patchedCall: false,
+      });
+      return line;
+    }
+
+    const currentMethod = methodStack[methodStack.length - 1];
+    let nextLine = line;
+    if (currentMethod && !currentMethod.patchedCall && currentMethod.params.length > 0) {
+      const callPattern = new RegExp(
+        `^(\\s*)TraceHooks\\.emit\\((\"line=\\d+ call ${escapeRegExp(currentMethod.name)}\").*\\);\\s*$`
+      );
+      const callMatch = line.match(callPattern);
+      if (callMatch) {
+        const serializedArgs = currentMethod.params
+          .map((paramName) => ` + " ${paramName}=" + TraceHooks.serializeResult(${paramName})`)
+          .join('');
+        nextLine = `${callMatch[1]}TraceHooks.emit(${callMatch[2]}${serializedArgs});`;
+        currentMethod.patchedCall = true;
+      }
+    }
+
+    if (currentMethod) {
+      currentMethod.depth += braceDelta(nextLine);
+      while (methodStack.length > 0 && methodStack[methodStack.length - 1].depth <= 0) {
+        methodStack.pop();
+      }
+    }
+
+    return nextLine;
+  }).join('\n');
+}
+
+function augmentArrayLengthReads(source) {
+  const lines = source.split('\n');
+  const methodStack = [];
+  const methodStartPattern =
+    /^(\s*)(?:(?:public|private|protected|static|final|synchronized)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>\[\], ?]*\s+)+([A-Za-z_][A-Za-z0-9_]*)\s*\(([^)]*)\)\s*\{\s*$/;
+
+  return lines.map((line) => {
+    const methodMatch = line.match(methodStartPattern);
+    if (methodMatch) {
+      const parameters = parseJavaParameters(methodMatch[3] ?? '');
+      methodStack.push({
+        depth: 1,
+        currentTraceLine: null,
+        hasTraceEmit: false,
+        arrayNames: new Set(parameters.filter((parameter) => parameter.isArray).map((parameter) => parameter.name)),
+      });
+      return line;
+    }
+
+    const currentMethod = methodStack[methodStack.length - 1];
+    let nextLine = line;
+
+    if (currentMethod) {
+      for (const name of collectJavaArrayDeclarations(line)) {
+        currentMethod.arrayNames.add(name);
+      }
+
+      const traceLineMatch = line.match(/TraceHooks\.emit\("line=(\d+)(?:\s|")/);
+      if (traceLineMatch) {
+        currentMethod.currentTraceLine = Number.parseInt(traceLineMatch[1], 10);
+        currentMethod.hasTraceEmit = true;
+      }
+
+      if (
+        currentMethod.hasTraceEmit &&
+        currentMethod.currentTraceLine !== null &&
+        !line.includes('TraceHooks.readArrayLengthAtLine')
+      ) {
+        for (const arrayName of currentMethod.arrayNames) {
+          const lengthPattern = new RegExp(`\\b${escapeRegExp(arrayName)}\\.length\\b`, 'g');
+          nextLine = nextLine.replace(
+            lengthPattern,
+            `TraceHooks.readArrayLengthAtLine(${currentMethod.currentTraceLine}, "${arrayName}", ${arrayName})`
+          );
+        }
+      }
+
+      currentMethod.depth += braceDelta(nextLine);
+      while (methodStack.length > 0 && methodStack[methodStack.length - 1].depth <= 0) {
+        methodStack.pop();
+      }
+    }
+
+    return nextLine;
+  }).join('\n');
+}
+
+function augmentTraceReturnValueSnapshots(source) {
+  const lines = source.split('\n');
+  const output = [];
+  const methodStack = [];
+  let returnValueIndex = 0;
+  const methodStartPattern =
+    /^(\s*)(?:(?:public|private|protected|static|final|synchronized)\s+)*([A-Za-z_][A-Za-z0-9_<>\[\], ?]*(?:\[\])?)\s+([A-Za-z_][A-Za-z0-9_]*)\s*\(([^)]*)\)\s*\{\s*$/;
+
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index];
+    const methodMatch = line.match(methodStartPattern);
+    if (methodMatch) {
+      methodStack.push({
+        name: methodMatch[3],
+        returnType: (methodMatch[2] ?? '').trim(),
+        depth: 1,
+      });
+      output.push(line);
+      continue;
+    }
+
+    const currentMethod = methodStack[methodStack.length - 1];
+    if (currentMethod && currentMethod.returnType !== 'void') {
+      const returnEmitMatch = line.match(
+        /^(\s*)TraceHooks\.emit\("line=(\d+) return ([A-Za-z_][A-Za-z0-9_]*)"\);\s*$/
+      );
+      const nextLine = lines[index + 1] ?? '';
+      const returnMatch = nextLine.match(/^(\s*)return\s+(.+);\s*$/);
+      if (returnEmitMatch && returnMatch && returnEmitMatch[3] === currentMethod.name) {
+        const tempName = `__tracecodeReturnValue${returnValueIndex++}`;
+        const indent = returnEmitMatch[1] ?? returnMatch[1] ?? '';
+        const returnExpression = returnMatch[2].trim();
+        output.push(`${indent}${currentMethod.returnType} ${tempName} = ${returnExpression};`);
+        output.push(
+          `${indent}TraceHooks.emit("line=${returnEmitMatch[2]} return ${currentMethod.name} value=" + TraceHooks.serializeResult(${tempName}));`
+        );
+        output.push(`${returnMatch[1] ?? indent}return ${tempName};`);
+        currentMethod.depth += braceDelta(line) + braceDelta(nextLine);
+        index += 1;
+        while (methodStack.length > 0 && methodStack[methodStack.length - 1].depth <= 0) {
+          methodStack.pop();
+        }
+        continue;
+      }
+    }
+
+    output.push(line);
+    if (currentMethod) {
+      currentMethod.depth += braceDelta(line);
+      while (methodStack.length > 0 && methodStack[methodStack.length - 1].depth <= 0) {
+        methodStack.pop();
+      }
+    }
+  }
+
+  return output.join('\n');
+}
+
 function splitImportPrelude(source) {
   const lines = source.split('\n');
   const importLines = [];
@@ -367,13 +845,99 @@ function splitImportPrelude(source) {
   return { importLines, bodyLines };
 }
 
+function splitImportPreludeEntries(source) {
+  const lines = source.split('\n');
+  const importEntries = [];
+  const bodyEntries = [];
+  let inImportPrelude = true;
+
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index];
+    const entry = { line, sourceLine: index + 1 };
+    const trimmed = line.trim();
+    if (inImportPrelude && (trimmed === '' || trimmed.startsWith('import '))) {
+      importEntries.push(entry);
+      continue;
+    }
+    inImportPrelude = false;
+    bodyEntries.push(entry);
+  }
+
+  return { importEntries, bodyEntries };
+}
+
+function trimBlankEntries(entries) {
+  let start = 0;
+  let end = entries.length;
+  while (start < end && entries[start].line.trim().length === 0) start += 1;
+  while (end > start && entries[end - 1].line.trim().length === 0) end -= 1;
+  return entries.slice(start, end);
+}
+
+function isTopLevelMethodStart(line) {
+  const trimmed = line.trim();
+  return /^(?:public\s+|private\s+|protected\s+)?(?:static\s+)?(?:[\w<>\[\], ?]+\s+)+[A-Za-z_][A-Za-z0-9_]*\s*\([^;]*\)\s*\{/.test(trimmed);
+}
+
+function braceDelta(line) {
+  let delta = 0;
+  let quote = null;
+  for (let index = 0; index < line.length; index += 1) {
+    const ch = line[index];
+    const prev = index > 0 ? line[index - 1] : '';
+    if (quote) {
+      if (ch === quote && prev !== '\\') quote = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      continue;
+    }
+    if (ch === '{') delta += 1;
+    if (ch === '}') delta -= 1;
+  }
+  return delta;
+}
+
+function splitScriptMembersAndStatements(lines) {
+  const memberLines = [];
+  const statementLines = [];
+  let statementDepth = 0;
+  for (let index = 0; index < lines.length; index += 1) {
+    const entry = lines[index];
+    const line = typeof entry === 'string' ? entry : entry.line;
+    if (statementDepth !== 0 || !isTopLevelMethodStart(line)) {
+      statementLines.push(entry);
+      statementDepth += braceDelta(line);
+      if (statementDepth < 0) statementDepth = 0;
+      continue;
+    }
+
+    let depth = 0;
+    do {
+      const current = lines[index] ?? '';
+      const currentLine = typeof current === 'string' ? current : current.line;
+      memberLines.push(current);
+      depth += braceDelta(currentLine);
+      index += 1;
+    } while (index < lines.length && depth > 0);
+    index -= 1;
+  }
+  return {
+    memberLines,
+    statementLines,
+    memberEntries: memberLines,
+    statementEntries: statementLines,
+  };
+}
+
 function normalizeFunctionSource(source) {
   if (/\bpackage\s+[A-Za-z_][A-Za-z0-9_.]*\s*;/.test(source)) {
     throw new Error('Java function style should not declare a package; the harness manages package isolation.');
   }
 
   if (/\bclass\s+Solution\b/.test(source)) {
-    return source;
+    return wrapSingleStatementLoopBodies(source);
   }
 
   if (/\b(class|interface|enum|record)\b/.test(source)) {
@@ -390,23 +954,62 @@ function normalizeFunctionSource(source) {
     throw new Error('Java function style requires a method fragment.');
   }
 
-  return `${importBlock ? `${importBlock}\n\n` : ''}class Solution {\n${indentBlock(body, 2)}\n}`;
+  return wrapSingleStatementLoopBodies(`${importBlock ? `${importBlock}\n\n` : ''}class Solution {\n${indentBlock(body, 2)}\n}`);
 }
 
 function normalizeScriptSource(source) {
+  return normalizeScriptSourceWithLineMap(source).code;
+}
+
+function normalizeScriptSourceWithLineMap(source) {
   if (/\bpackage\s+[A-Za-z_][A-Za-z0-9_.]*\s*;/.test(source)) {
     throw new Error('Java script style should not declare a package; the harness manages package isolation.');
   }
 
-  const { importLines, bodyLines } = splitImportPrelude(source);
-  const body = bodyLines.join('\n');
-  if (!body.trim()) {
+  const { importEntries, bodyEntries } = splitImportPreludeEntries(source);
+  const { memberEntries, statementEntries } = splitScriptMembersAndStatements(bodyEntries);
+  const trimmedMemberEntries = trimBlankEntries(memberEntries);
+  const trimmedStatementEntries = trimBlankEntries(statementEntries);
+  if (trimmedStatementEntries.length === 0) {
     throw new Error('Java script style requires executable statements and a result assignment.');
   }
 
-  const prelude = importLines.length > 0 ? `${importLines.join('\n')}\n` : '';
-  const wrapperPrefix = `class Solution { Object ${SCRIPT_METHOD_NAME}() { Object result = null; `;
-  return `${prelude}${wrapperPrefix}${body}\nreturn result;\n} }`;
+  const outputLines = [];
+  const lineMap = {};
+  const firstStatementLine = trimmedStatementEntries[0]?.sourceLine;
+  const lastStatementLine = trimmedStatementEntries[trimmedStatementEntries.length - 1]?.sourceLine;
+  const declaresResult = trimmedStatementEntries.some((entry) =>
+    /^(?:final\s+)?[\w<>\[\], ?]+\s+result\s*(?:=|;)/.test(entry.line.trim())
+  );
+  const pushLine = (line, sourceLine) => {
+    outputLines.push(line);
+    if (Number.isFinite(sourceLine) && sourceLine > 0) {
+      lineMap[outputLines.length] = sourceLine;
+    }
+  };
+
+  for (const entry of importEntries) {
+    pushLine(entry.line, entry.sourceLine);
+  }
+  pushLine('class Solution {');
+  for (const entry of trimmedMemberEntries) {
+    pushLine(entry.line.trim().length === 0 ? '' : `  ${entry.line}`, entry.sourceLine);
+  }
+  pushLine(`  Object ${SCRIPT_METHOD_NAME}() {`, firstStatementLine);
+  if (!declaresResult) {
+    pushLine('    Object result = null;', firstStatementLine);
+  }
+  for (const entry of trimmedStatementEntries) {
+    pushLine(entry.line.trim().length === 0 ? '' : `    ${entry.line}`, entry.sourceLine);
+  }
+  pushLine('    return result;', lastStatementLine);
+  pushLine('  }');
+  pushLine('}');
+
+  return {
+    code: wrapSingleStatementLoopBodies(outputLines.join('\n')),
+    lineMap,
+  };
 }
 
 function normalizeJavaRequest(payload) {
@@ -415,12 +1018,14 @@ function normalizeJavaRequest(payload) {
       throw new Error('Java script-mode execution only supports executionStyle="function".');
     }
 
+    const normalizedScript = normalizeScriptSourceWithLineMap(payload.code);
     return {
       ...payload,
-      code: normalizeScriptSource(payload.code),
+      code: normalizedScript.code,
       executionStyle: 'solution-method',
       functionName: SCRIPT_METHOD_NAME,
       sourceText: payload.code,
+      sourceLineMap: normalizedScript.lineMap,
       userCodeLineCount: payload.code.split(/\r?\n/).length,
       scriptMode: true,
     };
@@ -595,12 +1200,21 @@ async function rewriteSource(payload, requestId) {
   );
 }
 
-function normalizeScriptTraceEvents(events, scriptMode, userCodeLineCount) {
+function normalizeScriptTraceEvents(events, scriptMode, userCodeLineCount, sourceLineMap) {
   if (!scriptMode || !Array.isArray(events)) return events;
   return events.map((event) => {
-    const normalizedEvent = String(event)
+    let normalizedEvent = String(event)
       .replace(new RegExp(`\\bcall\\s+${SCRIPT_METHOD_NAME}\\b`, 'g'), 'call <module>')
       .replace(new RegExp(`\\breturn\\s+${SCRIPT_METHOD_NAME}\\b`, 'g'), 'return <module>');
+
+    const lineMatch = normalizedEvent.match(/^line=(\d+)(.*)$/);
+    if (lineMatch && sourceLineMap && Object.prototype.hasOwnProperty.call(sourceLineMap, lineMatch[1])) {
+      const mappedLine = Number(sourceLineMap[lineMatch[1]]);
+      if (Number.isFinite(mappedLine) && mappedLine > 0) {
+        normalizedEvent = `line=${mappedLine}${lineMatch[2] ?? ''}`;
+      }
+    }
+
     const match = normalizedEvent.match(/^line=(\d+)\s+return\s+<module>$/);
     if (!match || !Number.isFinite(userCodeLineCount) || userCodeLineCount <= 0) {
       return normalizedEvent;
@@ -611,6 +1225,56 @@ function normalizeScriptTraceEvents(events, scriptMode, userCodeLineCount) {
   });
 }
 
+function parseTraceLineNumber(event) {
+  const match = String(event).match(/^line=(\d+)(?:\s|$)/);
+  if (!match) return null;
+  const line = Number.parseInt(match[1], 10);
+  return Number.isFinite(line) && line > 0 ? line : null;
+}
+
+function isBareTraceLineEvent(event) {
+  return /^line=\d+$/.test(String(event));
+}
+
+function buildLoopBodyLineMap(sourceText) {
+  if (typeof sourceText !== 'string' || sourceText.length === 0) return null;
+  const lines = sourceText.split(/\r?\n/);
+  const loopBodyLineToHeaderLine = new Map();
+
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index];
+    if (!/\b(?:for|while)\s*\(/.test(line) || !line.includes('{')) continue;
+
+    for (let bodyIndex = index + 1; bodyIndex < lines.length; bodyIndex += 1) {
+      const trimmed = lines[bodyIndex].trim();
+      if (trimmed.length === 0) continue;
+      if (trimmed.startsWith('}')) break;
+      loopBodyLineToHeaderLine.set(bodyIndex + 1, index + 1);
+      break;
+    }
+  }
+
+  return loopBodyLineToHeaderLine.size > 0 ? loopBodyLineToHeaderLine : null;
+}
+
+function expandLoopHeaderTraceEvents(events, sourceText) {
+  if (!Array.isArray(events) || events.length === 0) return events;
+  const loopBodyLineToHeaderLine = buildLoopBodyLineMap(sourceText);
+  if (!loopBodyLineToHeaderLine) return events;
+
+  const expanded = [];
+  for (const event of events) {
+    const line = parseTraceLineNumber(event);
+    const headerLine = line === null ? undefined : loopBodyLineToHeaderLine.get(line);
+    const previousLine = expanded.length > 0 ? parseTraceLineNumber(expanded[expanded.length - 1]) : null;
+    if (headerLine !== undefined && isBareTraceLineEvent(event) && previousLine !== headerLine) {
+      expanded.push(`line=${headerLine}`);
+    }
+    expanded.push(event);
+  }
+  return expanded;
+}
+
 async function runJavaRequest(payload, requestId) {
   assertSupportedExecutionStyle(payload.executionStyle);
   if (typeof payload.code !== 'string') {
@@ -623,8 +1287,23 @@ async function runJavaRequest(payload, requestId) {
 
   const totalStart = performance.now();
   const rewriteStart = performance.now();
-  const normalizedPayload = normalizeJavaRequest(payload);
-  const rewrittenSource = await rewriteSource(normalizedPayload, requestId);
+  let normalizedPayload;
+  try {
+    normalizedPayload = normalizeJavaRequest(payload);
+  } catch (error) {
+    throw makeWorkerStageError('request normalization', error);
+  }
+
+  let rewrittenSource;
+  try {
+    rewrittenSource = await rewriteSource(normalizedPayload, requestId);
+    rewrittenSource = augmentTraceCallArgumentSnapshots(rewrittenSource);
+    rewrittenSource = augmentArrayLengthReads(rewrittenSource);
+    rewrittenSource = self.TraceCodeJavaSourceAugmentations.augmentJavaCollectionOperations(rewrittenSource);
+    rewrittenSource = augmentTraceReturnValueSnapshots(rewrittenSource);
+  } catch (error) {
+    throw makeWorkerStageError('source rewrite', error);
+  }
   const rewriteEnd = performance.now();
 
   const exportsClassName = buildExportsClassName(requestId);
@@ -632,21 +1311,41 @@ async function runJavaRequest(payload, requestId) {
   const sourcePath = `/str/${exportsClassName}.java`;
   const classesDir = `/files/java-worker/${requestId}/classes`;
 
-  await self.cheerpOSAddStringFile(sourcePath, rewrittenSource);
+  try {
+    await self.cheerpOSAddStringFile(sourcePath, rewrittenSource);
+  } catch (error) {
+    throw makeWorkerStageError('source file write', error);
+  }
+
+  let compileLibraryClass;
+  try {
+    compileLibraryClass = await getCompileLibraryClass();
+  } catch (error) {
+    throw makeWorkerStageError('compiler bridge load', error);
+  }
 
-  const compileLibraryClass = await getCompileLibraryClass();
   const libraryCallStart = performance.now();
-  const reportText = await compileLibraryClass.compileAndTrace(
-    sourcePath,
-    classesDir,
-    `${packageName}.${exportsClassName}`,
-    HELPER_JAR_PATH,
-    DEFAULT_COMPILER_DEBUG_PROFILE,
-    String(resolveMaxStoredEvents(payload.options))
-  );
+  let reportText;
+  try {
+    reportText = await compileLibraryClass.compileAndTrace(
+      sourcePath,
+      classesDir,
+      `${packageName}.${exportsClassName}`,
+      HELPER_JAR_PATH,
+      DEFAULT_COMPILER_DEBUG_PROFILE,
+      String(resolveMaxStoredEvents(payload.options))
+    );
+  } catch (error) {
+    throw makeWorkerStageError('compile and trace', error);
+  }
   const libraryCallEnd = performance.now();
 
-  const report = JSON.parse(reportText);
+  let report;
+  try {
+    report = JSON.parse(reportText);
+  } catch (error) {
+    throw makeWorkerStageError('trace report parse', error);
+  }
   const totalEnd = performance.now();
   const consoleOutput = [report.compilerStdout, report.compilerStderr].filter(
     (entry) => typeof entry === 'string' && entry.trim().length > 0
@@ -655,10 +1354,14 @@ async function runJavaRequest(payload, requestId) {
   if (report.success !== true) {
     return {
       success: false,
-      events: normalizeScriptTraceEvents(
-        Array.isArray(report.events) ? report.events : [],
-        normalizedPayload.scriptMode,
-        normalizedPayload.userCodeLineCount
+      events: expandLoopHeaderTraceEvents(
+        normalizeScriptTraceEvents(
+          Array.isArray(report.events) ? report.events : [],
+          normalizedPayload.scriptMode,
+          normalizedPayload.userCodeLineCount,
+          normalizedPayload.sourceLineMap
+        ),
+        normalizedPayload.sourceText
       ),
       ...(normalizedPayload.sourceText ? { sourceText: normalizedPayload.sourceText } : {}),
       executionTimeMs: totalEnd - totalStart,
@@ -686,10 +1389,14 @@ async function runJavaRequest(payload, requestId) {
   return {
     success: true,
     output: report.output ? JSON.parse(report.output) : undefined,
-    events: normalizeScriptTraceEvents(
-      Array.isArray(report.events) ? report.events : [],
-      normalizedPayload.scriptMode,
-      normalizedPayload.userCodeLineCount
+    events: expandLoopHeaderTraceEvents(
+      normalizeScriptTraceEvents(
+        Array.isArray(report.events) ? report.events : [],
+        normalizedPayload.scriptMode,
+        normalizedPayload.userCodeLineCount,
+        normalizedPayload.sourceLineMap
+      ),
+      normalizedPayload.sourceText
     ),
     ...(normalizedPayload.sourceText ? { sourceText: normalizedPayload.sourceText } : {}),
     executionTimeMs: totalEnd - totalStart,
@@ -747,7 +1454,7 @@ self.onmessage = (event) => {
         postMessageResponse({
           id: message.id,
           type: 'error',
-          payload: { error: error instanceof Error ? error.message : String(error) },
+          payload: { error: formatWorkerErrorMessage(error) },
         });
       }
     });
@@ -772,7 +1479,7 @@ self.onmessage = (event) => {
         postMessageResponse({
           id: message.id,
           type: 'error',
-          payload: { error: error instanceof Error ? error.message : String(error) },
+          payload: { error: formatWorkerErrorMessage(error) },
         });
       }
     });