grix-connector 4.0.2 → 4.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grix-connector",
-  "version": "4.0.2",
+  "version": "4.2.0",
   "description": "Connect local AI coding agents (Claude, Codex, Gemini, Qwen, DeepSeek, Cursor, OpenCode, Pi, OpenHuman, Reasonix) to the Grix scheduling platform. Also serves as an OpenClaw plugin for Grix channel transport.",
   "type": "module",
   "main": "dist/index.js",
@@ -16,6 +16,7 @@
     "!dist/**/*.ts",
     "openclaw-plugin",
     "scripts/install-guardian.mjs",
+    "scripts/upgrade-guardian.mjs",
     "scripts/analyze-audit-replays.mjs",
     "scripts/install-guardian.sh",
     "scripts/upgrade-guardian.sh",

package/scripts/install-guardian.mjs

@@ -1,33 +1,49 @@
 #!/usr/bin/env node
 // install-guardian — cross-platform npm postinstall script
-// 每次 npm install 都把 upgrade-guardian.sh 强制覆盖到 ~/.grix/bin/，
+// 每次 npm install 都把 guardian 强制覆盖到 ~/.grix/bin/，
 // 保证老用户也能拿到新版 guardian（不再以 "用户可能自改" 为由跳过覆盖）。
-// On Windows, skips since the guardian is a bash script.
 
 import { existsSync, copyFileSync, chmodSync, mkdirSync } from 'node:fs';
-import { join, resolve } from 'node:path';
+import { dirname, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
-
-if (process.platform === 'win32') {
-  process.exit(0);
-}
+import { fileURLToPath } from 'node:url';
 
 const GRIX_HOME = process.env.GRIX_CONNECTOR_HOME || join(homedir(), '.grix');
-const GUARDIAN_DEST = join(GRIX_HOME, 'bin', 'upgrade-guardian.sh');
+const BIN_DIR = join(GRIX_HOME, 'bin');
+
+// Windows 自动升级先把目标版本安装到旁路 prefix。这个阶段不能覆盖正在
+// 承接当前事务的包外 helper；目标版本确认健康后 guardian 再更新它。
+if (process.env.GRIX_UPGRADE_STAGING === '1') process.exit(0);
 
 // npm 的 INIT_CWD 是“调用 npm 的工作目录”，自动升级时通常是用户 cwd，
 // 并不是新包目录。优先从当前 postinstall 脚本所在 package 取 guardian。
-const PACKAGE_ROOT = resolve(import.meta.dirname, '..');
-const packageGuardian = join(PACKAGE_ROOT, 'scripts', 'upgrade-guardian.sh');
-const initCwdGuardian = process.env.INIT_CWD
-  ? join(process.env.INIT_CWD, 'scripts', 'upgrade-guardian.sh')
-  : '';
-const GUARDIAN_SRC = existsSync(packageGuardian) ? packageGuardian : initCwdGuardian;
+const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+function resolveGuardianSource(file) {
+  const packageGuardian = join(PACKAGE_ROOT, 'scripts', file);
+  const initCwdGuardian = process.env.INIT_CWD
+    ? join(process.env.INIT_CWD, 'scripts', file)
+    : '';
+  return existsSync(packageGuardian) ? packageGuardian : initCwdGuardian;
+}
+
+mkdirSync(BIN_DIR, { recursive: true });
 
-if (!existsSync(GUARDIAN_SRC)) {
-  process.exit(0);
+// Node guardian is self-contained and is the Windows activation/rollback path.
+const nodeGuardian = resolveGuardianSource('upgrade-guardian.mjs');
+if (nodeGuardian && existsSync(nodeGuardian)) {
+  const destination = join(BIN_DIR, 'upgrade-guardian.mjs');
+  const fallback = join(BIN_DIR, 'upgrade-guardian.fallback.mjs');
+  copyFileSync(nodeGuardian, destination);
+  copyFileSync(nodeGuardian, fallback);
+  try { chmodSync(destination, 0o755); } catch { /* best effort */ }
+  try { chmodSync(fallback, 0o755); } catch { /* best effort */ }
 }
 
-mkdirSync(join(GRIX_HOME, 'bin'), { recursive: true });
-copyFileSync(GUARDIAN_SRC, GUARDIAN_DEST);
-try { chmodSync(GUARDIAN_DEST, 0o755); } catch { /* best effort */ }
+if (process.platform !== 'win32') {
+  const shellGuardian = resolveGuardianSource('upgrade-guardian.sh');
+  if (shellGuardian && existsSync(shellGuardian)) {
+    const destination = join(BIN_DIR, 'upgrade-guardian.sh');
+    copyFileSync(shellGuardian, destination);
+    try { chmodSync(destination, 0o755); } catch { /* best effort */ }
+  }
+}