dsh-vscode-workbench 0.2.0 → 0.2.3

package/src/index.ts

@@ -8,7 +8,9 @@ import { spawn } from 'node:child_process'
 import chokidar from 'chokidar'
 import { WebSocket, WebSocketServer } from 'ws'
 import type { HostContext } from './context.ts'
-import { codiconAsset, createEntry, cwdFor, deleteEntry, fileIconAsset, gitAction, gitStatus, listFiles, monacoAsset, openWorkspaceFromPicker, pdfWorkerAsset, xlsxAsset, readDocument, projectSources, renameEntry, saveDocument, workspaceDownloadFile, searchWorkspace, uploadFile, workspacePreviewFile } from './host.ts'
+import type { LlmRuntime } from '@deepseek-ai/dsh-llm'
+import { generateCommitMessage, normalizeCommitPreferences } from './commit-message.ts'
+import { codiconAsset, createEntry, cwdFor, deleteEntry, fileIconAsset, gitAction, gitCommitContext, gitStatus, listFiles, monacoAsset, openWorkspaceFromPicker, pdfWorkerAsset, xlsxAsset, readDocument, projectSources, renameEntry, saveDocument, workspaceDownloadFile, searchWorkspace, uploadFile, workspacePreviewFile } from './host.ts'
 import { installLsp, lspStatuses, resolveLsp, uninstallLsp, pipeLanguageServer } from './lsp.ts'
 import { officePdf, officeStatus } from './office.ts'
 import { installTerminal } from './terminal.ts'
@@ -44,6 +46,21 @@ async function dispatch(ctx: HostContext, method: string, body: Record<string, u
     case 'search': return searchWorkspace(cwd, body as unknown as SearchRequest, signal)
     case 'git.status': return gitStatus(cwd)
     case 'git.action': return gitAction(cwd, stringField(body, 'action'), typeof body.path === 'string' ? body.path : undefined, typeof body.value === 'string' ? body.value : undefined)
+    case 'git.commitMessage': {
+      const session = ctx.sessions.get(sessionId)
+      const config = session?.requestHeader()?.config
+      if (config === undefined) throw new WorkbenchError('model-unavailable', '当前会话还没有模型配置，请先发送一条消息后再生成提交信息。', 409)
+      const llm: LlmRuntime | undefined = ctx.get('llm')
+      if (llm === undefined) throw new WorkbenchError('llm-unavailable', 'DSH 的模型服务当前不可用。', 503)
+      const context = await gitCommitContext(cwd)
+      const preferences = normalizeCommitPreferences(body.detail, body.language)
+      try {
+        return { message: await generateCommitMessage(llm, config, context, signal, preferences) }
+      } catch (error) {
+        if (error instanceof WorkbenchError) throw error
+        throw new WorkbenchError('llm-failed', error instanceof Error ? error.message : String(error), 502)
+      }
+    }
     default: throw new WorkbenchError('not-found', `unknown workbench API method ${method}`, 404)
   }
 }

package/src/lsp.ts

@@ -1,11 +1,17 @@
 /** Host-side registry and process bridge for language servers exposed to the workbench editor. */
 import { spawn, type ChildProcess } from 'node:child_process'
-import { access, mkdir, rm } from 'node:fs/promises'
+import { constants } from 'node:fs'
+import { access, mkdir, readdir, rm } from 'node:fs/promises'
 import { homedir } from 'node:os'
-import { join } from 'node:path'
+import { delimiter, join } from 'node:path'
 import { WorkbenchError } from './wire.ts'
 
-export type LspInstall = { kind: 'npm'; package: string; bin: string } | { kind: 'system'; command: string; hint: string }
+/** The toolchain a manual language server belongs to, detected separately from the server itself. */
+export type LspLanguage = { name: string; commands: readonly string[] }
+
+export type LspInstall =
+  | { kind: 'npm'; package: string; bin: string }
+  | { kind: 'system'; command: string; hint: string }
 
 export interface LspDefinition {
   id: string
@@ -14,24 +20,26 @@ export interface LspDefinition {
   languages: string[]
   install: LspInstall
   args: string[]
+  /** Toolchain checked before the server; servers for pure data formats have nothing to check. */
+  language?: LspLanguage
 }
 
 /** The strongest maintained server for each language, installable where the ecosystem allows it. */
 export const LSP_SERVERS: readonly LspDefinition[] = [
-  { id: 'python', name: 'Python · Pyright', languages: ['python'], install: { kind: 'npm', package: 'pyright', bin: 'pyright-langserver' }, args: ['--stdio'] },
-  { id: 'php', name: 'PHP · Intelephense', languages: ['php'], install: { kind: 'npm', package: 'intelephense', bin: 'intelephense' }, args: ['--stdio'] },
-  { id: 'shell', name: 'Shell · Bash Language Server', languages: ['shell'], install: { kind: 'npm', package: 'bash-language-server', bin: 'bash-language-server' }, args: ['start'] },
+  { id: 'python', name: 'Python · Pyright', languages: ['python'], install: { kind: 'npm', package: 'pyright', bin: 'pyright-langserver' }, args: ['--stdio'], language: { name: 'Python', commands: ['python3', 'python'] } },
+  { id: 'php', name: 'PHP · Intelephense', languages: ['php'], install: { kind: 'npm', package: 'intelephense', bin: 'intelephense' }, args: ['--stdio'], language: { name: 'PHP', commands: ['php'] } },
+  { id: 'shell', name: 'Shell · Bash Language Server', languages: ['shell'], install: { kind: 'npm', package: 'bash-language-server', bin: 'bash-language-server' }, args: ['start'], language: { name: 'Shell', commands: ['bash', 'zsh'] } },
   { id: 'yaml', name: 'YAML · YAML Language Server', languages: ['yaml'], install: { kind: 'npm', package: 'yaml-language-server', bin: 'yaml-language-server' }, args: ['--stdio'] },
   { id: 'json', name: 'JSON · VS Code JSON', languages: ['json'], install: { kind: 'npm', package: 'vscode-langservers-extracted', bin: 'vscode-json-language-server' }, args: ['--stdio'] },
   { id: 'css', name: 'CSS / SCSS / Less · VS Code CSS', languages: ['css', 'scss', 'less'], install: { kind: 'npm', package: 'vscode-langservers-extracted', bin: 'vscode-css-language-server' }, args: ['--stdio'] },
   { id: 'html', name: 'HTML · VS Code HTML', languages: ['html'], install: { kind: 'npm', package: 'vscode-langservers-extracted', bin: 'vscode-html-language-server' }, args: ['--stdio'] },
   { id: 'dockerfile', name: 'Dockerfile · Docker LS', languages: ['dockerfile'], install: { kind: 'npm', package: 'dockerfile-language-server-nodejs', bin: 'dockerfile-language-server-nodejs' }, args: ['--stdio'] },
-  { id: 'go', name: 'Go · gopls', languages: ['go'], install: { kind: 'system', command: 'gopls', hint: '在终端运行：go install golang.org/x/tools/gopls@latest（需要 Go 工具链）' }, args: ['serve'] },
-  { id: 'rust', name: 'Rust · rust-analyzer', languages: ['rust'], install: { kind: 'system', command: 'rust-analyzer', hint: '运行：rustup component add rust-analyzer' }, args: [] },
-  { id: 'cpp', name: 'C / C++ · clangd', languages: ['c', 'cpp', 'objective-c'], install: { kind: 'system', command: 'clangd', hint: '安装 LLVM（Windows：winget install LLVM.LLVM），并确保 clangd 在 PATH 中' }, args: [] },
-  { id: 'java', name: 'Java · Eclipse JDT LS', languages: ['java'], install: { kind: 'system', command: 'jdtls', hint: '下载 eclipse.jdt.ls 并让 jdtls 启动脚本在 PATH 中' }, args: [] },
-  { id: 'csharp', name: 'C# · csharp-ls', languages: ['csharp'], install: { kind: 'system', command: 'csharp-ls', hint: '运行：dotnet tool install --global csharp-ls（需要 .NET SDK）' }, args: [] },
-  { id: 'lua', name: 'Lua · Lua Language Server', languages: ['lua'], install: { kind: 'system', command: 'lua-language-server', hint: '从 github.com/LuaLS/lua-language-server/releases 下载，并把 lua-language-server 加入 PATH' }, args: [] },
+  { id: 'go', name: 'Go · gopls', languages: ['go'], install: { kind: 'system', command: 'gopls', hint: '在终端运行：go install golang.org/x/tools/gopls@latest（需要 Go 工具链）' }, args: ['serve'], language: { name: 'Go', commands: ['go'] } },
+  { id: 'rust', name: 'Rust · rust-analyzer', languages: ['rust'], install: { kind: 'system', command: 'rust-analyzer', hint: '运行：rustup component add rust-analyzer' }, args: [], language: { name: 'Rust', commands: ['rustc', 'cargo'] } },
+  { id: 'cpp', name: 'C / C++ · clangd', languages: ['c', 'cpp', 'objective-c'], install: { kind: 'system', command: 'clangd', hint: '安装 LLVM（Windows：winget install LLVM.LLVM），并确保 clangd 在 PATH 中' }, args: [], language: { name: 'C / C++ 工具链', commands: ['clang', 'gcc', 'cc'] } },
+  { id: 'java', name: 'Java · Eclipse JDT LS', languages: ['java'], install: { kind: 'system', command: 'jdtls', hint: '下载 eclipse.jdt.ls 并让 jdtls 启动脚本在 PATH 中' }, args: [], language: { name: 'Java', commands: ['java', 'javac'] } },
+  { id: 'csharp', name: 'C# · csharp-ls', languages: ['csharp'], install: { kind: 'system', command: 'csharp-ls', hint: '运行：dotnet tool install --global csharp-ls（需要 .NET SDK）' }, args: [], language: { name: '.NET SDK', commands: ['dotnet'] } },
+  { id: 'lua', name: 'Lua · Lua Language Server', languages: ['lua'], install: { kind: 'system', command: 'lua-language-server', hint: '从 github.com/LuaLS/lua-language-server/releases 下载，并把 lua-language-server 加入 PATH' }, args: [], language: { name: 'Lua', commands: ['lua', 'lua5.4', 'lua5.3', 'luajit'] } },
 ] as const
 
 export interface LspStatus {
@@ -41,6 +49,10 @@ export interface LspStatus {
   installable: boolean
   installed: boolean
   hint?: string
+  /** Executable name for manual servers, so the UI can name what it looked for. */
+  command?: string
+  /** Present for manual servers: whether the language toolchain itself is on this machine. */
+  language?: { name: string; installed: boolean }
 }
 
 /** Private install root so language servers never touch the user's global npm state. */
@@ -53,14 +65,57 @@ function npmBinPath(id: string, bin: string): string {
 
 async function exists(path: string): Promise<boolean> { return access(path).then(() => true, () => false) }
 
-function which(command: string): Promise<string | undefined> {
-  return new Promise(resolve => {
-    const child = spawn(process.platform === 'win32' ? 'where' : 'which', [command], { windowsHide: true })
-    let output = ''
-    child.stdout.on('data', chunk => { output += String(chunk) })
-    child.on('error', () => resolve(undefined))
-    child.on('close', code => resolve(code === 0 ? output.split(/\r?\n/).map(line => line.trim()).find(Boolean) : undefined))
-  })
+/**
+ * GUI-launched apps inherit a trimmed PATH: Homebrew, `go install` and `cargo install` targets routinely sit
+ * outside it, so detection has to look in the usual per-user bin directories too.
+ */
+export function lspSearchDirs(env: NodeJS.ProcessEnv = process.env, home = homedir()): string[] {
+  const fromPath = (env.PATH ?? env.Path ?? '').split(delimiter).filter(Boolean)
+  const extras = [
+    join(home, 'go', 'bin'),
+    join(home, '.cargo', 'bin'),
+    join(home, '.dotnet', 'tools'),
+    join(home, '.local', 'bin'),
+    join(home, 'bin'),
+    '/opt/homebrew/bin',
+    '/usr/local/bin',
+    '/usr/bin',
+    '/bin',
+    '/usr/sbin',
+    '/sbin',
+  ]
+  return [...new Set([...fromPath, ...extras])]
+}
+
+async function executableIn(directory: string, command: string): Promise<string | undefined> {
+  const names = process.platform === 'win32'
+    ? [`${command}.exe`, `${command}.cmd`, `${command}.bat`, command]
+    : [command]
+  for (const name of names) {
+    const file = join(directory, name)
+    const found = await access(file, constants.X_OK).then(() => true, () => false)
+    if (found) return file
+  }
+  return undefined
+}
+
+/** First executable named `command` found in `dirs`; exposed for tests and for toolchain probing. */
+export async function findExecutable(command: string, dirs: readonly string[]): Promise<string | undefined> {
+  for (const directory of dirs) {
+    const found = await executableIn(directory, command)
+    if (found !== undefined) return found
+  }
+  return undefined
+}
+
+async function rustupBinDirs(home: string): Promise<string[]> {
+  const root = join(home, '.rustup', 'toolchains')
+  const entries = await readdir(root, { withFileTypes: true }).catch(() => [])
+  return entries.filter(entry => entry.isDirectory()).map(entry => join(root, entry.name, 'bin'))
+}
+
+async function searchDirs(home = homedir()): Promise<string[]> {
+  return [...lspSearchDirs(process.env, home), ...await rustupBinDirs(home)]
 }
 
 function definition(id: string): LspDefinition {
@@ -69,25 +124,30 @@ function definition(id: string): LspDefinition {
   return found
 }
 
-async function commandFor(server: LspDefinition): Promise<{ command: string; shell: boolean } | undefined> {
+async function commandFor(server: LspDefinition, dirs: readonly string[]): Promise<{ command: string; shell: boolean } | undefined> {
   if (server.install.kind === 'npm') {
     const command = npmBinPath(server.id, server.install.bin)
     return await exists(command) ? { command, shell: process.platform === 'win32' } : undefined
   }
-  const command = await which(server.install.command)
+  const command = await findExecutable(server.install.command, dirs)
   return command === undefined ? undefined : { command, shell: process.platform === 'win32' }
 }
 
 export async function lspStatuses(): Promise<LspStatus[]> {
+  const dirs = await searchDirs()
   return Promise.all(LSP_SERVERS.map(async server => {
-    const resolved = await commandFor(server)
+    const resolved = await commandFor(server, dirs)
+    const language = server.language === undefined
+      ? undefined
+      : { name: server.language.name, installed: (await Promise.all(server.language.commands.map(command => findExecutable(command, dirs)))).some(Boolean) }
     return {
       id: server.id,
       name: server.name,
       languages: server.languages,
       installable: server.install.kind === 'npm',
       installed: resolved !== undefined,
-      ...(server.install.kind === 'system' ? { hint: server.install.hint } : {}),
+      ...(server.install.kind === 'system' ? { hint: server.install.hint, command: server.install.command } : {}),
+      ...(language === undefined ? {} : { language }),
     }
   }))
 }
@@ -123,7 +183,7 @@ export async function uninstallLsp(id: string): Promise<void> {
 /** Resolve the spawn command for a running server, or explain what the user must install. */
 export async function resolveLsp(id: string): Promise<{ command: string; shell: boolean; args: string[] }> {
   const server = definition(id)
-  const resolved = await commandFor(server)
+  const resolved = await commandFor(server, await searchDirs())
   if (resolved === undefined) {
     throw new WorkbenchError('lsp-missing', server.install.kind === 'system' ? server.install.hint : '语言服务器尚未安装', 409)
   }