From 3960386d138b0cbe1d65ecb8e8cdc162352c562b Mon Sep 17 00:00:00 2001 From: newbie Date: Thu, 12 Nov 2026 22:42:08 +0800 Subject: [PATCH] chore(release): 1.5.1 --- components.json | 4 +-- package.json | 4 +-- vendor/workspace-groups-remote/lib/groups.js | 34 ++++++++++++-------- vendor/workspace-groups-remote/package.json | 2 +- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/components.json b/components.json index 5d81093..c43a145 100644 --- a/components.json +++ b/components.json @@ -18,9 +18,9 @@ { "id": "workspace-groups-remote", "package": "workspace-groups-remote", - "version": "1.2.0", + "version": "1.2.1", "sourceRepo": "DeepsSeekHarness/workspace-groups-remote", - "sourceCommit": "99a8c811a4061443c5aed29a2ee0dae634a331c3", + "sourceCommit": "60cbf403b0d9e1c49cc39c4c43df0ab61fb78b4a", "vendorPath": "vendor/workspace-groups-remote" }, { diff --git a/package.json b/package.json index 891816f..c64e79e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "qq-dsh", - "version": "1.5.0", - "description": "QQ-dsh 閳?personal DSH plugin bundle: sansheng-liubu workbench + dsh-brain (LongMemory bridge, skill sync) + workspace-groups-remote (grouped workspaces + remote SSH) + dsh-better-chat (approval Enter/Esc), in one install.", + "version": "1.5.1", + "description": "QQ-dsh 闁?personal DSH plugin bundle: sansheng-liubu workbench + dsh-brain (LongMemory bridge, skill sync) + workspace-groups-remote (grouped workspaces + remote SSH) + dsh-better-chat (approval Enter/Esc), in one install.", "type": "module", "main": "index.js", "exports": { diff --git a/vendor/workspace-groups-remote/lib/groups.js b/vendor/workspace-groups-remote/lib/groups.js index bb2d3ca..66f7c37 100644 --- a/vendor/workspace-groups-remote/lib/groups.js +++ b/vendor/workspace-groups-remote/lib/groups.js @@ -3454,24 +3454,32 @@ async function buildFarm(input) { if (targets.length < 2) throw new Error("farm: needs at least two distinct folders"); const root = defaultFarmRoot(); const path = join(root, farmDirectoryName(String(input.name))); + const taken = /* @__PURE__ */ new Set(); + const links = targets.map((target) => ({ + name: linkNameFor(target, taken), + target + })); await mkdir(root, { recursive: true }); try { await mkdir(path); } catch (error) { - if (error.code === "EEXIST") throw new Error(`farm: already exists, remove it first: ${path}`); - throw new Error(`farm: cannot create ${path}: ${error instanceof Error ? error.message : String(error)}`); - } - const taken = /* @__PURE__ */ new Set(); - const links = []; - try { - for (const target of targets) { - const name = linkNameFor(target, taken); - await symlink(target, join(path, name), WINDOWS ? "junction" : "dir"); - links.push({ - name, - target - }); + if (error.code !== "EEXIST") throw new Error(`farm: cannot create ${path}: ${error instanceof Error ? error.message : String(error)}`); + const existing = (await readdir(path)).sort(); + const expected = links.map((link) => link.name).sort(); + if (existing.length !== expected.length || existing.some((name, index) => name !== expected[index])) throw new Error(`farm: already exists with different folders: ${path}`); + for (const link of links) { + const entryPath = join(path, link.name); + if (!(await lstat(entryPath)).isSymbolicLink()) throw new Error(`farm: already exists, entry is not a link: ${entryPath}`); + const actual = await realpath(entryPath); + if (!(WINDOWS ? actual.toLowerCase() === link.target.toLowerCase() : actual === link.target)) throw new Error(`farm: already exists, link points elsewhere: ${entryPath}`); } + return { + path, + links + }; + } + try { + for (const link of links) await symlink(link.target, join(path, link.name), WINDOWS ? "junction" : "dir"); } catch (error) { await discard(path); throw new Error(`farm: cannot link into ${path}: ${error instanceof Error ? error.message : String(error)}`); diff --git a/vendor/workspace-groups-remote/package.json b/vendor/workspace-groups-remote/package.json index 0580996..2628763 100644 --- a/vendor/workspace-groups-remote/package.json +++ b/vendor/workspace-groups-remote/package.json @@ -1,6 +1,6 @@ { "name": "workspace-groups-remote", - "version": "1.2.0", + "version": "1.2.1", "description": "Merged DSH bundle: the workspace-groups sidebar manager (category -> project -> session grouped tree, session tab strip) plus dsh-remote-ssh (VSCode Remote-SSH-like remote development: remote workspaces, file access, integrated terminal) in one installable package.", "keywords": [ "dsh",