@mrclrchtr/supi-tree-sitter 6.1.0 → 6.2.0

package/src/tool/outline-html-sql.ts

@@ -80,7 +80,7 @@ function sqlType(node: SyntaxNodeLike, source: string): OutlineItem | null {
     ? enumElements.children
         .filter((child) => child.type === "literal")
         .map((child) => ({
-          name: stripSqlQuotes(child.text),
+          name: sqlStringLiteralValue(child.text),
           kind: "enum-member",
           range: nodeToRange(child, source),
         }))
@@ -112,10 +112,12 @@ function sqlColumns(node: SyntaxNodeLike, source: string): OutlineItem[] {
 function sqlInlineConstraints(node: SyntaxNodeLike, source: string): OutlineItem[] {
   const marker = node.children.findIndex((child) => child.type === "keyword_constraint");
   if (marker < 0) return [];
-  const name = node.children.slice(marker + 1).find((child) => child.type === "literal");
-  return name
-    ? [{ name: stripSqlQuotes(name.text), kind: "constraint", range: nodeToRange(name, source) }]
-    : [];
+  const nameNode = node.children
+    .slice(marker + 1)
+    .find((child) => child.type === "literal" || child.type === "identifier");
+  const name = readSqlNameAfterKeyword(node.text, "CONSTRAINT");
+  if (!name || !nameNode) return [];
+  return [{ name, kind: "constraint", range: nodeToRange(nameNode, source) }];
 }
 
 function sqlSchemaChildren(node: SyntaxNodeLike, source: string): OutlineItem[] {
@@ -139,21 +141,29 @@ function sqlItem(
 }
 
 function sqlMember(node: SyntaxNodeLike, kind: string, source: string): OutlineItem | null {
+  const textName =
+    kind === "constraint"
+      ? readSqlNameAfterKeyword(node.text, "CONSTRAINT")
+      : readSqlIdentifier(node.text);
   const name = node.childForFieldName("name") ?? directChild(node, "identifier");
-  return name ? { name: stripSqlQuotes(name.text), kind, range: nodeToRange(node, source) } : null;
+  const value = textName ?? (name ? normalizeSqlIdentifierLike(name.text) : null);
+  return value ? { name: value, kind, range: nodeToRange(node, source) } : null;
 }
 
 function sqlDeclarationName(node: SyntaxNodeLike): string | null {
-  if (node.type === "create_index") {
-    const indexName = node.childForFieldName("column");
-    return indexName ? stripSqlQuotes(indexName.text) : null;
+  const keyword = SQL_DECLARATION_KEYWORDS[node.type];
+  if (keyword) {
+    const name = readSqlNameAfterKeyword(node.text, keyword);
+    if (name) return name;
   }
+
   const reference = directChild(node, "object_reference");
   if (reference) {
     const name = reference.childForFieldName("name") ?? lastDirectChild(reference, "identifier");
-    if (name) return name.text;
+    if (name) return normalizeSqlIdentifierLike(name.text);
   }
-  return directChild(node, "identifier")?.text ?? null;
+  const name = directChild(node, "identifier");
+  return name ? normalizeSqlIdentifierLike(name.text) : null;
 }
 
 function directChild(node: SyntaxNodeLike, type: string): SyntaxNodeLike | null {
@@ -168,12 +178,119 @@ function lastDirectChild(node: SyntaxNodeLike, type: string): SyntaxNodeLike | n
   return null;
 }
 
-function stripSqlQuotes(value: string): string {
+function normalizeSqlIdentifierLike(value: string): string {
+  if (value.startsWith('"') && value.endsWith('"')) {
+    return value.slice(1, -1).replaceAll('""', '"');
+  }
+  if (value.startsWith("'") && value.endsWith("'")) {
+    return sqlStringLiteralValue(value);
+  }
+  return value;
+}
+
+function sqlStringLiteralValue(value: string): string {
   return value.startsWith("'") && value.endsWith("'")
     ? value.slice(1, -1).replaceAll("''", "'")
     : value;
 }
 
+function readSqlNameAfterKeyword(text: string, keyword: string): string | null {
+  const marker = findSqlKeyword(text, keyword);
+  if (marker < 0) return null;
+  let position = skipSqlSpace(text, marker + keyword.length);
+  for (const optional of ["CONCURRENTLY", "IF", "NOT", "EXISTS"]) {
+    if (readSqlWord(text, position) === optional) {
+      position = skipSqlSpace(text, position + optional.length);
+    }
+  }
+  const name = readSqlQualifiedIdentifier(text, position);
+  return name ? normalizeSqlIdentifierLike(name) : null;
+}
+
+function readSqlIdentifier(text: string): string | null {
+  const name = readSqlQualifiedIdentifier(text, 0);
+  return name ? normalizeSqlIdentifierLike(name) : null;
+}
+
+function readSqlQualifiedIdentifier(text: string, start: number): string | null {
+  let position = skipSqlSpace(text, start);
+  let last: string | null = null;
+  while (position < text.length) {
+    const token = readSqlIdentifierToken(text, position);
+    if (!token) break;
+    last = token.value;
+    position = skipSqlSpace(text, token.end);
+    if (text[position] !== ".") break;
+    position = skipSqlSpace(text, position + 1);
+  }
+  return last;
+}
+
+function readSqlIdentifierToken(
+  text: string,
+  start: number,
+): { value: string; end: number } | null {
+  if (text[start] === '"' || text[start] === "'") {
+    const quote = text[start];
+    let position = start + 1;
+    while (position < text.length) {
+      if (text[position] !== quote) {
+        position += 1;
+        continue;
+      }
+      if (text[position + 1] === quote) {
+        position += 2;
+        continue;
+      }
+      position += 1;
+      return { value: text.slice(start, position), end: position };
+    }
+    return null;
+  }
+
+  let position = start;
+  while (position < text.length && !/[\s(;.,]/.test(text[position] ?? "")) position += 1;
+  return position > start ? { value: text.slice(start, position), end: position } : null;
+}
+
+// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: quoted SQL names need a small lexical scan before keyword recovery
+function findSqlKeyword(text: string, keyword: string): number {
+  const upper = text.toUpperCase();
+  let quote: '"' | "'" | null = null;
+  for (let position = 0; position < text.length; position += 1) {
+    const character = text[position];
+    if (quote !== null) {
+      if (character === quote && text[position + 1] === quote) {
+        position += 1;
+      } else if (character === quote) {
+        quote = null;
+      }
+      continue;
+    }
+    if (character === '"' || character === "'") {
+      quote = character;
+      continue;
+    }
+    if (!upper.startsWith(keyword, position)) continue;
+    const before = upper[position - 1] ?? " ";
+    const after = upper[position + keyword.length] ?? " ";
+    if (!/[A-Z0-9_]/.test(before) && !/[A-Z0-9_]/.test(after)) return position;
+  }
+  return -1;
+}
+
+function readSqlWord(text: string, start: number): string | null {
+  const end = text.slice(start).search(/\s/);
+  const wordEnd = end < 0 ? text.length : start + end;
+  return wordEnd > start ? text.slice(start, wordEnd).toUpperCase() : null;
+}
+
+function skipSqlSpace(text: string, start: number): number {
+  let position = start;
+  while (/\s/.test(text[position] ?? "")) position += 1;
+  return position;
+}
+
 function one(item: OutlineItem | null): OutlineItem[] {
   return item ? [item] : [];
 }
@@ -184,3 +301,18 @@ const HTML_ELEMENT_TYPES = new Set([
   "self_closing_tag",
   "style_element",
 ]);
+
+const SQL_DECLARATION_KEYWORDS: Record<string, string> = {
+  create_schema: "SCHEMA",
+  create_type: "TYPE",
+  create_table: "TABLE",
+  create_view: "VIEW",
+  create_materialized_view: "VIEW",
+  create_index: "INDEX",
+  create_sequence: "SEQUENCE",
+  create_function: "FUNCTION",
+  create_trigger: "TRIGGER",
+  create_database: "DATABASE",
+  create_role: "ROLE",
+  create_extension: "EXTENSION",
+};

package/src/tool/outline.ts

@@ -3,6 +3,7 @@
 import { nodeToRange } from "../coordinates.ts";
 import type { SyntaxNodeLike } from "../syntax-node.ts";
 import type { OutlineItem } from "../types.ts";
+import { extractBindingIdentifiers } from "./js-binding-pattern.ts";
 import { extractPolyglotOutlineItems } from "./outline-polyglot.ts";
 
 /** Node types that can be extracted directly as outline items. */
@@ -18,6 +19,7 @@ const OUTLINE_DECLARATION_NODE_TYPES = new Set([
   "method_definition",
   "public_field_definition",
   "variable_declarator",
+  "lexical_declaration",
   "ambient_declaration",
   "internal_module",
   "module",
@@ -39,20 +41,27 @@ function collectItems(node: SyntaxNodeLike, source: string): OutlineItem[] {
       continue;
     }
 
-    const item = extractItem(child, source);
-    if (item) items.push(item);
+    const extractedItems = extractItems(child, source);
+    if (extractedItems) items.push(...extractedItems);
     else items.push(...collectItems(child, source));
   }
 
   return items;
 }
 
+function extractItems(node: SyntaxNodeLike, source: string): OutlineItem[] | null {
+  if (node.type === "lexical_declaration") return extractLexicalDeclarationItems(node, source);
+  if (node.type === "ambient_declaration") return extractAmbientDeclarationItems(node, source);
+  if (node.type === "export_statement") return extractExportStatement(node, source);
+
+  const item = extractItem(node, source);
+  return item ? [item] : null;
+}
+
 function extractItem(node: SyntaxNodeLike, source: string): OutlineItem | null {
   switch (node.type) {
-    case "export_statement":
-      return extractExportStatement(node, source);
     case "lexical_declaration":
-      return extractLexicalDeclaration(node, source);
+      return extractLexicalDeclarationItems(node, source)[0] ?? null;
     case "function_declaration":
     case "generator_function_declaration":
     case "function_signature":
@@ -72,7 +81,7 @@ function extractItem(node: SyntaxNodeLike, source: string): OutlineItem | null {
     case "public_field_definition":
       return extractFieldDefinition(node, source);
     case "variable_declarator":
-      return extractVariableDeclarator(node, source);
+      return extractVariableDeclaratorItems(node, source)[0] ?? null;
     case "ambient_declaration":
       return extractAmbientDeclaration(node, source);
     case "internal_module":
@@ -83,38 +92,36 @@ function extractItem(node: SyntaxNodeLike, source: string): OutlineItem | null {
   }
 }
 
-/** Extract an outline item from an export wrapper without exposing non-extractable syntax nodes. */
-function extractExportStatement(node: SyntaxNodeLike, source: string): OutlineItem | null {
+/** Extract outline items from an export wrapper without exposing local syntax nodes. */
+function extractExportStatement(node: SyntaxNodeLike, source: string): OutlineItem[] {
   const decl = node.children.find((child) => OUTLINE_DECLARATION_NODE_TYPES.has(child.type));
   if (decl) {
+    if (decl.type === "lexical_declaration") return extractLexicalDeclarationItems(decl, source);
+    if (decl.type === "ambient_declaration") return extractAmbientDeclarationItems(decl, source);
     const item = extractItem(decl, source);
-    if (item) return item;
+    if (item) return [item];
   }
 
   if (hasDefaultKeyword(node)) {
-    return {
-      name: "default",
-      kind: "export",
-      range: nodeToRange(node, source),
-    };
+    return [{ name: "default", kind: "export", range: nodeToRange(node, source) }];
   }
 
   const exportClause = node.children.find((child) => child.type === "export_clause");
-  if (exportClause) {
-    return {
-      name: node.text.replace(/^export\s+/, "").substring(0, 60),
-      kind: "export",
-      range: nodeToRange(node, source),
-    };
-  }
-
-  return null;
+  return exportClause
+    ? [
+        {
+          name: node.text.replace(/^export\s+/, "").substring(0, 60),
+          kind: "export",
+          range: nodeToRange(node, source),
+        },
+      ]
+    : [];
 }
 
-function extractLexicalDeclaration(node: SyntaxNodeLike, source: string): OutlineItem | null {
-  const declarators = node.children.filter((child) => child.type === "variable_declarator");
-  if (declarators.length !== 1) return null;
-  return extractVariableDeclarator(declarators[0] as SyntaxNodeLike, source);
+function extractLexicalDeclarationItems(node: SyntaxNodeLike, source: string): OutlineItem[] {
+  return node.children
+    .filter((child) => child.type === "variable_declarator")
+    .flatMap((declarator) => extractVariableDeclaratorItems(declarator, source));
 }
 
 function extractNamedDeclaration(
@@ -154,14 +161,11 @@ function extractEnumDeclaration(node: SyntaxNodeLike, source: string): OutlineIt
   return { ...item, children: collectEnumMembers(node, source) };
 }
 
-function extractVariableDeclarator(node: SyntaxNodeLike, source: string): OutlineItem | null {
-  const nameNode = findNameNode(node);
-  if (!nameNode) return null;
-  return {
-    name: nameNode.text,
-    kind: detectKind(node),
-    range: nodeToRange(node, source),
-  };
+function extractVariableDeclaratorItems(node: SyntaxNodeLike, source: string): OutlineItem[] {
+  const names = extractBindingIdentifiers(node.childForFieldName("name"));
+  const kind = detectKind(node);
+  const range = nodeToRange(node, source);
+  return names.map((name) => ({ name, kind, range }));
 }
 
 function extractFieldDefinition(node: SyntaxNodeLike, source: string): OutlineItem | null {
@@ -174,9 +178,18 @@ function extractFieldDefinition(node: SyntaxNodeLike, source: string): OutlineIt
   };
 }
 
-function extractAmbientDeclaration(node: SyntaxNodeLike, source: string): OutlineItem | null {
+function extractAmbientDeclarationItems(node: SyntaxNodeLike, source: string): OutlineItem[] {
   const declaration = node.children.find((child) => OUTLINE_DECLARATION_NODE_TYPES.has(child.type));
-  return declaration ? extractItem(declaration, source) : null;
+  if (!declaration) return [];
+  if (declaration.type === "lexical_declaration") {
+    return extractLexicalDeclarationItems(declaration, source);
+  }
+  const item = extractItem(declaration, source);
+  return item ? [item] : [];
+}
+
+function extractAmbientDeclaration(node: SyntaxNodeLike, source: string): OutlineItem | null {
+  return extractAmbientDeclarationItems(node, source)[0] ?? null;
 }
 
 function extractModuleDeclaration(node: SyntaxNodeLike, source: string): OutlineItem | null {

package/src/tool/scope.ts

@@ -0,0 +1,138 @@
+import type { SyntaxNodeLike } from "../syntax-node.ts";
+import { extractBindingIdentifiers } from "./js-binding-pattern.ts";
+
+/** Return the declared name for one executable syntax scope. */
+export function extractScopeName(node: SyntaxNodeLike): string {
+  const declaredName = findDeclaredName(node);
+  if (declaredName) return declaredName;
+
+  if (node.type === "arrow_function" || node.type === "function_expression") {
+    const binding = findNearestJavaScriptBinding(node);
+    if (binding) return binding;
+  }
+
+  if (node.type === "function_definition") {
+    const binding = findNearestRBinding(node);
+    if (binding) return binding;
+  }
+
+  return "anonymous";
+}
+
+function findDeclaredName(node: SyntaxNodeLike): string | null {
+  const name = node.childForFieldName("name");
+  if (name && isNameNode(name)) return name.text;
+
+  const declarator = node.childForFieldName("declarator");
+  return declarator ? findDeclaratorName(declarator) : null;
+}
+
+function findDeclaratorName(node: SyntaxNodeLike): string | null {
+  const namedChild = node.childForFieldName("name");
+  if (namedChild && isNameNode(namedChild)) return namedChild.text;
+  if (isNameNode(node)) return node.text;
+  const nested = node.childForFieldName("declarator");
+  if (nested) {
+    const name = findDeclaratorName(nested);
+    if (name) return name;
+  }
+  for (const child of node.children) {
+    const name = findDeclaratorName(child);
+    if (name) return name;
+  }
+  return null;
+}
+
+function findNearestJavaScriptBinding(node: SyntaxNodeLike): string | null {
+  for (let current = node.parent; current; current = current.parent) {
+    const binding = bindingForJavaScriptAncestor(current, node);
+    if (binding) return binding;
+  }
+  return null;
+}
+
+// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: binding lookup covers the grammar's distinct assignment and object-pattern forms
+function bindingForJavaScriptAncestor(node: SyntaxNodeLike, target: SyntaxNodeLike): string | null {
+  if (node.type === "variable_declarator") {
+    return isDirectValue(node, target)
+      ? (extractBindingIdentifiers(node.childForFieldName("name"))[0] ?? null)
+      : null;
+  }
+  if (node.type === "pair_pattern") {
+    return isDirectValue(node, target)
+      ? (extractBindingIdentifiers(node.childForFieldName("value"))[0] ??
+          node.childForFieldName("key")?.text ??
+          null)
+      : null;
+  }
+  if (node.type === "pair") {
+    return isDirectValue(node, target) ? (node.childForFieldName("key")?.text ?? null) : null;
+  }
+  if (node.type === "assignment_expression") {
+    const right = node.childForFieldName("right");
+    if (!sameNode(right, target)) return null;
+    const left = node.childForFieldName("left");
+    return left
+      ? (extractBindingIdentifiers(left)[0] ??
+          (left.type === "member_expression" || left.type === "subscript_expression"
+            ? left.text
+            : null))
+      : null;
+  }
+  if (node.type === "public_field_definition") {
+    return isDirectValue(node, target)
+      ? ((node.childForFieldName("name") ?? node.childForFieldName("key"))?.text ?? null)
+      : null;
+  }
+  return null;
+}
+
+function isDirectValue(node: SyntaxNodeLike, target: SyntaxNodeLike): boolean {
+  return sameNode(node.childForFieldName("value"), target);
+}
+
+function findNearestRBinding(node: SyntaxNodeLike): string | null {
+  for (let current = node.parent; current; current = current.parent) {
+    const binding = bindingForRAncestor(current, node);
+    if (binding) return binding;
+  }
+  return null;
+}
+
+function bindingForRAncestor(node: SyntaxNodeLike, target: SyntaxNodeLike): string | null {
+  if (node.type !== "binary_operator") return null;
+  const right = node.childForFieldName("rhs") ?? node.childForFieldName("right");
+  const left = node.childForFieldName("lhs") ?? node.childForFieldName("left");
+  return right && left && sameNode(right, target) && left.type === "identifier" ? left.text : null;
+}
+
+function sameNode(left: SyntaxNodeLike | null, right: SyntaxNodeLike): boolean {
+  if (!left) return false;
+  return (
+    left.type === right.type &&
+    left.startPosition.row === right.startPosition.row &&
+    left.startPosition.column === right.startPosition.column &&
+    left.endPosition.row === right.endPosition.row &&
+    left.endPosition.column === right.endPosition.column
+  );
+}
+
+const NAME_NODE_TYPES = new Set([
+  "identifier",
+  "type_identifier",
+  "field_identifier",
+  "property_identifier",
+  "private_property_identifier",
+  "simple_identifier",
+  "word",
+  "constant",
+  "scope_resolution",
+  "qualified_identifier",
+  "template_function",
+  "operator_name",
+  "destructor_name",
+]);
+
+function isNameNode(node: SyntaxNodeLike): boolean {
+  return NAME_NODE_TYPES.has(node.type);
+}

package/src/types.ts

@@ -128,13 +128,6 @@ export interface TreeSitterSession extends TreeSitterService {
   dispose(): Promise<void>;
 }
 
-/** Session-scoped shared structural service published by the extension runtime. */
-export type SessionTreeSitterService = TreeSitterService;
-
-export type SessionTreeSitterServiceState =
-  | { kind: "ready"; service: SessionTreeSitterService }
-  | { kind: "unavailable"; reason: string };
-
 /** Supported grammar identifiers. */
 export type GrammarId =
   | "javascript"

package/src/worker/parsed-file-store.ts

@@ -196,10 +196,8 @@ export class ParsedFileStore {
   withQuery<T>(
     grammarId: GrammarId,
     queryText: string,
-    compileOrExecution: (() => Query) | QueryExecution<T>,
-    legacyExecute?: (query: Pick<Query, "matches">, cache: StructuralCacheObservation) => T,
+    execution: QueryExecution<T>,
   ): { readonly data: T; readonly cache: StructuralCacheObservation } {
-    const execution = normalizeQueryExecution(compileOrExecution, legacyExecute);
     this.#assertActive();
     throwIfStructuralRequestInterrupted(execution.control);
     const key = queryKey(grammarId, queryText);
@@ -365,17 +363,6 @@ export class ParsedFileStore {
   }
 }
 
-function normalizeQueryExecution<T>(
-  compileOrExecution: (() => Query) | QueryExecution<T>,
-  legacyExecute:
-    | ((query: Pick<Query, "matches">, cache: StructuralCacheObservation) => T)
-    | undefined,
-): QueryExecution<T> {
-  if (typeof compileOrExecution !== "function") return compileOrExecution;
-  if (!legacyExecute) throw new Error("Query execution callback is required");
-  return { compile: compileOrExecution, execute: legacyExecute };
-}
-
 function fileReadMessage(error: unknown): string {
   return error instanceof Error ? error.message : "File could not be read";
 }

package/src/worker/runtime.ts

@@ -372,16 +372,6 @@ export class TreeSitterRuntime {
     }
   }
 
-  /** Get the grammar ID for a file, or undefined if unsupported. */
-  getGrammarId(filePath: string): GrammarId | undefined {
-    return detectGrammar(filePath);
-  }
-
-  /** Resolve a file path from cwd. */
-  resolvePath(filePath: string): string {
-    return resolveToolPath(this.cwd, filePath);
-  }
-
   /** Dispose all held tree, query, and parser resources. */
   dispose(): void {
     if (this.disposed) return;

package/src/worker/service.ts

@@ -1,14 +1,12 @@
 import { detectGrammar } from "../language.ts";
 import { supportsGrammarOperation } from "../operation-support.ts";
 import type { StructuralWorkerOperation } from "../session/structural-worker-protocol.ts";
-import {
-  extractCallSites,
-  extractExports,
-  extractImports,
-  extractOutline,
-  lookupCalleesAt,
-  lookupNodeAt,
-} from "../tool/structure.ts";
+import { extractCallSites } from "../tool/call-sites.ts";
+import { lookupCalleesAt } from "../tool/callees.ts";
+import { extractExports } from "../tool/exports.ts";
+import { extractImports } from "../tool/imports.ts";
+import { lookupNodeAt } from "../tool/node-at.ts";
+import { collectOutline as extractOutline } from "../tool/outline.ts";
 import type { TreeSitterResult } from "../types.ts";
 import {
   type StructuralRequestControl,

package/src/worker/worker-main.ts

@@ -4,11 +4,11 @@ import type { StructuralTimingEvent } from "../session/structural-timing.ts";
 import { assertStructuralProtocolMessageSize } from "../session/structural-worker-message-size.ts";
 import {
   encodeStructuralResult,
-  type ParentToStructuralWorkerMessage,
+  getStructuralWorkerMessageGeneration,
   STRUCTURAL_WORKER_PROTOCOL_VERSION,
   type StructuralWorkerChunkAckMessage,
   type StructuralWorkerRequestMessage,
-  validateStructuralWorkerRequest,
+  validateParentToStructuralWorkerMessage,
 } from "../session/structural-worker-protocol.ts";
 import type { TreeSitterResult } from "../types.ts";
 import type { StructuralRequestControl } from "./request-control.ts";
@@ -56,21 +56,37 @@ export async function runStructuralWorker(
   };
 
   // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: protocol dispatch keeps request, cancel, and acknowledgement validation together
-  parentPort.on("message", (message: ParentToStructuralWorkerMessage) => {
-    if (message.version !== STRUCTURAL_WORKER_PROTOCOL_VERSION) return;
+  parentPort.on("message", (value: unknown) => {
+    const validation = validateParentToStructuralWorkerMessage(value);
+    if (validation.kind === "invalid") {
+      const generation = getStructuralWorkerMessageGeneration(value);
+      if (generation !== undefined && generation !== workerData.generation) return;
+      throw new Error(`Structural Worker protocol violation: ${validation.reason}`);
+    }
+
+    const message = validation.message;
     if (message.generation !== workerData.generation) return;
     if (message.kind === "cancel") {
-      if (active?.message.requestId === message.requestId) active.abortController.abort();
+      if (!active) return;
+      assertActiveRequestOwner(active, message.requestId);
+      active.abortController.abort();
       return;
     }
     if (message.kind === "chunk-ack") {
-      if (active?.message.requestId === message.requestId) sendNextChunk(message);
+      if (!active) return;
+      assertActiveRequestOwner(active, message.requestId);
+      if (!active.awaitingAck || message.sequence !== active.nextSequence - 1) {
+        throw new Error(
+          "Structural Worker protocol violation: Invalid chunk acknowledgement state",
+        );
+      }
+      sendNextChunk(message);
       return;
     }
-    if (message.kind !== "request" || active) return;
-    const validation = validateStructuralWorkerRequest(message);
-    if (validation.kind === "invalid") return;
-    void execute(validation.message);
+    if (active) {
+      throw new Error("Structural Worker protocol violation: Structural Worker request is busy");
+    }
+    void execute(message);
   });
 
   try {
@@ -187,6 +203,14 @@ export async function runStructuralWorker(
     active = null;
   }
 
+  function assertActiveRequestOwner(request: ActiveWorkerRequest, requestId: string): void {
+    if (request.message.requestId !== requestId) {
+      throw new Error(
+        "Structural Worker protocol violation: Message does not own the active request",
+      );
+    }
+  }
+
   function updateInterruptionOutcome(request: ActiveWorkerRequest): void {
     if (request.message.deadline !== undefined && Date.now() >= request.message.deadline) {
       request.outcome = "timeout";