glm-coding-router 1.0.0 → 1.1.0

package/dist/core/zai-key.js

@@ -1,69 +1,25 @@
-import { execFileSync } from "node:child_process";
+import { deleteUserEnv, detectUserEnvStore, readUserEnv as readUserEnvStore, writeUserEnv, } from "./user-env.js";
 export const ZAI_API_KEY_ENV = "ZAI_API_KEY";
-/** Only well-formed variable names may reach powershell.exe (spec §38). */
-function assertEnvVarName(name) {
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
-        throw new Error(`Invalid environment variable name: ${name}`);
-    }
-}
 /**
- * Read a variable from the Windows User Environment via PowerShell (spec §10).
- * Returns undefined on any failure — callers fall back or fail with their own error.
+ * Read the variable from this platform's per-user store (spec §10).
+ * The Windows implementation is unchanged; it now lives in user-env.ts.
  */
-export function readWindowsUserEnv(name) {
-    assertEnvVarName(name);
-    try {
-        const result = execFileSync("powershell.exe", [
-            "-NoProfile",
-            "-NonInteractive",
-            "-Command",
-            `[Environment]::GetEnvironmentVariable('${name}','User')`,
-        ], {
-            encoding: "utf8",
-            windowsHide: true,
-            stdio: ["ignore", "pipe", "ignore"],
-        });
-        const value = result.trim();
-        return value || undefined;
-    }
-    catch {
-        return undefined;
-    }
+export function readWindowsUserEnv(name, deps = {}) {
+    return readUserEnvStore(name, deps);
 }
-/**
- * Write a variable to the Windows User Environment (spec §11).
- * The value is passed through a child-process env var so it never needs
- * PowerShell string escaping (spec §38: no unescaped user data in commands).
- */
-export function setWindowsUserEnv(name, value) {
-    assertEnvVarName(name);
-    execFileSync("powershell.exe", [
-        "-NoProfile",
-        "-NonInteractive",
-        "-Command",
-        `[Environment]::SetEnvironmentVariable('${name}', $env:GLM_ROUTER_VALUE, 'User')`,
-    ], {
-        windowsHide: true,
-        stdio: ["ignore", "ignore", "pipe"],
-        env: { ...process.env, GLM_ROUTER_VALUE: value },
-    });
+/** Write the variable to this platform's per-user store (spec §11). */
+export function setWindowsUserEnv(name, value, deps = {}) {
+    writeUserEnv(name, value, deps);
 }
-export function deleteWindowsUserEnv(name) {
-    assertEnvVarName(name);
-    execFileSync("powershell.exe", [
-        "-NoProfile",
-        "-NonInteractive",
-        "-Command",
-        `[Environment]::SetEnvironmentVariable('${name}', $null, 'User')`,
-    ], {
-        windowsHide: true,
-        stdio: ["ignore", "ignore", "pipe"],
-    });
+export function deleteWindowsUserEnv(name, deps = {}) {
+    deleteUserEnv(name, deps);
 }
+/** Re-exported so callers do not need two imports. */
+export { detectUserEnvStore };
 /**
  * Resolve the Z.ai key with the mandatory fallback order (spec §10):
  *   1. process.env.ZAI_API_KEY
- *   2. Windows User Environment
+ *   2. this platform's per-user store
  *   3. fail (undefined)
  *
  * The fallback exists because Orca terminals snapshot a stale environment and
@@ -71,14 +27,14 @@ export function deleteWindowsUserEnv(name) {
  */
 export function resolveZaiApiKey(options = {}) {
     const env = options.env ?? process.env;
-    const readUserEnv = options.readUserEnv ?? readWindowsUserEnv;
+    const readUserEnv = options.readUserEnv ?? ((name) => readUserEnvStore(name));
     const fromProcess = env[ZAI_API_KEY_ENV];
     if (fromProcess && fromProcess.trim()) {
         return { key: fromProcess.trim(), source: "process-env" };
     }
     const fromUserEnv = readUserEnv(ZAI_API_KEY_ENV);
     if (fromUserEnv && fromUserEnv.trim()) {
-        return { key: fromUserEnv.trim(), source: "windows-user-env" };
+        return { key: fromUserEnv.trim(), source: "user-store" };
     }
     return undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glm-coding-router",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "GLM Coding Plan workers for Claude Code and Codex",
   "type": "module",
   "license": "MIT",