@ruelya/grok-build 1.0.1 → 1.0.3-rev

package/README.md

@@ -24,13 +24,12 @@ grok --version                           # expect …-rev (…) [stable]
 npx grok-build restore                   # restore previous binary from backup
 ```
 
-| Platform key | Binary path in package |
-|--------------|------------------------|
-| `win32-x64` | `artifacts/bin/win32-x64/grok.exe` |
-| `darwin-arm64` | `artifacts/bin/darwin-arm64/grok` |
-| `darwin-x64` | `artifacts/bin/darwin-x64/grok` |
-| `linux-x64` | `artifacts/bin/linux-x64/grok` |
-| `linux-arm64` | `artifacts/bin/linux-arm64/grok` |
+| Platform key | Release asset |
+|--------------|---------------|
+| `win32-x64` | `grok-win32-x64.exe` |
+| `linux-x64` | `grok-linux-x64` |
+| `linux-arm64` | `grok-linux-arm64` |
+| `darwin-arm64` | `grok-darwin-arm64` |
 
 ```bash
 bash scripts/stage-binaries.sh win32-x64 ./target/release/xai-grok-pager.exe
@@ -277,13 +276,12 @@ grok --version                           # 期望 …-rev (…) [stable]
 npx grok-build restore                   # 从备份恢复上一份二进制
 ```
 
-| 平台键 | 包内二进制路径 |
-|--------|----------------|
-| `win32-x64` | `artifacts/bin/win32-x64/grok.exe` |
-| `darwin-arm64` | `artifacts/bin/darwin-arm64/grok` |
-| `darwin-x64` | `artifacts/bin/darwin-x64/grok` |
-| `linux-x64` | `artifacts/bin/linux-x64/grok` |
-| `linux-arm64` | `artifacts/bin/linux-arm64/grok` |
+| 平台键 | Release 资源 |
+|--------|--------------|
+| `win32-x64` | `grok-win32-x64.exe` |
+| `linux-x64` | `grok-linux-x64` |
+| `linux-arm64` | `grok-linux-arm64` |
+| `darwin-arm64` | `grok-darwin-arm64` |
 
 ```bash
 bash scripts/stage-binaries.sh win32-x64 ./target/release/xai-grok-pager.exe

package/artifacts/BUILD_INFO.txt

@@ -1,2 +1,2 @@
-version=1.0.1
-release=https://github.com/Ruelya/grok-build-rev/releases/download/v1.0.1
+version=1.0.3-rev
+release=https://github.com/Ruelya/grok-build-rev/releases/download/v1.0.3-rev

package/bin/cli.mjs

@@ -197,65 +197,65 @@ function installThemes(home, { dryRun = false } = {}) {
  * Replaces a previous notes block if present; never changes non-comment settings.
  */
 /**
- * Ensure [cli].auto_update = false so official auto-update cannot overwrite the fork.
- * Idempotent: if already false, no rewrite; if true/missing under [cli], set false.
+ * Point [cli] auto_update at our npm package (not official x.ai CDN).
+ * Sets auto_update = true and installer = "npm".
  */
-function disableAutoUpdate(home, { dryRun = false } = {}) {
+function configureForkUpdater(home, { dryRun = false } = {}) {
   const cfgPath = join(home, "config.toml");
+  const block =
+    `# Written by Grok Build fork install — updates via npm (@ruelya/grok-build).\n` +
+    `[cli]\nauto_update = true\ninstaller = "npm"\n`;
   if (!existsSync(cfgPath)) {
     if (dryRun) return { ok: true, action: "create-cli", path: cfgPath };
     mkdirSync(home, { recursive: true });
-    writeFileSync(
-      cfgPath,
-      `# Written by Grok Build fork install — keep auto_update off so upstream cannot clobber the fork.\n[cli]\nauto_update = false\n`,
-      "utf8"
-    );
+    writeFileSync(cfgPath, block, "utf8");
     return { ok: true, action: "create-cli", path: cfgPath };
   }
   let raw = readFileSync(cfgPath, "utf8").replace(/\r\n/g, "\n");
+  let changed = false;
 
-  // Already disabled somewhere (user may have multiple [cli] tables).
   if (/^\s*auto_update\s*=\s*false\s*$/m.test(raw)) {
-    return { ok: true, action: "already-false", path: cfgPath };
+    raw = raw.replace(/^\s*auto_update\s*=\s*false\s*$/gm, "auto_update = true");
+    changed = true;
+  } else if (!/^\s*auto_update\s*=/m.test(raw)) {
+    const cliIdx = raw.search(/^\[cli\]\s*$/m);
+    if (cliIdx >= 0) {
+      const lineEnd = raw.indexOf("\n", cliIdx);
+      const insertAt = lineEnd === -1 ? raw.length : lineEnd + 1;
+      raw = raw.slice(0, insertAt) + "auto_update = true\n" + raw.slice(insertAt);
+    } else {
+      raw = raw.replace(/\s*$/, "\n\n") + "[cli]\nauto_update = true\n";
+    }
+    changed = true;
   }
 
-  // Flip any true → false
-  if (/^\s*auto_update\s*=\s*true\s*$/m.test(raw)) {
-    const next = raw.replace(/^\s*auto_update\s*=\s*true\s*$/gm, "auto_update = false");
-    if (dryRun) return { ok: true, action: "flip-true", path: cfgPath };
-    try {
-      copyFileSync(cfgPath, cfgPath + `.bak-auto-update-${stamp()}`);
-    } catch {
-      /* ignore */
+  if (/^\s*installer\s*=\s*".*"\s*$/m.test(raw)) {
+    const next = raw.replace(/^\s*installer\s*=\s*".*"\s*$/gm, 'installer = "npm"');
+    if (next !== raw) {
+      raw = next;
+      changed = true;
+    }
+  } else if (!/^\s*installer\s*=/m.test(raw)) {
+    const cliIdx = raw.search(/^\[cli\]\s*$/m);
+    if (cliIdx >= 0) {
+      const lineEnd = raw.indexOf("\n", cliIdx);
+      const insertAt = lineEnd === -1 ? raw.length : lineEnd + 1;
+      raw = raw.slice(0, insertAt) + 'installer = "npm"\n' + raw.slice(insertAt);
+    } else {
+      raw = raw.replace(/\s*$/, "\n\n") + '[cli]\ninstaller = "npm"\n';
     }
-    writeFileSync(cfgPath, next, "utf8");
-    return { ok: true, action: "flip-true", path: cfgPath };
+    changed = true;
   }
 
-  // No auto_update key: append under first [cli] or create [cli]
-  const cliIdx = raw.search(/^\[cli\]\s*$/m);
-  let next;
-  let action;
-  if (cliIdx >= 0) {
-    const lineEnd = raw.indexOf("\n", cliIdx);
-    const insertAt = lineEnd === -1 ? raw.length : lineEnd + 1;
-    next =
-      raw.slice(0, insertAt) +
-      "auto_update = false\n" +
-      raw.slice(insertAt);
-    action = "insert-cli";
-  } else {
-    next = raw.replace(/\s*$/, "\n\n") + "[cli]\nauto_update = false\n";
-    action = "append-cli";
-  }
-  if (dryRun) return { ok: true, action, path: cfgPath };
+  if (!changed) return { ok: true, action: "already-fork-npm", path: cfgPath };
+  if (dryRun) return { ok: true, action: "update-cli", path: cfgPath };
   try {
     copyFileSync(cfgPath, cfgPath + `.bak-auto-update-${stamp()}`);
   } catch {
     /* ignore */
   }
-  writeFileSync(cfgPath, next, "utf8");
-  return { ok: true, action, path: cfgPath };
+  writeFileSync(cfgPath, raw, "utf8");
+  return { ok: true, action: "update-cli", path: cfgPath };
 }
 
 /**
@@ -435,7 +435,7 @@ function cmdInstallSideBySide({ dryRun = false, bootstrap = false } = {}) {
   }
   replaceBinary(fork, dest);
   const installedThemes = installThemes(home, { dryRun: false });
-  const autoResult = disableAutoUpdate(home, { dryRun: false });
+  const autoResult = configureForkUpdater(home, { dryRun: false });
   const syncResult = installUsageSyncExample(home, { dryRun: false });
   console.log("\nInstalled fork side-by-side.");
   console.log(`  run     : ${dest}`);
@@ -513,7 +513,7 @@ function cmdApply({ dryRun = false } = {}) {
 
   const themeNames = installThemes(home, { dryRun: true });
   const cfgPlan = installConfigNotes(home, { dryRun: true });
-  const autoPlan = disableAutoUpdate(home, { dryRun: true });
+  const autoPlan = configureForkUpdater(home, { dryRun: true });
   const syncPlan = installUsageSyncExample(home, { dryRun: true });
 
   console.log(`Installed : ${exe}`);
@@ -530,7 +530,7 @@ function cmdApply({ dryRun = false } = {}) {
     console.log(`Config    : ${cfgPlan.path} (${cfgPlan.action} comment block)`);
   }
   if (autoPlan.ok) {
-    console.log(`Auto-update: ${autoPlan.action} → [cli].auto_update = false`);
+    console.log(`Auto-update: ${autoPlan.action} → [cli].auto_update=true installer=npm (@ruelya/grok-build)`);
   }
   if (syncPlan.ok) {
     console.log(`Usage sync : ${syncPlan.action} → ${syncPlan.path}`);
@@ -538,7 +538,7 @@ function cmdApply({ dryRun = false } = {}) {
 
   if (dryRun) {
     console.log(
-      "\n[dry-run] would backup stock, install fork as primary grok + themes + disable auto_update + seed usage sync.toml. No changes made."
+      "\n[dry-run] would backup stock, install fork as primary grok + themes + enable npm auto_update + seed usage sync.toml. No changes made."
     );
     return;
   }
@@ -570,7 +570,7 @@ function cmdApply({ dryRun = false } = {}) {
   replaceBinary(fork, exe);
   const installedThemes = installThemes(home, { dryRun: false });
   const cfgResult = installConfigNotes(home, { dryRun: false });
-  const autoResult = disableAutoUpdate(home, { dryRun: false });
+  const autoResult = configureForkUpdater(home, { dryRun: false });
   const syncResult = installUsageSyncExample(home, { dryRun: false });
 
   const after = runExeVersion(exe);
@@ -602,7 +602,7 @@ function cmdApply({ dryRun = false } = {}) {
     console.log(`  config : ${cfgResult.action} → ${cfgResult.path}`);
   }
   if (autoResult.ok) {
-    console.log(`  auto_update : ${autoResult.action} (disabled)`);
+    console.log(`  auto_update : ${autoResult.action} (npm @ruelya/grok-build)`);
   }
   if (syncResult.ok) {
     console.log(`  usage sync  : ${syncResult.action} → ${syncResult.path}`);

package/bin/install.mjs

@@ -73,10 +73,21 @@ function runVersion(exe) {
     shell: false,
     windowsHide: true,
   });
+  // SIGILL / crash → status null + signal; treat as unusable (e.g. neoverse-v2
+  // binary on Neoverse-N1 Ampere).
+  if (r.error || r.signal || (typeof r.status === "number" && r.status !== 0)) {
+    return null;
+  }
   const out = ((r.stdout || "") + (r.stderr || "")).trim();
   return out.split(/\r?\n/)[0] || null;
 }
 
+/** True when an on-disk binary exists but cannot even print --version. */
+function isBrokenBinary(exe) {
+  if (!existsSync(exe) || (fileSize(exe) || 0) < 1_000_000) return false;
+  return runVersion(exe) == null;
+}
+
 function fileSize(p) {
   try {
     return statSync(p).size;
@@ -178,40 +189,70 @@ function installThemes(home, { dryRun = false } = {}) {
   return files.map((f) => f.replace(/\.toml$/, ""));
 }
 
-function disableAutoUpdate(home, { dryRun = false } = {}) {
+/**
+ * Point in-app auto-update at our npm package (not official x.ai CDN).
+ *
+ * Writes:
+ *   [cli]
+ *   auto_update = true
+ *   installer = "npm"
+ *
+ * The fork binary hard-blocks the official internal/CDN installer; this only
+ * ensures config matches so `grok update` uses `npm i -g @ruelya/grok-build`.
+ */
+function configureForkUpdater(home, { dryRun = false } = {}) {
   const cfgPath = join(home, "config.toml");
+  const header =
+    "# Grok Build fork — auto_update via npm (@ruelya/grok-build), never official CDN.\n";
+  const block = `${header}[cli]\nauto_update = true\ninstaller = "npm"\n`;
+
   if (!existsSync(cfgPath)) {
     if (dryRun) return { ok: true, action: "create-cli" };
     mkdirSync(home, { recursive: true });
-    writeFileSync(
-      cfgPath,
-      `# Grok Build fork — disable stock auto_update so it cannot overwrite the fork.\n[cli]\nauto_update = false\n`,
-      "utf8"
-    );
+    writeFileSync(cfgPath, block, "utf8");
     return { ok: true, action: "create-cli" };
   }
+
   let raw = readFileSync(cfgPath, "utf8").replace(/\r\n/g, "\n");
+  let changed = false;
+
   if (/^\s*auto_update\s*=\s*false\s*$/m.test(raw)) {
-    return { ok: true, action: "already-false" };
-  }
-  if (/^\s*auto_update\s*=\s*true\s*$/m.test(raw)) {
-    const next = raw.replace(/^\s*auto_update\s*=\s*true\s*$/gm, "auto_update = false");
-    if (dryRun) return { ok: true, action: "flip-true" };
-    writeFileSync(cfgPath, next, "utf8");
-    return { ok: true, action: "flip-true" };
+    raw = raw.replace(/^\s*auto_update\s*=\s*false\s*$/gm, "auto_update = true");
+    changed = true;
+  } else if (!/^\s*auto_update\s*=/m.test(raw)) {
+    const cliIdx = raw.search(/^\[cli\]\s*$/m);
+    if (cliIdx >= 0) {
+      const lineEnd = raw.indexOf("\n", cliIdx);
+      const insertAt = lineEnd === -1 ? raw.length : lineEnd + 1;
+      raw = raw.slice(0, insertAt) + "auto_update = true\n" + raw.slice(insertAt);
+    } else {
+      raw = raw.replace(/\s*$/, "\n\n") + "[cli]\nauto_update = true\n";
+    }
+    changed = true;
   }
-  const cliIdx = raw.search(/^\[cli\]\s*$/m);
-  let next;
-  if (cliIdx >= 0) {
-    const lineEnd = raw.indexOf("\n", cliIdx);
-    const insertAt = lineEnd === -1 ? raw.length : lineEnd + 1;
-    next = raw.slice(0, insertAt) + "auto_update = false\n" + raw.slice(insertAt);
-  } else {
-    next = raw.replace(/\s*$/, "\n\n") + "[cli]\nauto_update = false\n";
+
+  if (/^\s*installer\s*=\s*".*"\s*$/m.test(raw)) {
+    const next = raw.replace(/^\s*installer\s*=\s*".*"\s*$/gm, 'installer = "npm"');
+    if (next !== raw) {
+      raw = next;
+      changed = true;
+    }
+  } else if (!/^\s*installer\s*=/m.test(raw)) {
+    const cliIdx = raw.search(/^\[cli\]\s*$/m);
+    if (cliIdx >= 0) {
+      const lineEnd = raw.indexOf("\n", cliIdx);
+      const insertAt = lineEnd === -1 ? raw.length : lineEnd + 1;
+      raw = raw.slice(0, insertAt) + 'installer = "npm"\n' + raw.slice(insertAt);
+    } else {
+      raw = raw.replace(/\s*$/, "\n\n") + '[cli]\ninstaller = "npm"\n';
+    }
+    changed = true;
   }
-  if (dryRun) return { ok: true, action: "insert" };
-  writeFileSync(cfgPath, next, "utf8");
-  return { ok: true, action: "insert" };
+
+  if (!changed) return { ok: true, action: "already-fork-npm" };
+  if (dryRun) return { ok: true, action: "update-cli" };
+  writeFileSync(cfgPath, raw, "utf8");
+  return { ok: true, action: "update-cli" };
 }
 
 async function resolveSourceBinary() {
@@ -221,7 +262,7 @@ async function resolveSourceBinary() {
       [
         `Unsupported platform: ${t.key}`,
         `  shipped builds: ${supportedTargets().join(", ")}`,
-        `  (Intel macOS / other arches are not published — use Apple Silicon, Linux x64, or Windows x64)`,
+        `  (Intel macOS is not published — use win32-x64, linux-x64, linux-arm64, or darwin-arm64)`,
         ``,
         `Override: GROK_FORK_BIN=/path/to/grok  or  GROK_FORK_RELEASE_BASE=https://…/releases/download/vX.Y.Z`,
       ].join("\n")
@@ -243,14 +284,31 @@ async function resolveSourceBinary() {
     );
   }
 
-  const cacheDir = join(PKG_ROOT, "artifacts", "cache", t.key);
+  // Versioned cache so upgrading 1.0.2 → 1.0.3 never reuses a bad binary
+  // (e.g. neoverse-v2 SIGILL on Ampere Neoverse-N1).
+  const ver = String(pkg.version || "unknown").replace(/[^\w.-]+/g, "_");
+  const cacheDir = join(PKG_ROOT, "artifacts", "cache", ver, t.key);
   mkdirSync(cacheDir, { recursive: true });
   const dest = join(cacheDir, t.exeName);
-  // Always re-download when missing; keep cache across reinstalls of same version.
-  if (!existsSync(dest) || fileSize(dest) < 1_000_000) {
+  const needFetch =
+    !existsSync(dest) ||
+    (fileSize(dest) || 0) < 1_000_000 ||
+    isBrokenBinary(dest);
+  if (needFetch) {
     console.log(`Downloading ${url} …`);
     await download(url, dest);
   }
+  // Refuse to install a still-broken download (wrong arch / CPU baseline).
+  if (isBrokenBinary(dest)) {
+    throw new Error(
+      [
+        `Downloaded binary cannot run on this CPU (Illegal instruction / crash).`,
+        `  url: ${url}`,
+        `  tip: need a portable linux-arm64 build (target-cpu=generic, not neoverse-v2).`,
+        `  reinstall: npm i -g @ruelya/grok-build@latest && npx grok-build install`,
+      ].join("\n")
+    );
+  }
   return { path: dest, source: "download", url };
 }
 
@@ -310,8 +368,9 @@ async function cmdInstall({ dryRun = false } = {}) {
   }
 
   const installedThemes = installThemes(home, { dryRun: false });
-  const auto = disableAutoUpdate(home, { dryRun: false });
+  const auto = configureForkUpdater(home, { dryRun: false });
   const after = runVersion(exe);
+  const packageVersion = loadPkg().version || null;
 
   const marker = {
     appliedAt: new Date().toISOString(),
@@ -328,12 +387,14 @@ async function cmdInstall({ dryRun = false } = {}) {
     themes: installedThemes,
     autoUpdate: auto,
     package: PKG_ROOT,
-    packageVersion: loadPkg().version || null,
+    packageVersion,
+    npmPackage: "@ruelya/grok-build",
   };
   writeFileSync(join(home, MARKER), JSON.stringify(marker, null, 2) + "\n");
 
   console.log("\nInstalled Grok Build fork as primary client.");
   console.log(`  after  : ${after || "?"}`);
+  console.log(`  pkg    : @ruelya/grok-build@${packageVersion || "?"}`);
   console.log(`  run    : ${exe}`);
   console.log(`  or     : grok --version   (if ~/.grok/bin is on PATH)`);
   if (installedThemes.length) {
@@ -343,7 +404,9 @@ async function cmdInstall({ dryRun = false } = {}) {
   } else {
     console.log("  themes : (none bundled — package missing artifacts/themes/*.toml)");
   }
-  if (auto.ok) console.log(`  auto_update: ${auto.action}`);
+  if (auto.ok) {
+    console.log(`  update : npm installer (${auto.action}) — grok update → @ruelya/grok-build`);
+  }
 }
 
 function cmdRestore({ dryRun = false } = {}) {

package/bin/platform.mjs

@@ -7,6 +7,7 @@
  * Release assets (v${version}):
  *   grok-win32-x64.exe
  *   grok-linux-x64
+ *   grok-linux-arm64
  *   grok-darwin-arm64
  *
  * Override: GROK_FORK_RELEASE_BASE, package.json forkReleaseBase, GROK_FORK_BIN
@@ -23,7 +24,12 @@ export const PKG_ROOT = resolve(__dirname, "..");
 const DEFAULT_REPO = "Ruelya/grok-build-rev";
 
 /** Platforms we ship (no Intel macOS). */
-export const SUPPORTED_TARGETS = ["win32-x64", "linux-x64", "darwin-arm64"];
+export const SUPPORTED_TARGETS = [
+  "win32-x64",
+  "linux-x64",
+  "linux-arm64",
+  "darwin-arm64",
+];
 
 /** @returns {{ platform: string, arch: string, key: string, exeName: string }} */
 export function detectTarget() {

package/config_example.toml

@@ -13,8 +13,9 @@ disabled_mcp_servers = []
 # [cli]
 # -----------------------------------------------------------------------------
 [cli]
-auto_update = false
-# installer = "npm" | "cargo" | …
+# Fork: keep true + installer=npm so updates use @ruelya/grok-build (never x.ai CDN)
+auto_update = true
+# installer = "npm" | "gh-release" | "internal"(blocked on fork)
 installer = "npm"
 # npm_registry = "https://registry.npmjs.org"
 # channel = "alpha" | "stable"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ruelya/grok-build",
-  "version": "1.0.1",
-  "description": "Grok Build fork (rev). Thin npm installer — downloads native binary from GitHub Releases.",
+  "version": "1.0.3-rev",
+  "description": "Grok Build fork. Product version tracks upstream (currently 1.0.3-rev). Thin installer downloads from GitHub Releases.",
   "type": "module",
   "bin": {
     "grok": "bin/grok.mjs",
@@ -48,5 +48,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "forkReleaseBase": "https://github.com/Ruelya/grok-build-rev/releases/download/v1.0.1"
+  "forkReleaseBase": "https://github.com/Ruelya/grok-build-rev/releases/download/v1.0.3-rev"
 }