@askdkc/dsh-lsp-server 0.1.16 → 0.1.18

package/lib/extra-tool.js

@@ -8,9 +8,10 @@ const inject = [
 	"tools",
 	"systemPrompt",
 	"webstackLsp",
-	"codeIntelligenceRuntime"
+	"codeIntelligenceRuntime",
+	"workingDirectory"
 ];
-function createExtraTool(service, codeIntelligence, config = {}) {
+function createExtraTool(service, codeIntelligence, config = {}, workingDirectory) {
 	const limits = {
 		maxDiagnostics: 200,
 		maxCompletions: 100,
@@ -107,16 +108,16 @@ function createExtraTool(service, codeIntelligence, config = {}) {
 				if (!codeIntelligence) throw new WebstackLspError("LSP_CODE_INTELLIGENCE_UNAVAILABLE", "code-intelligence service is unavailable");
 				if (args.operation === "snapshot") if (args.action === "capabilities") result = codeIntelligence.capabilities();
 				else if (args.action === "open") {
-					const scope = snapshotScope(exec.agent);
+					const scope = snapshotScope(exec.agent, await resolveWorkspace(workingDirectory, exec.agent, signal));
 					if (typeof args.file_path !== "string") throw new TypeError("file_path is required for snapshot open");
 					result = await codeIntelligence.snapshot.open(scope, args.file_path, signal);
 				} else if (args.action === "release") {
-					const scope = snapshotScope(exec.agent);
+					const scope = snapshotScope(exec.agent, await resolveWorkspace(workingDirectory, exec.agent, signal));
 					if (typeof args.handle !== "string") throw new TypeError("handle is required for snapshot release");
 					result = await codeIntelligence.snapshot.release(scope, args.handle);
 				} else throw new TypeError("snapshot action must be open, release, or capabilities");
 				else {
-					const scope = snapshotScope(exec.agent);
+					const scope = snapshotScope(exec.agent, await resolveWorkspace(workingDirectory, exec.agent, signal));
 					if (args.operation === "structure") if (args.action === "outline") {
 						const range = readRange(args);
 						result = await codeIntelligence.structure.outline(scope, requiredString(args.handle, "handle"), {
@@ -151,8 +152,7 @@ function createExtraTool(service, codeIntelligence, config = {}) {
 					}
 				}
 			} else {
-				const workspaceRoot = exec.agent?.session.header.cwd;
-				if (!workspaceRoot) throw new WebstackLspError("LSP_WORKSPACE_REQUIRED", "lsp_extra requires a session workspace cwd");
+				const workspaceRoot = await resolveWorkspace(workingDirectory, exec.agent, signal);
 				if (!args.file_path) throw new TypeError("file_path is required");
 				if (args.operation === "diagnostics") {
 					const diagnostics = await service.diagnostics({
@@ -186,7 +186,7 @@ function createExtraTool(service, codeIntelligence, config = {}) {
 	});
 }
 function apply(ctx, config = {}) {
-	const tool = createExtraTool(ctx.webstackLsp, ctx.codeIntelligenceRuntime, config);
+	const tool = createExtraTool(ctx.webstackLsp, ctx.codeIntelligenceRuntime, config, ctx.workingDirectory);
 	ctx.tools.register(tool);
 	ctx.systemPrompt.section({
 		name: "tool:lsp_extra",
@@ -194,14 +194,18 @@ function apply(ctx, config = {}) {
 		text: "Use lsp_extra diagnostics after editing supported code files (PHP/Blade, TypeScript/JavaScript, JSX/TSX, Svelte, HTML, CSS/PCSS). Check status for supportedFileSuffixes, code-intelligence parser capabilities and server availability when uncertain. For Markdown and other unsupported documents, use content/structure checks instead. Open a snapshot before structure or semantic queries, pass its handle, and release it when finished. Structure/semantic positions and ranges are zero-based UTF-16; completion cursors remain one-based UTF-16. A skipped query is unverified, never a clean result; do not repeat an unsupported query unchanged. Query IDs are registered and cannot contain arbitrary Tree-sitter queries. The tool never applies edits."
 	});
 }
-function snapshotScope(agent) {
+async function resolveWorkspace(workingDirectory, agent, signal) {
+	if (!agent || !workingDirectory) throw new WebstackLspError("LSP_WORKSPACE_REQUIRED", "lsp_extra requires an active session and the workingDirectory service");
+	return workingDirectory.ensure(agent, signal);
+}
+function snapshotScope(agent, workspaceRoot) {
 	if (typeof agent !== "object" || agent === null) throw new WebstackLspError("LSP_WORKSPACE_REQUIRED", "snapshot operations require an active agent session");
 	const value = agent;
-	if (typeof value.id !== "string" || typeof value.session?.id !== "string" || typeof value.session.header?.cwd !== "string") throw new WebstackLspError("LSP_WORKSPACE_REQUIRED", "snapshot operations require trusted owner, session and workspace identity");
+	if (typeof value.id !== "string" || typeof value.session?.id !== "string") throw new WebstackLspError("LSP_WORKSPACE_REQUIRED", "snapshot operations require trusted owner, session and workspace identity");
 	return {
 		ownerId: value.id,
 		sessionId: value.session.id,
-		workspaceRoot: value.session.header.cwd
+		workspaceRoot
 	};
 }
 function requiredString(value, name$1) {

package/lib/extra-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"extra-tool.js","names":["result: unknown","name"],"sources":["../src/extra-tool.ts"],"sourcesContent":["import type { Context } from '@deepseek-ai/cordis'\nimport { defineTool } from '@deepseek-ai/dsh-tools'\nimport type { ToolDefinition } from '@deepseek-ai/dsh-tools'\nimport type {} from '@deepseek-ai/dsh-system-prompt'\nimport type {} from './provider.js'\nimport type { WebstackLspService } from './service.js'\nimport { WebstackLspError } from './errors.js'\nimport { mergeDiagnostics } from './merge/diagnostics.js'\nimport { mergeCompletions } from './merge/completion.js'\nimport type { CodeIntelligenceToolServiceV1, SnapshotScope } from './structure/types.js'\n\nexport const name = 'lsp_extra'\nexport const inject = ['tools', 'systemPrompt', 'webstackLsp', 'codeIntelligenceRuntime']\nexport interface Config { maxDiagnostics?: number; maxCompletions?: number; maxResultChars?: number; timeoutMs?: number }\n\nexport function createExtraTool(service: WebstackLspService, codeIntelligence?: CodeIntelligenceToolServiceV1, config: Config = {}): ToolDefinition {\n  const limits = { maxDiagnostics: 200, maxCompletions: 100, maxResultChars: 32000, timeoutMs: 60000, ...config }\n  for (const [key, value] of Object.entries(limits)) if (!Number.isSafeInteger(value) || value < 1 || value > 2147483647) throw new TypeError(`${key} must be a positive integer no greater than 2147483647`)\n  return defineTool({\n    name,\n    description: 'Read language-server status, diagnostics, or completion candidates for PHP/Blade, TypeScript/JavaScript, JSX/TSX, Svelte, HTML and CSS/PCSS. status reports supportedFileSuffixes and server availability. Unsupported document diagnostics return skipped (unverified). file_path is workspace-relative. Completion line and character are one-based UTF-16. No edits are applied.',\n    parameters: {\n      operation: { type: 'string', enum: ['status', 'diagnostics', 'completion', 'snapshot', 'structure', 'semantic'], required: true },\n      action: { type: 'string', enum: ['open', 'release', 'capabilities', 'outline', 'enclosing', 'query', 'span', 'definition', 'references', 'implementation', 'hover', 'diagnostics', 'completion'] },\n      file_path: { type: 'string' }, line: { type: 'integer' }, character: { type: 'integer' },\n      handle: { type: 'string' }, node_handle: { type: 'string' }, query_id: { type: 'string' }, max_chars: { type: 'integer' }, limit: { type: 'integer' },\n      position_line: { type: 'integer' }, position_character: { type: 'integer' },\n      start_line: { type: 'integer' }, start_character: { type: 'integer' }, end_line: { type: 'integer' }, end_character: { type: 'integer' },\n      kinds: { type: 'array', items: { type: 'string' } },\n      severity: { type: 'string', enum: ['all', 'error', 'warning'] },\n      servers: { type: 'array', items: { type: 'string' } },\n    },\n    output: {\n      schema: { type: 'json' },\n      render: (_args, value) => {\n        const text = JSON.stringify(value)\n        return [{ type: 'text', text: text.length <= limits.maxResultChars ? text : `${text.slice(0, Math.max(0, limits.maxResultChars - 14))}\\n[truncated]`.slice(0, limits.maxResultChars) }]\n      },\n    },\n    timeoutMs: limits.timeoutMs,\n    async execute(args, exec) {\n      const signal = AbortSignal.any([exec.signal, AbortSignal.timeout(limits.timeoutMs)])\n      signal.throwIfAborted()\n      let result: unknown\n      if (args.operation === 'status') result = { ...(await service.status()), ...(codeIntelligence ? { codeIntelligence: codeIntelligence.capabilities() } : {}) }\n      else if (args.operation === 'snapshot' || args.operation === 'structure' || args.operation === 'semantic') {\n        if (!codeIntelligence) throw new WebstackLspError('LSP_CODE_INTELLIGENCE_UNAVAILABLE', 'code-intelligence service is unavailable')\n        if (args.operation === 'snapshot') {\n          if (args.action === 'capabilities') result = codeIntelligence.capabilities()\n          else if (args.action === 'open') {\n            const scope = snapshotScope(exec.agent)\n            if (typeof args.file_path !== 'string') throw new TypeError('file_path is required for snapshot open')\n            result = await codeIntelligence.snapshot.open(scope, args.file_path, signal)\n          } else if (args.action === 'release') {\n            const scope = snapshotScope(exec.agent)\n            if (typeof args.handle !== 'string') throw new TypeError('handle is required for snapshot release')\n            result = await codeIntelligence.snapshot.release(scope, args.handle)\n          } else throw new TypeError('snapshot action must be open, release, or capabilities')\n        } else {\n          const scope = snapshotScope(exec.agent)\n          if (args.operation === 'structure') {\n          if (args.action === 'outline') {\n            const range = readRange(args)\n            result = await codeIntelligence.structure.outline(scope, requiredString(args.handle, 'handle'), { ...(range ? { range } : {}), ...(args.limit === undefined ? {} : { limit: args.limit as number }) }, signal)\n          }\n          else if (args.action === 'enclosing') result = await codeIntelligence.structure.enclosing(scope, requiredString(args.handle, 'handle'), zeroBasedPosition(args), { ...(args.kinds === undefined ? {} : { kinds: args.kinds as string[] }) }, signal)\n          else if (args.action === 'query') {\n            const range = readRange(args)\n            result = await codeIntelligence.structure.query(scope, requiredString(args.handle, 'handle'), requiredString(args.query_id, 'query_id'), { ...(range ? { range } : {}), ...(args.limit === undefined ? {} : { limit: args.limit as number }) }, signal)\n          }\n          else if (args.action === 'span') result = await codeIntelligence.structure.span(scope, requiredString(args.node_handle, 'node_handle'), args.max_chars as number | undefined, signal)\n          else throw new TypeError('structure action must be outline, enclosing, query, or span')\n          } else {\n          const action = args.action\n          if (!['definition', 'references', 'implementation', 'hover', 'diagnostics', 'completion'].includes(String(action))) throw new TypeError('unsupported semantic action')\n          result = await codeIntelligence.semantic.query(scope, requiredString(args.handle, 'handle'), {\n            operation: action as 'definition' | 'references' | 'implementation' | 'hover' | 'diagnostics' | 'completion',\n            ...(action === 'diagnostics' ? {} : { position: zeroBasedPosition(args) }),\n            ...(args.severity ? { severity: args.severity as 'all' | 'error' | 'warning' } : {}),\n            ...(args.servers ? { servers: args.servers as string[] } : {}),\n          }, signal)\n          }\n        }\n      }\n      else {\n        const workspaceRoot = exec.agent?.session.header.cwd\n        if (!workspaceRoot) throw new WebstackLspError('LSP_WORKSPACE_REQUIRED', 'lsp_extra requires a session workspace cwd')\n        if (!args.file_path) throw new TypeError('file_path is required')\n        if (args.operation === 'diagnostics') {\n          const diagnostics = await service.diagnostics({ workspaceRoot, filePath: args.file_path, ...(args.severity ? { severity: args.severity } : {}), ...(args.servers ? { servers: args.servers } : {}) }, signal)\n          result = { ...diagnostics, ...mergeDiagnostics([diagnostics.diagnostics], limits) }\n        } else {\n          if (!args.line || args.line < 1 || !args.character || args.character < 1) throw new TypeError('completion requires positive one-based line and character')\n          const completion = await service.completion({ workspaceRoot, filePath: args.file_path, position: { line: args.line - 1, character: args.character - 1 } }, signal)\n          result = { ...completion, ...mergeCompletions([completion.items], limits) }\n        }\n      }\n      // Strip undefined optionals and expose a lossless JSON result to DSH's schema validator.\n      return JSON.parse(JSON.stringify(result))\n    },\n  })\n}\n\nexport function apply(ctx: Context, config: Config = {}): void {\n  const tool = createExtraTool(ctx.webstackLsp, ctx.codeIntelligenceRuntime, config)\n  ctx.tools.register(tool)\n  ctx.systemPrompt.section({ name: 'tool:lsp_extra', order: 500, text: 'Use lsp_extra diagnostics after editing supported code files (PHP/Blade, TypeScript/JavaScript, JSX/TSX, Svelte, HTML, CSS/PCSS). Check status for supportedFileSuffixes, code-intelligence parser capabilities and server availability when uncertain. For Markdown and other unsupported documents, use content/structure checks instead. Open a snapshot before structure or semantic queries, pass its handle, and release it when finished. Structure/semantic positions and ranges are zero-based UTF-16; completion cursors remain one-based UTF-16. A skipped query is unverified, never a clean result; do not repeat an unsupported query unchanged. Query IDs are registered and cannot contain arbitrary Tree-sitter queries. The tool never applies edits.' })\n}\n\nfunction snapshotScope(agent: unknown): SnapshotScope {\n  if (typeof agent !== 'object' || agent === null) throw new WebstackLspError('LSP_WORKSPACE_REQUIRED', 'snapshot operations require an active agent session')\n  const value = agent as { id?: unknown; session?: { id?: unknown; header?: { cwd?: unknown } } }\n  if (typeof value.id !== 'string' || typeof value.session?.id !== 'string' || typeof value.session.header?.cwd !== 'string')\n    throw new WebstackLspError('LSP_WORKSPACE_REQUIRED', 'snapshot operations require trusted owner, session and workspace identity')\n  return { ownerId: value.id, sessionId: value.session.id, workspaceRoot: value.session.header.cwd }\n}\n\nfunction requiredString(value: unknown, name: string): string {\n  if (typeof value !== 'string' || !value.trim()) throw new TypeError(`${name} is required`)\n  return value\n}\n\nfunction zeroBasedPosition(args: Record<string, unknown>): { line: number; character: number } {\n  if (!Number.isSafeInteger(args.position_line) || !Number.isSafeInteger(args.position_character) || (args.position_line as number) < 0 || (args.position_character as number) < 0)\n    throw new TypeError('position_line and position_character must be zero-based non-negative UTF-16 offsets')\n  return { line: args.position_line as number, character: args.position_character as number }\n}\n\nfunction readRange(args: Record<string, unknown>): { start: { line: number; character: number }; end: { line: number; character: number } } | undefined {\n  const fields = [args.start_line, args.start_character, args.end_line, args.end_character]\n  if (fields.every(value => value === undefined)) return undefined\n  if (fields.some(value => !Number.isSafeInteger(value) || (value as number) < 0)) throw new TypeError('range requires four zero-based non-negative coordinates')\n  return { start: { line: args.start_line as number, character: args.start_character as number }, end: { line: args.end_line as number, character: args.end_character as number } }\n}\n"],"mappings":"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"}
+{"version":3,"file":"extra-tool.js","names":["result: unknown","name"],"sources":["../src/extra-tool.ts"],"sourcesContent":["import type { Context } from '@deepseek-ai/cordis'\nimport { defineTool } from '@deepseek-ai/dsh-tools'\nimport type { ToolDefinition, ToolExecutionInput } from '@deepseek-ai/dsh-tools'\nimport type { WorkingDirectoryService } from '@deepseek-ai/dsh-working-directory'\nimport type {} from '@deepseek-ai/dsh-system-prompt'\nimport type {} from './provider.js'\nimport type { WebstackLspService } from './service.js'\nimport { WebstackLspError } from './errors.js'\nimport { mergeDiagnostics } from './merge/diagnostics.js'\nimport { mergeCompletions } from './merge/completion.js'\nimport type { CodeIntelligenceToolServiceV1, SnapshotScope } from './structure/types.js'\n\nexport const name = 'lsp_extra'\nexport const inject = ['tools', 'systemPrompt', 'webstackLsp', 'codeIntelligenceRuntime', 'workingDirectory']\nexport interface Config { maxDiagnostics?: number; maxCompletions?: number; maxResultChars?: number; timeoutMs?: number }\n\nexport function createExtraTool(service: WebstackLspService, codeIntelligence?: CodeIntelligenceToolServiceV1, config: Config = {}, workingDirectory?: Pick<WorkingDirectoryService, 'ensure'>): ToolDefinition {\n  const limits = { maxDiagnostics: 200, maxCompletions: 100, maxResultChars: 32000, timeoutMs: 60000, ...config }\n  for (const [key, value] of Object.entries(limits)) if (!Number.isSafeInteger(value) || value < 1 || value > 2147483647) throw new TypeError(`${key} must be a positive integer no greater than 2147483647`)\n  return defineTool({\n    name,\n    description: 'Read language-server status, diagnostics, or completion candidates for PHP/Blade, TypeScript/JavaScript, JSX/TSX, Svelte, HTML and CSS/PCSS. status reports supportedFileSuffixes and server availability. Unsupported document diagnostics return skipped (unverified). file_path is workspace-relative. Completion line and character are one-based UTF-16. No edits are applied.',\n    parameters: {\n      operation: { type: 'string', enum: ['status', 'diagnostics', 'completion', 'snapshot', 'structure', 'semantic'], required: true },\n      action: { type: 'string', enum: ['open', 'release', 'capabilities', 'outline', 'enclosing', 'query', 'span', 'definition', 'references', 'implementation', 'hover', 'diagnostics', 'completion'] },\n      file_path: { type: 'string' }, line: { type: 'integer' }, character: { type: 'integer' },\n      handle: { type: 'string' }, node_handle: { type: 'string' }, query_id: { type: 'string' }, max_chars: { type: 'integer' }, limit: { type: 'integer' },\n      position_line: { type: 'integer' }, position_character: { type: 'integer' },\n      start_line: { type: 'integer' }, start_character: { type: 'integer' }, end_line: { type: 'integer' }, end_character: { type: 'integer' },\n      kinds: { type: 'array', items: { type: 'string' } },\n      severity: { type: 'string', enum: ['all', 'error', 'warning'] },\n      servers: { type: 'array', items: { type: 'string' } },\n    },\n    output: {\n      schema: { type: 'json' },\n      render: (_args, value) => {\n        const text = JSON.stringify(value)\n        return [{ type: 'text', text: text.length <= limits.maxResultChars ? text : `${text.slice(0, Math.max(0, limits.maxResultChars - 14))}\\n[truncated]`.slice(0, limits.maxResultChars) }]\n      },\n    },\n    timeoutMs: limits.timeoutMs,\n    async execute(args, exec) {\n      const signal = AbortSignal.any([exec.signal, AbortSignal.timeout(limits.timeoutMs)])\n      signal.throwIfAborted()\n      let result: unknown\n      if (args.operation === 'status') result = { ...(await service.status()), ...(codeIntelligence ? { codeIntelligence: codeIntelligence.capabilities() } : {}) }\n      else if (args.operation === 'snapshot' || args.operation === 'structure' || args.operation === 'semantic') {\n        if (!codeIntelligence) throw new WebstackLspError('LSP_CODE_INTELLIGENCE_UNAVAILABLE', 'code-intelligence service is unavailable')\n        if (args.operation === 'snapshot') {\n          if (args.action === 'capabilities') result = codeIntelligence.capabilities()\n          else if (args.action === 'open') {\n            const scope = snapshotScope(exec.agent, await resolveWorkspace(workingDirectory, exec.agent, signal))\n            if (typeof args.file_path !== 'string') throw new TypeError('file_path is required for snapshot open')\n            result = await codeIntelligence.snapshot.open(scope, args.file_path, signal)\n          } else if (args.action === 'release') {\n            const scope = snapshotScope(exec.agent, await resolveWorkspace(workingDirectory, exec.agent, signal))\n            if (typeof args.handle !== 'string') throw new TypeError('handle is required for snapshot release')\n            result = await codeIntelligence.snapshot.release(scope, args.handle)\n          } else throw new TypeError('snapshot action must be open, release, or capabilities')\n        } else {\n          const scope = snapshotScope(exec.agent, await resolveWorkspace(workingDirectory, exec.agent, signal))\n          if (args.operation === 'structure') {\n          if (args.action === 'outline') {\n            const range = readRange(args)\n            result = await codeIntelligence.structure.outline(scope, requiredString(args.handle, 'handle'), { ...(range ? { range } : {}), ...(args.limit === undefined ? {} : { limit: args.limit as number }) }, signal)\n          }\n          else if (args.action === 'enclosing') result = await codeIntelligence.structure.enclosing(scope, requiredString(args.handle, 'handle'), zeroBasedPosition(args), { ...(args.kinds === undefined ? {} : { kinds: args.kinds as string[] }) }, signal)\n          else if (args.action === 'query') {\n            const range = readRange(args)\n            result = await codeIntelligence.structure.query(scope, requiredString(args.handle, 'handle'), requiredString(args.query_id, 'query_id'), { ...(range ? { range } : {}), ...(args.limit === undefined ? {} : { limit: args.limit as number }) }, signal)\n          }\n          else if (args.action === 'span') result = await codeIntelligence.structure.span(scope, requiredString(args.node_handle, 'node_handle'), args.max_chars as number | undefined, signal)\n          else throw new TypeError('structure action must be outline, enclosing, query, or span')\n          } else {\n          const action = args.action\n          if (!['definition', 'references', 'implementation', 'hover', 'diagnostics', 'completion'].includes(String(action))) throw new TypeError('unsupported semantic action')\n          result = await codeIntelligence.semantic.query(scope, requiredString(args.handle, 'handle'), {\n            operation: action as 'definition' | 'references' | 'implementation' | 'hover' | 'diagnostics' | 'completion',\n            ...(action === 'diagnostics' ? {} : { position: zeroBasedPosition(args) }),\n            ...(args.severity ? { severity: args.severity as 'all' | 'error' | 'warning' } : {}),\n            ...(args.servers ? { servers: args.servers as string[] } : {}),\n          }, signal)\n          }\n        }\n      }\n      else {\n        const workspaceRoot = await resolveWorkspace(workingDirectory, exec.agent, signal)\n        if (!args.file_path) throw new TypeError('file_path is required')\n        if (args.operation === 'diagnostics') {\n          const diagnostics = await service.diagnostics({ workspaceRoot, filePath: args.file_path, ...(args.severity ? { severity: args.severity } : {}), ...(args.servers ? { servers: args.servers } : {}) }, signal)\n          result = { ...diagnostics, ...mergeDiagnostics([diagnostics.diagnostics], limits) }\n        } else {\n          if (!args.line || args.line < 1 || !args.character || args.character < 1) throw new TypeError('completion requires positive one-based line and character')\n          const completion = await service.completion({ workspaceRoot, filePath: args.file_path, position: { line: args.line - 1, character: args.character - 1 } }, signal)\n          result = { ...completion, ...mergeCompletions([completion.items], limits) }\n        }\n      }\n      // Strip undefined optionals and expose a lossless JSON result to DSH's schema validator.\n      return JSON.parse(JSON.stringify(result))\n    },\n  })\n}\n\nexport function apply(ctx: Context, config: Config = {}): void {\n  const tool = createExtraTool(ctx.webstackLsp, ctx.codeIntelligenceRuntime, config, ctx.workingDirectory)\n  ctx.tools.register(tool)\n  ctx.systemPrompt.section({ name: 'tool:lsp_extra', order: 500, text: 'Use lsp_extra diagnostics after editing supported code files (PHP/Blade, TypeScript/JavaScript, JSX/TSX, Svelte, HTML, CSS/PCSS). Check status for supportedFileSuffixes, code-intelligence parser capabilities and server availability when uncertain. For Markdown and other unsupported documents, use content/structure checks instead. Open a snapshot before structure or semantic queries, pass its handle, and release it when finished. Structure/semantic positions and ranges are zero-based UTF-16; completion cursors remain one-based UTF-16. A skipped query is unverified, never a clean result; do not repeat an unsupported query unchanged. Query IDs are registered and cannot contain arbitrary Tree-sitter queries. The tool never applies edits.' })\n}\n\nasync function resolveWorkspace(workingDirectory: Pick<WorkingDirectoryService, 'ensure'> | undefined, agent: ToolExecutionInput['agent'], signal: AbortSignal): Promise<string> {\n  if (!agent || !workingDirectory) throw new WebstackLspError('LSP_WORKSPACE_REQUIRED', 'lsp_extra requires an active session and the workingDirectory service')\n  return workingDirectory.ensure(agent, signal)\n}\n\nfunction snapshotScope(agent: unknown, workspaceRoot: string): SnapshotScope {\n  if (typeof agent !== 'object' || agent === null) throw new WebstackLspError('LSP_WORKSPACE_REQUIRED', 'snapshot operations require an active agent session')\n  const value = agent as { id?: unknown; session?: { id?: unknown } }\n  if (typeof value.id !== 'string' || typeof value.session?.id !== 'string')\n    throw new WebstackLspError('LSP_WORKSPACE_REQUIRED', 'snapshot operations require trusted owner, session and workspace identity')\n  return { ownerId: value.id, sessionId: value.session.id, workspaceRoot }\n}\n\nfunction requiredString(value: unknown, name: string): string {\n  if (typeof value !== 'string' || !value.trim()) throw new TypeError(`${name} is required`)\n  return value\n}\n\nfunction zeroBasedPosition(args: Record<string, unknown>): { line: number; character: number } {\n  if (!Number.isSafeInteger(args.position_line) || !Number.isSafeInteger(args.position_character) || (args.position_line as number) < 0 || (args.position_character as number) < 0)\n    throw new TypeError('position_line and position_character must be zero-based non-negative UTF-16 offsets')\n  return { line: args.position_line as number, character: args.position_character as number }\n}\n\nfunction readRange(args: Record<string, unknown>): { start: { line: number; character: number }; end: { line: number; character: number } } | undefined {\n  const fields = [args.start_line, args.start_character, args.end_line, args.end_character]\n  if (fields.every(value => value === undefined)) return undefined\n  if (fields.some(value => !Number.isSafeInteger(value) || (value as number) < 0)) throw new TypeError('range requires four zero-based non-negative coordinates')\n  return { start: { line: args.start_line as number, character: args.start_character as number }, end: { line: args.end_line as number, character: args.end_character as number } }\n}\n"],"mappings":"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"}

package/lib/grammars/manifest.json

@@ -45,6 +45,186 @@
       "abiVersion": 15,
       "asset": "tree-sitter-php.wasm",
       "sha256": "d4df6a6ff08c87c3ec4f9cbb785fe09998a0cb570e03f57d7b19b3acfb146aa7"
+    },
+    {
+      "language": "bash",
+      "package": "tree-sitter-bash",
+      "version": "0.25.1",
+      "sourceCommit": "801326684a26ffc4e749bb016c50c6c30bdfa345",
+      "license": "MIT",
+      "abiVersion": 15,
+      "asset": "tree-sitter-bash.wasm",
+      "sha256": "8292919c88a0f7d3fb31d0cd0253ca5a9531bc1ede82b0537f2c63dd8abe6a7a"
+    },
+    {
+      "language": "c",
+      "package": "tree-sitter-c",
+      "version": "0.24.1",
+      "sourceCommit": "7fa1be1b694b6e763686793d97da01f36a0e5c12",
+      "license": "MIT",
+      "abiVersion": 15,
+      "asset": "tree-sitter-c.wasm",
+      "sha256": "c852c2a85ebf2beb636aa3b0ef7f7e70458684d74f6741b20dcb296885bed9f9"
+    },
+    {
+      "language": "cpp",
+      "package": "tree-sitter-cpp",
+      "version": "0.23.4",
+      "sourceCommit": "f41e1a044c8a84ea9fa8577fdd2eab92ec96de02",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-cpp.wasm",
+      "sha256": "174eb0deb75b2ec7881bcacda9f995648d8e683956e5c2267e69ab6dc503fcbf"
+    },
+    {
+      "language": "c_sharp",
+      "package": "tree-sitter-c-sharp",
+      "version": "0.23.5",
+      "sourceCommit": "cac6d5fb595f5811a076336682d5d595ac1c9e85",
+      "license": "MIT",
+      "abiVersion": 15,
+      "asset": "tree-sitter-c_sharp.wasm",
+      "sha256": "6f69e1cae44e1c32c1eccc170dc5a9778fb94ff716f71113fe1f8c4299aa2f40"
+    },
+    {
+      "language": "css",
+      "package": "tree-sitter-css",
+      "version": "0.25.0",
+      "sourceCommit": "dda5cfc5722c429eaba1c910ca32c2c0c5bb1a3f",
+      "license": "MIT",
+      "abiVersion": 15,
+      "asset": "tree-sitter-css.wasm",
+      "sha256": "8a23977fe271357cce6f254ef88c9bebf3854602d8046605aef6a45c02135c59"
+    },
+    {
+      "language": "go",
+      "package": "tree-sitter-go",
+      "version": "0.25.0",
+      "sourceCommit": "1547678a9da59885853f5f5cc8a99cc203fa2e2c",
+      "license": "MIT",
+      "abiVersion": 15,
+      "asset": "tree-sitter-go.wasm",
+      "sha256": "9504573f352b20be7f2f1911754d710622aedc15afff16d5ed8fb5645681aee7"
+    },
+    {
+      "language": "haskell",
+      "package": "tree-sitter-haskell",
+      "version": "0.23.1",
+      "sourceCommit": "c30d812bc90827f1a54106a25bc9a6307f5cdcec",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-haskell.wasm",
+      "sha256": "37a6b07b1a838d02ffb4f4c2a06863637a8efe48432d60a275f50f1d08f1092c"
+    },
+    {
+      "language": "html",
+      "package": "tree-sitter-html",
+      "version": "0.23.2",
+      "sourceCommit": "5a5ca8551a179998360b4a4ca2c0f366a35acc03",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-html.wasm",
+      "sha256": "c48fcd82c7ea8bf943180088ba7f28c48b2bb5287874179168bf9d31e394cf85"
+    },
+    {
+      "language": "java",
+      "package": "tree-sitter-java",
+      "version": "0.23.5",
+      "sourceCommit": "94703d5a6bed02b98e438d7cad1136c01a60ba2c",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-java.wasm",
+      "sha256": "4fdeac4ca6ca089f06c6f7e562abcac1733cd465728cc7031ebb73c2019122c4"
+    },
+    {
+      "language": "json",
+      "package": "tree-sitter-json",
+      "version": "0.24.8",
+      "sourceCommit": "ee35a6ebefcef0c5c416c0d1ccec7370cfca5a24",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-json.wasm",
+      "sha256": "d2119fb98d5912719b13f9458574f8608d2d29dfbe45f6be1f860ea1fe2a2405"
+    },
+    {
+      "language": "julia",
+      "package": "tree-sitter-julia",
+      "version": "0.23.1",
+      "sourceCommit": "a8e1262997d5a45520a06cbe1b86c0737d507054",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-julia.wasm",
+      "sha256": "e0f52c36eadf0299e46fccd6715c760d35eaa3f09721bec38633da551ac9e781"
+    },
+    {
+      "language": "ocaml",
+      "package": "tree-sitter-ocaml",
+      "version": "0.24.2",
+      "sourceCommit": "0cc270ff90ca09c29d0f2f9dec69ddfef55a3eff",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-ocaml.wasm",
+      "sha256": "761a78a804931cfac1fa0c6238989b4b0e86cc70db461b1315d743de923f8246"
+    },
+    {
+      "language": "ocaml_interface",
+      "package": "tree-sitter-ocaml",
+      "version": "0.24.2",
+      "sourceCommit": "0cc270ff90ca09c29d0f2f9dec69ddfef55a3eff",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-ocaml_interface.wasm",
+      "sha256": "c065e8da9052899592bd68c820ffda076e23394129de14c0bd2c46b189415ea9"
+    },
+    {
+      "language": "python",
+      "package": "tree-sitter-python",
+      "version": "0.25.0",
+      "sourceCommit": "293fdc02038ee2bf0e2e206711b69c90ac0d413f",
+      "license": "MIT",
+      "abiVersion": 15,
+      "asset": "tree-sitter-python.wasm",
+      "sha256": "16108b50df4ee9a30168794252ab55e7c93bfc5765d7fa0aa3e335752c515f47"
+    },
+    {
+      "language": "ql_dbscheme",
+      "package": "tree-sitter-ql-dbscheme",
+      "version": "0.23.1",
+      "sourceCommit": "15baf01feb5f20bb3d668d27abc0a36e944b183f",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-ql_dbscheme.wasm",
+      "sha256": "c3e3c839c45eca3def8aed27c5205ec1fceed80d2b85a7d65f23747549ba0355"
+    },
+    {
+      "language": "ruby",
+      "package": "tree-sitter-ruby",
+      "version": "0.23.1",
+      "sourceCommit": "71bd32fb7607035768799732addba884a37a6210",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-ruby.wasm",
+      "sha256": "09a96427d7c72f0613ed470cd9812223fc4a91d6a9c025c0235cc6bd59ff96f4"
+    },
+    {
+      "language": "rust",
+      "package": "tree-sitter-rust",
+      "version": "0.24.0",
+      "sourceCommit": "18b0515fca567f5a10aee9978c6d2640e878671a",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-rust.wasm",
+      "sha256": "f65f354215611fd94ad34134b3427eb3d58cbb745df7b6509ba722184db73d57"
+    },
+    {
+      "language": "scala",
+      "package": "tree-sitter-scala",
+      "version": "0.24.0",
+      "sourceCommit": "2d55e74b0485fe05058ffe5e8155506c9710c767",
+      "license": "MIT",
+      "abiVersion": 14,
+      "asset": "tree-sitter-scala.wasm",
+      "sha256": "b7ec2bb29c19827abcefd18ed5cb5a43596009f96a5d53c5b9d1f9676d7521c3"
     }
   ]
 }

package/lib/parser-worker.mjs

@@ -8,6 +8,24 @@ const assets = {
   typescript: 'tree-sitter-typescript.wasm',
   tsx: 'tree-sitter-tsx.wasm',
   php: 'tree-sitter-php.wasm',
+  bash: 'tree-sitter-bash.wasm',
+  c: 'tree-sitter-c.wasm',
+  cpp: 'tree-sitter-cpp.wasm',
+  c_sharp: 'tree-sitter-c_sharp.wasm',
+  css: 'tree-sitter-css.wasm',
+  go: 'tree-sitter-go.wasm',
+  haskell: 'tree-sitter-haskell.wasm',
+  html: 'tree-sitter-html.wasm',
+  java: 'tree-sitter-java.wasm',
+  json: 'tree-sitter-json.wasm',
+  julia: 'tree-sitter-julia.wasm',
+  ocaml: 'tree-sitter-ocaml.wasm',
+  ocaml_interface: 'tree-sitter-ocaml_interface.wasm',
+  python: 'tree-sitter-python.wasm',
+  ql_dbscheme: 'tree-sitter-ql_dbscheme.wasm',
+  ruby: 'tree-sitter-ruby.wasm',
+  rust: 'tree-sitter-rust.wasm',
+  scala: 'tree-sitter-scala.wasm',
 }
 const MAX_CACHE_ENTRIES = 16
 const MAX_CACHE_BYTES = 16 * 1024 * 1024

package/lib/provider.js

@@ -1,7 +1,7 @@
 import { WebstackLspError } from "./errors-DtyWAUi0.js";
 import { SERVER_IDS, createWebstackLspService, initializationOptions, resolveConfig, resolveLaunch, serverConfiguration } from "./launch-ByUvgkVv.js";
 import { mergeCompletions, mergeDiagnostics } from "./completion-B7NPVCEN.js";
-import { DocumentSnapshotStore, createCodeIntelligenceToolServiceV1 } from "./code-intelligence-BUs39chK.js";
+import { DocumentSnapshotStore, createCodeIntelligenceToolServiceV1 } from "./code-intelligence-BbjV-vXG.js";
 import { LspProviderId } from "@deepseek-ai/dsh-lsp";
 import { isAbsolute } from "node:path";
 import { TextDecoder } from "node:util";
@@ -287,6 +287,70 @@ function hasTailwindCandidate(source, line, classRegex = [], character, classAtt
 	return [...DEFAULT_PATTERNS, ...configured].some((pattern) => pattern.test(context));
 }
 
+//#endregion
+//#region src/servers/typescript-diagnostics.ts
+const command = "typescript.tsserverRequest";
+const diagnosticCommands = [
+	"syntacticDiagnosticsSync",
+	"semanticDiagnosticsSync",
+	"suggestionDiagnosticsSync"
+];
+const severities = {
+	error: 1,
+	warning: 2,
+	message: 3,
+	suggestion: 4
+};
+function supportsTypeScriptDiagnostics(capabilities) {
+	const provider = capabilities.executeCommandProvider;
+	return isRecord$6(provider) && Array.isArray(provider.commands) && provider.commands.includes(command);
+}
+async function requestTypeScriptDiagnostics(connection, uri, signal) {
+	const diagnostics = [];
+	for (const diagnosticCommand of diagnosticCommands) {
+		const response = await connection.request("workspace/executeCommand", {
+			command,
+			arguments: [
+				diagnosticCommand,
+				{ file: uri },
+				{
+					executionTarget: 0,
+					expectsResult: true
+				}
+			]
+		}, signal);
+		if (!isRecord$6(response) || response.type !== "response" || response.success !== true || !Array.isArray(response.body)) throw malformedResponse();
+		for (const item of response.body) diagnostics.push(toDiagnostic(item));
+	}
+	return diagnostics;
+}
+function toDiagnostic(value) {
+	if (!isRecord$6(value) || typeof value.text !== "string" || typeof value.category !== "string" || !Object.hasOwn(severities, value.category) || !Number.isSafeInteger(value.code)) throw malformedResponse();
+	return {
+		range: {
+			start: toPosition(value.start),
+			end: toPosition(value.end)
+		},
+		message: value.text,
+		severity: severities[value.category],
+		code: value.code,
+		source: typeof value.source === "string" ? value.source : "ts"
+	};
+}
+function toPosition(value) {
+	if (!isRecord$6(value) || typeof value.line !== "number" || typeof value.offset !== "number" || !Number.isSafeInteger(value.line) || !Number.isSafeInteger(value.offset) || value.line < 1 || value.offset < 1) throw malformedResponse();
+	return {
+		line: value.line - 1,
+		character: value.offset - 1
+	};
+}
+function isRecord$6(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function malformedResponse() {
+	return new WebstackLspError("LSP_MALFORMED_RESPONSE", "TypeScript server returned an invalid diagnostic response");
+}
+
 //#endregion
 //#region src/protocol/initialize.ts
 async function initializeServer(connection, params, signal) {
@@ -1493,6 +1557,10 @@ var WebstackLspRuntime = class {
 						await opened();
 						return (await connection.request("textDocument/diagnostic", { textDocument: { uri: source.uri } }, deadline))?.items ?? [];
 					}
+					if (item.server === "typescript" && supportsTypeScriptDiagnostics(session.capabilities)) {
+						await opened();
+						return requestTypeScriptDiagnostics(connection, source.uri, deadline);
+					}
 					let remove = () => {};
 					const published = new Promise((resolve$1) => {
 						remove = connection.onNotification((message) => {
@@ -1717,7 +1785,7 @@ var WebstackLspRuntime = class {
 				if (opened && connection.isOpen) await connection.notify("textDocument/didClose", { textDocument: { uri: source.uri } }).catch(() => {});
 			}
 		}, signal), signal, manualOpen ? (session) => {
-			return !!session.capabilities.diagnosticProvider;
+			return !!session.capabilities.diagnosticProvider || id === "typescript" && supportsTypeScriptDiagnostics(session.capabilities);
 		} : void 0);
 	}
 };