@woosau/dsh-custom-env 0.1.9 → 0.1.10

package/README.md

@@ -32,7 +32,7 @@ dsh plugin --profile desktop remove @woosau/dsh-custom-env
 4. Paste `NAME=VALUE` lines into an empty row to add or update several variables at once (same names overlay existing rows as drafts and keep their group)
 5. Drag across rows to multi-select, or Ctrl/Cmd+click to toggle; Ctrl/Cmd+C copies selected rows as `NAME=VALUE` (input text selection still wins when present)
 6. **Restore** brings back the value from when this app session started
-7. At startup, values are injected into the Host `process.env` first; writing the user environment (registry / launchctl) is deferred off the boot path and is not broadcast. Log off or reboot before other tools need those values
+7. At startup, values are injected into the Host `process.env` first; writing the user environment (registry / launchctl) is deferred via `setImmediate` into a child process and is not broadcast. Log off or reboot before other tools need those values
 8. Use **Install** only when shown, to wire this Host’s `dsh` command into your user PATH (Windows / macOS)
 
 System-reserved names (such as `PATH` and names starting with `DSH_` / `XDG_`) cannot be edited here.

package/README.zh-CN.md

@@ -32,7 +32,7 @@ dsh plugin --profile desktop remove @woosau/dsh-custom-env
 4. 在空行粘贴多行 `NAME=VALUE` 可批量新增或覆盖同名变量（同名写入原行草稿，且不改其所属分组）
 5. 拖动可多选行，Ctrl/Cmd+点击切换选中；Ctrl/Cmd+C 按 `NAME=VALUE` 复制选中行（若 Input 内有文字选区则优先复制文字）
 6. **恢复** 可回到本次应用启动时的值
-7. 启动时先注入当前 Host 的 `process.env`；写入用户环境（注册表 / launchctl）会延后到启动路径之后，且不会广播。其它工具若要读到，请注销/重启后再开终端
+7. 启动时先注入当前 Host 的 `process.env`；写入用户环境（注册表 / launchctl）会在启动路径之后的 `setImmediate` 里交给子进程，且不会广播。其它工具若要读到，请注销/重启后再开终端
 8. 仅在出现 **安装** 时使用：把本 Host 的 `dsh` 接到用户 PATH（Windows / macOS）
 
 系统保留名（如 `PATH`，以及 `DSH_` / `XDG_` 开头）不可在此编辑。

package/lib/index.js

@@ -1098,6 +1098,24 @@ function hasGroup(file, groupId) {
   return file.groups.some((group) => group.id === groupId);
 }
 
+// src/os-user-env/write-user-env-child.ts
+import { spawn as spawn2 } from "node:child_process";
+import { existsSync as existsSync9 } from "node:fs";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+function startWriteUserEnvChild(entries) {
+  const scriptUrl = new URL("./write-user-env.child.js", import.meta.url);
+  const script = fileURLToPath2(scriptUrl);
+  if (!existsSync9(script)) return void 0;
+  const child = spawn2(process.execPath, [script], {
+    stdio: ["pipe", "ignore", "pipe"],
+    env: { ...process.env, ELECTRON_RUN_AS_NODE: "1" },
+    windowsHide: true
+  });
+  child.stdin?.end(JSON.stringify(entries), "utf8");
+  child.stderr?.pipe(process.stderr);
+  return child;
+}
+
 // src/types.ts
 function classifyEntry(id, name, value, baselineById) {
   const base = baselineById.get(id);
@@ -1122,6 +1140,36 @@ function applyOsUserEnv(entries) {
 `);
   }
 }
+function scheduleOsUserEnvSync(ctx, entries) {
+  if (Object.keys(entries).length === 0) return;
+  let child;
+  const handle = setImmediate(() => {
+    try {
+      child = startWriteUserEnvChild(entries);
+      if (child === void 0) {
+        applyOsUserEnv(entries);
+        return;
+      }
+      child.on("error", (error) => {
+        process.stderr.write(
+          `custom-env: OS user env child failed (${asMessage(error)}); falling back to sync write
+`
+        );
+        applyOsUserEnv(entries);
+      });
+    } catch (error) {
+      process.stderr.write(
+        `custom-env: could not start OS user env child (${asMessage(error)}); falling back to sync write
+`
+      );
+      applyOsUserEnv(entries);
+    }
+  });
+  ctx.effect(() => () => {
+    clearImmediate(handle);
+    child?.kill();
+  }, "custom-env: deferred OS env sync");
+}
 function writeLive(entries) {
   applyProcessEnv(entries);
   applyOsUserEnv(entries);
@@ -1157,14 +1205,7 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
       this.baselineById.set(id, { name, value });
     }
     applyProcessEnv(loaded);
-    if (Object.keys(loaded).length > 0) {
-      const handle = setImmediate(() => {
-        applyOsUserEnv(loaded);
-      });
-      ctx.effect(() => () => {
-        clearImmediate(handle);
-      }, "custom-env: deferred OS env sync");
-    }
+    scheduleOsUserEnvSync(ctx, loaded);
   }
   allocId() {
     return `env-${++this.idSeq}`;

package/lib/types/os-user-env/write-user-env-child.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Spawn a child to persist OS user env without blocking the Host.
+ * Sets `ELECTRON_RUN_AS_NODE` so Desktop's Electron binary runs the script as Node.
+ */
+import { type ChildProcess } from 'node:child_process';
+/**
+ * Start a child that writes `entries` into the OS user environment.
+ * @param entries - Variable map to persist.
+ * @returns The child process, or `undefined` when the bundled script is missing.
+ */
+export declare function startWriteUserEnvChild(entries: Readonly<Record<string, string>>): ChildProcess | undefined;

package/lib/types/os-user-env/write-user-env.child.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Child-process entry: read JSON env entries from stdin and persist to the OS user env.
+ */
+export {};

package/lib/write-user-env.child.js

@@ -0,0 +1,158 @@
+// src/os-user-env/macos.ts
+import { mkdirSync, writeFileSync, unlinkSync, existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { spawnSync } from "node:child_process";
+var AGENT_LABEL = "ai.dsh.custom-env";
+var AGENT_DIR = () => join(homedir(), "Library", "LaunchAgents");
+var AGENT_PATH = () => join(AGENT_DIR(), `${AGENT_LABEL}.plist`);
+var cached;
+function escapeXml(value) {
+  return value.replace(/&/gu, "&amp;").replace(/</gu, "&lt;").replace(/>/gu, "&gt;").replace(/"/gu, "&quot;");
+}
+function buildPlist(entries) {
+  const pairs = Object.entries(entries).map(([key, value]) => `    <key>${escapeXml(key)}</key>
+    <string>${escapeXml(value)}</string>`).join("\n");
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${AGENT_LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>/bin/true</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>EnvironmentVariables</key>
+  <dict>
+${pairs}
+  </dict>
+</dict>
+</plist>
+`;
+}
+function launchctl(args) {
+  const result = spawnSync("launchctl", args, { encoding: "utf8" });
+  if (result.error) throw result.error;
+  if (result.status !== 0) {
+    const detail = (result.stderr || result.stdout || "").trim();
+    throw new Error(`custom-env: launchctl ${args.join(" ")} failed${detail === "" ? "" : `: ${detail}`}`);
+  }
+}
+function ensureCache() {
+  if (cached !== void 0) return cached;
+  cached = {};
+  return cached;
+}
+function writeAgent(entries) {
+  const path = AGENT_PATH();
+  if (Object.keys(entries).length === 0) {
+    if (existsSync(path)) {
+      try {
+        launchctl(["unload", path]);
+      } catch (_error) {
+      }
+      unlinkSync(path);
+    }
+    return;
+  }
+  mkdirSync(AGENT_DIR(), { recursive: true });
+  writeFileSync(path, buildPlist(entries), "utf8");
+  try {
+    launchctl(["unload", path]);
+  } catch (_error) {
+  }
+  launchctl(["load", path]);
+}
+function writeMacosUserEnv(entries, platform = process.platform) {
+  if (platform !== "darwin") return;
+  const pairs = Object.entries(entries);
+  if (pairs.length === 0) return;
+  const map = ensureCache();
+  for (const [name, value] of pairs) {
+    map[name] = value;
+    launchctl(["setenv", name, value]);
+  }
+  writeAgent(map);
+}
+
+// src/os-user-env/windows.ts
+import { createRequire } from "node:module";
+var HKEY_CURRENT_USER = 2147483649;
+var KEY_SET_VALUE = 2;
+var REG_SZ = 1;
+var ERROR_SUCCESS = 0;
+var bindings;
+function loadBindings() {
+  if (bindings !== void 0) return bindings;
+  const require2 = createRequire(import.meta.url);
+  const koffi = require2("koffi");
+  const advapi32 = koffi.load("advapi32.dll");
+  bindings = {
+    openKey: advapi32.func(
+      "long __stdcall RegOpenKeyExW(uintptr_t hKey, const char16_t *subKey, uint32_t options, uint32_t samDesired, _Out_ void **result)"
+    ),
+    queryValue: advapi32.func(
+      "long __stdcall RegQueryValueExW(void *hKey, const char16_t *valueName, void *reserved, _Inout_ uint32_t *type, uint8_t *data, _Inout_ uint32_t *cbData)"
+    ),
+    setValue: advapi32.func(
+      "long __stdcall RegSetValueExW(void *hKey, const char16_t *valueName, uint32_t reserved, uint32_t type, const uint8_t *data, uint32_t cbData)"
+    ),
+    deleteValue: advapi32.func(
+      "long __stdcall RegDeleteValueW(void *hKey, const char16_t *valueName)"
+    ),
+    closeKey: advapi32.func("long __stdcall RegCloseKey(void *hKey)")
+  };
+  return bindings;
+}
+function encodeRegSz(value) {
+  return Buffer.from(`${value}\0`, "utf16le");
+}
+function writeWindowsUserEnv(entries, platform = process.platform) {
+  if (platform !== "win32") return;
+  const pairs = Object.entries(entries);
+  if (pairs.length === 0) return;
+  const api = loadBindings();
+  const keySlot = [null];
+  const openStatus = api.openKey(HKEY_CURRENT_USER, "Environment", 0, KEY_SET_VALUE, keySlot);
+  if (openStatus !== ERROR_SUCCESS) {
+    throw new Error(`custom-env: RegOpenKeyExW failed (Win32 ${openStatus})`);
+  }
+  const hKey = keySlot[0];
+  try {
+    for (const [name, value] of pairs) {
+      const data = encodeRegSz(value);
+      const status = api.setValue(hKey, name, 0, REG_SZ, data, data.length);
+      if (status !== ERROR_SUCCESS) {
+        throw new Error(`custom-env: RegSetValueExW(${name}) failed (Win32 ${status})`);
+      }
+    }
+  } finally {
+    api.closeKey(hKey);
+  }
+}
+
+// src/os-user-env/index.ts
+function writeUserEnv(entries) {
+  writeWindowsUserEnv(entries);
+  writeMacosUserEnv(entries);
+}
+
+// src/os-user-env/write-user-env.child.ts
+var chunks = [];
+for await (const chunk of process.stdin) {
+  chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+}
+var raw = Buffer.concat(chunks).toString("utf8").trim();
+if (raw === "") process.exit(0);
+try {
+  const entries = JSON.parse(raw);
+  writeUserEnv(entries);
+} catch (error) {
+  const message = error instanceof Error ? error.message : String(error);
+  process.stderr.write(`custom-env child: ${message}
+`);
+  process.exitCode = 1;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@woosau/dsh-custom-env",
   "description": "DSH plugin: manage $DSH_HOME/.env from Settings",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -72,6 +72,7 @@
     "cordis.patch.yml",
     "scripts/command-path.ps1",
     "lib/index.js",
+    "lib/write-user-env.child.js",
     "lib/client.js",
     "lib/types/**/*.d.ts",
     "lib/typert.host.js",