writedock-mcp 0.4.14 → 0.4.16

package/source/src/setup.ts

@@ -1,14 +1,12 @@
 import { spawn } from 'node:child_process'
-import { copyFile, mkdir, readFile, writeFile } from 'node:fs/promises'
+import { access, copyFile, mkdir, readFile, writeFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
+import { writeLauncher } from './launcher'
 import { bundledExtension, defaultExtensionDirectory, findInstalledExtension, installExtensionFiles } from './extension-update'
 
-const NPX_ARGS = ['-y', '--prefer-online', 'writedock-mcp@latest']
-/** On Windows npx is a .cmd script, which clients that start programs directly cannot run. */
-const serverCommand = (platform: NodeJS.Platform) => platform === 'win32'
-  ? { command: 'cmd', args: ['/c', 'npx', ...NPX_ARGS] }
-  : { command: 'npx', args: NPX_ARGS }
+type ServerCommand = { command: string; args: string[] }
+const isOurs = (text: string) => text.includes('writedock-mcp@latest') || text.includes('start-mcp')
 
 async function readIfPresent(path: string) {
   // Windows editors may save a BOM, which JSON.parse rejects.
@@ -22,26 +20,38 @@ async function save(path: string, content: string, previous: string | undefined)
   await writeFile(path, content)
 }
 
-/** Keeps the user's other settings; an existing WriteDock entry stays, because it may hold a custom port or data directory. */
-export async function configureCodex(path: string, platform: NodeJS.Platform = process.platform): Promise<'added' | 'present'> {
+/**
+ * Keeps the user's other settings. An entry from an earlier setup moves to the launcher. Anything else stays,
+ * because it may hold a custom command, port or data directory.
+ */
+export async function configureCodex(path: string, server: ServerCommand): Promise<'added' | 'updated' | 'present'> {
   const previous = await readIfPresent(path)
-  if (previous !== undefined && /^\s*\[mcp_servers\.writedock\]/m.test(previous)) return 'present'
-  const { command, args } = serverCommand(platform)
-  const entry = `[mcp_servers.writedock]\ncommand = "${command}"\nargs = ${JSON.stringify(args)}\nstartup_timeout_sec = 120\n`
+  const lines = `command = ${JSON.stringify(server.command)}\nargs = ${JSON.stringify(server.args)}\nstartup_timeout_sec = 120\n`
+  const section = previous === undefined ? null : /^[ \t]*\[mcp_servers\.writedock\][^\n]*\n([\s\S]*?)(?=^[ \t]*\[|(?![\s\S]))/m.exec(previous)
+  if (section && previous !== undefined) {
+    const customised = /^[ \t]*\[mcp_servers\.writedock\./m.test(previous) || !isOurs(section[1])
+    const current = section[1].includes(JSON.stringify(server.args).slice(1, -1)) && section[1].includes(JSON.stringify(server.command))
+    if (customised || current) return 'present'
+    const start = section.index + section[0].length - section[1].length
+    await save(path, `${previous.slice(0, start)}${lines}\n${previous.slice(start + section[1].length)}`, previous)
+    return 'updated'
+  }
+  const entry = `[mcp_servers.writedock]\n${lines}`
   await save(path, previous ? `${previous.replace(/\s*$/, '')}\n\n${entry}` : entry, previous)
   return 'added'
 }
 
-export async function configureJsonClient(path: string, platform: NodeJS.Platform = process.platform): Promise<'added' | 'present'> {
+export async function configureJsonClient(path: string, server: ServerCommand): Promise<'added' | 'updated' | 'present'> {
   const previous = await readIfPresent(path)
-  const config = previous?.trim() ? JSON.parse(previous) as { mcpServers?: Record<string, unknown> } : {}
-  if (config.mcpServers?.writedock) return 'present'
-  config.mcpServers = { ...config.mcpServers, writedock: serverCommand(platform) }
+  const config = previous?.trim() ? JSON.parse(previous) as { mcpServers?: Record<string, { command?: unknown; args?: unknown; env?: unknown }> } : {}
+  const existing = config.mcpServers?.writedock
+  if (existing && (existing.env || !isOurs(JSON.stringify(existing.args ?? [])) || JSON.stringify([existing.command, existing.args]) === JSON.stringify([server.command, server.args]))) return 'present'
+  config.mcpServers = { ...config.mcpServers, writedock: server }
   await save(path, `${JSON.stringify(config, null, 2)}\n`, previous)
-  return 'added'
+  return existing ? 'updated' : 'added'
 }
 
-const exists = async (path: string) => (await readIfPresent(path)) !== undefined
+const exists = (path: string) => access(path).then(() => true, () => false)
 
 /** Best effort: shows the folder so the user can pick it, or drag it onto the extensions page. */
 function revealFolder(path: string) {
@@ -50,15 +60,18 @@ function revealFolder(path: string) {
 }
 
 /** Only clients already on this computer are configured, so setup never creates settings for an app the user does not have. */
-export async function runSetup(home = homedir(), log: (line: string) => void = console.log, platform: NodeJS.Platform = process.platform) {
+export async function runSetup(home = homedir(), log: (line: string) => void = console.log, platform: NodeJS.Platform = process.platform, nodePath = process.execPath) {
+  const server = await writeLauncher(home, platform, nodePath)
+  const entry = { command: server.command, args: server.args }
   const claudeDesktop = platform === 'win32'
     ? join(process.env.APPDATA || join(home, 'AppData/Roaming'), 'Claude/claude_desktop_config.json')
     : platform === 'darwin'
       ? join(home, 'Library/Application Support/Claude/claude_desktop_config.json')
       : join(home, '.config/Claude/claude_desktop_config.json')
-  const clients: { name: string; path: string; detect: string; configure: (path: string, platform: NodeJS.Platform) => Promise<'added' | 'present'> }[] = [
+  const clients: { name: string; path: string; detect: string; configure: (path: string, server: ServerCommand) => Promise<'added' | 'updated' | 'present'> }[] = [
     { name: 'Codex', path: join(home, '.codex/config.toml'), detect: join(home, '.codex/config.toml'), configure: configureCodex },
     { name: 'Claude Code', path: join(home, '.claude.json'), detect: join(home, '.claude.json'), configure: configureJsonClient },
+    { name: 'WorkBuddy', path: join(home, '.workbuddy/mcp.json'), detect: join(home, '.workbuddy'), configure: configureJsonClient },
     { name: 'Cursor', path: join(home, '.cursor/mcp.json'), detect: join(home, '.cursor/mcp.json'), configure: configureJsonClient },
     { name: 'Claude Desktop', path: claudeDesktop, detect: claudeDesktop, configure: configureJsonClient },
   ]
@@ -67,13 +80,13 @@ export async function runSetup(home = homedir(), log: (line: string) => void = c
     if (!await exists(client.detect)) continue
     found++
     try {
-      const state = await client.configure(client.path, platform)
-      log(state === 'added' ? `✓ ${client.name}：已添加 WriteDock（原配置备份为 .writedock-backup）` : `✓ ${client.name}：已有 WriteDock 配置，未改动`)
+      const state = await client.configure(client.path, entry)
+      log(state === 'present' ? `✓ ${client.name}：已有 WriteDock 配置，未改动` : `✓ ${client.name}：已${state === 'added' ? '添加' : '更新'} WriteDock（原配置备份为 .writedock-backup）`)
     } catch (error) { log(`✗ ${client.name}：配置失败（${error instanceof Error ? error.message : String(error)}），原文件未改动`) }
   }
   if (!found) {
     log('没有找到已知的 agent 客户端。请在你的客户端里添加这个 MCP 服务：')
-    log(JSON.stringify({ mcpServers: { writedock: serverCommand(platform) } }, null, 2))
+    log(JSON.stringify({ mcpServers: { writedock: entry } }, null, 2))
   }
   // Keep whichever folder the browser already loads, so a repeat setup does not ask for another manual load.
   const bundle = bundledExtension()