vcorp-chrome 2.2.0 → 2.2.1

package/extension/cloud.js

@@ -668,6 +668,7 @@ const updateTask = (jobId, fn) => serial(async () => {
 const HOST = 'ai.vcorp.desktop';
 const DESK = 'cloudDesktop';   // storage.local：启用桌面能力时宿主报的设备
 const DESK_PENDING = 'cloudDesktopPending';   // 为补上 nativeMessaging 绑定而重载，重载后接着启用
+const DESK_ERR = 'cloudDesktopError';   // 上次启用失败的原因，给侧栏看。重载后的那次启用没人接它抛的错
 const DESK_SNAPS = 4;          // 每个任务记几份快照的户口。户口按 ref 存名字，大应用一份上百 KB
 
 const deskInfo = async () => (await chrome.storage.local.get(DESK))[DESK] || null;
@@ -717,6 +718,7 @@ async function desktopChild() {
 }
 
 async function enableDesktop() {
+  await chrome.storage.local.remove(DESK_ERR);
   // 运行时才授予的 nativeMessaging，Chrome 不给已经在跑的 service worker 补上绑定，重载后才有
   if (!chrome.runtime.sendNativeMessage) {
     if (!(await chrome.permissions.contains({ permissions: ['nativeMessaging'] }))) {
@@ -727,9 +729,16 @@ async function enableDesktop() {
     chrome.runtime.reload();
     return;
   }
-  const r = await hostCall({ op: 'hello' });
-  const device = cleanDevice(r.device);
-  if (!device || device.kind !== 'desktop') throw err('DEVICE_OFFLINE', '桌面宿主报上来的设备不对');
+  let device;
+  let r;
+  try {
+    r = await hostCall({ op: 'hello' });
+    device = cleanDevice(r.device);
+    if (!device || device.kind !== 'desktop') throw err('DEVICE_OFFLINE', '桌面宿主报上来的设备不对');
+  } catch (e) {
+    await chrome.storage.local.set({ [DESK_ERR]: (e.message || String(e)).replace('请用户在终端', '请在终端') });
+    throw e;
+  }
   await chrome.storage.local.set({ [DESK]: { device, ready: !!r.ready, at: Date.now() } });
   await log({ ev: 'desktop_on', msg: device.id });
   // 重连一次，服务器在 hello 里看到这台设备
@@ -737,7 +746,7 @@ async function enableDesktop() {
 }
 
 async function disableDesktop() {
-  await chrome.storage.local.remove(DESK);
+  await chrome.storage.local.remove([DESK, DESK_ERR]);
   await log({ ev: 'desktop_off' });
   disconnect(); retryDelay = 0; void connect();
 }
@@ -1156,8 +1165,8 @@ async function uploadMedia(p, tid, sid, label) {
 const fromPanel = (sender) => !sender.tab && typeof sender.url === 'string' && sender.url.startsWith(chrome.runtime.getURL(''));
 
 async function panelState() {
-  const [cfg, { [STATUS]: status }, { [CLAIM]: claimed }, tasks, { [LOG]: list = [] }] = await Promise.all([
-    getCfg(), chrome.storage.session.get(STATUS), chrome.storage.session.get(CLAIM), getTasks(), chrome.storage.local.get(LOG),
+  const [cfg, { [STATUS]: status }, { [CLAIM]: claimed }, tasks, { [LOG]: list = [], [DESK_ERR]: deskErr }] = await Promise.all([
+    getCfg(), chrome.storage.session.get(STATUS), chrome.storage.session.get(CLAIM), getTasks(), chrome.storage.local.get([LOG, DESK_ERR]),
   ]);
   return {
     cfg: cfg && { origin: cfg.origin, account: cfg.account, sites: allowOf(cfg), auto: cfg.auto, autoConfirm: !!cfg.autoConfirm, paused: cfg.paused, pairedAt: cfg.pairedAt },
@@ -1165,7 +1174,7 @@ async function panelState() {
     claim: claimed && claimed.expiresAt > Date.now() ? { origin: claimed.origin, account: claimed.account } : null,
     tasks: Object.values(tasks).sort((a, b) => b.lastAt - a.lastAt).map(({ desk: _desk, ...t }) => t),
     folders: await folders.listFolders().catch(() => []),
-    desktop: await deskInfo().then((d) => (d && chrome.runtime.sendNativeMessage ? d : null)),
+    desktop: await deskInfo().then((d) => (d && chrome.runtime.sendNativeMessage ? d : deskErr ? { error: deskErr } : null)),
     log: list.slice(-40).reverse(),
     defaultOrigin: policy.DEFAULT_ORIGIN,
   };

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "vcorp-chrome",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "让 AI agent 操控你已登录的 Chrome。基于花叔的 huashu-chrome（MIT）修改。",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq6xRqEwG4yTuHRG1Zah3j//T3B72XnazyZ+9fOCa5P4bBLPmNBN7YAGL5WnjtPVJefXT9r2Ol0qvNztayDG3dMjK6AZoWccgKa5rhxcvWgFUjanXtmBBQ0qgYwNhuEJSkdinLLtyUg6YmK7Mn72NWpfa/NfqNHdK5AHslvvtJ50iQAYmabl2Nd3vOJ9DxtLBt8a2DfoGPWizgEB3+gkqm2PB8LywwwoiGKd7acr1wZEWmWK9/s0YWdzIstjlvk5AO5XFn6EtEzW8tAAOwBka9239pcyj0kEogWctHLJn7p9VFru38r+I1USyGn6u9XQ68n9edWddxBYokETCqEMT9QIDAQAB",
   "minimum_chrome_version": "116",

package/extension/panel.js

@@ -442,7 +442,9 @@ $('deskOn').onclick = async () => {
   const granted = await chrome.permissions.request({ permissions: ['nativeMessaging'] }).catch(() => false);
   if (!granted) { $('deskState').textContent = '没有拿到权限，桌面能力保持关闭'; return; }
   $('deskState').textContent = '启用中…第一次启用要重载扩展，侧栏若关掉了，重新打开即可';
-  await cloudCall('desktopEnable');
+  const r = await cloudCall('desktopEnable');
+  // 失败原因写在桌面这一栏，不要留着「启用中…」，也不用在顶上再报一遍
+  if (r && !r.ok && r.error) { $('deskState').textContent = r.error; $('cloudErr').hidden = true; }
 };
 $('deskOff').onclick = async () => {
   await cloudCall('desktopDisable');
@@ -453,7 +455,7 @@ $('deskOff').onclick = async () => {
 
 chrome.storage.onChanged.addListener((changes, area) => {
   const keys0 = Object.keys(changes);
-  if (keys0.some((k) => ['cloud', 'cloudTasks', 'cloudLog', 'cloudStatus', 'cloudClaim', 'folderTick', 'cloudDesktop'].includes(k))) void cloudCall('state');
+  if (keys0.some((k) => ['cloud', 'cloudTasks', 'cloudLog', 'cloudStatus', 'cloudClaim', 'folderTick', 'cloudDesktop', 'cloudDesktopError'].includes(k))) void cloudCall('state');
   if (area !== 'session') return;
   const keys = Object.keys(changes);
   if (keys.includes(`panel:${tabId}`) || keys.includes('liveSids')) renderPage();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vcorp-chrome",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "让任何 AI agent 操控你自己的 Chrome——带着全部登录态。MCP + Chrome 扩展，Claude Code / Codex / Cursor / Gemini CLI 通用。",
   "type": "module",
   "bin": {

package/src/lib/native-install.js

@@ -2,7 +2,7 @@
 //
 // Chrome 找宿主靠一份清单：Windows 在注册表 HKCU 下登记清单路径，macOS / Linux 把清单放进
 // 浏览器约定的目录。清单的 path 指向一个启动脚本，脚本用装它时的那个 node 跑 native-host/host.js。
-// allowed_origins 只写本扩展：扩展 id 由 manifest.json 里的 key 算出来，不手抄。
+// allowed_origins 只写本扩展：开发者模式加载的 id 由 manifest.json 里的 key 算出来，再加上商店版的 id。
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -28,6 +28,14 @@ function ourExtensionId() {
   return extensionId(mf.key);
 }
 
+// 商店版的 id 是商店分配的：打商店包时 manifest.key 被剥掉（scripts/pack-extension.mjs），算不出来，只能写死
+export const STORE_EXTENSION_ID = 'migojdmaegllchbambngejkclndannnf';
+
+// 清单放行的来源：开发者模式加载的（id 由 key 算出）和商店装的，两种都是本扩展
+export function allowedOrigins(id = ourExtensionId()) {
+  return [...new Set([id, STORE_EXTENSION_ID])].map((x) => `chrome-extension://${x}/`);
+}
+
 const REG_KEYS = [
   `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${HOST_NAME}`,
   `HKCU\\Software\\Microsoft\\Edge\\NativeMessagingHosts\\${HOST_NAME}`,
@@ -57,7 +65,7 @@ export function install() {
     description: 'vcorp-chrome desktop host',
     path: launcher,
     type: 'stdio',
-    allowed_origins: [`chrome-extension://${id}/`],
+    allowed_origins: allowedOrigins(id),
   }, null, 2));
   const placed = [];
   if (win) {