magpie-cursor-relay 0.3.11 → 0.3.13

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.3.13
+
+卸载时删除本机根证书。此前 `setup.command uninstall` 只还原 Cursor 代理，证书和私钥都留在本机。
+
+- 卸载按 SHA-1 指纹精确删除钥匙串里本插件的 `Cursor BYOK Local CA`（同名的其他工具证书不受影响），并删除 `data/ca` 目录及私钥；钥匙串删除失败时会明确提示手动删除。
+- README 写明会安装受信任根证书、只在插件页移除不会删除证书，以及 Cursor 使用条款带来的账号风险；说明本插件为社区插件，未上架插件市场。
+- 验证：插件测试 73 项通过（新增卸载删证书回归测试）。引擎与 0.3.12 相同。
+
+## 0.3.12
+
+Cursor 模型菜单只显示 Magpie 里的模型名，不再在后面拼接 ` · provider/model` 完整 ID；完整 ID 仍在悬停提示里（`Magpie / <id>`）。
+
+- 引擎显示名由「名字 · ID」改为「名字」，引擎重新构建，`integrity.json` 校验值已更新。引擎内部模型编号由显示名参与计算，升级后 Cursor 里已选的模型可能需要重新选一次。
+- `scripts/build-native.sh` 尊重 `CARGO_TARGET_DIR`，可复用编译缓存。
+- 验证：引擎单测 3 项（新增显示名断言）、Lodestar 回归 3 项、插件测试 72 项通过。
+
 ## 0.3.11
 
 修复 `magpie cursor-bridge <模型>` 命令行连接报 `ReferenceError: process is not defined`：Magpie 命令行在没有 `process` 的沙箱里执行插件的 `connect()`，自动启动检查现在先判断 `process` 是否存在，连接配置照常写出，由已在运行的后台桥接自行接管。

package/README.md

@@ -2,7 +2,15 @@
 
 让 Cursor 编辑器直接使用 Magpie 中配置的全部模型与路由组。模型菜单返回 Magpie 模型目录，隐藏 Cursor 默认 Auto 入口，保留 Cursor 原有登录。
 
-当前发布 **0.3.11，仅随包提供 Apple Silicon macOS 引擎**；Windows / Intel macOS 暂无对应发布产物。
+当前发布 **0.3.13，仅随包提供 Apple Silicon macOS 引擎**；Windows / Intel macOS 暂无对应发布产物。
+
+> **社区插件，未上架 Magpie 插件市场。** 安装前请先了解下面两点风险，自行决定是否使用。
+
+## 使用前必读
+
+- **会安装一个受信任的根证书。** 本插件要截获 Cursor 与其后端（`*.cursor.sh`）之间的 HTTPS 流量，才能把模型请求转给 Magpie，所以初始化时会在本机生成名为 `Cursor BYOK Local CA` 的根证书（有效期约 10 年），并加入当前用户登录钥匙串的受信任根证书。私钥保存在 `~/.config/magpie-cursor-bridge/data/ca/`，能读取该文件的程序可以冒充任意 HTTPS 网站。
+- **卸载会删除这张证书和私钥**（0.3.13 起）。请用 `bash setup.command uninstall` 卸载；只在 Magpie 插件页移除插件**不会**执行卸载，证书会留下，此时请先运行卸载命令，或在「钥匙串访问」里手动删除 `Cursor BYOK Local CA`。
+- **Cursor 账号风险。** 桥接会在本地应答 Cursor 的部分接口（账号、套餐、用量等），这类做法违反 Cursor 的使用条款，存在被停用账号的风险。
 
 **和市场里其他 Cursor 插件的区别**
 
@@ -22,7 +30,7 @@
 
 ### 安装方式
 
-在 Magpie → **Plugins** 搜索 **Magpie-Cursor-Relay** 安装，或在终端执行：
+本插件不在 Magpie 插件市场，请在终端执行：
 ```text
 magpie plugin add magpie-cursor-relay
 ```
@@ -82,7 +90,7 @@ magpie plugin add magpie-cursor-relay
 | :--- | :--- | :--- |
 | **启动/更新服务** | `powershell -ExecutionPolicy Bypass -File setup.ps1` | `bash setup.command` |
 | **查看后台运行状态** | `powershell -ExecutionPolicy Bypass -File setup.ps1 status` | `bash setup.command status` |
-| **停用并卸载后台服务** | `powershell -ExecutionPolicy Bypass -File setup.ps1 uninstall` | `bash setup.command uninstall` |
+| **停用并卸载（含删除根证书）** | `powershell -ExecutionPolicy Bypass -File setup.ps1 uninstall` | `bash setup.command uninstall` |
 
 - **断开连接**：在 Magpie 的 Agents 页面选择 Disconnect，或在终端执行 `magpie cursor-bridge default`。
 - **代理自愈与还原**：当桥接服务退出或在 Magpie 中断开连接时，Cursor 的代理配置会自动恢复为初始状态。

package/bin/cursor-magpie-bridge

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/bin/cursor-magpie-bridge
-size: 47264576 bytes
-sha256: 2ed05bbb3f9e42f2874f3417324655d1f7f2c0c30fa00430bf965e98c4def327
+size: 47265904 bytes
+sha256: 631a94fc402efa38cefa79264171cafdf2dc1308e02a4f2cec59d4cc0cd306bf

package/install.js

@@ -4,7 +4,7 @@ import os from 'node:os';
 import path from 'node:path';
 import {fileURLToPath} from 'node:url';
 import {atomic,restoreProxy} from './lib/settings.js';
-import {paths,run,verifyPackage,initializeCertificate,stage,activate,stopJob,label} from './lib/install.js';
+import {paths,run,verifyPackage,initializeCertificate,removeCertificate,stage,activate,stopJob,label} from './lib/install.js';
 const source=path.dirname(fileURLToPath(import.meta.url));
 const manifest=JSON.parse(fs.readFileSync(path.join(source,'package.json'),'utf8'));
 const command=process.argv[2]||'setup';
@@ -73,7 +73,10 @@ try {
         if(magpie) run(magpie,['plugin','rm',p.target],{optional:true});
         if(p.plist && fs.existsSync(p.plist)) fs.unlinkSync(p.plist);
         if(p.startupScript && fs.existsSync(p.startupScript)) fs.unlinkSync(p.startupScript);
-        console.log('后台已卸载，Cursor 代理已还原。若从 Magpie 插件页安装，请同时移除该插件。证书、数据及恢复记录保留。');
+        const ca=removeCertificate(p);
+        console.log(ca.removed
+          ? '后台已卸载，Cursor 代理已还原，本机根证书及其私钥已删除。若从 Magpie 插件页安装，请同时移除该插件。会话数据保留。'
+          : `后台已卸载，Cursor 代理已还原，证书私钥已删除；钥匙串里的证书未能删除（SHA-1 ${ca.sha1}），请在「钥匙串访问」里手动删除 Cursor BYOK Local CA。`);
       } else {
         verifyPackage(source);
         const isWin = process.platform === 'win32';

package/integrity.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.11",
+  "version": "0.3.13",
   "engine_version": "0.2.1",
-  "engine": "2ed05bbb3f9e42f2874f3417324655d1f7f2c0c30fa00430bf965e98c4def327"
+  "engine": "631a94fc402efa38cefa79264171cafdf2dc1308e02a4f2cec59d4cc0cd306bf"
 }

package/lib/install.js

@@ -106,6 +106,29 @@ export function initializeCertificate(engine,p,exec=run,{trust=true}={}) {
   }
   return state;
 }
+// Undo initializeCertificate: untrust and delete exactly our CA (matched by
+// SHA-1, so another tool's CA with the same name is left alone), then delete
+// the CA directory with its private key. Returns whether the store still holds it.
+export function removeCertificate(p,exec=run) {
+  const dir=path.join(p.root,'data/ca');
+  const cert=path.join(dir,'ca.crt');
+  if(!fs.existsSync(cert)) { fs.rmSync(dir,{recursive:true,force:true}); return {removed:true}; }
+  const pem=fs.readFileSync(cert,'utf8');
+  const der=Buffer.from(pem.replace(/-----[^-]+-----|\s/g,''),'base64');
+  const sha1=createHash('sha1').update(der).digest('hex').toUpperCase();
+  let removed;
+  if (process.platform === 'win32') {
+    exec('powershell',['-NoProfile','-Command',`Start-Process certutil -ArgumentList '-delstore Root ${sha1}' -Verb RunAs -Wait`],{optional:true});
+    removed=!exec('certutil',['-store','Root',sha1],{optional:true}).stdout?.toUpperCase().includes(sha1);
+  } else {
+    const keychain=path.join(p.home,'Library/Keychains/login.keychain-db');
+    exec('/usr/bin/security',['remove-trusted-cert',cert],{optional:true,stdio:'inherit'});
+    exec('/usr/bin/security',['delete-certificate','-Z',sha1,keychain],{optional:true});
+    removed=!(exec('/usr/bin/security',['find-certificate','-a','-Z',keychain],{optional:true}).stdout||'').includes(sha1);
+  }
+  fs.rmSync(dir,{recursive:true,force:true});
+  return {removed,sha1};
+}
 export function plistText(p,runtime,release) {
   const esc=s=>s.replaceAll('&','&amp;').replaceAll('<','&lt;').replaceAll('>','&gt;');
   const args=[runtime,path.join(release,'bridge.js'),'supervise'].map(s=>`<string>${esc(s)}</string>`).join('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie-cursor-relay",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "type": "module",
   "description": "Magpie-Cursor-Relay：让 Cursor 用 Magpie 的全部模型与路由组（Apple Silicon macOS）",
   "license": "MIT",

package/scripts/build-native.sh

@@ -17,7 +17,7 @@ git -C "$bridge_build/source" apply "$bridge_package/source.patch"
 CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-2}" cargo test --manifest-path "$bridge_build/source/Cargo.toml" --release --locked -p cursor-server --test lodestar_replay_repro
 CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-2}" cargo build --manifest-path "$bridge_build/source/Cargo.toml" --release --locked -p cursor-server --bin cursor-magpie-bridge
 mkdir -p "$bridge_package/bin"
-cp "$bridge_build/source/target/release/cursor-magpie-bridge" "$bridge_package/bin/cursor-magpie-bridge.new"
+cp "${CARGO_TARGET_DIR:-$bridge_build/source/target}/release/cursor-magpie-bridge" "$bridge_package/bin/cursor-magpie-bridge.new"
 chmod 755 "$bridge_package/bin/cursor-magpie-bridge.new"
 codesign --force --sign - "$bridge_package/bin/cursor-magpie-bridge.new"
 mv "$bridge_package/bin/cursor-magpie-bridge.new" "$bridge_package/bin/cursor-magpie-bridge"

package/source.patch

@@ -91,7 +91,7 @@ new file mode 100644
 index 0000000..29b7fc2
 --- /dev/null
 +++ b/server/src/bin/cursor-magpie-bridge.rs
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,152 @@
 +//! Headless Cursor protocol bridge. No desktop/account writes or management API.
 +use std::{path::PathBuf, sync::Arc, time::Duration};
 +use cursor_server::{api, config, cursor::{prompting::{PromptAssets, PromptCompiler}, transport::TransportRegistry}, local_app::CursorHarness, model::ModelConfigInput, network::NetworkClients, plugin::{PluginRegistry, PluginRuntime}, provider::ProviderRouter, search::WebCache, store::Store};
@@ -117,7 +117,7 @@ index 0000000..29b7fc2
 +    models.into_iter().enumerate().map(|(i,m)| {
 +        if !seen.insert(m.id.clone()) { return Err("duplicate model id".into()); }
 +        Ok(serde_json::from_value(json!({
-+            "sort_order": i, "display_name": if m.name.is_empty() {m.id.clone()} else {format!("{} · {}", m.name, m.id)},
++            "sort_order": i, "display_name": if m.name.is_empty() {m.id.clone()} else {m.name.clone()},
 +            "group_name":"Magpie", "type":"openai", "base_url": c.gateway.trim_end_matches('/'),
 +            "api_key":c.key, "tooltip_data":format!("Magpie / {}",m.id), "model_id":m.id,
 +            "context_window_tokens":m.context.filter(|v| *v > 0),
@@ -215,6 +215,7 @@ index 0000000..29b7fc2
 +    fn selected_model_first_and_route_preserved() {
 +        let models=catalogue(&serde_json::to_vec(&config()).unwrap()).unwrap();
 +        assert_eq!(models[0].model_id,"p/b");
++        assert_eq!(models[0].display_name,"B");
 +        assert_eq!(models[1].context_window_tokens,Some(200000));
 +        assert_eq!(models[0].base_url,"http://127.0.0.1:3425/v1");
 +        assert_eq!(models[0].api_key,"test-only");

package/test/install.test.js

@@ -7,7 +7,7 @@ import {fileURLToPath} from 'node:url';
 import {spawnSync} from 'node:child_process';
 import {createRequire} from 'node:module';
 import {createHash} from 'node:crypto';
-import {paths,verifyPackage,initializeCertificate,stage,activate,plistText,label} from '../lib/install.js';
+import {paths,verifyPackage,initializeCertificate,removeCertificate,stage,activate,plistText,label} from '../lib/install.js';
 
 const isWin = process.platform === 'win32';
 const source=fileURLToPath(new URL('..',import.meta.url));
@@ -186,3 +186,21 @@ test('GitHub installation supports a dependency hoisted by Magpie Bun',t=>{
  const release=stage(plugin,paths(home),version,runtime);
  assert.ok(fs.existsSync(path.join(release,'node_modules/jsonc-parser/package.json')));
 });
+
+test('uninstall removes exactly our CA from the keychain and deletes its private key',t=>{
+  if(isWin) return;
+  const home=temp(t);const p=paths(home);const dir=path.join(p.root,'data/ca');
+  fs.mkdirSync(dir,{recursive:true});
+  const der=Buffer.from('fake certificate body');
+  fs.writeFileSync(path.join(dir,'ca.crt'),`-----BEGIN CERTIFICATE-----\n${der.toString('base64')}\n-----END CERTIFICATE-----\n`);
+  fs.writeFileSync(path.join(dir,'ca.key'),'secret');
+  const sha1=createHash('sha1').update(der).digest('hex').toUpperCase();
+  for(const stillThere of [false,true]) {
+    fs.mkdirSync(dir,{recursive:true});fs.writeFileSync(path.join(dir,'ca.crt'),`-----BEGIN CERTIFICATE-----\n${der.toString('base64')}\n-----END CERTIFICATE-----\n`);
+    const calls=[];
+    const out=removeCertificate(p,(cmd,args)=>{calls.push(args);return {status:0,stdout:args[0]==='find-certificate'&&stillThere?`SHA-1 hash: ${sha1}`:''};});
+    assert.ok(calls.some(a=>a[0]==='delete-certificate'&&a[2]===sha1));
+    assert.equal(out.removed,!stillThere);
+    assert.equal(fs.existsSync(dir),false);
+  }
+});