@mrclrchtr/supi-review 6.1.0 → 6.2.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.
- package/README.md +4 -2
- package/node_modules/@mrclrchtr/supi-agent-runtime/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-agent-runtime/node_modules/@mrclrchtr/supi-core/src/debug-identity.ts +11 -0
- package/node_modules/@mrclrchtr/supi-agent-runtime/node_modules/@mrclrchtr/supi-core/src/debug.ts +5 -0
- package/node_modules/@mrclrchtr/supi-agent-runtime/package.json +2 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/README.md +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-core/src/debug-identity.ts +11 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-core/src/debug.ts +5 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/README.md +21 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/debug-identity.ts +11 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/debug.ts +5 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/package.json +4 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/api.ts +12 -7
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-cache.ts +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-capabilities.ts +0 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-publication.ts +6 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-refresh.ts +2 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-timing.ts +5 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostics.ts +2 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client.ts +17 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/transport.ts +40 -18
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/config/config.ts +164 -30
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/config/lsp-settings.ts +9 -87
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/config/server-config.ts +0 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/config/tsconfig-scope.ts +4 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/config/types.ts +0 -29
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/debug-telemetry.ts +7 -21
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/diagnostics/diagnostic-severity.ts +6 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/diagnostics/diagnostic-summary.ts +11 -14
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/diagnostics/evidence.ts +0 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/diagnostics/stale-diagnostics.ts +0 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/diagnostics/workspace-sentinels.ts +29 -49
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-client-state.ts +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-diagnostics.ts +4 -8
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-helpers.ts +1 -9
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-project-info.ts +6 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-workspace-recovery.ts +9 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-workspace-symbol.ts +26 -41
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager.ts +275 -99
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/provider/lsp-semantic-provider.ts +4 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/provider/semantic-symbol-mapper.ts +59 -28
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-controller.ts +27 -19
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-diagnostics.ts +26 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-registration.ts +0 -17
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-registry.ts +83 -19
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-transition-debug.ts +5 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/session/scanner.ts +24 -21
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/session/workspace-lsp-runtime.ts +29 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/summary.ts +19 -40
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/utils.ts +13 -19
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/workspace-path-policy.ts +287 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/README.md +6 -18
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/debug-identity.ts +11 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/debug.ts +5 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/package.json +3 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/api.ts +1 -11
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/coordinates.ts +19 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/language.ts +5 -23
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/operation-support.ts +3 -21
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/provider/tree-sitter-provider.ts +5 -9
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/session/runtime-controller.ts +10 -20
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/session/session.ts +7 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/session/structural-worker-client.ts +9 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/session/structural-worker-protocol.ts +134 -9
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/call-name.ts +96 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/call-sites.ts +11 -12
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/callees.ts +39 -56
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/exports.ts +9 -7
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/js-binding-pattern.ts +26 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/node-at.ts +2 -21
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/outline-html-sql.ts +144 -12
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/outline.ts +50 -37
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/scope.ts +138 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/types.ts +0 -7
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/worker/parsed-file-store.ts +1 -14
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/worker/runtime.ts +0 -10
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/worker/service.ts +6 -8
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/worker/worker-main.ts +34 -10
- package/node_modules/@mrclrchtr/supi-code-intelligence/package.json +5 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/capability/capability-warnings.ts +4 -22
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/search/ast-scan-timing.ts +4 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/search/ast-scan.ts +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/api.ts +1 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/extension.ts +4 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/health-refresh.ts +24 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/health-types.ts +19 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/input/health-refactor.ts +16 -14
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/refactor-types.ts +14 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/refactor-workflow.ts +21 -16
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/substrate/lsp/lifecycle.ts +0 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/substrate/lsp/maintenance.ts +4 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/substrate/lsp/settings.ts +6 -9
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/substrate/lsp/state.ts +0 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/substrate/workspace-provider-host.ts +2 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_health/file-scope-markdown.ts +43 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_health/markdown.ts +66 -66
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_health/refresh-outcome.ts +46 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_health/refresh-status.ts +166 -23
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_health/result.ts +1 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_health/tui.ts +18 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_refactor_apply/guidance.ts +3 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_refactor_plan/guidance.ts +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/register.ts +5 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/schemas.ts +21 -11
- package/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-core/src/debug-identity.ts +11 -0
- package/node_modules/@mrclrchtr/supi-core/src/debug.ts +5 -0
- package/package.json +4 -4
- package/src/audit/review-audit.ts +6 -1
- package/src/config.ts +36 -0
- package/src/thinking.ts +62 -0
- package/src/tool/review_run/execute.ts +11 -4
- package/src/tool/review_run/execution.ts +12 -0
- package/src/tool/review_run/planner.ts +4 -2
- package/src/tool/review_run/runner.ts +14 -4
- package/src/tool/review_run/workflow.ts +6 -0
- package/src/tui/common.ts +7 -0
- package/src/tui/review-command.ts +29 -1
- package/src/types.ts +12 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/config/server-actions.ts +0 -59
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/pattern-matcher.ts +0 -24
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/scripts/generate-kotlin-wasm.mjs +0 -132
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/scripts/generate-sql-wasm.mjs +0 -158
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/scripts/vendor-wasm.mjs +0 -167
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/index.ts +0 -42
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/session/runtime-registration.ts +0 -37
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/session/service-registry.ts +0 -30
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/structure.ts +0 -8
|
@@ -4,6 +4,11 @@ import {
|
|
|
4
4
|
} from "@mrclrchtr/supi-agent-runtime/api";
|
|
5
5
|
import { normalizeReviewInput } from "../../review-input.ts";
|
|
6
6
|
import { buildReviewPacket } from "../../target/packet.ts";
|
|
7
|
+
import {
|
|
8
|
+
clampReviewThinkingLevel,
|
|
9
|
+
REVIEWER_DEFAULT_THINKING_LEVEL,
|
|
10
|
+
type ReviewThinkingLevel,
|
|
11
|
+
} from "../../thinking.ts";
|
|
7
12
|
import type {
|
|
8
13
|
ReviewerAuditRequest,
|
|
9
14
|
ReviewerExtensionSetStatus,
|
|
@@ -55,6 +60,8 @@ function toTaskResult(
|
|
|
55
60
|
mode: task.mode,
|
|
56
61
|
packetHash,
|
|
57
62
|
modelId: result.modelId,
|
|
63
|
+
requestedThinkingLevel: result.requestedThinkingLevel,
|
|
64
|
+
effectiveThinkingLevel: result.effectiveThinkingLevel,
|
|
58
65
|
...(result.usage ? { usage: result.usage } : {}),
|
|
59
66
|
...(result.capabilityWarnings ? { capabilityWarnings: result.capabilityWarnings } : {}),
|
|
60
67
|
...(result.submissionRecovery ? { submissionRecovery: result.submissionRecovery } : {}),
|
|
@@ -110,6 +117,7 @@ export async function executeReviewTasks(
|
|
|
110
117
|
reviewInput: ReviewInput,
|
|
111
118
|
scope: ReviewScope,
|
|
112
119
|
model: ReviewModelSelection,
|
|
120
|
+
reviewerThinkingLevel: ReviewThinkingLevel = REVIEWER_DEFAULT_THINKING_LEVEL,
|
|
113
121
|
projectTrusted?: boolean,
|
|
114
122
|
signal?: AbortSignal,
|
|
115
123
|
onUpdate?: ReviewExecutionUpdate,
|
|
@@ -122,6 +130,7 @@ export async function executeReviewTasks(
|
|
|
122
130
|
const review = normalizeReviewInput(reviewInput);
|
|
123
131
|
let completedCount = 0;
|
|
124
132
|
const totalCount = review.tasks.length;
|
|
133
|
+
const effectiveThinkingLevel = clampReviewThinkingLevel(model.model, reviewerThinkingLevel);
|
|
125
134
|
// Partial tool output is replaced repeatedly; retain the review context and task state for expanded views.
|
|
126
135
|
const presentation = {
|
|
127
136
|
targetTitle: snapshot.title,
|
|
@@ -179,6 +188,7 @@ export async function executeReviewTasks(
|
|
|
179
188
|
prompt: packet.prompt,
|
|
180
189
|
packetHash: packet.packetHash,
|
|
181
190
|
model,
|
|
191
|
+
requestedThinkingLevel: reviewerThinkingLevel,
|
|
182
192
|
...(recoveryModel ? { recoveryModel } : {}),
|
|
183
193
|
...(recoveryModelId ? { recoveryModelId } : {}),
|
|
184
194
|
providerAuthority,
|
|
@@ -218,6 +228,8 @@ export async function executeReviewTasks(
|
|
|
218
228
|
mode: task.mode,
|
|
219
229
|
packetHash: packet.packetHash,
|
|
220
230
|
modelId: model.canonicalId,
|
|
231
|
+
requestedThinkingLevel: reviewerThinkingLevel,
|
|
232
|
+
effectiveThinkingLevel,
|
|
221
233
|
failureCode: "unexpected-runner-failure",
|
|
222
234
|
diagnostics: createUnobservedAgentRunDiagnostics(),
|
|
223
235
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { clampThinkingLevel } from "@earendil-works/pi-ai";
|
|
2
1
|
import { defineTool } from "@earendil-works/pi-coding-agent";
|
|
3
2
|
import { createEarlyCancellationDiagnostics } from "@mrclrchtr/supi-agent-runtime/api";
|
|
4
3
|
import { HEADLESS_INSPECTION_TOOL_NAMES } from "@mrclrchtr/supi-code-intelligence/headless";
|
|
5
4
|
import { Value } from "typebox/value";
|
|
6
5
|
import { normalizeReviewInput } from "../../review-input.ts";
|
|
6
|
+
import { clampReviewThinkingLevel, PLANNER_DEFAULT_THINKING_LEVEL } from "../../thinking.ts";
|
|
7
7
|
import type { PlannerDraft, PlannerInvocation, PlannerRunResult } from "../../types.ts";
|
|
8
8
|
import { runIsolatedChild } from "./child-session.ts";
|
|
9
9
|
import { REVIEW_CHILD_TOOL_SPECS } from "./child-tools.ts";
|
|
@@ -38,6 +38,8 @@ export async function runPlanner(invocation: PlannerInvocation): Promise<Planner
|
|
|
38
38
|
return { kind: "canceled", diagnostics: createEarlyCancellationDiagnostics() };
|
|
39
39
|
}
|
|
40
40
|
const holder: { value?: PlannerDraft } = {};
|
|
41
|
+
const requestedThinkingLevel =
|
|
42
|
+
invocation.requestedThinkingLevel ?? PLANNER_DEFAULT_THINKING_LEVEL;
|
|
41
43
|
const spec = REVIEW_CHILD_TOOL_SPECS.submitPlannerDraft;
|
|
42
44
|
const submit = defineTool({
|
|
43
45
|
...spec,
|
|
@@ -57,7 +59,7 @@ export async function runPlanner(invocation: PlannerInvocation): Promise<Planner
|
|
|
57
59
|
...(invocation.providerAuthority ? { providerAuthority: invocation.providerAuthority } : {}),
|
|
58
60
|
protocolPrompt: buildPlannerSystemPrompt(),
|
|
59
61
|
model: invocation.model,
|
|
60
|
-
thinkingLevel:
|
|
62
|
+
thinkingLevel: clampReviewThinkingLevel(invocation.model, requestedThinkingLevel),
|
|
61
63
|
timeoutMs: PLANNER_TIMEOUT_MS,
|
|
62
64
|
prompt: invocation.prompt,
|
|
63
65
|
signal: invocation.signal,
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { clampThinkingLevel } from "@earendil-works/pi-ai";
|
|
2
1
|
import {
|
|
3
2
|
type AgentRunSessionView,
|
|
4
3
|
createEarlyCancellationDiagnostics,
|
|
@@ -6,6 +5,7 @@ import {
|
|
|
6
5
|
import { HEADLESS_INSPECTION_TOOL_NAMES } from "@mrclrchtr/supi-code-intelligence/headless";
|
|
7
6
|
import { ReviewAuditTraceCollector } from "../../audit/review-audit.ts";
|
|
8
7
|
import { summarizeReviewSnapshot } from "../../git.ts";
|
|
8
|
+
import { clampReviewThinkingLevel, REVIEWER_DEFAULT_THINKING_LEVEL } from "../../thinking.ts";
|
|
9
9
|
import type {
|
|
10
10
|
ReviewerCapabilityWarning,
|
|
11
11
|
ReviewerExtensionSetStatus,
|
|
@@ -31,10 +31,18 @@ function auditOutcome(result: ReviewerRunResult): {
|
|
|
31
31
|
/** Run one caller-defined task in an isolated Inspection-only Reviewer Session. */
|
|
32
32
|
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: review, recovery, and continuous audit stay in one adapter lifecycle.
|
|
33
33
|
export async function runReviewer(invocation: ReviewerInvocation): Promise<ReviewerRunResult> {
|
|
34
|
+
const requestedThinkingLevel =
|
|
35
|
+
invocation.requestedThinkingLevel ?? REVIEWER_DEFAULT_THINKING_LEVEL;
|
|
36
|
+
const effectiveThinkingLevel = clampReviewThinkingLevel(
|
|
37
|
+
invocation.model.model,
|
|
38
|
+
requestedThinkingLevel,
|
|
39
|
+
);
|
|
34
40
|
if (invocation.signal?.aborted) {
|
|
35
41
|
return {
|
|
36
42
|
kind: "canceled",
|
|
37
43
|
modelId: invocation.model.canonicalId,
|
|
44
|
+
requestedThinkingLevel,
|
|
45
|
+
effectiveThinkingLevel,
|
|
38
46
|
reviewerExtensionSetStatus: "unobserved",
|
|
39
47
|
diagnostics: createEarlyCancellationDiagnostics(),
|
|
40
48
|
};
|
|
@@ -48,7 +56,6 @@ export async function runReviewer(invocation: ReviewerInvocation): Promise<Revie
|
|
|
48
56
|
const decline = createReviewRecoveryDeclineTool(recoveryTerminal);
|
|
49
57
|
const warnings: ReviewerCapabilityWarning[] = [];
|
|
50
58
|
const protocolPrompt = buildReviewerSystemPrompt(invocation.dependencyBootstrapConfigured);
|
|
51
|
-
const thinkingLevel = clampThinkingLevel(invocation.model.model, "max");
|
|
52
59
|
let reviewerExtensionSetStatus: ReviewerExtensionSetStatus = "unobserved";
|
|
53
60
|
let session: AgentRunSessionView | undefined;
|
|
54
61
|
let trace: ReviewAuditTraceCollector | undefined;
|
|
@@ -69,7 +76,7 @@ export async function runReviewer(invocation: ReviewerInvocation): Promise<Revie
|
|
|
69
76
|
...(invocation.providerAuthority ? { providerAuthority: invocation.providerAuthority } : {}),
|
|
70
77
|
protocolPrompt,
|
|
71
78
|
model: invocation.model.model,
|
|
72
|
-
thinkingLevel,
|
|
79
|
+
thinkingLevel: effectiveThinkingLevel,
|
|
73
80
|
timeoutMs: undefined,
|
|
74
81
|
prompt: invocation.prompt,
|
|
75
82
|
signal: invocation.signal,
|
|
@@ -113,6 +120,8 @@ export async function runReviewer(invocation: ReviewerInvocation): Promise<Revie
|
|
|
113
120
|
const result: ReviewerRunResult = {
|
|
114
121
|
...outcome,
|
|
115
122
|
modelId: invocation.model.canonicalId,
|
|
123
|
+
requestedThinkingLevel,
|
|
124
|
+
effectiveThinkingLevel,
|
|
116
125
|
reviewerExtensionSetStatus,
|
|
117
126
|
...(warnings.length > 0 ? { capabilityWarnings: warnings } : {}),
|
|
118
127
|
...(submissionRecovery ? { submissionRecovery } : {}),
|
|
@@ -132,7 +141,8 @@ export async function runReviewer(invocation: ReviewerInvocation): Promise<Revie
|
|
|
132
141
|
const audit = await invocation.audit.store.create({
|
|
133
142
|
task: invocation.task,
|
|
134
143
|
modelId: invocation.model.canonicalId,
|
|
135
|
-
thinkingLevel,
|
|
144
|
+
thinkingLevel: effectiveThinkingLevel,
|
|
145
|
+
requestedThinkingLevel,
|
|
136
146
|
protocolPrompt,
|
|
137
147
|
packet: invocation.prompt,
|
|
138
148
|
packetHash: invocation.packetHash,
|
|
@@ -11,6 +11,7 @@ import { normalizeReviewInput } from "../../review-input.ts";
|
|
|
11
11
|
import { normalizeReviewScope, validateReviewScope } from "../../review-scope.ts";
|
|
12
12
|
import { reviewTargetEndpoints } from "../../target/input.ts";
|
|
13
13
|
import { snapshotsMatch } from "../../target/snapshot-match.ts";
|
|
14
|
+
import type { ReviewThinkingLevel } from "../../thinking.ts";
|
|
14
15
|
import type {
|
|
15
16
|
PlannerRunResult,
|
|
16
17
|
PlanningRecord,
|
|
@@ -41,6 +42,7 @@ export interface DraftReviewTasksInput {
|
|
|
41
42
|
scope?: ReviewScope;
|
|
42
43
|
plannerContext: string;
|
|
43
44
|
plannerModel?: ReviewModelSelection;
|
|
45
|
+
plannerThinkingLevel?: ReviewThinkingLevel;
|
|
44
46
|
signal?: AbortSignal;
|
|
45
47
|
onUpdate?: OnUpdate;
|
|
46
48
|
}
|
|
@@ -54,6 +56,8 @@ export interface RunReviewInput {
|
|
|
54
56
|
/** Optional batch-level path focus, validated in the frozen after state. */
|
|
55
57
|
scope?: ReviewScope;
|
|
56
58
|
reviewerModel: ReviewModelSelection;
|
|
59
|
+
/** Requested thinking level for Reviewer Sessions in this workflow. */
|
|
60
|
+
reviewerThinkingLevel?: ReviewThinkingLevel;
|
|
57
61
|
/** Optional explicit second model for Submission Recovery. */
|
|
58
62
|
recoveryModel?: ReviewModelSelection;
|
|
59
63
|
/** Requested recovery model id when configuration did not resolve. */
|
|
@@ -137,6 +141,7 @@ export async function draftReviewTasks(input: DraftReviewTasksInput) {
|
|
|
137
141
|
result = await runPlanner({
|
|
138
142
|
cwd: snapshot.repositoryRoot,
|
|
139
143
|
model: input.plannerModel.model,
|
|
144
|
+
requestedThinkingLevel: input.plannerThinkingLevel,
|
|
140
145
|
...(input.providerAuthority ? { providerAuthority: input.providerAuthority } : {}),
|
|
141
146
|
prompt: buildPlannerPrompt(snapshot, scope, input.plannerContext),
|
|
142
147
|
signal: input.signal,
|
|
@@ -379,6 +384,7 @@ export async function runReview(input: RunReviewInput) {
|
|
|
379
384
|
review,
|
|
380
385
|
scope,
|
|
381
386
|
input.reviewerModel,
|
|
387
|
+
input.reviewerThinkingLevel,
|
|
382
388
|
input.projectTrusted,
|
|
383
389
|
input.signal,
|
|
384
390
|
input.onUpdate,
|
package/src/tui/common.ts
CHANGED
|
@@ -105,6 +105,12 @@ export function renderReviewToolCall(
|
|
|
105
105
|
|
|
106
106
|
// ── Task section (expanded) ──────────────────────────────────────
|
|
107
107
|
|
|
108
|
+
function formatThinkingLevel(result: ReviewTaskResult): string {
|
|
109
|
+
return result.requestedThinkingLevel === result.effectiveThinkingLevel
|
|
110
|
+
? `Thinking: ${result.requestedThinkingLevel}`
|
|
111
|
+
: `Thinking: ${result.requestedThinkingLevel} clamped to ${result.effectiveThinkingLevel}`;
|
|
112
|
+
}
|
|
113
|
+
|
|
108
114
|
/** Render a single finding's details into the container. */
|
|
109
115
|
function renderFinding(container: Container, finding: ReviewFinding, theme: Theme): void {
|
|
110
116
|
container.addChild(new Text(formatFindingLine(finding, theme), 1, 0));
|
|
@@ -257,6 +263,7 @@ export function buildTaskSection(
|
|
|
257
263
|
const metaParts = [
|
|
258
264
|
theme.fg("dim", `model: ${result.modelId}`),
|
|
259
265
|
theme.fg("dim", `hash: ${result.packetHash.slice(0, 12)}…`),
|
|
266
|
+
theme.fg("dim", formatThinkingLevel(result)),
|
|
260
267
|
...(result.usage ? [theme.fg("dim", formatReviewUsage(result.usage))] : []),
|
|
261
268
|
];
|
|
262
269
|
container.addChild(new Text(metaParts.join(" "), 1, 0));
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
resolveRecoveryReviewModel,
|
|
16
16
|
} from "../model.ts";
|
|
17
17
|
import type { ReviewArtifactStore } from "../session/review-artifact-store.ts";
|
|
18
|
+
import { type ReviewThinkingLevel, resolveReviewThinkingLevel } from "../thinking.ts";
|
|
18
19
|
import { createReviewOutput } from "../tool/output-page.ts";
|
|
19
20
|
import { formatReviewBatch } from "../tool/review_run/format.ts";
|
|
20
21
|
import { queuePostReviewTurn } from "../tool/review_run/post-policy.ts";
|
|
@@ -212,6 +213,7 @@ async function draftInteractiveReview(
|
|
|
212
213
|
ctx: CommandContext,
|
|
213
214
|
target: ReviewTargetSpec,
|
|
214
215
|
scope: ReviewScope,
|
|
216
|
+
plannerThinkingLevel?: ReviewThinkingLevel,
|
|
215
217
|
): Promise<InteractivePlannerDraft | undefined> {
|
|
216
218
|
const config = loadReviewConfig(ctx.cwd);
|
|
217
219
|
const plannerModel = resolveAgentReviewModel(ctx, config.plannerModel);
|
|
@@ -227,6 +229,7 @@ async function draftInteractiveReview(
|
|
|
227
229
|
scope,
|
|
228
230
|
plannerContext: collectPlannerContext(session.messages),
|
|
229
231
|
plannerModel,
|
|
232
|
+
plannerThinkingLevel,
|
|
230
233
|
signal,
|
|
231
234
|
}),
|
|
232
235
|
);
|
|
@@ -258,6 +261,7 @@ async function executeInteractiveReview(
|
|
|
258
261
|
review: ReviewInput;
|
|
259
262
|
scope: ReviewScope;
|
|
260
263
|
reviewerModel: ReviewModelSelection;
|
|
264
|
+
reviewerThinkingLevel: ReviewThinkingLevel;
|
|
261
265
|
expectedSnapshot: ReviewSnapshot;
|
|
262
266
|
expectedSnapshotTarget: ReviewTargetSpec;
|
|
263
267
|
planning?: PlanningRecord;
|
|
@@ -279,6 +283,7 @@ async function executeInteractiveReview(
|
|
|
279
283
|
review: input.review,
|
|
280
284
|
scope: input.scope,
|
|
281
285
|
reviewerModel: input.reviewerModel,
|
|
286
|
+
reviewerThinkingLevel: input.reviewerThinkingLevel,
|
|
282
287
|
...(recoveryModel ? { recoveryModel } : {}),
|
|
283
288
|
...(config.recoveryModel !== "disabled" &&
|
|
284
289
|
config.recoveryModel !== CURRENT_SESSION_REVIEW_MODEL &&
|
|
@@ -340,9 +345,31 @@ export async function runReviewCommand(
|
|
|
340
345
|
]);
|
|
341
346
|
if (!planningChoice) return;
|
|
342
347
|
|
|
348
|
+
const config = loadReviewConfig(ctx.cwd);
|
|
349
|
+
let reviewerThinkingLevel: ReviewThinkingLevel;
|
|
350
|
+
let plannerThinkingLevel: ReviewThinkingLevel | undefined;
|
|
351
|
+
try {
|
|
352
|
+
reviewerThinkingLevel = resolveReviewThinkingLevel(config.reviewerThinkingLevel, "Reviewer");
|
|
353
|
+
plannerThinkingLevel =
|
|
354
|
+
planningChoice === "AI suggests tasks"
|
|
355
|
+
? resolveReviewThinkingLevel(config.plannerThinkingLevel, "Planner")
|
|
356
|
+
: undefined;
|
|
357
|
+
} catch (error) {
|
|
358
|
+
ctx.ui.notify(
|
|
359
|
+
error instanceof Error ? error.message : "Invalid Review thinking level.",
|
|
360
|
+
"error",
|
|
361
|
+
);
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
364
|
+
|
|
343
365
|
const plannerDraft =
|
|
344
366
|
planningChoice === "AI suggests tasks"
|
|
345
|
-
? await draftInteractiveReview(
|
|
367
|
+
? await draftInteractiveReview(
|
|
368
|
+
ctx,
|
|
369
|
+
selectedTarget.selectedTarget,
|
|
370
|
+
scope,
|
|
371
|
+
plannerThinkingLevel,
|
|
372
|
+
)
|
|
346
373
|
: undefined;
|
|
347
374
|
if (planningChoice === "AI suggests tasks" && !plannerDraft) return;
|
|
348
375
|
const snapshot =
|
|
@@ -380,6 +407,7 @@ export async function runReviewCommand(
|
|
|
380
407
|
review: edited,
|
|
381
408
|
scope,
|
|
382
409
|
reviewerModel,
|
|
410
|
+
reviewerThinkingLevel,
|
|
383
411
|
expectedSnapshot: snapshot,
|
|
384
412
|
expectedSnapshotTarget: selectedTarget.selectedTarget,
|
|
385
413
|
...(usePlannerDraft && plannerDraft ? { planning: plannerDraft.planning } : {}),
|
package/src/types.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import type { Model, Usage } from "@earendil-works/pi-ai";
|
|
1
|
+
import type { Model, ModelThinkingLevel, Usage } from "@earendil-works/pi-ai";
|
|
2
2
|
import type {
|
|
3
3
|
AgentRunDiagnostics,
|
|
4
4
|
AgentRunProviderAuthority,
|
|
5
5
|
} from "@mrclrchtr/supi-agent-runtime/api";
|
|
6
6
|
import type { LocalReviewAuditStore } from "./audit/local-review-audit-store.ts";
|
|
7
|
+
import type { ReviewThinkingLevel } from "./thinking.ts";
|
|
7
8
|
import type { ReviewWorkspaceCleanupWarning } from "./workspace/review-workspace.ts";
|
|
8
9
|
|
|
9
10
|
/** A full Git commit id after target resolution. */
|
|
@@ -233,6 +234,8 @@ export interface ReviewProgress {
|
|
|
233
234
|
|
|
234
235
|
export interface PlannerInvocation {
|
|
235
236
|
prompt: string;
|
|
237
|
+
/** Requested level for this Planner Draft; omitted values keep the package default. */
|
|
238
|
+
requestedThinkingLevel?: ReviewThinkingLevel;
|
|
236
239
|
providerAuthority?: AgentRunProviderAuthority;
|
|
237
240
|
// biome-ignore lint/suspicious/noExplicitAny: Model<any> is Pi's canonical type
|
|
238
241
|
model: Model<any>;
|
|
@@ -255,6 +258,8 @@ export interface ReviewerAuditRequest {
|
|
|
255
258
|
|
|
256
259
|
export interface ReviewerInvocation {
|
|
257
260
|
prompt: string;
|
|
261
|
+
/** Requested level for this Reviewer Session; omitted values keep the package default. */
|
|
262
|
+
requestedThinkingLevel?: ReviewThinkingLevel;
|
|
258
263
|
providerAuthority?: AgentRunProviderAuthority;
|
|
259
264
|
packetHash: string;
|
|
260
265
|
task: ReviewTask;
|
|
@@ -277,6 +282,8 @@ export type ReviewerExtensionSetStatus = "active" | "degraded" | "unobserved";
|
|
|
277
282
|
|
|
278
283
|
export type ReviewerRunResult = ChildRunOutcome<ReviewSubmission> & {
|
|
279
284
|
modelId: string;
|
|
285
|
+
requestedThinkingLevel: ReviewThinkingLevel;
|
|
286
|
+
effectiveThinkingLevel: ModelThinkingLevel;
|
|
280
287
|
reviewerExtensionSetStatus: ReviewerExtensionSetStatus;
|
|
281
288
|
capabilityWarnings?: ReviewerCapabilityWarning[];
|
|
282
289
|
audit?: ReviewAuditReference;
|
|
@@ -287,6 +294,10 @@ interface ReviewTaskResultIdentity {
|
|
|
287
294
|
taskId: string;
|
|
288
295
|
mode: ReviewMode;
|
|
289
296
|
modelId: string;
|
|
297
|
+
/** Requested Reviewer Thinking Level for this task. */
|
|
298
|
+
requestedThinkingLevel: ReviewThinkingLevel;
|
|
299
|
+
/** Effective Reviewer Thinking Level after model capability clamping. */
|
|
300
|
+
effectiveThinkingLevel: ModelThinkingLevel;
|
|
290
301
|
/** SHA-256 of the exact reviewer packet bytes. */
|
|
291
302
|
packetHash: string;
|
|
292
303
|
/** Aggregate nested-model usage for this task, when reported by the provider. */
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
// Server capability action label helpers — maps LSP capabilities to readable action labels.
|
|
2
|
-
|
|
3
|
-
import type { ServerCapabilities } from "../config/types.ts";
|
|
4
|
-
|
|
5
|
-
interface LspServerSupportedActionSpec {
|
|
6
|
-
label: string;
|
|
7
|
-
isSupported: (capabilities: ServerCapabilities | null | undefined) => boolean;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
const LSP_SERVER_SUPPORTED_ACTION_SPECS: readonly LspServerSupportedActionSpec[] = [
|
|
11
|
-
{
|
|
12
|
-
label: "diagnostics [optional file]",
|
|
13
|
-
isSupported: () => true,
|
|
14
|
-
},
|
|
15
|
-
{
|
|
16
|
-
label: "hover(file,line,char)",
|
|
17
|
-
isSupported: (capabilities) => Boolean(capabilities?.hoverProvider),
|
|
18
|
-
},
|
|
19
|
-
{
|
|
20
|
-
label: "definition(file,line,char)",
|
|
21
|
-
isSupported: (capabilities) => Boolean(capabilities?.definitionProvider),
|
|
22
|
-
},
|
|
23
|
-
{
|
|
24
|
-
label: "references(file,line,char)",
|
|
25
|
-
isSupported: (capabilities) => Boolean(capabilities?.referencesProvider),
|
|
26
|
-
},
|
|
27
|
-
{
|
|
28
|
-
label: "implementation(file,line,char)",
|
|
29
|
-
isSupported: (capabilities) => Boolean(capabilities?.implementationProvider),
|
|
30
|
-
},
|
|
31
|
-
{
|
|
32
|
-
label: "symbols(file)",
|
|
33
|
-
isSupported: (capabilities) => Boolean(capabilities?.documentSymbolProvider),
|
|
34
|
-
},
|
|
35
|
-
{
|
|
36
|
-
label: "workspace_symbols(query)",
|
|
37
|
-
isSupported: (capabilities) => Boolean(capabilities?.workspaceSymbolProvider),
|
|
38
|
-
},
|
|
39
|
-
{
|
|
40
|
-
label: "rename(file,line,char,newName)",
|
|
41
|
-
isSupported: (capabilities) => Boolean(capabilities?.renameProvider),
|
|
42
|
-
},
|
|
43
|
-
{
|
|
44
|
-
label: "code_actions(file,line,char)",
|
|
45
|
-
isSupported: (capabilities) => Boolean(capabilities?.codeActionProvider),
|
|
46
|
-
},
|
|
47
|
-
] as const;
|
|
48
|
-
|
|
49
|
-
/**
|
|
50
|
-
* Get the list of supported LSP server actions based on capabilities.
|
|
51
|
-
*/
|
|
52
|
-
export function getSupportedLspServerActions(
|
|
53
|
-
capabilities: ServerCapabilities | null | undefined,
|
|
54
|
-
): string[] {
|
|
55
|
-
if (!capabilities) return [];
|
|
56
|
-
return LSP_SERVER_SUPPORTED_ACTION_SPECS.filter((spec) => spec.isSupported(capabilities)).map(
|
|
57
|
-
(spec) => spec.label,
|
|
58
|
-
);
|
|
59
|
-
}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
import ignore from "ignore";
|
|
2
|
-
|
|
3
|
-
/** Gitignore-style glob pattern matching for path exclusion.
|
|
4
|
-
*
|
|
5
|
-
* Delegates to the {@link https://github.com/kaelzhang/node-ignore | ignore} package,
|
|
6
|
-
* which provides battle-tested .gitignore semantics used by ESLint, Prettier, and others.
|
|
7
|
-
*
|
|
8
|
-
* Supports full gitignore syntax: literal names, `*` / `?` wildcards, `**` recursive globs,
|
|
9
|
-
* leading `/` anchored patterns, trailing `/` directory-only patterns, and `!` negation.
|
|
10
|
-
*
|
|
11
|
-
* **Note:** Patterns that start with `#` are treated as comments unless escaped with `\#`.
|
|
12
|
-
*/
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* Check whether a project-relative file path matches a gitignore-style glob pattern.
|
|
16
|
-
*
|
|
17
|
-
* @param filePath - Relative file path with forward slashes (e.g. `"src/__tests__/bar.test.ts"`)
|
|
18
|
-
* @param pattern - Gitignore-style glob pattern (e.g. `"__tests__/"`, `"*.test.ts"`, `"/build"`)
|
|
19
|
-
* @returns `true` if the file path matches the pattern
|
|
20
|
-
*/
|
|
21
|
-
export function isGlobMatch(filePath: string, pattern: string): boolean {
|
|
22
|
-
if (!filePath || !pattern) return false;
|
|
23
|
-
return ignore().add(pattern).ignores(filePath);
|
|
24
|
-
}
|
|
@@ -1,132 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
|
|
3
|
-
import { spawnSync } from "node:child_process";
|
|
4
|
-
import { createHash } from "node:crypto";
|
|
5
|
-
import * as fs from "node:fs";
|
|
6
|
-
import { createRequire } from "node:module";
|
|
7
|
-
import * as os from "node:os";
|
|
8
|
-
import * as path from "node:path";
|
|
9
|
-
import { fileURLToPath } from "node:url";
|
|
10
|
-
|
|
11
|
-
const require = createRequire(import.meta.url);
|
|
12
|
-
const scriptDir = path.dirname(fileURLToPath(import.meta.url));
|
|
13
|
-
const packageRoot = path.resolve(scriptDir, "..");
|
|
14
|
-
const wasmDir = path.join(packageRoot, "resources", "grammars", "kotlin");
|
|
15
|
-
const wasmPath = path.join(wasmDir, "tree-sitter-kotlin.wasm");
|
|
16
|
-
const metadataPath = path.join(wasmDir, "tree-sitter-kotlin.wasm.json");
|
|
17
|
-
const checkMode = process.argv.includes("--check");
|
|
18
|
-
|
|
19
|
-
function readPackage(packageName) {
|
|
20
|
-
const packageJsonPath = require.resolve(`${packageName}/package.json`);
|
|
21
|
-
return {
|
|
22
|
-
dir: path.dirname(packageJsonPath),
|
|
23
|
-
json: JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")),
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
function sha256(filePath) {
|
|
28
|
-
return createHash("sha256").update(fs.readFileSync(filePath)).digest("hex");
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
function readMetadata() {
|
|
32
|
-
return JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
function expectedReleaseAsset(version) {
|
|
36
|
-
return `https://github.com/fwcd/tree-sitter-kotlin/releases/download/${version}/tree-sitter-kotlin.wasm`;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
function assertKotlinWasmCurrent() {
|
|
40
|
-
const kotlinPackage = readPackage("tree-sitter-kotlin");
|
|
41
|
-
const cliPackage = readPackage("tree-sitter-cli");
|
|
42
|
-
const metadata = readMetadata();
|
|
43
|
-
const actualSha = sha256(wasmPath);
|
|
44
|
-
const errors = [];
|
|
45
|
-
|
|
46
|
-
if (metadata.source?.npmPackage !== "tree-sitter-kotlin") {
|
|
47
|
-
errors.push("metadata source package must be tree-sitter-kotlin");
|
|
48
|
-
}
|
|
49
|
-
if (metadata.source?.version !== kotlinPackage.json.version) {
|
|
50
|
-
errors.push(
|
|
51
|
-
`metadata pins tree-sitter-kotlin ${metadata.source?.version}, but installed package is ${kotlinPackage.json.version}`,
|
|
52
|
-
);
|
|
53
|
-
}
|
|
54
|
-
if (metadata.source?.releaseAsset !== expectedReleaseAsset(kotlinPackage.json.version)) {
|
|
55
|
-
errors.push(
|
|
56
|
-
"metadata release asset URL does not match the installed tree-sitter-kotlin version",
|
|
57
|
-
);
|
|
58
|
-
}
|
|
59
|
-
if (metadata.generatedWith?.treeSitterCli !== cliPackage.json.version) {
|
|
60
|
-
errors.push(
|
|
61
|
-
`metadata pins tree-sitter-cli ${metadata.generatedWith?.treeSitterCli}, but installed CLI is ${cliPackage.json.version}`,
|
|
62
|
-
);
|
|
63
|
-
}
|
|
64
|
-
if (metadata.sha256 !== actualSha) {
|
|
65
|
-
errors.push(`metadata sha256 ${metadata.sha256} does not match vendored file ${actualSha}`);
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
if (errors.length > 0) {
|
|
69
|
-
throw new Error(
|
|
70
|
-
`Vendored Kotlin Tree-sitter WASM is stale:\n- ${errors.join("\n- ")}\nRun: pnpm --filter @mrclrchtr/supi-tree-sitter generate:kotlin-wasm`,
|
|
71
|
-
);
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
process.stdout.write(
|
|
75
|
-
`Kotlin Tree-sitter WASM is current (${kotlinPackage.json.version}, ${actualSha}).\n`,
|
|
76
|
-
);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
function generateKotlinWasm() {
|
|
80
|
-
const kotlinPackage = readPackage("tree-sitter-kotlin");
|
|
81
|
-
const cliPackage = readPackage("tree-sitter-cli");
|
|
82
|
-
const cliPath = path.join(cliPackage.dir, "cli.js");
|
|
83
|
-
const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), "supi-kotlin-wasm-"));
|
|
84
|
-
const grammarDir = path.join(tempRoot, "tree-sitter-kotlin");
|
|
85
|
-
|
|
86
|
-
try {
|
|
87
|
-
fs.cpSync(kotlinPackage.dir, grammarDir, { recursive: true });
|
|
88
|
-
const result = spawnSync(process.execPath, [cliPath, "build", "--wasm"], {
|
|
89
|
-
cwd: grammarDir,
|
|
90
|
-
stdio: "inherit",
|
|
91
|
-
});
|
|
92
|
-
|
|
93
|
-
if (result.status !== 0) {
|
|
94
|
-
throw new Error(
|
|
95
|
-
"tree-sitter build --wasm failed. Install Docker or Emscripten, then rerun generate:kotlin-wasm.",
|
|
96
|
-
);
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
const generatedWasmPath = path.join(grammarDir, "tree-sitter-kotlin.wasm");
|
|
100
|
-
if (!fs.existsSync(generatedWasmPath)) {
|
|
101
|
-
throw new Error(`Expected generated WASM at ${generatedWasmPath}`);
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
fs.mkdirSync(wasmDir, { recursive: true });
|
|
105
|
-
fs.copyFileSync(generatedWasmPath, wasmPath);
|
|
106
|
-
|
|
107
|
-
const checksum = sha256(wasmPath);
|
|
108
|
-
const metadata = {
|
|
109
|
-
source: {
|
|
110
|
-
npmPackage: "tree-sitter-kotlin",
|
|
111
|
-
version: kotlinPackage.json.version,
|
|
112
|
-
repository: "https://github.com/fwcd/tree-sitter-kotlin",
|
|
113
|
-
releaseAsset: expectedReleaseAsset(kotlinPackage.json.version),
|
|
114
|
-
},
|
|
115
|
-
generatedWith: {
|
|
116
|
-
treeSitterCli: cliPackage.json.version,
|
|
117
|
-
},
|
|
118
|
-
sha256: checksum,
|
|
119
|
-
};
|
|
120
|
-
fs.writeFileSync(metadataPath, `${JSON.stringify(metadata, null, 2)}\n`);
|
|
121
|
-
process.stdout.write(`Generated ${wasmPath}\n`);
|
|
122
|
-
process.stdout.write(`SHA256 ${checksum}\n`);
|
|
123
|
-
} finally {
|
|
124
|
-
fs.rmSync(tempRoot, { recursive: true, force: true });
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
if (checkMode) {
|
|
129
|
-
assertKotlinWasmCurrent();
|
|
130
|
-
} else {
|
|
131
|
-
generateKotlinWasm();
|
|
132
|
-
}
|