claude-ide-bridge 2.6.2 → 2.7.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 +18 -4
- package/dist/activityLog.js.map +1 -1
- package/dist/automation.d.ts +14 -0
- package/dist/automation.js +21 -0
- package/dist/automation.js.map +1 -1
- package/dist/bridge.js +2 -2
- package/dist/bridge.js.map +1 -1
- package/dist/claudeOrchestrator.js.map +1 -1
- package/dist/config.d.ts +2 -0
- package/dist/config.js +4 -1
- package/dist/config.js.map +1 -1
- package/dist/extensionClient.d.ts +1 -0
- package/dist/extensionClient.js +4 -1
- package/dist/extensionClient.js.map +1 -1
- package/dist/index.js +140 -1
- package/dist/index.js.map +1 -1
- package/dist/oauth.js +2 -2
- package/dist/oauth.js.map +1 -1
- package/dist/orchestrator/childBridgeRegistry.js +1 -2
- package/dist/orchestrator/childBridgeRegistry.js.map +1 -1
- package/dist/orchestrator/index.d.ts +1 -1
- package/dist/orchestrator/index.js.map +1 -1
- package/dist/orchestrator/orchestratorBridge.js.map +1 -1
- package/dist/streamableHttp.js +6 -0
- package/dist/streamableHttp.js.map +1 -1
- package/dist/tools/bridgeStatus.d.ts +49 -1
- package/dist/tools/bridgeStatus.js +46 -3
- package/dist/tools/bridgeStatus.js.map +1 -1
- package/dist/tools/debug.js +4 -1
- package/dist/tools/debug.js.map +1 -1
- package/dist/tools/explainSymbol.d.ts +83 -0
- package/dist/tools/explainSymbol.js +82 -0
- package/dist/tools/explainSymbol.js.map +1 -0
- package/dist/tools/findFiles.js +6 -0
- package/dist/tools/findFiles.js.map +1 -1
- package/dist/tools/getAIComments.d.ts +1 -0
- package/dist/tools/getAIComments.js +1 -0
- package/dist/tools/getAIComments.js.map +1 -1
- package/dist/tools/getCodeCoverage.d.ts +54 -0
- package/dist/tools/getCodeCoverage.js +31 -2
- package/dist/tools/getCodeCoverage.js.map +1 -1
- package/dist/tools/getDependencyTree.d.ts +24 -0
- package/dist/tools/getDependencyTree.js +17 -6
- package/dist/tools/getDependencyTree.js.map +1 -1
- package/dist/tools/getDiagnostics.d.ts +65 -0
- package/dist/tools/getDiagnostics.js +37 -4
- package/dist/tools/getDiagnostics.js.map +1 -1
- package/dist/tools/getDocumentSymbols.d.ts +47 -0
- package/dist/tools/getDocumentSymbols.js +35 -5
- package/dist/tools/getDocumentSymbols.js.map +1 -1
- package/dist/tools/getFileTree.d.ts +23 -0
- package/dist/tools/getFileTree.js +16 -4
- package/dist/tools/getFileTree.js.map +1 -1
- package/dist/tools/getGitLog.d.ts +31 -0
- package/dist/tools/getGitLog.js +25 -3
- package/dist/tools/getGitLog.js.map +1 -1
- package/dist/tools/getGitStatus.d.ts +46 -0
- package/dist/tools/getGitStatus.js +21 -3
- package/dist/tools/getGitStatus.js.map +1 -1
- package/dist/tools/getImportTree.d.ts +30 -0
- package/dist/tools/getImportTree.js +15 -3
- package/dist/tools/getImportTree.js.map +1 -1
- package/dist/tools/getOpenEditors.d.ts +41 -0
- package/dist/tools/getOpenEditors.js +33 -3
- package/dist/tools/getOpenEditors.js.map +1 -1
- package/dist/tools/getSecurityAdvisories.d.ts +67 -0
- package/dist/tools/getSecurityAdvisories.js +45 -7
- package/dist/tools/getSecurityAdvisories.js.map +1 -1
- package/dist/tools/getToolCapabilities.js +6 -0
- package/dist/tools/getToolCapabilities.js.map +1 -1
- package/dist/tools/github/actions.d.ts +2 -2
- package/dist/tools/github/actions.js +6 -2
- package/dist/tools/github/actions.js.map +1 -1
- package/dist/tools/github/index.d.ts +3 -3
- package/dist/tools/github/index.js +3 -3
- package/dist/tools/github/index.js.map +1 -1
- package/dist/tools/index.d.ts +3 -2
- package/dist/tools/index.js +12 -6
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/lsp.js +28 -7
- package/dist/tools/lsp.js.map +1 -1
- package/dist/tools/refactorPreview.d.ts +44 -0
- package/dist/tools/refactorPreview.js +68 -0
- package/dist/tools/refactorPreview.js.map +1 -0
- package/dist/tools/terminal.js +3 -1
- package/dist/tools/terminal.js.map +1 -1
- package/dist/tools/utils.d.ts +13 -1
- package/dist/tools/utils.js +17 -2
- package/dist/tools/utils.js.map +1 -1
- package/dist/tools/watchDiagnostics.js +0 -3
- package/dist/tools/watchDiagnostics.js.map +1 -1
- package/dist/transport.d.ts +6 -0
- package/dist/transport.js +7 -2
- package/dist/transport.js.map +1 -1
- package/package.json +3 -3
|
@@ -21,11 +21,65 @@ export declare function createGetCodeCoverageTool(workspace: string): {
|
|
|
21
21
|
};
|
|
22
22
|
additionalProperties: false;
|
|
23
23
|
};
|
|
24
|
+
outputSchema: {
|
|
25
|
+
type: string;
|
|
26
|
+
properties: {
|
|
27
|
+
reportFile: {
|
|
28
|
+
type: string;
|
|
29
|
+
};
|
|
30
|
+
format: {
|
|
31
|
+
type: string;
|
|
32
|
+
};
|
|
33
|
+
files: {
|
|
34
|
+
type: string;
|
|
35
|
+
items: {
|
|
36
|
+
type: string;
|
|
37
|
+
properties: {
|
|
38
|
+
file: {
|
|
39
|
+
type: string;
|
|
40
|
+
};
|
|
41
|
+
lines: {
|
|
42
|
+
type: string;
|
|
43
|
+
};
|
|
44
|
+
branches: {
|
|
45
|
+
type: string[];
|
|
46
|
+
};
|
|
47
|
+
functions: {
|
|
48
|
+
type: string[];
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
required: string[];
|
|
52
|
+
};
|
|
53
|
+
};
|
|
54
|
+
summary: {
|
|
55
|
+
type: string;
|
|
56
|
+
properties: {
|
|
57
|
+
totalFiles: {
|
|
58
|
+
type: string;
|
|
59
|
+
};
|
|
60
|
+
averageLineCoverage: {
|
|
61
|
+
type: string;
|
|
62
|
+
};
|
|
63
|
+
belowThreshold: {
|
|
64
|
+
type: string;
|
|
65
|
+
};
|
|
66
|
+
};
|
|
67
|
+
};
|
|
68
|
+
};
|
|
69
|
+
required: string[];
|
|
70
|
+
};
|
|
24
71
|
};
|
|
25
72
|
handler: (args: Record<string, unknown>) => Promise<{
|
|
26
73
|
content: Array<{
|
|
27
74
|
type: string;
|
|
28
75
|
text: string;
|
|
29
76
|
}>;
|
|
77
|
+
structuredContent: unknown;
|
|
78
|
+
} | {
|
|
79
|
+
content: Array<{
|
|
80
|
+
type: string;
|
|
81
|
+
text: string;
|
|
82
|
+
}>;
|
|
83
|
+
isError: true;
|
|
30
84
|
}>;
|
|
31
85
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { existsSync, promises as fsPromises } from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import { error, optionalString,
|
|
3
|
+
import { error, optionalString, successStructured } from "./utils.js";
|
|
4
4
|
function pct(hit, found) {
|
|
5
5
|
if (found === 0)
|
|
6
6
|
return 100;
|
|
@@ -114,6 +114,35 @@ export function createGetCodeCoverageTool(workspace) {
|
|
|
114
114
|
},
|
|
115
115
|
additionalProperties: false,
|
|
116
116
|
},
|
|
117
|
+
outputSchema: {
|
|
118
|
+
type: "object",
|
|
119
|
+
properties: {
|
|
120
|
+
reportFile: { type: "string" },
|
|
121
|
+
format: { type: "string" },
|
|
122
|
+
files: {
|
|
123
|
+
type: "array",
|
|
124
|
+
items: {
|
|
125
|
+
type: "object",
|
|
126
|
+
properties: {
|
|
127
|
+
file: { type: "string" },
|
|
128
|
+
lines: { type: "number" },
|
|
129
|
+
branches: { type: ["number", "null"] },
|
|
130
|
+
functions: { type: ["number", "null"] },
|
|
131
|
+
},
|
|
132
|
+
required: ["file", "lines"],
|
|
133
|
+
},
|
|
134
|
+
},
|
|
135
|
+
summary: {
|
|
136
|
+
type: "object",
|
|
137
|
+
properties: {
|
|
138
|
+
totalFiles: { type: "integer" },
|
|
139
|
+
averageLineCoverage: { type: "number" },
|
|
140
|
+
belowThreshold: { type: "integer" },
|
|
141
|
+
},
|
|
142
|
+
},
|
|
143
|
+
},
|
|
144
|
+
required: ["reportFile", "format", "files", "summary"],
|
|
145
|
+
},
|
|
117
146
|
},
|
|
118
147
|
handler: async (args) => {
|
|
119
148
|
const fileArg = optionalString(args, "file");
|
|
@@ -194,7 +223,7 @@ export function createGetCodeCoverageTool(workspace) {
|
|
|
194
223
|
const belowThreshold = minCoverage > 0
|
|
195
224
|
? filtered.length
|
|
196
225
|
: files.filter((f) => f.lines < 80).length;
|
|
197
|
-
return
|
|
226
|
+
return successStructured({
|
|
198
227
|
reportFile,
|
|
199
228
|
format,
|
|
200
229
|
files: filtered,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCodeCoverage.js","sourceRoot":"","sources":["../../src/tools/getCodeCoverage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"getCodeCoverage.js","sourceRoot":"","sources":["../../src/tools/getCodeCoverage.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,29 @@ export declare function createGetDependencyTreeTool(workspace: string, _probes?:
|
|
|
23
23
|
};
|
|
24
24
|
additionalProperties: false;
|
|
25
25
|
};
|
|
26
|
+
outputSchema: {
|
|
27
|
+
type: string;
|
|
28
|
+
properties: {
|
|
29
|
+
available: {
|
|
30
|
+
type: string;
|
|
31
|
+
};
|
|
32
|
+
packageManager: {
|
|
33
|
+
type: string[];
|
|
34
|
+
};
|
|
35
|
+
count: {
|
|
36
|
+
type: string;
|
|
37
|
+
};
|
|
38
|
+
tree: {
|
|
39
|
+
anyOf: {
|
|
40
|
+
type: string;
|
|
41
|
+
}[];
|
|
42
|
+
};
|
|
43
|
+
error: {
|
|
44
|
+
type: string;
|
|
45
|
+
};
|
|
46
|
+
};
|
|
47
|
+
required: string[];
|
|
48
|
+
};
|
|
26
49
|
};
|
|
27
50
|
timeoutMs: number;
|
|
28
51
|
handler(args: Record<string, unknown>, signal?: AbortSignal): Promise<{
|
|
@@ -30,5 +53,6 @@ export declare function createGetDependencyTreeTool(workspace: string, _probes?:
|
|
|
30
53
|
type: string;
|
|
31
54
|
text: string;
|
|
32
55
|
}>;
|
|
56
|
+
structuredContent: unknown;
|
|
33
57
|
}>;
|
|
34
58
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { existsSync } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
-
import { execSafe, optionalInt, optionalString,
|
|
3
|
+
import { execSafe, optionalInt, optionalString, successStructured, } from "./utils.js";
|
|
4
4
|
const CACHE_TTL = 30_000;
|
|
5
5
|
function detectPackageManager(workspace, hint) {
|
|
6
6
|
if (hint && hint !== "auto")
|
|
@@ -138,6 +138,17 @@ export function createGetDependencyTreeTool(workspace, _probes) {
|
|
|
138
138
|
},
|
|
139
139
|
additionalProperties: false,
|
|
140
140
|
},
|
|
141
|
+
outputSchema: {
|
|
142
|
+
type: "object",
|
|
143
|
+
properties: {
|
|
144
|
+
available: { type: "boolean" },
|
|
145
|
+
packageManager: { type: ["string", "null"] },
|
|
146
|
+
count: { type: "integer" },
|
|
147
|
+
tree: { anyOf: [{ type: "object" }, { type: "null" }] },
|
|
148
|
+
error: { type: "string" },
|
|
149
|
+
},
|
|
150
|
+
required: ["available", "packageManager"],
|
|
151
|
+
},
|
|
141
152
|
},
|
|
142
153
|
timeoutMs: 35_000,
|
|
143
154
|
async handler(args, signal) {
|
|
@@ -147,11 +158,11 @@ export function createGetDependencyTreeTool(workspace, _probes) {
|
|
|
147
158
|
const now = Date.now();
|
|
148
159
|
const cached = cache.get(cacheKey);
|
|
149
160
|
if (cached && now - cached.timestamp < CACHE_TTL) {
|
|
150
|
-
return
|
|
161
|
+
return successStructured(cached.data);
|
|
151
162
|
}
|
|
152
163
|
const detected = detectPackageManager(workspace, pm);
|
|
153
164
|
if (!detected) {
|
|
154
|
-
return
|
|
165
|
+
return successStructured({
|
|
155
166
|
available: false,
|
|
156
167
|
packageManager: null,
|
|
157
168
|
error: "No supported package manifest found (package.json, Cargo.toml, go.mod, requirements.txt)",
|
|
@@ -173,18 +184,18 @@ export function createGetDependencyTreeTool(workspace, _probes) {
|
|
|
173
184
|
result = await runPip(workspace, signal);
|
|
174
185
|
break;
|
|
175
186
|
default:
|
|
176
|
-
return
|
|
187
|
+
return successStructured({
|
|
177
188
|
available: false,
|
|
178
189
|
packageManager: detected,
|
|
179
190
|
error: `Unsupported package manager: ${detected}`,
|
|
180
191
|
});
|
|
181
192
|
}
|
|
182
193
|
cache.set(cacheKey, { data: result, timestamp: Date.now() });
|
|
183
|
-
return
|
|
194
|
+
return successStructured({ available: true, ...result });
|
|
184
195
|
}
|
|
185
196
|
catch (err) {
|
|
186
197
|
const msg = err instanceof Error ? err.message : String(err);
|
|
187
|
-
return
|
|
198
|
+
return successStructured({
|
|
188
199
|
available: false,
|
|
189
200
|
packageManager: detected,
|
|
190
201
|
error: msg,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDependencyTree.js","sourceRoot":"","sources":["../../src/tools/getDependencyTree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,
|
|
1
|
+
{"version":3,"file":"getDependencyTree.js","sourceRoot":"","sources":["../../src/tools/getDependencyTree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,QAAQ,EACR,WAAW,EACX,cAAc,EACd,iBAAiB,GAClB,MAAM,YAAY,CAAC;AAEpB,MAAM,SAAS,GAAG,MAAM,CAAC;AAoBzB,SAAS,oBAAoB,CAAC,SAAiB,EAAE,IAAa;IAC5D,IAAI,IAAI,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACzC,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9D,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,IACE,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAC/C,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAE7C,OAAO,KAAK,CAAC;IACf,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,IAAa;IAC/B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAClC,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,MAAM,CACnB,SAAiB,EACjB,KAAa,EACb,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAC3B,KAAK,EACL,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,KAAK,EAAE,EAAE,OAAO,CAAC,EAC7C,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CACxE,CAAC;IACF,4EAA4E;IAC5E,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,2BAA2B,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAI5B,CAAC;IAEF,SAAS,MAAM,CACb,IAAY,EACZ,GAAiE;QAEjE,MAAM,IAAI,GAAY,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;QACrD,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAC1D,MAAM,CACJ,CAAC,EACD,CAAiE,CAClE,CACF,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAY;QACpB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,KAAK;QAC1B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE,MAAM,CAAC,YAAY;YACvB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CACjD,MAAM,CACJ,CAAC,EACD,CAAiE,CAClE,CACF;YACH,CAAC,CAAC,EAAE;KACP,CAAC;IAEF,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,QAAQ,CACrB,SAAiB,EACjB,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAC3B,OAAO,EACP,CAAC,UAAU,EAAE,WAAW,EAAE,oBAAoB,CAAC,EAC/C,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAC5C,CAAC;IACF,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,uBAAuB,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAOtC,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAErE,MAAM,IAAI,GAAY;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACrC,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,GAAG;SACf,CAAC,CAAC;KACJ,CAAC;IACF,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;AAC1E,CAAC;AAED,KAAK,UAAU,KAAK,CAClB,SAAiB,EACjB,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE;QAClE,GAAG,EAAE,SAAS;QACd,MAAM;QACN,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI;KAC3B,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,gBAAgB,CAAC,CAAC;IAC5D,CAAC;IACD,+DAA+D;IAC/D,MAAM,OAAO,GAA8D,EAAE,CAAC;IAC9E,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACjC,+BAA+B;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1E,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CACV,IAAI,CAAC,KAAK,CAAC,KAAK,CAAuD,CACxE,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,wBAAwB;QAC1B,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAY;QACpB,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,QAAQ;QAC5B,OAAO,EAAE,IAAI,EAAE,OAAO;QACtB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KAC9D,CAAC;IACF,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;AAC5D,CAAC;AAED,KAAK,UAAU,MAAM,CACnB,SAAiB,EACjB,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE;QAC9D,GAAG,EAAE,SAAS;QACd,MAAM;QACN,OAAO,EAAE,MAAM;KAChB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,iBAAiB,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAGnC,CAAC;IACH,MAAM,IAAI,GAAY;QACpB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,SAAS;QAC7C,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KAC9D,CAAC;IACF,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,SAAiB,EACjB,OAAsB;IAEtB,MAAM,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAE5C,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,mBAAmB;YACzB,WAAW,EACT,6QAA6Q;YAC/Q,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;YACnC,WAAW,EAAE;gBACX,IAAI,EAAE,QAAiB;gBACvB,UAAU,EAAE;oBACV,KAAK,EAAE;wBACL,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,CAAC;wBACV,OAAO,EAAE,EAAE;wBACX,WAAW,EAAE,6CAA6C;qBAC3D;oBACD,cAAc,EAAE;wBACd,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;wBAC3C,WAAW,EACT,kEAAkE;qBACrE;iBACF;gBACD,oBAAoB,EAAE,KAAc;aACrC;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC9B,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;oBAC5C,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC1B,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE;oBACvD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBAC1B;gBACD,QAAQ,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC;aAC1C;SACF;QACD,SAAS,EAAE,MAAM;QAEjB,KAAK,CAAC,OAAO,CAAC,IAA6B,EAAE,MAAoB;YAC/D,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,MAAM,CAAC;YAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAExD,MAAM,QAAQ,GAAG,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;gBACjD,OAAO,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,iBAAiB,CAAC;oBACvB,SAAS,EAAE,KAAK;oBAChB,cAAc,EAAE,IAAI;oBACpB,KAAK,EACH,0FAA0F;iBAC7F,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC;gBACH,IAAI,MAAiB,CAAC;gBACtB,QAAQ,QAAQ,EAAE,CAAC;oBACjB,KAAK,KAAK;wBACR,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;wBACnD,MAAM;oBACR,KAAK,OAAO;wBACV,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;wBAC3C,MAAM;oBACR,KAAK,IAAI;wBACP,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,KAAK;wBACR,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;wBACzC,MAAM;oBACR;wBACE,OAAO,iBAAiB,CAAC;4BACvB,SAAS,EAAE,KAAK;4BAChB,cAAc,EAAE,QAAQ;4BACxB,KAAK,EAAE,gCAAgC,QAAQ,EAAE;yBAClD,CAAC,CAAC;gBACP,CAAC;gBAED,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC7D,OAAO,iBAAiB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;YAC3D,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACtB,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC7D,OAAO,iBAAiB,CAAC;oBACvB,SAAS,EAAE,KAAK;oBAChB,cAAc,EAAE,QAAQ;oBACxB,KAAK,EAAE,GAAG;iBACX,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -27,6 +27,70 @@ export declare function createGetDiagnosticsTool(workspace: string, probes?: Pro
|
|
|
27
27
|
};
|
|
28
28
|
};
|
|
29
29
|
};
|
|
30
|
+
outputSchema: {
|
|
31
|
+
type: string;
|
|
32
|
+
properties: {
|
|
33
|
+
available: {
|
|
34
|
+
type: string;
|
|
35
|
+
};
|
|
36
|
+
source: {
|
|
37
|
+
type: string;
|
|
38
|
+
};
|
|
39
|
+
linters: {
|
|
40
|
+
type: string;
|
|
41
|
+
items: {
|
|
42
|
+
type: string;
|
|
43
|
+
};
|
|
44
|
+
};
|
|
45
|
+
linterErrors: {
|
|
46
|
+
type: string;
|
|
47
|
+
};
|
|
48
|
+
diagnostics: {
|
|
49
|
+
type: string;
|
|
50
|
+
items: {
|
|
51
|
+
type: string;
|
|
52
|
+
properties: {
|
|
53
|
+
file: {
|
|
54
|
+
type: string;
|
|
55
|
+
};
|
|
56
|
+
severity: {
|
|
57
|
+
type: string;
|
|
58
|
+
enum: string[];
|
|
59
|
+
};
|
|
60
|
+
message: {
|
|
61
|
+
type: string;
|
|
62
|
+
};
|
|
63
|
+
rule: {
|
|
64
|
+
type: string;
|
|
65
|
+
};
|
|
66
|
+
line: {
|
|
67
|
+
type: string;
|
|
68
|
+
};
|
|
69
|
+
column: {
|
|
70
|
+
type: string;
|
|
71
|
+
};
|
|
72
|
+
endLine: {
|
|
73
|
+
type: string;
|
|
74
|
+
};
|
|
75
|
+
endColumn: {
|
|
76
|
+
type: string;
|
|
77
|
+
};
|
|
78
|
+
source: {
|
|
79
|
+
type: string;
|
|
80
|
+
};
|
|
81
|
+
};
|
|
82
|
+
required: string[];
|
|
83
|
+
};
|
|
84
|
+
};
|
|
85
|
+
summary: {
|
|
86
|
+
type: string;
|
|
87
|
+
};
|
|
88
|
+
truncated: {
|
|
89
|
+
type: string;
|
|
90
|
+
};
|
|
91
|
+
};
|
|
92
|
+
required: string[];
|
|
93
|
+
};
|
|
30
94
|
};
|
|
31
95
|
timeoutMs: number;
|
|
32
96
|
handler(args: Record<string, unknown>, signal?: AbortSignal): Promise<{
|
|
@@ -34,5 +98,6 @@ export declare function createGetDiagnosticsTool(workspace: string, probes?: Pro
|
|
|
34
98
|
type: string;
|
|
35
99
|
text: string;
|
|
36
100
|
}>;
|
|
101
|
+
structuredContent: unknown;
|
|
37
102
|
}>;
|
|
38
103
|
};
|
|
@@ -6,7 +6,7 @@ import { govetLinter } from "./linters/govet.js";
|
|
|
6
6
|
import { pyrightLinter } from "./linters/pyright.js";
|
|
7
7
|
import { ruffLinter } from "./linters/ruff.js";
|
|
8
8
|
import { typescriptLinter } from "./linters/typescript.js";
|
|
9
|
-
import { optionalString,
|
|
9
|
+
import { optionalString, successStructured, toFileUri } from "./utils.js";
|
|
10
10
|
// Cap diagnostic message length and strip control characters to prevent
|
|
11
11
|
// prompt injection from malicious LSP servers or linters.
|
|
12
12
|
const MAX_MESSAGE_LEN = 500;
|
|
@@ -122,6 +122,39 @@ export function createGetDiagnosticsTool(workspace, probes, extensionClient, lin
|
|
|
122
122
|
},
|
|
123
123
|
},
|
|
124
124
|
},
|
|
125
|
+
outputSchema: {
|
|
126
|
+
type: "object",
|
|
127
|
+
properties: {
|
|
128
|
+
available: { type: "boolean" },
|
|
129
|
+
source: { type: "string" },
|
|
130
|
+
linters: { type: "array", items: { type: "string" } },
|
|
131
|
+
linterErrors: { type: "object" },
|
|
132
|
+
diagnostics: {
|
|
133
|
+
type: "array",
|
|
134
|
+
items: {
|
|
135
|
+
type: "object",
|
|
136
|
+
properties: {
|
|
137
|
+
file: { type: "string" },
|
|
138
|
+
severity: {
|
|
139
|
+
type: "string",
|
|
140
|
+
enum: ["error", "warning", "information", "hint"],
|
|
141
|
+
},
|
|
142
|
+
message: { type: "string" },
|
|
143
|
+
rule: { type: "string" },
|
|
144
|
+
line: { type: "integer" },
|
|
145
|
+
column: { type: "integer" },
|
|
146
|
+
endLine: { type: "integer" },
|
|
147
|
+
endColumn: { type: "integer" },
|
|
148
|
+
source: { type: "string" },
|
|
149
|
+
},
|
|
150
|
+
required: ["file", "severity", "message"],
|
|
151
|
+
},
|
|
152
|
+
},
|
|
153
|
+
summary: { type: "object" },
|
|
154
|
+
truncated: { type: "boolean" },
|
|
155
|
+
},
|
|
156
|
+
required: ["available", "source", "diagnostics"],
|
|
157
|
+
},
|
|
125
158
|
},
|
|
126
159
|
// 30s: CLI linters (tsc, biome) can be slow on cold start over VPS disk
|
|
127
160
|
timeoutMs: 30_000,
|
|
@@ -182,7 +215,7 @@ export function createGetDiagnosticsTool(workspace, probes, extensionClient, lin
|
|
|
182
215
|
return d;
|
|
183
216
|
});
|
|
184
217
|
const filtered = applyFilters(sanitized);
|
|
185
|
-
return
|
|
218
|
+
return successStructured({
|
|
186
219
|
available: true,
|
|
187
220
|
source: "extension",
|
|
188
221
|
linters: ["vscode-lsp"],
|
|
@@ -208,7 +241,7 @@ export function createGetDiagnosticsTool(workspace, probes, extensionClient, lin
|
|
|
208
241
|
}
|
|
209
242
|
// Fallback to CLI linters — run all in parallel
|
|
210
243
|
if (availableLinters.length === 0) {
|
|
211
|
-
return
|
|
244
|
+
return successStructured({
|
|
212
245
|
available: false,
|
|
213
246
|
source: "cli",
|
|
214
247
|
linters: [],
|
|
@@ -247,7 +280,7 @@ export function createGetDiagnosticsTool(workspace, probes, extensionClient, lin
|
|
|
247
280
|
if (err)
|
|
248
281
|
errors[l.name] = err;
|
|
249
282
|
}
|
|
250
|
-
return
|
|
283
|
+
return successStructured({
|
|
251
284
|
available: true,
|
|
252
285
|
source: "cli",
|
|
253
286
|
linters: availableLinters.map((l) => l.name),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDiagnostics.js","sourceRoot":"","sources":["../../src/tools/getDiagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,GACtB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"getDiagnostics.js","sourceRoot":"","sources":["../../src/tools/getDiagnostics.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,11 +17,58 @@ export declare function createGetDocumentSymbolsTool(workspace: string, extensio
|
|
|
17
17
|
required: string[];
|
|
18
18
|
additionalProperties: false;
|
|
19
19
|
};
|
|
20
|
+
outputSchema: {
|
|
21
|
+
type: string;
|
|
22
|
+
properties: {
|
|
23
|
+
symbols: {
|
|
24
|
+
type: string;
|
|
25
|
+
items: {
|
|
26
|
+
type: string;
|
|
27
|
+
properties: {
|
|
28
|
+
name: {
|
|
29
|
+
type: string;
|
|
30
|
+
};
|
|
31
|
+
kind: {
|
|
32
|
+
type: string;
|
|
33
|
+
};
|
|
34
|
+
line: {
|
|
35
|
+
type: string;
|
|
36
|
+
};
|
|
37
|
+
column: {
|
|
38
|
+
type: string;
|
|
39
|
+
};
|
|
40
|
+
parent: {
|
|
41
|
+
type: string[];
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
required: string[];
|
|
45
|
+
};
|
|
46
|
+
};
|
|
47
|
+
count: {
|
|
48
|
+
type: string;
|
|
49
|
+
};
|
|
50
|
+
source: {
|
|
51
|
+
type: string;
|
|
52
|
+
enum: string[];
|
|
53
|
+
};
|
|
54
|
+
note: {
|
|
55
|
+
type: string;
|
|
56
|
+
};
|
|
57
|
+
};
|
|
58
|
+
required: string[];
|
|
59
|
+
};
|
|
20
60
|
};
|
|
21
61
|
handler: (args: Record<string, unknown>, signal?: AbortSignal) => Promise<{
|
|
22
62
|
content: Array<{
|
|
23
63
|
type: string;
|
|
24
64
|
text: string;
|
|
25
65
|
}>;
|
|
66
|
+
structuredContent: unknown;
|
|
67
|
+
} | {
|
|
68
|
+
content: Array<{
|
|
69
|
+
type: string;
|
|
70
|
+
text: string;
|
|
71
|
+
}>;
|
|
72
|
+
isError: true;
|
|
26
73
|
}>;
|
|
27
74
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
-
import { error, execSafe, languageIdFromPath, requireString, resolveFilePath,
|
|
2
|
+
import { error, execSafe, languageIdFromPath, requireString, resolveFilePath, successStructured, } from "./utils.js";
|
|
3
3
|
// Language-specific patterns to detect symbol definitions (grep fallback)
|
|
4
4
|
const SYMBOL_PATTERNS = {
|
|
5
5
|
typescript: String.raw `^\s*(export\s+)?(default\s+)?(abstract\s+)?(class|interface|type|enum|function|async\s+function|const|let|var)\s+\w`,
|
|
@@ -31,6 +31,32 @@ export function createGetDocumentSymbolsTool(workspace, extensionClient) {
|
|
|
31
31
|
required: ["filePath"],
|
|
32
32
|
additionalProperties: false,
|
|
33
33
|
},
|
|
34
|
+
outputSchema: {
|
|
35
|
+
type: "object",
|
|
36
|
+
properties: {
|
|
37
|
+
symbols: {
|
|
38
|
+
type: "array",
|
|
39
|
+
items: {
|
|
40
|
+
type: "object",
|
|
41
|
+
properties: {
|
|
42
|
+
name: { type: "string" },
|
|
43
|
+
kind: { type: "string" },
|
|
44
|
+
line: { type: "integer" },
|
|
45
|
+
column: { type: "integer" },
|
|
46
|
+
parent: { type: ["string", "null"] },
|
|
47
|
+
},
|
|
48
|
+
required: ["name", "kind", "line"],
|
|
49
|
+
},
|
|
50
|
+
},
|
|
51
|
+
count: { type: "integer" },
|
|
52
|
+
source: {
|
|
53
|
+
type: "string",
|
|
54
|
+
enum: ["lsp", "grep-fallback", "unavailable"],
|
|
55
|
+
},
|
|
56
|
+
note: { type: "string" },
|
|
57
|
+
},
|
|
58
|
+
required: ["symbols", "count", "source"],
|
|
59
|
+
},
|
|
34
60
|
},
|
|
35
61
|
handler: async (args, signal) => {
|
|
36
62
|
const rawPath = requireString(args, "filePath");
|
|
@@ -41,7 +67,7 @@ export function createGetDocumentSymbolsTool(workspace, extensionClient) {
|
|
|
41
67
|
const result = await extensionClient.getDocumentSymbols(filePath, signal);
|
|
42
68
|
if (result !== null && typeof result === "object") {
|
|
43
69
|
const r = result;
|
|
44
|
-
return
|
|
70
|
+
return successStructured({ ...r, source: "lsp" });
|
|
45
71
|
}
|
|
46
72
|
// null means LSP not ready for this file — fall through to grep
|
|
47
73
|
}
|
|
@@ -54,7 +80,7 @@ export function createGetDocumentSymbolsTool(workspace, extensionClient) {
|
|
|
54
80
|
const pattern = SYMBOL_PATTERNS[langId];
|
|
55
81
|
if (!pattern) {
|
|
56
82
|
// No pattern — just return empty with a note
|
|
57
|
-
return
|
|
83
|
+
return successStructured({
|
|
58
84
|
symbols: [],
|
|
59
85
|
count: 0,
|
|
60
86
|
source: "unavailable",
|
|
@@ -70,7 +96,11 @@ export function createGetDocumentSymbolsTool(workspace, extensionClient) {
|
|
|
70
96
|
maxBuffer: 256 * 1024,
|
|
71
97
|
});
|
|
72
98
|
if (!rgResult.stdout.trim()) {
|
|
73
|
-
return
|
|
99
|
+
return successStructured({
|
|
100
|
+
symbols: [],
|
|
101
|
+
count: 0,
|
|
102
|
+
source: "grep-fallback",
|
|
103
|
+
});
|
|
74
104
|
}
|
|
75
105
|
const symbols = [];
|
|
76
106
|
for (const line of rgResult.stdout.split("\n")) {
|
|
@@ -90,7 +120,7 @@ export function createGetDocumentSymbolsTool(workspace, extensionClient) {
|
|
|
90
120
|
const kind = kindToSymbolKind(kindRaw);
|
|
91
121
|
symbols.push({ name, kind, line: lineNum, parent: null });
|
|
92
122
|
}
|
|
93
|
-
return
|
|
123
|
+
return successStructured({
|
|
94
124
|
symbols,
|
|
95
125
|
count: symbols.length,
|
|
96
126
|
source: "grep-fallback",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDocumentSymbols.js","sourceRoot":"","sources":["../../src/tools/getDocumentSymbols.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EACL,KAAK,EACL,QAAQ,EACR,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"getDocumentSymbols.js","sourceRoot":"","sources":["../../src/tools/getDocumentSymbols.ts"],"names":[],"mappings":"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"}
|