dsh-eda-mcp 0.6.2 → 0.7.0

package/src/client/EdaMcpSettingsCard.tsx

@@ -10,6 +10,7 @@ export interface EdaMcpSettings {
   announceToAgent?: boolean
   toolCallTimeoutMs?: number
   allowRawApi?: boolean
+  edaExecutable?: string
 }
 
 export interface EdaMcpSettingsCardState {
@@ -266,6 +267,33 @@ function NumberField(props: NumberFieldProps) {
   )
 }
 
+interface TextFieldProps {
+  label: string
+  hint: string
+  value: string | undefined
+  placeholder?: string
+  disabled?: boolean
+  onChange: (value: string | undefined) => void
+}
+
+function TextField(props: TextFieldProps) {
+  return (
+    <Field label={props.label} hint={props.hint}>
+      <input
+        type="text"
+        value={props.value ?? ''}
+        placeholder={props.placeholder}
+        disabled={props.disabled}
+        onChange={(event) => {
+          const text = event.target.value.trim()
+          props.onChange(text === '' ? undefined : text)
+        }}
+        style={inputStyle}
+      />
+    </Field>
+  )
+}
+
 interface BooleanFieldProps {
   label: string
   hint: string
@@ -407,6 +435,14 @@ export function EdaMcpSettingsCard(props: EdaMcpSettingsCardProps) {
           disabled={disabled}
           onChange={(value) => { clearNotice(); update('toolCallTimeoutMs', value) }}
         />
+        <TextField
+          label={t('settings.edaExecutable')}
+          hint={t('settings.edaExecutableHint')}
+          value={draft.edaExecutable}
+          placeholder="lceda-pro.exe"
+          disabled={disabled}
+          onChange={(value) => { clearNotice(); update('edaExecutable', value) }}
+        />
         <BooleanField
           label={t('settings.allowRawApi')}
           hint={t('settings.allowRawApiHint')}

package/src/client/locales.ts

@@ -9,6 +9,8 @@ export const zh = {
   'settings.toolCallTimeoutMsHint': '单次 EDA API 调用超时，默认 60000。',
   'settings.allowRawApi': '允许通用 eda_api_call',
   'settings.allowRawApiHint': '开启后 MCP 工具 eda_api_call 可调用白名单内的 JLCEDA 扩展 API。',
+  'settings.edaExecutable': '嘉立创EDA 可执行文件（可选）',
+  'settings.edaExecutableHint': '留空即自动探测：环境变量 → 注册表登记的文件关联 → 常见安装目录 → PATH。只有自动探测失败时才需要填完整路径。',
   'settings.save': '保存',
   'settings.saving': '保存中…',
   'settings.saved': '已保存',
@@ -38,6 +40,8 @@ export const en = {
   'settings.toolCallTimeoutMsHint': 'Timeout for one EDA API call; default 60000.',
   'settings.allowRawApi': 'Allow generic eda_api_call',
   'settings.allowRawApiHint': 'Expose the eda_api_call tool restricted to the allow-listed JLCEDA APIs.',
+  'settings.edaExecutable': 'JLCEDA Pro executable (optional)',
+  'settings.edaExecutableHint': 'Leave empty to auto-detect: environment variable, the file-association command in the registry, conventional install directories, then PATH. Set a full path only when auto-detection fails.',
   'settings.save': 'Save',
   'settings.saving': 'Saving…',
   'settings.saved': 'Saved',

package/src/index.ts

@@ -20,6 +20,8 @@ export interface EdaMcpConfig {
   announceToAgent?: boolean
   toolCallTimeoutMs?: number
   allowRawApi?: boolean
+  /** Path to lceda-pro.exe; empty lets eda_launch discover it. */
+  edaExecutable?: string
 }
 
 /**
@@ -33,6 +35,8 @@ export const Config = z.object({
   announceToAgent: z.boolean().default(true).volatile(),
   toolCallTimeoutMs: z.number().min(1000).max(300000).default(60000).volatile(),
   allowRawApi: z.boolean().default(true).volatile(),
+  /** Optional path to lceda-pro.exe; empty means "let eda_launch discover it". */
+  edaExecutable: z.string().default('').volatile(),
 })
 
 /** Hooks a settings registration hands to the DSH settings seam. */
@@ -167,6 +171,8 @@ function bridgeLaunchFor(active: EdaMcpConfig) {
       ...runtime.extraEnv,
       DSH_EDA_MCP_ALLOW_RAW_API: allowRawApi ? '1' : '0',
       DSH_EDA_MCP_TOOL_TIMEOUT_MS: String(toolCallTimeoutMs),
+      // eda_launch falls back to the registry / install dirs / PATH when empty.
+      DSH_EDA_EXECUTABLE: typeof active.edaExecutable === 'string' ? active.edaExecutable : '',
     },
     cwd: dirname(BRIDGE_PATH),
     toolCallTimeoutMs,

package/test/eda-launch.test.ts

@@ -0,0 +1,114 @@
+/**
+ * eda-launch: executable discovery and launch argument shaping.
+ *
+ * `node --experimental-strip-types test/eda-launch.test.ts`
+ *
+ * No process is spawned: the resolver takes a `LaunchProbe` seam and the registry
+ * output is fed as text, so the cases below run identically on any machine.
+ */
+import {
+  buildLaunchArgs, buildLaunchScript, decodeRegistryOutput, envCandidates, parseExecutableFromCommand, parseRegStringValue,
+  parseRegValueNames, pathCandidates, registryCandidates, resolveExecutable,
+  type LaunchProbe,
+} from '../src/bridge/eda-launch.ts'
+
+let failures = 0
+function check(label: string, actual: unknown, expected: unknown): void {
+  const ok = JSON.stringify(actual) === JSON.stringify(expected)
+  if (!ok) failures += 1
+  console.log(`${ok ? 'PASS' : 'FAIL'} ${label}`)
+  if (!ok) console.log(`     got      ${JSON.stringify(actual)}\n     expected ${JSON.stringify(expected)}`)
+}
+
+function probe(overrides: Partial<LaunchProbe> & { files?: string[] } = {}): LaunchProbe {
+  const files = new Set(overrides.files ?? [])
+  return {
+    platform: overrides.platform ?? 'win32',
+    env: overrides.env ?? {},
+    exists: overrides.exists ?? ((path: string) => files.has(path)),
+    registryQuery: overrides.registryQuery ?? (() => undefined),
+  }
+}
+
+// --- command line parsing ------------------------------------------------
+check('quoted exe with %1', parseExecutableFromCommand('"D:\\lceda-pro\\lceda-pro.exe" "%1"'), 'D:\\lceda-pro\\lceda-pro.exe')
+check('unquoted exe with %1', parseExecutableFromCommand('C:\\App\\lceda-pro.exe %1'), 'C:\\App\\lceda-pro.exe')
+check('quoted exe without args', parseExecutableFromCommand('"C:\\Program Files\\LCEDA Pro\\lceda-pro.exe"'), 'C:\\Program Files\\LCEDA Pro\\lceda-pro.exe')
+check('empty command', parseExecutableFromCommand(''), undefined)
+check('undefined command', parseExecutableFromCommand(undefined), undefined)
+check('unterminated quote is rejected', parseExecutableFromCommand('"C:\\broken'), undefined)
+
+// --- registry output decoding -------------------------------------------
+const gbkBytes = Buffer.from([0xBC, 0xD1, 0xC1, 0xA2, 0xB4, 0xB4]) // 佳立创 in GBK
+check('GBK bytes decode to the right characters', decodeRegistryOutput(gbkBytes), '佳立创')
+check('plain ASCII stays as-is', decodeRegistryOutput(Buffer.from('  X    REG_SZ    abc', 'utf8')), '  X    REG_SZ    abc')
+check('valid UTF-8 is not re-decoded', decodeRegistryOutput(Buffer.from('嘉立创', 'utf8')), '嘉立创')
+
+// --- registry output parsing --------------------------------------------
+const regDefault = `\r\nHKEY_CURRENT_USER\\Software\\Classes\\嘉立创EDA库文件\\shell\\open\\command\r\n    (默认)    REG_SZ    "D:\\lceda-pro\\lceda-pro.exe" "%1"\r\n\r\n`
+check('REG_SZ payload', parseRegStringValue(regDefault), '"D:\\lceda-pro\\lceda-pro.exe" "%1"')
+check('missing REG_SZ', parseRegStringValue('no such key'), undefined)
+check('OpenWithProgids names', parseRegValueNames('HKEY_CURRENT_USER\\Software\\Classes\\.eprj2\\OpenWithProgids\r\n    MyProgid    REG_NONE\r\n    Other    REG_NONE\r\n'), ['MyProgid', 'Other'])
+check('empty OpenWithProgids', parseRegValueNames(''), [])
+
+// --- resolution order ----------------------------------------------------
+const exeFromRegistry = 'D:\\lceda-pro\\lceda-pro.exe'
+const registryOutput = (key: string): string | undefined => {
+  if (key.endsWith('.eprj2\\OpenWithProgids')) return '    JlcProEdaFile    REG_NONE\r\n'
+  if (key.endsWith('JlcProEdaFile\\shell\\open\\command')) return '    (默认)    REG_SZ    "D:\\lceda-pro\\lceda-pro.exe" "%1"\r\n'
+  return undefined
+}
+
+check('registry hit', resolveExecutable(probe({ files: [exeFromRegistry], registryQuery: registryOutput })), { executable: exeFromRegistry, source: 'registry' })
+
+check('config override wins', resolveExecutable(
+  probe({ files: ['C:\\custom\\lceda.exe', exeFromRegistry], registryQuery: registryOutput }),
+  { executable: 'C:\\custom\\lceda.exe' },
+), { executable: 'C:\\custom\\lceda.exe', source: 'config' })
+
+check('a missing config override is skipped', resolveExecutable(
+  probe({ files: [exeFromRegistry], registryQuery: registryOutput }),
+  { executable: 'C:\\does\\not\\exist.exe' },
+), { executable: exeFromRegistry, source: 'registry' })
+
+check('env var used when config is absent', resolveExecutable(
+  probe({ env: { DSH_EDA_EXECUTABLE: 'E:\\eda\\lceda-pro.exe' }, files: ['E:\\eda\\lceda-pro.exe', exeFromRegistry], registryQuery: registryOutput }),
+), { executable: 'E:\\eda\\lceda-pro.exe', source: 'env' })
+
+check('second env key is honoured', resolveExecutable(
+  probe({ env: { JLCEDA_EXECUTABLE: 'E:\\eda2\\lceda-pro.exe' }, files: ['E:\\eda2\\lceda-pro.exe'] }),
+), { executable: 'E:\\eda2\\lceda-pro.exe', source: 'env' })
+
+const programFilesExe = 'C:\\Program Files\\lceda-pro\\lceda-pro.exe'
+check('install dir candidate', resolveExecutable(
+  probe({ env: { ProgramFiles: 'C:\\Program Files' }, files: [programFilesExe] }),
+), { executable: programFilesExe, source: 'install-dir' })
+
+check('PATH candidate', resolveExecutable(
+  probe({ env: { PATH: 'C:\\tools;D:\\bin' }, files: ['D:\\bin\\lceda-pro.exe'] }),
+), { executable: 'D:\\bin\\lceda-pro.exe', source: 'path' })
+
+check('nothing found', resolveExecutable(probe({ env: {} })), undefined)
+check('registry is ignored off Windows', registryCandidates(probe({ platform: 'linux' })), [])
+
+// --- candidate generation ------------------------------------------------
+check('install candidates include Program Files', envCandidates(probe({ env: { ProgramFiles: 'C:\\Program Files' } })).includes(programFilesExe), true)
+check('PATH candidates split on ;', pathCandidates(probe({ env: { PATH: 'A;B' } })), ['A\\lceda-pro.exe', 'A\\lceda-pro', 'A\\LCEDA Pro', 'B\\lceda-pro.exe', 'B\\lceda-pro', 'B\\LCEDA Pro'])
+check('PATH candidates split on : off Windows', pathCandidates(probe({ platform: 'linux', env: { PATH: '/usr/bin:/opt' } })).slice(0, 2), ['/usr/bin/lceda-pro.exe', '/usr/bin/lceda-pro'])
+
+// --- launch arguments ----------------------------------------------------
+check('windows without project', buildLaunchArgs('win32', 'D:\\lceda-pro\\lceda-pro.exe'), { command: 'D:\\lceda-pro\\lceda-pro.exe', args: [] })
+check('windows with project', buildLaunchArgs('win32', 'D:\\lceda-pro\\lceda-pro.exe', 'D:\\p\\a.eprj2'), { command: 'D:\\lceda-pro\\lceda-pro.exe', args: ['D:\\p\\a.eprj2'] })
+check('blank project is ignored', buildLaunchArgs('win32', 'X.exe', '   '), { command: 'X.exe', args: [] })
+check('macOS opens the app bundle', buildLaunchArgs('darwin', '/Applications/LCEDA Pro.app'), { command: 'open', args: ['-a', '/Applications/LCEDA Pro.app'] })
+check('macOS opens the document', buildLaunchArgs('darwin', '/Applications/LCEDA Pro.app', '/p/a.eprj2'), { command: 'open', args: ['-a', '/Applications/LCEDA Pro.app', '/p/a.eprj2'] })
+check('linux runs the binary', buildLaunchArgs('linux', '/opt/lceda-pro', '/p/a.eprj2'), { command: '/opt/lceda-pro', args: ['/p/a.eprj2'] })
+
+// --- Windows hand-off script (explorer launch) ---------------------------
+const scriptLines = buildLaunchScript('D:\\lceda-pro\\lceda-pro.exe').split('\r\n')
+check('script starts with echo off', scriptLines[0], '@echo off')
+check('script starts the app', scriptLines[1], 'start "" "D:\\lceda-pro\\lceda-pro.exe"')
+check('script with a project quotes both paths', buildLaunchScript('C:\\a b\\lceda-pro.exe', 'D:\\p q\\x.eprj2').split('\r\n')[1], 'start "" "C:\\a b\\lceda-pro.exe" "D:\\p q\\x.eprj2"')
+
+console.log(failures === 0 ? '\nALL PASS' : `\n${failures} FAILED`)
+process.exit(failures === 0 ? 0 : 1)

package/test/seams.test.ts

@@ -15,6 +15,20 @@ import { pathToFileURL } from 'node:url'
 const seamRoot = process.env.DSH_SEAM_ROOT ?? process.cwd()
 let failures = 0
 
+// --- extension version single source of truth ----------------------------
+// The extension announces its version over the WebSocket. It once carried a
+// hand-written constant that went stale (manifest 0.3.6, runtime 0.3.5), so the
+// bridge reported a version mismatch no matter what was imported. The build
+// injects the manifest version into the placeholder; keep it that way.
+{
+  const extensionDir = join(process.cwd(), 'jlc-extension')
+  const manifest = JSON.parse(readFileSync(join(extensionDir, 'extension.json'), 'utf8')) as { version: string }
+  const bridgeSource = readFileSync(join(extensionDir, 'api-bridge.js'), 'utf8')
+  report('extension manifest declares a version', /^\d+\.\d+\.\d+$/.test(manifest.version), manifest.version)
+  report('api-bridge.js keeps the version placeholder', bridgeSource.includes('__EXTENSION_VERSION__'))
+  report('api-bridge.js has no hard-coded version constant', !/var VERSION = '\d/.test(bridgeSource))
+}
+
 function report(label: string, ok: boolean, detail = ''): void {
   if (!ok) failures += 1
   console.log(`${ok ? 'PASS' : 'FAIL'} ${label}${detail === '' ? '' : ' — ' + detail}`)