@woosau/dsh-custom-env 0.1.8 → 0.1.10

package/lib/index.js

@@ -951,6 +951,171 @@ function removeEnvEntries(names) {
   return removed;
 }
 
+// src/groups-store.ts
+import { randomBytes } from "node:crypto";
+import { existsSync as existsSync8, mkdirSync as mkdirSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { dirname as dirname6, join as join8 } from "node:path";
+import { resolveDshHome as resolveDshHome2 } from "@deepseek-ai/dsh-home-paths";
+
+// src/group-ids.ts
+var DEFAULT_GROUP_ID = "default";
+var DEFAULT_GROUP_TITLE = "\u9ED8\u8BA4\u5206\u7EC4";
+
+// src/groups-store.ts
+function groupsFilePath() {
+  return join8(resolveDshHome2(), ".dsh-custom-env-groups.json");
+}
+function defaultFile() {
+  return {
+    version: 1,
+    groups: [{ id: DEFAULT_GROUP_ID, title: DEFAULT_GROUP_TITLE }],
+    membership: {}
+  };
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeGroupsFile(raw) {
+  if (!isRecord(raw)) return defaultFile();
+  const groupsIn = Array.isArray(raw.groups) ? raw.groups : [];
+  const groups = [];
+  const seen = /* @__PURE__ */ new Set();
+  let hasDefault = false;
+  for (const item of groupsIn) {
+    if (!isRecord(item)) continue;
+    const id = typeof item.id === "string" ? item.id.trim() : "";
+    const title = typeof item.title === "string" ? item.title.trim() : "";
+    if (id === "" || title === "" || seen.has(id)) continue;
+    seen.add(id);
+    if (id === DEFAULT_GROUP_ID) {
+      hasDefault = true;
+      groups.unshift({ id: DEFAULT_GROUP_ID, title: DEFAULT_GROUP_TITLE });
+      continue;
+    }
+    groups.push({ id, title });
+  }
+  if (!hasDefault) groups.unshift({ id: DEFAULT_GROUP_ID, title: DEFAULT_GROUP_TITLE });
+  const groupIds = new Set(groups.map((group) => group.id));
+  const membership = {};
+  if (isRecord(raw.membership)) {
+    for (const [entryId, groupId] of Object.entries(raw.membership)) {
+      if (typeof groupId !== "string" || entryId.trim() === "" || groupId.trim() === "") continue;
+      membership[entryId] = groupIds.has(groupId) ? groupId : DEFAULT_GROUP_ID;
+    }
+  }
+  return { version: 1, groups, membership };
+}
+function readGroupsFile() {
+  const path = groupsFilePath();
+  if (!existsSync8(path)) return defaultFile();
+  try {
+    return normalizeGroupsFile(JSON.parse(readFileSync3(path, "utf8")));
+  } catch {
+    return defaultFile();
+  }
+}
+function writeGroupsFile(file) {
+  const path = groupsFilePath();
+  mkdirSync4(dirname6(path), { recursive: true });
+  const normalized = normalizeGroupsFile(file);
+  writeFileSync4(path, `${JSON.stringify(normalized, null, 2)}
+`, "utf8");
+}
+function pruneMembership(file, liveIds) {
+  let changed = false;
+  const membership = {};
+  for (const [entryId, groupId] of Object.entries(file.membership)) {
+    if (!liveIds.has(entryId)) {
+      changed = true;
+      continue;
+    }
+    membership[entryId] = groupId;
+  }
+  return changed ? { ...file, membership } : file;
+}
+function resolveGroupId(file, entryId) {
+  const groupId = file.membership[entryId];
+  if (groupId === void 0) return DEFAULT_GROUP_ID;
+  return file.groups.some((group) => group.id === groupId) ? groupId : DEFAULT_GROUP_ID;
+}
+function setMembership(file, entryId, groupId) {
+  const nextId = file.groups.some((group) => group.id === groupId) ? groupId : DEFAULT_GROUP_ID;
+  if (file.membership[entryId] === nextId) return file;
+  return { ...file, membership: { ...file.membership, [entryId]: nextId } };
+}
+function clearMembership(file, entryId) {
+  if (file.membership[entryId] === void 0) return file;
+  const membership = { ...file.membership };
+  delete membership[entryId];
+  return { ...file, membership };
+}
+function clearMembershipMany(file, entryIds) {
+  let next = file;
+  for (const entryId of entryIds) next = clearMembership(next, entryId);
+  return next;
+}
+function allocGroupId(existing) {
+  for (; ; ) {
+    const id = `g-${randomBytes(6).toString("hex")}`;
+    if (!existing.has(id)) return id;
+  }
+}
+function createGroup(file, title) {
+  const trimmed = title.trim();
+  if (trimmed === "") throw new Error("empty group title");
+  const existing = new Set(file.groups.map((group2) => group2.id));
+  const group = { id: allocGroupId(existing), title: trimmed };
+  return { file: { ...file, groups: [...file.groups, group] }, group };
+}
+function renameGroup(file, id, title) {
+  if (id === DEFAULT_GROUP_ID) throw new Error("cannot rename default group");
+  const trimmed = title.trim();
+  if (trimmed === "") throw new Error("empty group title");
+  const index = file.groups.findIndex((group) => group.id === id);
+  if (index < 0) throw new Error(`unknown group "${id}"`);
+  const groups = file.groups.map((group, i) => i === index ? { id, title: trimmed } : group);
+  return { ...file, groups };
+}
+function deleteGroupMeta(file, id, moveToDefault) {
+  if (id === DEFAULT_GROUP_ID) throw new Error("cannot delete default group");
+  if (!file.groups.some((group) => group.id === id)) throw new Error(`unknown group "${id}"`);
+  const memberIds = Object.entries(file.membership).filter(([, groupId]) => groupId === id).map(([entryId]) => entryId);
+  const membership = { ...file.membership };
+  for (const entryId of memberIds) {
+    if (moveToDefault) membership[entryId] = DEFAULT_GROUP_ID;
+    else delete membership[entryId];
+  }
+  return {
+    file: {
+      ...file,
+      groups: file.groups.filter((group) => group.id !== id),
+      membership
+    },
+    memberIds
+  };
+}
+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);
@@ -975,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);
@@ -994,8 +1189,8 @@ function removeLives(names) {
 function removeLive(name) {
   removeLives([name]);
 }
-var _cliInstall_dec, _cliStatus_dec, _restore_dec, _deleteEntry_dec, _removeVar_dec, _removeVars_dec, _setVar_dec, _setVars_dec, _upsert_dec, _list_dec, _a, _init;
-var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [Remote("list")], _upsert_dec = [Remote("upsert")], _setVars_dec = [Remote("setVars")], _setVar_dec = [Remote("setVar")], _removeVars_dec = [Remote("removeVars")], _removeVar_dec = [Remote("removeVar")], _deleteEntry_dec = [Remote("deleteEntry")], _restore_dec = [Remote("restore")], _cliStatus_dec = [Remote("cliStatus")], _cliInstall_dec = [Remote("cliInstall")], _a) {
+var _cliInstall_dec, _cliStatus_dec, _moveEntry_dec, _deleteGroup_dec, _renameGroup_dec, _createGroup_dec, _restore_dec, _deleteEntry_dec, _removeVar_dec, _removeVars_dec, _setVar_dec, _setVars_dec, _upsert_dec, _list_dec, _a, _init;
+var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [Remote("list")], _upsert_dec = [Remote("upsert")], _setVars_dec = [Remote("setVars")], _setVar_dec = [Remote("setVar")], _removeVars_dec = [Remote("removeVars")], _removeVar_dec = [Remote("removeVar")], _deleteEntry_dec = [Remote("deleteEntry")], _restore_dec = [Remote("restore")], _createGroup_dec = [Remote("createGroup")], _renameGroup_dec = [Remote("renameGroup")], _deleteGroup_dec = [Remote("deleteGroup")], _moveEntry_dec = [Remote("moveEntry")], _cliStatus_dec = [Remote("cliStatus")], _cliInstall_dec = [Remote("cliInstall")], _a) {
   constructor(ctx) {
     super(ctx, "customEnv");
     __runInitializers(_init, 5, this);
@@ -1010,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}`;
@@ -1040,6 +1228,19 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
     }
     return name;
   }
+  loadGroups() {
+    return readGroupsFile();
+  }
+  saveGroups(file) {
+    writeGroupsFile(file);
+  }
+  requireGroup(file, groupId) {
+    const id = groupId.trim() === "" ? DEFAULT_GROUP_ID : groupId;
+    if (!hasGroup(file, id)) {
+      throw new RemoteError("custom-env/invalid-group", `unknown group "${id}"`, { group: id });
+    }
+    return id;
+  }
   /**
    * Write `name=value` replacing `from` in place; sync process.env / OS.
    * Empty values create missing keys only, unless `forceEmpty` (restore).
@@ -1066,6 +1267,7 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
     for (const [name, id] of [...this.idByName]) {
       if (!present.has(name)) this.unbind(id);
     }
+    let groupsFile = this.loadGroups();
     const entries = raw.map(({ name, value }) => {
       let id = this.idByName.get(name);
       if (id === void 0) {
@@ -1073,31 +1275,58 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
         this.bind(id, name);
       }
       const classified = classifyEntry(id, name, value, this.baselineById);
-      return { id, name, value, kind: classified.kind, previous: classified.previous };
+      const groupId = resolveGroupId(groupsFile, id);
+      return { id, name, value, groupId, kind: classified.kind, previous: classified.previous };
     });
-    return { path, exists, entries };
+    const liveIds = new Set(entries.map((entry) => entry.id));
+    const pruned = pruneMembership(groupsFile, liveIds);
+    if (pruned !== groupsFile) {
+      this.saveGroups(pruned);
+      groupsFile = pruned;
+    }
+    return { path, exists, groups: groupsFile.groups, entries };
   }
-  async upsert(id, name, value) {
+  async upsert(id, name, value, groupId) {
     if (id === "") {
+      let groupsFile = this.loadGroups();
+      const target = this.requireGroup(groupsFile, groupId ?? DEFAULT_GROUP_ID);
       this.commit(name, name, value);
-      if (!this.idByName.has(name)) this.bind(this.allocId(), name);
+      let rowId = this.idByName.get(name);
+      if (rowId === void 0) {
+        rowId = this.allocId();
+        this.bind(rowId, name);
+      }
+      groupsFile = setMembership(groupsFile, rowId, target);
+      this.saveGroups(groupsFile);
       return this.list();
     }
     const from = this.requireName(id, name);
     this.commit(from, name, value);
     this.bind(id, name);
+    if (groupId !== void 0) {
+      let groupsFile = this.loadGroups();
+      const target = this.requireGroup(groupsFile, groupId);
+      groupsFile = setMembership(groupsFile, id, target);
+      this.saveGroups(groupsFile);
+    }
     return this.list();
   }
   async setVars(entries) {
     if (entries.length === 0) return;
+    let groupsFile = this.loadGroups();
     const lastByName = /* @__PURE__ */ new Map();
     for (const entry of entries) {
       if (!isWritableEnvName(entry.name)) {
         throw new RemoteError("custom-env/invalid-name", `refused name "${entry.name}"`, { name: entry.name });
       }
-      lastByName.set(entry.name, entry.value);
+      if (entry.group !== void 0) {
+        const group = this.requireGroup(groupsFile, entry.group);
+        lastByName.set(entry.name, { value: entry.value, group });
+      } else {
+        lastByName.set(entry.name, { value: entry.value });
+      }
     }
-    const normalized = [...lastByName].map(([name, value]) => ({ name, value }));
+    const normalized = [...lastByName].map(([name, { value }]) => ({ name, value }));
     let written;
     try {
       written = writeEnvEntries(normalized);
@@ -1107,14 +1336,29 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
     }
     if (written.length === 0) return;
     const live = {};
+    let membershipChanged = false;
     for (const entry of written) {
       live[entry.name] = entry.value;
-      if (!this.idByName.has(entry.name)) this.bind(this.allocId(), entry.name);
+      let rowId = this.idByName.get(entry.name);
+      const isNewRow = rowId === void 0;
+      if (rowId === void 0) {
+        rowId = this.allocId();
+        this.bind(rowId, entry.name);
+      }
+      const explicitGroup = lastByName.get(entry.name)?.group;
+      if (explicitGroup !== void 0) {
+        groupsFile = setMembership(groupsFile, rowId, explicitGroup);
+        membershipChanged = true;
+      } else if (isNewRow) {
+        groupsFile = setMembership(groupsFile, rowId, DEFAULT_GROUP_ID);
+        membershipChanged = true;
+      }
     }
+    if (membershipChanged) this.saveGroups(groupsFile);
     writeLive(live);
   }
-  async setVar(name, value) {
-    await this.setVars([{ name, value }]);
+  async setVar(name, value, group) {
+    await this.setVars([{ name, value, group }]);
   }
   async removeVars(names) {
     if (names.length === 0) return 0;
@@ -1128,6 +1372,11 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
       seen.add(name);
       unique.push(name);
     }
+    const dropIds = [];
+    for (const name of unique) {
+      const id = this.idByName.get(name);
+      if (id !== void 0) dropIds.push(id);
+    }
     let removed;
     try {
       removed = removeEnvEntries(unique);
@@ -1140,6 +1389,9 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
       const id = this.idByName.get(name);
       if (id !== void 0) this.unbind(id);
     }
+    if (dropIds.length > 0) {
+      this.saveGroups(clearMembershipMany(this.loadGroups(), dropIds));
+    }
     return removed;
   }
   async removeVar(name) {
@@ -1169,6 +1421,66 @@ var CustomEnvController = class extends (_a = TypertRemoteService, _list_dec = [
     this.bind(id, base.name);
     return this.list();
   }
+  async createGroup(title) {
+    try {
+      const { file, group } = createGroup(this.loadGroups(), title);
+      this.saveGroups(file);
+      return group;
+    } catch (error) {
+      throw new RemoteError("custom-env/invalid-group", asMessage(error), { group: title }, { cause: error });
+    }
+  }
+  async renameGroup(id, title) {
+    try {
+      const file = renameGroup(this.loadGroups(), id, title);
+      this.saveGroups(file);
+      const group = file.groups.find((item) => item.id === id);
+      if (group === void 0) {
+        throw new RemoteError("custom-env/invalid-group", `unknown group "${id}"`, { group: id });
+      }
+      return group;
+    } catch (error) {
+      if (error instanceof RemoteError) throw error;
+      throw new RemoteError("custom-env/invalid-group", asMessage(error), { group: id }, { cause: error });
+    }
+  }
+  async deleteGroup(id, options) {
+    let meta;
+    try {
+      meta = deleteGroupMeta(this.loadGroups(), id, options.moveToDefault);
+    } catch (error) {
+      throw new RemoteError("custom-env/invalid-group", asMessage(error), { group: id }, { cause: error });
+    }
+    if (!options.moveToDefault && meta.memberIds.length > 0) {
+      const names = [];
+      for (const entryId of meta.memberIds) {
+        const name = this.nameById.get(entryId);
+        if (name !== void 0) names.push(name);
+      }
+      if (names.length > 0) {
+        try {
+          removeEnvEntries(names);
+        } catch (error) {
+          throw new RemoteError("custom-env/invalid-name", asMessage(error), { name: names[0] }, { cause: error });
+        }
+        removeLives(names);
+        for (const name of names) {
+          const entryId = this.idByName.get(name);
+          if (entryId !== void 0) this.unbind(entryId);
+        }
+      }
+    }
+    this.saveGroups(meta.file);
+    return this.list();
+  }
+  async moveEntry(id, groupId) {
+    this.requireName(id, id);
+    let groupsFile = this.loadGroups();
+    const target = this.requireGroup(groupsFile, groupId);
+    groupsFile = setMembership(groupsFile, id, target);
+    this.saveGroups(groupsFile);
+    return this.list();
+  }
   async cliStatus() {
     return cliStatus();
   }
@@ -1190,10 +1502,16 @@ __decorateElement(_init, 1, "removeVars", _removeVars_dec, CustomEnvController);
 __decorateElement(_init, 1, "removeVar", _removeVar_dec, CustomEnvController);
 __decorateElement(_init, 1, "deleteEntry", _deleteEntry_dec, CustomEnvController);
 __decorateElement(_init, 1, "restore", _restore_dec, CustomEnvController);
+__decorateElement(_init, 1, "createGroup", _createGroup_dec, CustomEnvController);
+__decorateElement(_init, 1, "renameGroup", _renameGroup_dec, CustomEnvController);
+__decorateElement(_init, 1, "deleteGroup", _deleteGroup_dec, CustomEnvController);
+__decorateElement(_init, 1, "moveEntry", _moveEntry_dec, CustomEnvController);
 __decorateElement(_init, 1, "cliStatus", _cliStatus_dec, CustomEnvController);
 __decorateElement(_init, 1, "cliInstall", _cliInstall_dec, CustomEnvController);
 __decoratorMetadata(_init, CustomEnvController);
 export {
+  DEFAULT_GROUP_ID,
+  DEFAULT_GROUP_TITLE,
   classifyEntry,
   CustomEnvController as default,
   envFilePath