@windypro-rourou/dsh-eda 0.1.9 → 0.1.10

package/README.md

@@ -52,18 +52,21 @@ git clone https://github.com/WindyPro-rourou/JCL-EDA.git node_modules/@windypro-
 └─ package.json                   ← @windypro-rourou/dsh-eda（files 含 lib/src/patch；npm i github:… 即装）
 ```
 
-## 已注册的 agent 工具（21 个）
+## 已注册的 agent 工具（24 个）
 
 | 工具 | 用途 |
 |---|---|
-| `eda_status` | 插件/官方桥状态（装没装 / 端口 / 是否就绪） |
+| `eda_status` | 插件/官方桥状态（装没装 / 端口 / 是否就绪 / 新版本提示） |
 | `eda_template_list` / `eda_translate_request` | 模板卡目录 / 中文需求→结构化草稿（离线兜底用） |
 | `eda_generate_schematic_json` | **离线兜底**：需求/模板 → 可导入标准版原理图 JSON + 结构/连通性校验（**9 种符号**：电阻/LED/电容/二极管/开关/电感/晶振/电池/保险丝 + 网络标签） |
 | `eda_bridge_install` / `eda_backend_connect` | 一键安装官方桥 / 启动·连接官方桥 |
 | `eda_exec` | **云端实时生成的双手**：执行任意官方 `eda.*` 代码（需已连接；自动记录新建图元→可撤回） |
+| `eda_task` | **后台任务**：长操作（自动布线/大导出/批量写回）提交与查询（桥异步补丁：/tasks、/routing，超时返回 taskId 且迟到结果保留） |
+| `eda_export` | **打样交付包**：一键导出 Gerber zip + BOM + 坐标文件（Pick&Place）+ PCB 信息到本地目录 |
+| `eda_sch_to_pcb` | **原理图→PCB 复制**：读原理图器件 `getState_Component()` → 在 PCB 网格放置（可靠替代不可用的 `importChanges`） |
 | `eda_place` / `eda_wire` / `eda_netflag` / `eda_save` | **确定性封装**：搜索+定位+放置一体（返回引脚坐标）/ 引脚级连线（自动校验）/ 电源地网络标志 / 保存当前文档 |
 | `eda_pick_spot` | **框内定位**：读页面尺寸+已有图元 → 返回互不冲突的框内网格空位（sch/pcb 双模式） |
-| `eda_capabilities` | **能力清单**：官方 eda.* API 结构化目录（域/方法/用法/坑/实测片段）——agent 主动查询 |
+| `eda_capabilities` | **能力清单**：官方 eda.* API 结构化目录（含层能力矩阵/全链路实测/坑）——agent 主动查询 |
 | `eda_board_overview` | **画板全览**：当前文档图元/网络/页面尺寸摘要（agent 的眼睛，画前画后都可用） |
 | `eda_trace` | **现场截图**：缩放适配 → PNG 存 `~/.dsh/eda/shots/`（效果确认/视觉留档） |
 | `eda_snapshot` | **紧急保存**：画板现场（`.epro2`+SVG 预览+网表/BOM）+ 动作日志 → `~/.dsh/eda/snapshots/` |

package/lib/index.js

@@ -1866,6 +1866,290 @@ function edaTaskTool(backend) {
   })
 }
 
+
+/**
+ * eda_export：一键导出打样交付包（Gerber / BOM / 坐标 / PCB 信息）到本地目录。
+ * 注意：getManufactureData() 会挂起——这里逐个导出；Gerber 用无参 getGerberFile()（约 2-3s）。
+ */
+function edaExportTool(backend) {
+  return defineTool({
+    name: 'eda_export',
+    description: 'Export a fabrication-ready delivery package for the CURRENT PCB to a local folder: Gerber zip, BOM xlsx, ' +
+      'pick-and-place xlsx, and PCB info. Each kind can be requested individually. ' +
+      'Requires the official bridge connected and a PCB document (auto-opens the project PCB if a schematic is active). ' +
+      'Triggers: 导出打样包, export gerber, 打样交付, 导出 BOM/坐标, fab package.',
+    parameters: {
+      kinds: { type: 'string', description: '逗号分隔：gerber,bom,pnp,info（默认全部）' },
+      dir: { type: 'string', description: '可选：本地输出目录（默认 ~/.dsh/eda/export/<时间戳>/）' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          ok: { type: 'boolean', required: true },
+          dir: { type: 'string' },
+          files: {
+            type: 'array',
+            items: {
+              type: 'object',
+              additionalProperties: false,
+              properties: {
+                kind: { type: 'string', required: true },
+                name: { type: 'string', required: true },
+                size: { type: 'integer', required: true },
+                path: { type: 'string', required: true },
+              },
+            },
+          },
+          errors: { type: 'array', items: { type: 'string' } },
+          error: { type: 'string' },
+        },
+      },
+      render: (_args, value) => {
+        if (value?.ok !== true) return [{ type: 'text', text: '导出失败: ' + (value?.error ?? '?') }]
+        const lines = ['✅ 打样交付包已导出到 ' + value.dir + '（' + (value.files?.length ?? 0) + ' 个文件）']
+        for (const f of value.files ?? []) lines.push('  ' + f.kind.padEnd(7) + ' ' + f.name + ' (' + (f.size / 1024).toFixed(1) + 'KB) → ' + f.path)
+        if ((value.errors ?? []).length > 0) lines.push('⚠ 部分失败: ' + value.errors.join('; '))
+        return [{ type: 'text', text: lines.join('\n') }]
+      },
+    },
+    async execute(args, exec) {
+      const sid = sessionIdOf(exec)
+      await backend.refresh()
+      if (!statusOf(backend).connected) {
+        pushActivity({ sid, tool: 'eda_export', action: '导出打样包', ok: false, error: '官方桥未连接（门控拦截）' })
+        return { ok: false, error: '官方桥未连接：请先 eda_backend_connect（并确认扩展已开启「外部交互」）。', dir: '', files: [], errors: [] }
+      }
+      const kinds = String(args?.kinds ?? '').split(',').map((s) => s.trim().toLowerCase()).filter((s) => ['gerber', 'bom', 'pnp', 'info'].includes(s))
+      const useKinds = kinds.length > 0 ? kinds : ['gerber', 'bom', 'pnp', 'info']
+      const dir = typeof args?.dir === 'string' && args.dir.trim() !== ''
+        ? args.dir
+        : join(homedir(), '.dsh', 'eda', 'export', new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19))
+      const actId = pushPendingActivity({ sid, tool: 'eda_export', action: '导出打样包', code: 'kinds=' + useKinds.join(',') })
+      const t0 = Date.now()
+      try {
+        // 1) 确保当前是 PCB（在原理图时自动打开工程 PCB）
+        const docR = await backend.execute('return await eda.dmt_SelectControl.getCurrentDocumentInfo();', 15000)
+        let doc = null
+        try { doc = JSON.parse(docR.result ?? 'null') } catch (e) { doc = null }
+        if (doc === null || doc.documentType !== 3) {
+          const openR = await backend.execute('return await (async () => {' +
+            'const proj = await eda.dmt_Project.getCurrentProjectInfo();' +
+            'const pcbUuid = proj?.data?.[0]?.pcb?.uuid;' +
+            'if (!pcbUuid) return { ok: false, err: "当前工程没有 PCB" };' +
+            'await eda.dmt_EditorControl.openDocument(pcbUuid);' +
+            'return { ok: true, pcbUuid }; })();', 20000)
+          let open = null
+          try { open = JSON.parse(openR.result ?? 'null') } catch (e) { open = null }
+          if (!openR.ok || !open || open.ok !== true) {
+            updateActivity(actId, { status: 'error', ok: false, action: '导出打样包', error: '无法打开 PCB 文档', durationMs: Date.now() - t0 })
+            return { ok: false, error: '当前工程没有可导出的 PCB 文档', dir, files: [], errors: [] }
+          }
+          await new Promise((resolve) => setTimeout(resolve, 1800))
+        }
+        // 2) 执行导出（逐个 grab；Gerber 用无参）
+        const code = 'return await (async () => {' +
+          'const kinds = ' + JSON.stringify(useKinds) + ';' +
+          'const out = {};' +
+          'const grab = async (kind, fn) => {' +
+          '  try {' +
+          '    const f = await fn();' +
+          '    if (!f) { out[kind] = { ok: false, err: "null File" }; return; }' +
+          '    const bytes = new Uint8Array(await f.arrayBuffer());' +
+          '    let bin = "";' +
+          '    for (let i = 0; i < bytes.length; i += 0x8000) bin += String.fromCharCode.apply(null, bytes.subarray(i, i + 0x8000));' +
+          '    out[kind] = { ok: true, name: f.name, size: f.size, b64: btoa(bin) };' +
+          '  } catch (e) { out[kind] = { ok: false, err: String(e).slice(0, 140) }; }' +
+          '};' +
+          'if (kinds.includes("gerber")) await grab("gerber", () => eda.pcb_ManufactureData.getGerberFile());' +
+          'if (kinds.includes("bom")) await grab("bom", () => eda.pcb_ManufactureData.getBomFile());' +
+          'if (kinds.includes("pnp")) await grab("pnp", () => eda.pcb_ManufactureData.getPickAndPlaceFile());' +
+          'if (kinds.includes("info")) await grab("info", () => eda.pcb_ManufactureData.getPcbInfoFile());' +
+          'return out; })();'
+        const r = await backend.execute(code, 90000)
+        if (!r.ok) {
+          updateActivity(actId, { status: 'error', ok: false, action: '导出打样包', error: r.error, durationMs: Date.now() - t0 })
+          return { ok: false, error: r.error, dir, files: [], errors: [] }
+        }
+        let parsed = null
+        try { parsed = JSON.parse(r.result ?? 'null') } catch (e) { parsed = null }
+        if (!parsed) return { ok: false, error: '导出结果解析失败', dir, files: [], errors: [] }
+        // 3) 解码写本地文件
+        await fsp.mkdir(dir, { recursive: true })
+        const files = []
+        const errors = []
+        for (const [kind, v] of Object.entries(parsed)) {
+          if (!v || v.ok !== true) { errors.push(kind + ': ' + (v?.err ?? 'failed')); continue }
+          const safeName = String(v.name ?? kind).replace(/[\\/:*?"<>|]/g, '_')
+          const path = join(dir, safeName)
+          await fsp.writeFile(path, Buffer.from(String(v.b64 ?? ''), 'base64'))
+          files.push({ kind, name: safeName, size: Number(v.size ?? 0), path })
+        }
+        updateActivity(actId, {
+          status: files.length > 0 ? 'done' : 'error',
+          ok: files.length > 0, action: '导出打样包',
+          result: files.map((f) => f.name).join(', ').slice(0, 200),
+          error: errors.join('; ').slice(0, 200), durationMs: Date.now() - t0,
+        })
+        return { ok: files.length > 0, dir, files, errors, error: files.length > 0 ? '' : (errors.join('; ') || '导出失败') }
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err)
+        updateActivity(actId, { status: 'error', ok: false, action: '导出打样包', error: msg, durationMs: Date.now() - t0 })
+        return { ok: false, error: msg, dir, files: [], errors: [] }
+      }
+    },
+  })
+}
+
+/**
+ * eda_sch_to_pcb：把当前原理图的器件复制到 PCB（替代不可靠的 importChanges）。
+ * 读原理图元件 → getState_Component() 取 device → 在 PCB 网格放置（layer 1）。
+ */
+function edaSchToPcbTool(backend) {
+  return defineTool({
+    name: 'eda_sch_to_pcb',
+    description: 'Copy the components of the CURRENT schematic onto the project PCB (direct placement). ' +
+      'This is the reliable replacement for the unreliable PCB_Document.importChanges() (returns true but places nothing). ' +
+      'Reads each schematic component via getState_Component(), opens the project PCB and places it on layer 1 in a grid. ' +
+      'Triggers: 原理图转PCB, 复制器件到PCB, sch to pcb, 同步原理图到PCB.',
+    parameters: {
+      spacing: { type: 'integer', description: '可选：网格间距（mil，默认 900）' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          ok: { type: 'boolean', required: true },
+          pcbUuid: { type: 'string' },
+          total: { type: 'integer' },
+          placedOk: { type: 'integer' },
+          placed: {
+            type: 'array',
+            items: {
+              type: 'object',
+              additionalProperties: false,
+              properties: {
+                designator: { type: 'string' },
+                ok: { type: 'boolean', required: true },
+                uuid: { type: 'string' },
+                err: { type: 'string' },
+              },
+            },
+          },
+          note: { type: 'string' },
+          error: { type: 'string' },
+        },
+      },
+      render: (_args, value) => {
+        if (value?.ok !== true) return [{ type: 'text', text: '原理图转 PCB 失败: ' + (value?.error ?? '?') }]
+        const lines = ['✅ 原理图 → PCB：' + (value.placedOk ?? 0) + '/' + (value.total ?? 0) + ' 个器件已放置到 ' + (value.pcbUuid ?? '')]
+        for (const p of value.placed ?? []) if (!p.ok && p.err) lines.push('  ⚠ ' + (p.designator ?? '?') + ': ' + p.err)
+        if (value.note) lines.push(value.note)
+        return [{ type: 'text', text: lines.join('\n') }]
+      },
+    },
+    async execute(args, exec) {
+      const sid = sessionIdOf(exec)
+      await backend.refresh()
+      if (!statusOf(backend).connected) {
+        pushActivity({ sid, tool: 'eda_sch_to_pcb', action: '原理图转PCB', ok: false, error: '官方桥未连接（门控拦截）' })
+        return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: '官方桥未连接：请先 eda_backend_connect。' }
+      }
+      const spacing = Number.isFinite(args?.spacing) ? Math.max(300, Math.min(3000, args.spacing)) : 900
+      const actId = pushPendingActivity({ sid, tool: 'eda_sch_to_pcb', action: '原理图转PCB', code: 'spacing=' + spacing })
+      const t0 = Date.now()
+      try {
+        const pre = await backend.execute('return await (async () => {' +
+          'const comps = await eda.sch_PrimitiveComponent.getAll();' +
+          'const list = [];' +
+          'for (const c of (comps || [])) {' +
+          '  let type = ""; try { type = c.getState_ComponentType(); } catch (e) {}' +
+          '  if (["sheet","netflag","netport","wire","bus","text"].includes(type)) continue;' +
+          '  let device = null; try { device = c.getState_Component ? c.getState_Component() : null; } catch (e) {}' +
+          '  if (!device) continue;' +
+          '  list.push({ id: (() => { try { return c.getState_PrimitiveId(); } catch (e) { return ""; } })(),' +
+          '    designator: (() => { try { return c.getState_Designator(); } catch (e) { return ""; } })() });' +
+          '}' +
+          'const proj = await eda.dmt_Project.getCurrentProjectInfo();' +
+          'const pcbUuid = proj?.data?.[0]?.pcb?.uuid;' +
+          'return { ok: true, count: list.length, pcbUuid }; })();', 30000)
+        let preData = null
+        try { preData = JSON.parse(pre.result ?? 'null') } catch (e) { preData = null }
+        if (!pre.ok || !preData || preData.ok !== true) {
+          updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: '读取原理图器件失败', durationMs: Date.now() - t0 })
+          return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: '读取原理图器件失败：' + (pre.error ?? '') }
+        }
+        if (!preData.pcbUuid) {
+          updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: '当前工程没有 PCB', durationMs: Date.now() - t0 })
+          return { ok: false, pcbUuid: '', total: Number(preData.count ?? 0), placedOk: 0, placed: [], note: '', error: '当前工程没有 PCB（先 createPcb 建板）' }
+        }
+        const code = 'return await (async () => {' +
+          'const sleep = (ms) => new Promise(r => setTimeout(r, ms));' +
+          'const comps = await eda.sch_PrimitiveComponent.getAll();' +
+          'const list = [];' +
+          'for (const c of (comps || [])) {' +
+          '  let type = ""; try { type = c.getState_ComponentType(); } catch (e) {}' +
+          '  if (["sheet","netflag","netport","wire","bus","text"].includes(type)) continue;' +
+          '  let device = null; try { device = c.getState_Component ? c.getState_Component() : null; } catch (e) {}' +
+          '  if (!device) continue;' +
+          '  list.push({ designator: (() => { try { return c.getState_Designator(); } catch (e) { return ""; } })(), device });' +
+          '}' +
+          'const proj = await eda.dmt_Project.getCurrentProjectInfo();' +
+          'const pcbUuid = proj?.data?.[0]?.pcb?.uuid;' +
+          'if (!pcbUuid) return { ok: false, err: "no pcb" };' +
+          'await eda.dmt_EditorControl.openDocument(pcbUuid);' +
+          'await sleep(1800);' +
+          'const spacing = SPACING;' +
+          'const placed = [];' +
+          'let x = 1500, y = 1200, col = 0;' +
+          'for (const it of list) {' +
+          '  try {' +
+          '    const comp = await eda.pcb_PrimitiveComponent.create(it.device, 1, x, y);' +
+          '    placed.push({ designator: String(it.designator || ""), ok: !!comp, uuid: comp && comp.getState_PrimitiveId ? comp.getState_PrimitiveId() : "" });' +
+          '  } catch (e) { placed.push({ designator: String(it.designator || ""), ok: false, err: String(e).slice(0, 80) }); }' +
+          '  col++; if (col % 6 === 0) { x = 1500; y += spacing; } else x += spacing;' +
+          '  await sleep(120);' +
+          '}' +
+          'try { await eda.pcb_Document.save(); } catch (e) {}' +
+          'return { ok: true, pcbUuid, total: list.length, placedOk: placed.filter(p => p.ok).length, placed }; })();'
+        const r = await backend.execute(code.replace('SPACING', String(spacing)), 120000)
+        if (!r.ok) {
+          updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: r.error, durationMs: Date.now() - t0 })
+          return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: r.error }
+        }
+        let parsed = null
+        try { parsed = JSON.parse(r.result ?? 'null') } catch (e) { parsed = null }
+        if (!parsed) return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: '结果解析失败' }
+        if (parsed.ok !== true) {
+          updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: String(parsed.err ?? 'failed'), durationMs: Date.now() - t0 })
+          return { ok: false, pcbUuid: '', total: Number(parsed.total ?? 0), placedOk: 0, placed: [], note: '', error: String(parsed.err ?? '原理图转 PCB 失败') }
+        }
+        const placed = (parsed.placed ?? []).map((p) => {
+          const row = { designator: String(p.designator ?? ''), ok: p.ok === true }
+          if (p.uuid) row.uuid = String(p.uuid)
+          if (p.err) row.err = String(p.err)
+          return row
+        })
+        updateActivity(actId, {
+          status: 'done', ok: true, action: '原理图转PCB',
+          result: (parsed.placedOk ?? 0) + '/' + (parsed.total ?? 0) + ' 已放置', error: '', durationMs: Date.now() - t0,
+        })
+        return {
+          ok: true, pcbUuid: String(parsed.pcbUuid ?? ''), total: Number(parsed.total ?? 0),
+          placedOk: Number(parsed.placedOk ?? 0), placed,
+          note: '放置坐标是元件原点（封装可能偏移）；位号沿用原理图但 PCB 上可能为空，需人工确认。',
+        }
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err)
+        updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: msg, durationMs: Date.now() - t0 })
+        return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: msg }
+      }
+    },
+  })
+}
+
 /** eda_save：保存当前文档（sch/pcb 自动判断）。 */
 function edaSaveTool(backend) {
   return defineTool({
@@ -1991,6 +2275,8 @@ export function apply(ctx, config) {
         edaBackendConnectTool(edaHandle, backend),
         edaExecTool(backend),
         edaTaskTool(backend),
+        edaExportTool(backend),
+        edaSchToPcbTool(backend),
         edaPickSpotTool(backend),
         edaCapabilitiesTool(),
         edaSkillReadTool(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windypro-rourou/dsh-eda",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "description": "dsh-lichuang-eda (JCL-EDA): 嘉立创 EDA 助手 DSH 插件 —— 官方 eda.* API 云端实时生成（原理图/PCB）+ 离线标准版 JSON 兜底 + 面板记录式时间线（撤回/清空/紧急保存）。开箱即用：npm i 后 cordis.patch.yml insert 一行即挂载。",
   "packageManager": "pnpm@11.22.0",