@mrclrchtr/supi-code-intelligence 11.4.0 → 12.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/CHANGELOG.md +22 -0
  2. package/README.md +13 -7
  3. package/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
  4. package/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts +1 -0
  5. package/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts +51 -23
  6. package/node_modules/@mrclrchtr/supi-core/package.json +1 -1
  7. package/node_modules/@mrclrchtr/supi-lsp/README.md +21 -16
  8. package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
  9. package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts +1 -0
  10. package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts +51 -23
  11. package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/package.json +1 -1
  12. package/node_modules/@mrclrchtr/supi-lsp/package.json +3 -3
  13. package/node_modules/@mrclrchtr/supi-lsp/src/api.ts +2 -2
  14. package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-capabilities.ts +13 -3
  15. package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostics.ts +25 -9
  16. package/node_modules/@mrclrchtr/supi-lsp/src/client/client-document-sync.ts +7 -5
  17. package/node_modules/@mrclrchtr/supi-lsp/src/client/client-edit-capture.ts +258 -0
  18. package/node_modules/@mrclrchtr/supi-lsp/src/client/client.ts +64 -11
  19. package/node_modules/@mrclrchtr/supi-lsp/src/config/capabilities.ts +8 -0
  20. package/node_modules/@mrclrchtr/supi-lsp/src/config/operation-support.ts +48 -79
  21. package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager.ts +3 -1
  22. package/node_modules/@mrclrchtr/supi-lsp/src/provider/lsp-refactor-provider.ts +21 -35
  23. package/node_modules/@mrclrchtr/supi-lsp/src/provider/refactor-command-capture.ts +139 -0
  24. package/node_modules/@mrclrchtr/supi-lsp/src/provider/refactor-planning.ts +202 -47
  25. package/node_modules/@mrclrchtr/supi-lsp/src/session/route-boundary.ts +26 -0
  26. package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-registry.ts +57 -12
  27. package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-rename.ts +3 -0
  28. package/node_modules/@mrclrchtr/supi-lsp/src/session/workspace-lsp-runtime.ts +22 -1
  29. package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
  30. package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts +1 -0
  31. package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts +51 -23
  32. package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/package.json +1 -1
  33. package/node_modules/@mrclrchtr/supi-tree-sitter/package.json +3 -3
  34. package/node_modules/@mrclrchtr/supi-tree-sitter/src/coordinates.ts +16 -2
  35. package/node_modules/@mrclrchtr/supi-tree-sitter/src/session/structural-worker-client.ts +3 -2
  36. package/node_modules/@mrclrchtr/supi-tree-sitter/src/syntax-errors.ts +2 -0
  37. package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/call-range.ts +94 -0
  38. package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/call-sites.ts +26 -6
  39. package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/callees.ts +6 -3
  40. package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/exports.ts +13 -4
  41. package/node_modules/@mrclrchtr/supi-tree-sitter/src/worker/runtime.ts +1 -9
  42. package/package.json +5 -5
  43. package/src/analysis/health/server-status.ts +41 -12
  44. package/src/analysis/target/anchored-structural.ts +4 -1
  45. package/src/analysis/target/symbol.ts +1 -1
  46. package/src/session/find-types.ts +8 -4
  47. package/src/session/find-workflow.ts +11 -16
  48. package/src/session/input/health-refactor.ts +48 -34
  49. package/src/session/input/workflows.ts +45 -46
  50. package/src/session/inspect/file-point.ts +2 -2
  51. package/src/session/inspect-types.ts +1 -1
  52. package/src/session/inspect-workflow.ts +3 -3
  53. package/src/session/refactor-file-actions.ts +122 -0
  54. package/src/session/refactor-plan-pipeline.ts +152 -0
  55. package/src/session/refactor-plans.ts +18 -15
  56. package/src/session/refactor-types.ts +24 -12
  57. package/src/session/refactor-workflow.ts +68 -243
  58. package/src/tool/code_find/execute.ts +6 -7
  59. package/src/tool/code_find/spec.ts +9 -16
  60. package/src/tool/code_find/tui.ts +12 -6
  61. package/src/tool/code_graph/spec.ts +6 -0
  62. package/src/tool/code_health/spec.ts +6 -0
  63. package/src/tool/code_health/structured-schema.ts +4 -4
  64. package/src/tool/code_health/structured.ts +15 -17
  65. package/src/tool/code_inspect/execute.ts +1 -1
  66. package/src/tool/code_inspect/markdown.ts +33 -6
  67. package/src/tool/code_inspect/result.ts +1 -1
  68. package/src/tool/code_inspect/spec.ts +14 -6
  69. package/src/tool/code_inspect/structured.ts +2 -2
  70. package/src/tool/code_inspect/tui.ts +2 -2
  71. package/src/tool/code_orientation/spec.ts +8 -0
  72. package/src/tool/code_refactor_apply/result.ts +2 -1
  73. package/src/tool/code_refactor_apply/spec.ts +7 -0
  74. package/src/tool/code_refactor_plan/execute.ts +0 -2
  75. package/src/tool/code_refactor_plan/result.ts +23 -13
  76. package/src/tool/code_refactor_plan/spec.ts +8 -2
  77. package/src/tool/code_refactor_plan/structured.ts +59 -12
  78. package/src/tool/code_refactor_plan/tui.ts +14 -17
  79. package/src/tool/code_resolve/markdown.ts +1 -1
  80. package/src/tool/code_resolve/spec.ts +6 -0
  81. package/src/tool/namespace.ts +14 -0
  82. package/src/tool/refactor-markdown.ts +55 -15
  83. package/src/tool/register.ts +3 -0
  84. package/src/tool/result/refactor-preview.ts +118 -0
  85. package/src/tool/result/refactor-unavailable.ts +16 -0
  86. package/src/tool/result/refactor.ts +8 -2
  87. package/src/tool/schemas.ts +63 -20
  88. package/src/tool/specs.ts +3 -0
  89. package/src/ui/status-overlay.ts +1 -1
@@ -18,6 +18,8 @@ import {
18
18
  import { resolveToolPath as resolveSessionPath } from "@mrclrchtr/supi-core/path";
19
19
  import { createSessionStateRegistry } from "@mrclrchtr/supi-core/session";
20
20
  import { CodeActionTriggerKind } from "vscode-languageserver-types";
21
+ import type { CommandEditCaptureResult } from "../client/client-edit-capture.ts";
22
+ import { advertisedCodeActionKinds } from "../config/operation-support.ts";
21
23
  import type {
22
24
  CodeAction,
23
25
  Diagnostic,
@@ -39,7 +41,12 @@ import type {
39
41
  WorkspaceSentinelSyncResult,
40
42
  } from "../diagnostics/workspace-sentinels.ts";
41
43
  import type { LspManager } from "../manager/manager.ts";
44
+ import {
45
+ COMMAND_ONLY_ACTION_REASON,
46
+ captureEligibleActions,
47
+ } from "../provider/refactor-command-capture.ts";
42
48
  import { raceReadinessValue } from "./readiness.ts";
49
+ import { outsideRouteRootReason } from "./route-boundary.ts";
43
50
  import type {
44
51
  DiagnosticEvidenceSummary,
45
52
  ProcessCrashRecoveryReport,
@@ -49,6 +56,7 @@ import type {
49
56
  import { runRoutedRename } from "./runtime-rename.ts";
50
57
  import type {
51
58
  BulkTrackFilesResult,
59
+ RoutedCodeActionResponse,
52
60
  RoutedMutationResponse,
53
61
  SemanticReadinessResult,
54
62
  WorkspaceCodeActionRequestOptions,
@@ -56,6 +64,9 @@ import type {
56
64
  WorkspaceLspRuntimeState,
57
65
  } from "./workspace-lsp-runtime.ts";
58
66
 
67
+ /** Upper bound for a server command run to capture its pushed edit. */
68
+ const COMMAND_CAPTURE_TIMEOUT_MS = 10_000;
69
+
59
70
  export type {
60
71
  ProcessCrashDiagnosticDemand,
61
72
  WorkspaceLspDiagnosticSurface,
@@ -84,6 +95,7 @@ export {
84
95
  export type {
85
96
  BulkTrackFileOutcome,
86
97
  BulkTrackFilesResult,
98
+ RoutedCodeActionResponse,
87
99
  RoutedMutationDocumentSnapshot,
88
100
  RoutedMutationResponse,
89
101
  SemanticReadinessResult,
@@ -288,12 +300,39 @@ class DefaultWorkspaceLspRuntime implements WorkspaceLspRuntime {
288
300
  return this.manager.getOpenDocumentVersion(this.resolveFilePath(filePath));
289
301
  }
290
302
 
303
+ async captureCodeActionEdit(
304
+ filePath: string,
305
+ action: CodeAction,
306
+ control?: CodeRequestControl,
307
+ ): Promise<RoutedMutationResponse<CommandEditCaptureResult | null> | null> {
308
+ const resolvedPath = this.resolveFilePath(filePath);
309
+ const client = await this.manager.ensureFileOpen(resolvedPath, {
310
+ recoverProcessCrash: true,
311
+ protectInputs: true,
312
+ control,
313
+ });
314
+ if (!client) return null;
315
+ const authorizedMutationRoots = [client.root];
316
+ const outside = outsideRouteRootReason(resolvedPath, client.root);
317
+ if (outside) return { value: null, authorizedMutationRoots, reason: outside };
318
+ const listed = client.serverCapabilities?.executeCommandProvider?.commands;
319
+ const [eligible] = captureEligibleActions([action], Array.isArray(listed) ? listed : undefined);
320
+ if (!eligible) {
321
+ return { value: null, authorizedMutationRoots, reason: COMMAND_ONLY_ACTION_REASON };
322
+ }
323
+ const value = await client.captureCommandEdits(eligible.command, {
324
+ timeoutMs: COMMAND_CAPTURE_TIMEOUT_MS,
325
+ ...(control ? { control } : {}),
326
+ });
327
+ return { value, authorizedMutationRoots };
328
+ }
329
+
291
330
  async codeActions(
292
331
  filePath: string,
293
332
  positionOrRange: Position | Range,
294
333
  control?: CodeRequestControl,
295
334
  options?: WorkspaceCodeActionRequestOptions,
296
- ): Promise<RoutedMutationResponse<CodeAction[] | null> | null> {
335
+ ): Promise<RoutedCodeActionResponse | null> {
297
336
  const resolvedPath = this.resolveFilePath(filePath);
298
337
  const client = await this.manager.ensureFileOpen(resolvedPath, {
299
338
  recoverProcessCrash: true,
@@ -301,6 +340,10 @@ class DefaultWorkspaceLspRuntime implements WorkspaceLspRuntime {
301
340
  control,
302
341
  });
303
342
  if (!client) return null;
343
+ const outside = outsideRouteRootReason(resolvedPath, client.root);
344
+ if (outside) {
345
+ return { value: null, authorizedMutationRoots: [client.root], reason: outside };
346
+ }
304
347
 
305
348
  const range = isRange(positionOrRange)
306
349
  ? positionOrRange
@@ -315,21 +358,23 @@ class DefaultWorkspaceLspRuntime implements WorkspaceLspRuntime {
315
358
  triggerKind: options?.triggerKind ?? CodeActionTriggerKind.Invoked,
316
359
  ...(options?.only ? { only: [...options.only] } : {}),
317
360
  };
361
+ const advertisedKinds = advertisedCodeActionKinds(client.serverCapabilities ?? null);
362
+ const advertisedCommands = client.serverCapabilities?.executeCommandProvider?.commands;
363
+ const routed = {
364
+ authorizedMutationRoots: [client.root],
365
+ ...(advertisedKinds ? { advertisedKinds } : {}),
366
+ ...(Array.isArray(advertisedCommands) ? { advertisedCommands } : {}),
367
+ };
318
368
  if (typeof client.codeActionsDetailed === "function") {
319
369
  const result = await client.codeActionsDetailed(resolvedPath, range, context, control);
320
- return {
321
- value: result.kind === "completed" ? result.data : null,
322
- authorizedMutationRoots: [client.root],
323
- ...(result.kind === "unavailable"
324
- ? { reason: result.reason }
325
- : result.data === null
326
- ? { reason: "LSP server returned no code actions." }
327
- : {}),
328
- };
370
+ // A completed `null` result means the server has no actions here (LSP spec).
371
+ return result.kind === "completed"
372
+ ? { ...routed, value: result.data ?? [] }
373
+ : { ...routed, value: null, reason: result.reason };
329
374
  }
330
375
  return {
331
- value: await client.codeActions(resolvedPath, range, context, control),
332
- authorizedMutationRoots: [client.root],
376
+ ...routed,
377
+ value: (await client.codeActions(resolvedPath, range, context, control)) ?? [],
333
378
  };
334
379
  }
335
380
 
@@ -5,6 +5,7 @@ import type { SemanticInputDocumentSnapshot } from "../client/client-semantic-in
5
5
  import type { Position, WorkspaceEdit } from "../config/types.ts";
6
6
  import type { LspManager } from "../manager/manager.ts";
7
7
  import { discoverSemanticEditFiles } from "../provider/semantic-edit-discovery.ts";
8
+ import { outsideRouteRootReason } from "./route-boundary.ts";
8
9
  import type {
9
10
  RoutedMutationDocumentSnapshot,
10
11
  RoutedMutationResponse,
@@ -26,6 +27,8 @@ export async function runRoutedRename(options: {
26
27
  });
27
28
  if (!client) return null;
28
29
  const authorizedMutationRoots = [client.root];
30
+ const outside = outsideRouteRootReason(file, client.root);
31
+ if (outside) return { value: null, authorizedMutationRoots, reason: outside };
29
32
 
30
33
  if (typeof client.renameDetailedWithSnapshots === "function") {
31
34
  return renameWithSnapshots({
@@ -1,4 +1,5 @@
1
1
  import type { CodeQueryResult, CodeRequestControl } from "@mrclrchtr/supi-code-runtime/api";
2
+ import type { CommandEditCaptureResult } from "../client/client-edit-capture.ts";
2
3
  import type {
3
4
  CodeAction,
4
5
  CodeActionContext,
@@ -80,6 +81,14 @@ export interface RoutedMutationResponse<T> {
80
81
  readonly reason?: string;
81
82
  }
82
83
 
84
+ /** One code-action response with the routed server's negotiated kinds. */
85
+ export interface RoutedCodeActionResponse extends RoutedMutationResponse<CodeAction[] | null> {
86
+ /** Negotiated `codeActionProvider.codeActionKinds`; undefined when the server did not narrow them. */
87
+ readonly advertisedKinds?: readonly string[];
88
+ /** Negotiated `executeCommandProvider.commands`; undefined when the server lists none. */
89
+ readonly advertisedCommands?: readonly string[];
90
+ }
91
+
83
92
  /** Extra protocol context for one explicit code-action request. */
84
93
  export interface WorkspaceCodeActionRequestOptions {
85
94
  /** Operation-specific CodeActionKind filters. */
@@ -164,7 +173,19 @@ export interface WorkspaceLspRuntime extends WorkspaceLspDiagnosticSurface {
164
173
  positionOrRange: Position | Range,
165
174
  control?: CodeRequestControl,
166
175
  options?: WorkspaceCodeActionRequestOptions,
167
- ): Promise<RoutedMutationResponse<CodeAction[] | null> | null>;
176
+ ): Promise<RoutedCodeActionResponse | null>;
177
+ /**
178
+ * Run the command of one command-only code action on the client routed to
179
+ * `filePath` and capture the single edit the server pushes. No pushed edit is
180
+ * applied. The runtime enforces eligibility itself: a `refactor*`,
181
+ * `source.organizeImports*`, or `source.fixAll*` kind, and a command the
182
+ * server lists when it lists any; other actions are unavailable unrun.
183
+ */
184
+ captureCodeActionEdit(
185
+ filePath: string,
186
+ action: CodeAction,
187
+ control?: CodeRequestControl,
188
+ ): Promise<RoutedMutationResponse<CommandEditCaptureResult | null> | null>;
168
189
  getOpenDocumentVersion(filePath: string): number | null;
169
190
  /**
170
191
  * Wait for file readiness; an explicit refresh may make one shared route
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mrclrchtr/supi-code-runtime",
3
- "version": "11.4.0",
3
+ "version": "12.0.0",
4
4
  "description": "Shared workspace context and capability contracts for code intelligence",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -60,6 +60,7 @@ export type {
60
60
  ImportData,
61
61
  NodeAtData,
62
62
  OutlineData,
63
+ RefactorActionIdentity,
63
64
  RefactorOperation,
64
65
  RefactorRequest,
65
66
  RefactorResult,
@@ -193,31 +193,53 @@ export interface WorkspaceEdit {
193
193
  }
194
194
 
195
195
  /**
196
- * Supported refactor operation names for the current semantic planning path.
197
- */
198
- export type RefactorOperation =
199
- | "rename_symbol"
200
- | "extract_function"
201
- | "extract_variable"
202
- | "rename_file"
203
- | "move_file"
204
- | "update_imports"
205
- | "delete_dead_code";
206
-
207
- /**
208
- * Operation-aware refactor planning request.
196
+ * Operation-aware refactor planning request. Each operation carries only the
197
+ * scope it needs:
209
198
  *
210
- * Consumers provide a target file/position plus operation-specific options.
211
- * File/resource operations remain requestable so providers can reject them
212
- * explicitly and honestly until shared workspace-edit resource ops exist.
199
+ * - `rename_symbol`: one symbol position and the new name.
200
+ * - `code_action`: one file range and a CodeActionKind prefix under `refactor`.
201
+ * - `source_action`: one whole file and a CodeActionKind prefix under `source`.
202
+ *
203
+ * `kind` matches the requested kind and its dotted sub-kinds. `title`, when
204
+ * present, selects one action by its exact title.
213
205
  */
214
- export interface RefactorRequest {
215
- operation: RefactorOperation;
216
- file: string;
217
- position: CodePosition;
218
- range?: SourceRange;
219
- newName?: string;
220
- destination?: string;
206
+ export type RefactorRequest =
207
+ | {
208
+ operation: "rename_symbol";
209
+ file: string;
210
+ position: CodePosition;
211
+ newName: string;
212
+ }
213
+ | {
214
+ operation: "code_action";
215
+ file: string;
216
+ range: SourceRange;
217
+ kind: string;
218
+ title?: string;
219
+ }
220
+ | {
221
+ operation: "source_action";
222
+ file: string;
223
+ kind: string;
224
+ title?: string;
225
+ };
226
+
227
+ /** Supported refactor operation names. */
228
+ export type RefactorOperation = RefactorRequest["operation"];
229
+
230
+ /** The code action selected for a precise code- or source-action plan. */
231
+ export interface RefactorActionIdentity {
232
+ /** Server-reported CodeActionKind. */
233
+ kind: string;
234
+ /** Server-reported action title. */
235
+ title: string;
236
+ /**
237
+ * How the edits were obtained: `edit` from the action itself (after
238
+ * `codeAction/resolve` when needed), or `captured-command` from the single
239
+ * `workspace/applyEdit` the server pushed while running the action's command.
240
+ * Captured edits were refused, never applied.
241
+ */
242
+ provenance?: "edit" | "captured-command";
221
243
  }
222
244
 
223
245
  /**
@@ -228,6 +250,10 @@ export interface DisambiguationCandidate {
228
250
  file?: string;
229
251
  line?: number;
230
252
  character?: number;
253
+ /** Server-reported CodeActionKind, for code-action candidates. */
254
+ kind?: string;
255
+ /** Exact action title to pass back as `title`, for code-action candidates. */
256
+ title?: string;
231
257
  }
232
258
 
233
259
  /**
@@ -241,6 +267,8 @@ export type RefactorResult =
241
267
  | {
242
268
  kind: "precise";
243
269
  edits: WorkspaceEdit;
270
+ /** The selected code action, for code- and source-action plans. */
271
+ action?: RefactorActionIdentity;
244
272
  /** Provider roots authorized by the semantic route. Consumers canonicalize before storage. */
245
273
  authorizedMutationRoots: string[];
246
274
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mrclrchtr/supi-core",
3
- "version": "11.4.0",
3
+ "version": "12.0.0",
4
4
  "description": "Shared settings, configuration, reporting, and session infrastructure",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mrclrchtr/supi-tree-sitter",
3
- "version": "11.4.0",
3
+ "version": "12.0.0",
4
4
  "description": "Structural AST analysis for SuPi code intelligence",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -36,8 +36,8 @@
36
36
  "dependencies": {
37
37
  "jiti": "^2.7.0",
38
38
  "web-tree-sitter": "^0.27.0",
39
- "@mrclrchtr/supi-code-runtime": "11.4.0",
40
- "@mrclrchtr/supi-core": "11.4.0"
39
+ "@mrclrchtr/supi-code-runtime": "12.0.0",
40
+ "@mrclrchtr/supi-core": "12.0.0"
41
41
  },
42
42
  "bundledDependencies": [
43
43
  "@mrclrchtr/supi-code-runtime",
@@ -100,7 +100,21 @@ export function validatePublicPositionBounds(
100
100
  return null;
101
101
  }
102
102
 
103
- /** Split source into logical lines without CRLF line-ending bytes. */
103
+ /**
104
+ * Split source into Tree-sitter rows, dropping the `\r` of CRLF endings.
105
+ * Tree-sitter rows break only on `\n`, so a lone `\r` is not a line break here.
106
+ * LSP treats a lone `\r` as a line break, so structural lines after one differ from LSP lines.
107
+ */
104
108
  export function splitSourceLines(source: string): string[] {
105
- return source.replace(/\r\n?/g, "\n").split("\n");
109
+ if (lastSplit?.source === source) return lastSplit.lines;
110
+ const lines = source.split(/\r?\n/);
111
+ lastSplit = { source, lines };
112
+ return lines;
106
113
  }
114
+
115
+ /**
116
+ * Single-entry cache: range conversion calls this once per node on the same
117
+ * source, so re-splitting each time made extraction quadratic in file size.
118
+ * Callers must not mutate the returned array.
119
+ */
120
+ let lastSplit: { source: string; lines: string[] } | undefined;
@@ -331,8 +331,9 @@ export class StructuralWorkerClient {
331
331
  try {
332
332
  throwIfCodeRequestInterrupted(active.control);
333
333
  } catch (error) {
334
+ // Keep the chunk handshake alive so the Worker can send its terminal message
335
+ // instead of waiting for the hard stop.
334
336
  this.#interrupt(active, error);
335
- return;
336
337
  }
337
338
  active.chunks.push(Uint8Array.from(message.payload));
338
339
  active.nextSequence += 1;
@@ -433,7 +434,7 @@ export class StructuralWorkerClient {
433
434
  return;
434
435
  }
435
436
  const worker = this.#worker;
436
- if (this.#active !== request || !worker) return;
437
+ if (this.#active !== request || !worker || request.hardStopTimer) return;
437
438
  Atomics.store(request.cancellationFlag, 0, 1);
438
439
  if (
439
440
  !this.#send(worker, {
@@ -4,7 +4,9 @@ import type { GrammarId, SourceRange } from "./types.ts";
4
4
 
5
5
  /** Return whether a parsed tree contains an explicit or recovered syntax error. */
6
6
  export function hasSyntaxErrors(root: SyntaxNodeLike): boolean {
7
+ // web-tree-sitter's hasError already covers ERROR and missing descendants.
7
8
  if (root.hasError === true) return true;
9
+ if (root.hasError === false) return false;
8
10
  if (root.type === "ERROR" || root.isMissing === true) return true;
9
11
  return (root.children ?? []).some(hasSyntaxErrors);
10
12
  }
@@ -0,0 +1,94 @@
1
+ // Callee ranges for grammars whose call queries capture the whole call node.
2
+
3
+ import { tsPointToPublic } from "../coordinates.ts";
4
+ import type { SyntaxNodeLike } from "../syntax-node.ts";
5
+ import type { GrammarId, SourceRange } from "../types.ts";
6
+
7
+ /**
8
+ * Return the callee range for a whole-call capture, so call-site ranges cover the
9
+ * callee expression in every grammar (`a.b` in `a.b(1)`), as JS/TS, Python, Go,
10
+ * and Rust queries capture directly. Returns `null` when the capture already is
11
+ * the callee or no narrower callee exists.
12
+ */
13
+ export function calleeRangeForCallNode(
14
+ node: SyntaxNodeLike,
15
+ grammarId: GrammarId,
16
+ source: string,
17
+ ): SourceRange | null {
18
+ const end = calleeEnd(node, grammarId);
19
+ if (!end) return null;
20
+ const start = tsPointToPublic(node.startPosition, source);
21
+ const publicEnd = tsPointToPublic(end, source);
22
+ return {
23
+ startLine: start.line,
24
+ startCharacter: start.character,
25
+ endLine: publicEnd.line,
26
+ endCharacter: publicEnd.character,
27
+ };
28
+ }
29
+
30
+ /**
31
+ * Find the syntax node for one query capture by walking up from the leaf at its start.
32
+ * Returns `null` when no ancestor has the capture's type and range.
33
+ */
34
+ export function findCaptureNode(
35
+ root: SyntaxNodeLike & {
36
+ descendantForPosition(point: { row: number; column: number }): SyntaxNodeLike | null;
37
+ },
38
+ capture: { nodeType: string; range: SourceRange },
39
+ ): SyntaxNodeLike | null {
40
+ const { range } = capture;
41
+ let node = root.descendantForPosition({
42
+ row: range.startLine - 1,
43
+ column: range.startCharacter - 1,
44
+ });
45
+ while (node) {
46
+ if (
47
+ node.type === capture.nodeType &&
48
+ node.startPosition.row === range.startLine - 1 &&
49
+ node.startPosition.column === range.startCharacter - 1 &&
50
+ node.endPosition.row === range.endLine - 1 &&
51
+ node.endPosition.column === range.endCharacter - 1
52
+ ) {
53
+ return node;
54
+ }
55
+ node = node.parent;
56
+ }
57
+ return null;
58
+ }
59
+
60
+ function calleeEnd(
61
+ node: SyntaxNodeLike,
62
+ grammarId: GrammarId,
63
+ ): { row: number; column: number } | null {
64
+ switch (grammarId) {
65
+ case "java":
66
+ return node.type === "method_invocation"
67
+ ? (node.childForFieldName("name")?.endPosition ?? null)
68
+ : null;
69
+ case "kotlin":
70
+ return node.type === "call_expression" ? (kotlinCallee(node)?.endPosition ?? null) : null;
71
+ case "ruby":
72
+ return node.type === "call"
73
+ ? ((node.childForFieldName("method") ?? node.childForFieldName("receiver"))?.endPosition ??
74
+ null)
75
+ : null;
76
+ default:
77
+ return null;
78
+ }
79
+ }
80
+
81
+ /**
82
+ * Kotlin nests `f(x) { }` as an outer call (lambda-only suffix) wrapping `f(x)`.
83
+ * Treat both as one call so they share the callee `f`; `f(1)(2)` keeps `f(1)` as
84
+ * the outer callee because its suffix has value arguments.
85
+ */
86
+ function kotlinCallee(node: SyntaxNodeLike): SyntaxNodeLike | null {
87
+ const callee = node.children[0];
88
+ if (!callee) return null;
89
+ const suffix = node.children.find((child) => child.type === "call_suffix");
90
+ const lambdaOnly =
91
+ suffix !== undefined && !suffix.children.some((child) => child.type === "value_arguments");
92
+ if (callee.type === "call_expression" && lambdaOnly) return kotlinCallee(callee);
93
+ return callee;
94
+ }
@@ -1,10 +1,17 @@
1
1
  /** File-wide call-site extraction using per-grammar tree-sitter queries. */
2
2
 
3
3
  import type { CodeRequestControl } from "@mrclrchtr/supi-code-runtime/api";
4
- import type { CallSiteMatch, GrammarId, TreeSitterResult } from "../types.ts";
4
+ import type {
5
+ CallSiteMatch,
6
+ GrammarId,
7
+ QueryCapture,
8
+ SourceRange,
9
+ TreeSitterResult,
10
+ } from "../types.ts";
5
11
  import { isTypeOnlyImportCapture } from "../worker/call-context.ts";
6
12
  import { queryParsedFile, type TreeSitterRuntime } from "../worker/runtime.ts";
7
13
  import { normalizeCallName } from "./call-name.ts";
14
+ import { calleeRangeForCallNode, findCaptureNode } from "./call-range.ts";
8
15
 
9
16
  // ── Per-grammar call-site queries ─────────────────────────────────────
10
17
 
@@ -90,17 +97,19 @@ export async function extractCallSites(
90
97
  const name = normalizeCallName(capture.text, grammarId, capture.nodeType);
91
98
  if (name.length === 0) continue;
92
99
 
100
+ const range = callSiteRange(tree.rootNode, capture, grammarId, source);
101
+
93
102
  // Collapse duplicate captures only when they identify the same source range.
94
- const key = `${capture.range.startLine}:${capture.range.startCharacter}:${capture.range.endLine}:${capture.range.endCharacter}`;
103
+ const key = `${range.startLine}:${range.startCharacter}:${range.endLine}:${range.endCharacter}`;
95
104
  if (seen.has(key)) continue;
96
105
  seen.add(key);
97
106
 
98
107
  matches.push({
99
108
  name,
100
- startLine: capture.range.startLine,
101
- startCharacter: capture.range.startCharacter,
102
- endLine: capture.range.endLine,
103
- endCharacter: capture.range.endCharacter,
109
+ startLine: range.startLine,
110
+ startCharacter: range.startCharacter,
111
+ endLine: range.endLine,
112
+ endCharacter: range.endCharacter,
104
113
  });
105
114
  }
106
115
 
@@ -111,3 +120,14 @@ export async function extractCallSites(
111
120
  tree.delete();
112
121
  }
113
122
  }
123
+
124
+ /** Narrow whole-call captures to their callee so ranges match the other grammars. */
125
+ function callSiteRange(
126
+ root: Parameters<typeof findCaptureNode>[0],
127
+ capture: QueryCapture,
128
+ grammarId: GrammarId,
129
+ source: string,
130
+ ): SourceRange {
131
+ const node = findCaptureNode(root, capture);
132
+ return (node && calleeRangeForCallNode(node, grammarId, source)) ?? capture.range;
133
+ }
@@ -9,6 +9,7 @@ import type { GrammarId, SourceRange, TreeSitterResult } from "../types.ts";
9
9
  import { isTypeOnlyImportCapture } from "../worker/call-context.ts";
10
10
  import { queryParsedFile, type TreeSitterRuntime } from "../worker/runtime.ts";
11
11
  import { normalizeCallName } from "./call-name.ts";
12
+ import { calleeRangeForCallNode } from "./call-range.ts";
12
13
  import { createCalleeDisplayName, createSourceLineStarts } from "./callee-display-name.ts";
13
14
  import { extractScopeName } from "./scope.ts";
14
15
 
@@ -387,11 +388,13 @@ function filterCalleeCaptures(
387
388
 
388
389
  if (isTypeOnlyImportCapture(enclosingNode, capture, grammarId)) continue;
389
390
  const name = normalizeCallName(capture.text, grammarId, capture.nodeType);
390
- const rangeKey = sourceRangeKey(capture.range);
391
+ const syntaxNode = syntaxNodes.get(captureNodeKey(capture));
392
+ const range =
393
+ (syntaxNode && calleeRangeForCallNode(syntaxNode, grammarId, source)) ?? capture.range;
394
+ const rangeKey = sourceRangeKey(range);
391
395
  if (name.length === 0 || seenRanges.has(rangeKey)) continue;
392
396
  seenRanges.add(rangeKey);
393
397
 
394
- const syntaxNode = syntaxNodes.get(captureNodeKey(capture));
395
398
  const displayName = syntaxNode
396
399
  ? createCalleeDisplayName({
397
400
  node: syntaxNode,
@@ -404,7 +407,7 @@ function filterCalleeCaptures(
404
407
  callees.push({
405
408
  name,
406
409
  ...(displayName === undefined ? {} : { displayName }),
407
- range: capture.range,
410
+ range,
408
411
  });
409
412
  }
410
413
 
@@ -91,9 +91,11 @@ const DECLARATION_EXPORT_NODE_TYPES = new Set([
91
91
  "type_alias_declaration",
92
92
  "enum_declaration",
93
93
  "lexical_declaration",
94
+ "variable_declaration",
94
95
  "ambient_declaration",
95
96
  "internal_module",
96
97
  "module",
98
+ "import_alias",
97
99
  ]);
98
100
 
99
101
  function extractDeclarationExport(
@@ -101,7 +103,7 @@ function extractDeclarationExport(
101
103
  source: string,
102
104
  exports: ExportRecord[],
103
105
  ): void {
104
- if (decl.type === "lexical_declaration") {
106
+ if (decl.type === "lexical_declaration" || decl.type === "variable_declaration") {
105
107
  extractLexicalDeclarationExports(decl, source, exports);
106
108
  return;
107
109
  }
@@ -111,7 +113,11 @@ function extractDeclarationExport(
111
113
  return;
112
114
  }
113
115
 
114
- const name = getDeclarationName(decl);
116
+ // `export import X = Y.Z` exports the alias `X`, which may name a value, type, or namespace.
117
+ const name =
118
+ decl.type === "import_alias"
119
+ ? (decl.children.find((child) => child.type === "identifier")?.text ?? null)
120
+ : getDeclarationName(decl);
115
121
  if (!name) return;
116
122
 
117
123
  exports.push({
@@ -143,7 +149,7 @@ function extractAmbientDeclarationExport(
143
149
  const nested = decl.children.find((child) => child.type !== "declare" && child.type !== ";");
144
150
  if (!nested) return;
145
151
 
146
- if (nested.type === "lexical_declaration") {
152
+ if (nested.type === "lexical_declaration" || nested.type === "variable_declaration") {
147
153
  extractLexicalDeclarationExports(nested, source, exports);
148
154
  return;
149
155
  }
@@ -177,6 +183,8 @@ function exportKindForDeclaration(type: string): string {
177
183
  case "internal_module":
178
184
  case "module":
179
185
  return "namespace";
186
+ case "import_alias":
187
+ return "alias";
180
188
  default:
181
189
  return type.replace(/_declaration$/, "");
182
190
  }
@@ -217,8 +225,9 @@ function extractDefaultExport(node: SyntaxNodeLike, source: string, exports: Exp
217
225
  });
218
226
  }
219
227
 
228
+ /** Return the `from "module"` specifier; a string value such as `export default "x"` is not one. */
220
229
  function findStringChild(node: SyntaxNodeLike): SyntaxNodeLike | undefined {
221
- return node.children.find((child) => child.type === "string");
230
+ return node.childForFieldName("source") ?? undefined;
222
231
  }
223
232
 
224
233
  function extractReExport(
@@ -13,11 +13,7 @@ import {
13
13
  type StructuralTimingEvent,
14
14
  startStructuralTiming,
15
15
  } from "../session/structural-timing.ts";
16
- import {
17
- collectSyntaxErrorRanges,
18
- hasSyntaxErrors,
19
- withSyntaxCompleteness,
20
- } from "../syntax-errors.ts";
16
+ import { withSyntaxCompleteness } from "../syntax-errors.ts";
21
17
  import type { GrammarId, QueryCapture, TreeSitterResult } from "../types.ts";
22
18
  import {
23
19
  ParsedFileReadError,
@@ -172,8 +168,6 @@ export class TreeSitterRuntime {
172
168
  source: string;
173
169
  resolvedPath: string;
174
170
  grammarId: GrammarId;
175
- hasSyntaxErrors: boolean;
176
- errorRanges: ReturnType<typeof collectSyntaxErrorRanges>;
177
171
  };
178
172
  }
179
173
  | Exclude<TreeSitterResult<never>, { kind: "success" | "partial" }>
@@ -249,8 +243,6 @@ export class TreeSitterRuntime {
249
243
  source: parsed.source,
250
244
  resolvedPath: parsed.resolvedPath,
251
245
  grammarId: parsed.grammarId,
252
- hasSyntaxErrors: hasSyntaxErrors(parsed.tree.rootNode),
253
- errorRanges: collectSyntaxErrorRanges(parsed.tree.rootNode, parsed.source),
254
246
  },
255
247
  };
256
248
  } catch (err: unknown) {