@dsh-workbench/core 1.0.0 → 1.0.1

package/README.md

@@ -34,6 +34,15 @@ npx @dsh-workbench/core --profile wb2
 
 全局装过就不用 `npx`：`npm i -g @dsh-workbench/core` 之后直接 `dsh-workbench`。
 
+从 1.0.0 之前的独立实例升上来：旧数据**不会**自动并。先退出所有 dsh，再跑：
+
+```bash
+dsh-workbench migrate          # 切共用根 + 并旧会话/项目/附件
+dsh-workbench migrate --force  # 已经迁过一次、想再补并一次
+```
+
+只会补缺、不覆盖；旧目录保留。npx 用户把 `dsh-workbench` 换成 `npx @dsh-workbench/core`。
+
 先决条件（就三条）：
 
 | 要有 | 为什么 |
@@ -48,6 +57,7 @@ npx @dsh-workbench/core --profile wb2
 |---|---|
 | `dsh-workbench create` | 交互式新建一个工作台实例 |
 | `dsh-workbench setup` | 幂等建默认的 `workbench` profile；配 `--from` 建别的名字 |
+| `dsh-workbench migrate` | 把旧实例的会话 / 项目 / 附件并到共用数据根（`--force` 可重跑） |
 | `dsh-workbench` | 起工作台（默认端口 `:3081`，其余参数透传给 `dsh web`） |
 | `dsh-workbench --profile <名字>` | 起指定实例 |
 | `dsh-workbench setup --from <来源> --profile <新名>` | 以某个现有 profile 为模板建一个 |
@@ -78,7 +88,7 @@ npx @dsh-workbench/core --profile wb2
 | `profile/` | 出厂 profile 模板：可写根那一行（启动器 `--patch` 用，seed 也抄进 profile） |
 | `skills/` | 模块 DIY 指引，装好后挂给 agent；漏了不报错，只是 agent 不知道要怎么做模块 |
 | `bin/` | `dsh-workbench` 启动器、隔离 opencli 的入口 |
-| `scripts/` | 随包出货的脚本：`seed-profile.sh` / `seed-workshop.sh` / `create-workbench.mjs` / `clone-profile.mjs` |
+| `scripts/` | 随包出货的脚本：`seed-profile.sh` / `seed-workshop.sh` / `create-workbench.mjs` / `clone-profile.mjs` / `share-data-root.mjs` |
 
 ## 数据落在哪
 
@@ -92,8 +102,8 @@ npx @dsh-workbench/core --profile wb2
 | DIY 工坊依赖安装日志 | `~/.dsh/workbench/seed.log` |
 
 独立实例**只分 profile，不分数据根**：会话、项目、附件跟 `dsh web` 和 Desktop 是同一份，
-只有设置与插件各一份。旧版本分过家的实例，下次启动会把 `~/.dsh/workbench/{sessions,storages,attachments}`
-并回共用根（只补不覆盖，旧目录保留）。
+只有设置与插件各一份。旧版本分过家的实例，启动时**不会**自动并；先退出所有 dsh，再跑
+`dsh-workbench migrate`（只补不覆盖，旧目录保留）。
 
 设置只有一份，写在哪都看得见：
 

package/bin/dsh-workbench

@@ -8,6 +8,7 @@
 #                                            #    以 web 为模板建一个独立工作台
 #   ./bin/dsh-workbench --profile wb2         # ② 起指定 profile，默认 :3081
 #   ./bin/dsh-workbench --no-open             #    其余参数透传给 dsh web
+#   ./bin/dsh-workbench migrate               #    把旧实例的会话/项目/附件并到共用数据根（--force 可重跑）
 #   ./bin/dsh-workbench --help
 #
 # 与 `dsh web` 并存：不同的 profile、不同的 node_modules、不同的端口、独立的进程。
@@ -35,6 +36,8 @@ PROFILE_EXPLICIT=0
 [ -n "${WORKBENCH_PROFILE:-}" ] && PROFILE_EXPLICIT=1
 SETUP=0
 CREATE=0
+MIGRATE=0
+FORCE=0
 DSH_ARGS=()
 
 die() {
@@ -43,7 +46,7 @@ die() {
 }
 
 usage() {
-  sed -n '3,15p' "${BASH_SOURCE[0]}" | sed 's/^# \{0,1\}//'
+  sed -n '3,12p' "${BASH_SOURCE[0]}" | sed 's/^# \{0,1\}//'
 }
 
 if [ "${1:-}" = "create" ]; then
@@ -54,6 +57,10 @@ if [ "${1:-}" = "setup" ]; then
   SETUP=1
   shift
 fi
+if [ "${1:-}" = "migrate" ]; then
+  MIGRATE=1
+  shift
+fi
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -75,6 +82,11 @@ while [ $# -gt 0 ]; do
       echo "dsh-workbench: 会话与项目跟 dsh web 共用一份数据根，$1 不再需要（忽略）。" >&2
       shift
       ;;
+    --force)
+      [ "$MIGRATE" = "1" ] || die "--force 只用于 migrate"
+      FORCE=1
+      shift
+      ;;
     --no-settings) WB_COPY_SETTINGS=0; shift ;;
     help | --help | -h) usage; exit 0 ;;
     --) shift; DSH_ARGS+=("$@"); break ;;
@@ -85,6 +97,9 @@ done
 if [ "$SETUP" = "1" ] && [ ${#DSH_ARGS[@]} -gt 0 ]; then
   die "setup 不认识这些参数：${DSH_ARGS[*]}"
 fi
+if [ "$MIGRATE" = "1" ] && [ ${#DSH_ARGS[@]} -gt 0 ]; then
+  die "migrate 不认识这些参数：${DSH_ARGS[*]}"
+fi
 if [ "${WB_CLONE:-0}" = "1" ] && [ "$PROFILE_EXPLICIT" = "0" ]; then
   die "用 --from 时还要指定 --profile <新名字>（例如 --from web --profile wb2）"
 fi
@@ -272,6 +287,22 @@ if [ ! -f "$PROFILE_DIR/package.json" ]; then
   exit 1
 fi
 
+if [ "$MIGRATE" = "1" ]; then
+  MIGRATE_ARGS=(--migrate)
+  [ "$FORCE" = "1" ] && MIGRATE_ARGS+=(--force)
+  WORKBENCH_PROFILE="$PROFILE" DSH_HOME="$DSH_HOME" DSH_WORKBENCH_HOME="$WORKBENCH_HOME" \
+    node "$REPO_DIR/scripts/share-data-root.mjs" "${MIGRATE_ARGS[@]}" || exit 1
+  if [ "$PROFILE" = "workbench" ]; then
+    START_CMD="$REPO_DIR/bin/dsh-workbench"
+  else
+    START_CMD="$REPO_DIR/bin/dsh-workbench --profile $PROFILE"
+  fi
+  echo
+  echo "迁移结束。现在起工作台：$START_CMD"
+  echo "如果 dsh web 刚才也开着，先重启它，让它从共用根重新读一遍。"
+  exit 0
+fi
+
 # ── 硬门禁：工作台 bundle 必须**被选中**（在 `dsh.profile.bundles` 里）─────────
 #
 # 判据只能是 `dsh.profile.bundles`，**不能** grep 整个 package.json：依赖装着 ≠ 被选中。
@@ -307,15 +338,16 @@ if [ "$BUNDLE_GUARD" -ne 0 ]; then
   exit 1
 fi
 
-# ── 已有实例：把会话 / 项目 / 附件收回到共用数据根（幂等，每次启动都过一遍）
+# ── 已有实例：只整理配置，旧数据不自动迁移
 #
 # 旧版本给 workbench profile 追加过隔离的三行（sessions / storages / attachment 指到
-# `$DSH_HOME/workbench/**`）。现在改成跟 Desktop 一样「只分 profile、不分数据根」，
-# 那三行与旧数据都在这条命令里收回来；新 profile 上它只补可写根那一行。
-# 必须排在这里（exec dsh 之前）：那几行要在这一代配置读进去之前就改好。
+# `$DSH_HOME/workbench/**`）。现在缺省跟 Desktop 一样「只分 profile、不分数据根」；
+# 但如果旧目录里还有数据、且没有 `.data-root-shared`，这里只打印 migrate 提示，
+# 不改 profile、不动数据 —— 由用户自己决定什么时候并。
+# 必须排在这里（exec dsh 之前）：配置要在这一代 dsh 读进去之前就定好。
 WORKBENCH_PROFILE="$PROFILE" DSH_HOME="$DSH_HOME" DSH_WORKBENCH_HOME="$WORKBENCH_HOME" \
   node "$REPO_DIR/scripts/share-data-root.mjs" ||
-  echo "dsh-workbench: 提醒 —— 数据根没整理成（见上一行），这次仍按现在的 profile 起。" >&2
+  echo "dsh-workbench: 提醒 —— 数据根配置没整理成（见上一行），这次仍按现在的 profile 起。" >&2
 
 # 清掉从父 dsh 会话继承来的身份变量。
 #

package/client.js

@@ -3086,6 +3086,7 @@ window.__ModuleLoader__.load({
       	"panels.market.selfUpdateFailed": "Self-update failed: {reason}",
       	"panels.market.selfUpdateUnknown": "the outside process left no reason (see ~/.dsh/workbench/self-update.log)",
       	"panels.market.selfUpdateRolledBack": "Not swapped; rolled back to {version}.",
+      	"panels.market.selfUpdateNeedsMigrate": "Workbench updated. Old sessions and projects are not merged automatically: quit every dsh, then run dsh-workbench migrate (--force to merge again).",
       	"panels.market.uninstall": "Uninstall",
       	"panels.market.uninstallLabel": "Uninstall {name}",
       	"panels.market.installing": "Installing…",
@@ -3718,6 +3719,7 @@ window.__ModuleLoader__.load({
       		"panels.market.selfUpdateFailed": "自更新没成：{reason}",
       		"panels.market.selfUpdateUnknown": "外部进程没留下原因（看 ~/.dsh/workbench/self-update.log）",
       		"panels.market.selfUpdateRolledBack": "没换成，已回滚到 {version}。",
+      		"panels.market.selfUpdateNeedsMigrate": "工作台已更新。旧会话 / 项目不会自动并：先退出所有 dsh，再运行 dsh-workbench migrate（--force 可补并）。",
       		"panels.market.uninstall": "卸载",
       		"panels.market.uninstallLabel": "卸载 {name}",
       		"panels.market.installing": "正在安装…",
@@ -6498,6 +6500,9 @@ window.__ModuleLoader__.load({
       	"remove-bundle",
       	"uninstall-plugin"
       ];
+      function marketMigrationNotice(t, update) {
+      	return update?.migration === "needed" ? t("panels.market.selfUpdateNeedsMigrate") : null;
+      }
       function ConfirmUninstall({ t, name, onConfirm, onCancel }) {
       	const [acknowledged, setAcknowledged] = (0, react.useState)(false);
       	return /* @__PURE__ */ (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.RiskConfirmation, {
@@ -6674,18 +6679,21 @@ window.__ModuleLoader__.load({
       		send: (body) => provision.send(body),
       		onChanged
       	});
+      	const landed = pendingLanded(pending, updateMap, effective, workbench?.installed, shared, pluginSource === null ? null : pluginList, {
+      		units: installed === void 0 ? null : new Set(installed.map((module) => module.unit)),
+      		plugins: pluginSource === null ? null : new Set(pluginList.map((row) => row.id))
+      	});
+      	const effectiveSelfUpdate = mock?.selfUpdate ?? selfUpdate;
       	useSettleHold({
       		pending,
-      		landed: pendingLanded(pending, updateMap, effective, workbench?.installed, shared, pluginSource === null ? null : pluginList, {
-      			units: installed === void 0 ? null : new Set(installed.map((module) => module.unit)),
-      			plugins: pluginSource === null ? null : new Set(pluginList.map((row) => row.id))
-      		}),
+      		landed,
       		t,
       		onChanged,
-      		selfUpdate: mock?.selfUpdate ?? selfUpdate,
+      		selfUpdate: effectiveSelfUpdate,
       		setPending,
       		setFailed
       	});
+      	const migrationNotice = marketMigrationNotice(t, effectiveSelfUpdate);
       	const settled = marketSettled(freshness, installedRead);
       	const nothing = shown.length === 0 && self === void 0 && installedList.length === 0 && pluginList.length === 0;
       	if (!settled || (settling?.size ?? 0) > 0 && shown.length === 0 && installedList.length === 0) return /* @__PURE__ */ (0, react.createElement)(MarketChecking, { t });
@@ -6699,7 +6707,7 @@ window.__ModuleLoader__.load({
       		shared,
       		pending,
       		failed,
-      		notice,
+      		notice: notice ?? migrationNotice,
       		act,
       		onConfirming: setConfirming,
       		setDefault,

package/dist/client/client.body.js

@@ -3079,6 +3079,7 @@ var en = {
 	"panels.market.selfUpdateFailed": "Self-update failed: {reason}",
 	"panels.market.selfUpdateUnknown": "the outside process left no reason (see ~/.dsh/workbench/self-update.log)",
 	"panels.market.selfUpdateRolledBack": "Not swapped; rolled back to {version}.",
+	"panels.market.selfUpdateNeedsMigrate": "Workbench updated. Old sessions and projects are not merged automatically: quit every dsh, then run dsh-workbench migrate (--force to merge again).",
 	"panels.market.uninstall": "Uninstall",
 	"panels.market.uninstallLabel": "Uninstall {name}",
 	"panels.market.installing": "Installing…",
@@ -3711,6 +3712,7 @@ var dictionaries = {
 		"panels.market.selfUpdateFailed": "自更新没成：{reason}",
 		"panels.market.selfUpdateUnknown": "外部进程没留下原因（看 ~/.dsh/workbench/self-update.log）",
 		"panels.market.selfUpdateRolledBack": "没换成，已回滚到 {version}。",
+		"panels.market.selfUpdateNeedsMigrate": "工作台已更新。旧会话 / 项目不会自动并：先退出所有 dsh，再运行 dsh-workbench migrate（--force 可补并）。",
 		"panels.market.uninstall": "卸载",
 		"panels.market.uninstallLabel": "卸载 {name}",
 		"panels.market.installing": "正在安装…",
@@ -6491,6 +6493,9 @@ var CONFIRM_UNINSTALL = [
 	"remove-bundle",
 	"uninstall-plugin"
 ];
+function marketMigrationNotice(t, update) {
+	return update?.migration === "needed" ? t("panels.market.selfUpdateNeedsMigrate") : null;
+}
 function ConfirmUninstall({ t, name, onConfirm, onCancel }) {
 	const [acknowledged, setAcknowledged] = (0, react.useState)(false);
 	return /* @__PURE__ */ (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.RiskConfirmation, {
@@ -6667,18 +6672,21 @@ function MarketView({ t, manifests, installable, capabilities, freshness, onChan
 		send: (body) => provision.send(body),
 		onChanged
 	});
+	const landed = pendingLanded(pending, updateMap, effective, workbench?.installed, shared, pluginSource === null ? null : pluginList, {
+		units: installed === void 0 ? null : new Set(installed.map((module) => module.unit)),
+		plugins: pluginSource === null ? null : new Set(pluginList.map((row) => row.id))
+	});
+	const effectiveSelfUpdate = mock?.selfUpdate ?? selfUpdate;
 	useSettleHold({
 		pending,
-		landed: pendingLanded(pending, updateMap, effective, workbench?.installed, shared, pluginSource === null ? null : pluginList, {
-			units: installed === void 0 ? null : new Set(installed.map((module) => module.unit)),
-			plugins: pluginSource === null ? null : new Set(pluginList.map((row) => row.id))
-		}),
+		landed,
 		t,
 		onChanged,
-		selfUpdate: mock?.selfUpdate ?? selfUpdate,
+		selfUpdate: effectiveSelfUpdate,
 		setPending,
 		setFailed
 	});
+	const migrationNotice = marketMigrationNotice(t, effectiveSelfUpdate);
 	const settled = marketSettled(freshness, installedRead);
 	const nothing = shown.length === 0 && self === void 0 && installedList.length === 0 && pluginList.length === 0;
 	if (!settled || (settling?.size ?? 0) > 0 && shown.length === 0 && installedList.length === 0) return /* @__PURE__ */ (0, react.createElement)(MarketChecking, { t });
@@ -6692,7 +6700,7 @@ function MarketView({ t, manifests, installable, capabilities, freshness, onChan
 		shared,
 		pending,
 		failed,
-		notice,
+		notice: notice ?? migrationNotice,
 		act,
 		onConfirming: setConfirming,
 		setDefault,

package/dist/client/index.js

@@ -3082,6 +3082,7 @@ var en = {
 	"panels.market.selfUpdateFailed": "Self-update failed: {reason}",
 	"panels.market.selfUpdateUnknown": "the outside process left no reason (see ~/.dsh/workbench/self-update.log)",
 	"panels.market.selfUpdateRolledBack": "Not swapped; rolled back to {version}.",
+	"panels.market.selfUpdateNeedsMigrate": "Workbench updated. Old sessions and projects are not merged automatically: quit every dsh, then run dsh-workbench migrate (--force to merge again).",
 	"panels.market.uninstall": "Uninstall",
 	"panels.market.uninstallLabel": "Uninstall {name}",
 	"panels.market.installing": "Installing…",
@@ -3714,6 +3715,7 @@ var dictionaries = {
 		"panels.market.selfUpdateFailed": "自更新没成：{reason}",
 		"panels.market.selfUpdateUnknown": "外部进程没留下原因（看 ~/.dsh/workbench/self-update.log）",
 		"panels.market.selfUpdateRolledBack": "没换成，已回滚到 {version}。",
+		"panels.market.selfUpdateNeedsMigrate": "工作台已更新。旧会话 / 项目不会自动并：先退出所有 dsh，再运行 dsh-workbench migrate（--force 可补并）。",
 		"panels.market.uninstall": "卸载",
 		"panels.market.uninstallLabel": "卸载 {name}",
 		"panels.market.installing": "正在安装…",
@@ -6494,6 +6496,9 @@ var CONFIRM_UNINSTALL = [
 	"remove-bundle",
 	"uninstall-plugin"
 ];
+function marketMigrationNotice(t, update) {
+	return update?.migration === "needed" ? t("panels.market.selfUpdateNeedsMigrate") : null;
+}
 function ConfirmUninstall({ t, name, onConfirm, onCancel }) {
 	const [acknowledged, setAcknowledged] = useState(false);
 	return /* @__PURE__ */ createElement(RiskConfirmation, {
@@ -6670,18 +6675,21 @@ function MarketView({ t, manifests, installable, capabilities, freshness, onChan
 		send: (body) => provision.send(body),
 		onChanged
 	});
+	const landed = pendingLanded(pending, updateMap, effective, workbench?.installed, shared, pluginSource === null ? null : pluginList, {
+		units: installed === void 0 ? null : new Set(installed.map((module) => module.unit)),
+		plugins: pluginSource === null ? null : new Set(pluginList.map((row) => row.id))
+	});
+	const effectiveSelfUpdate = mock?.selfUpdate ?? selfUpdate;
 	useSettleHold({
 		pending,
-		landed: pendingLanded(pending, updateMap, effective, workbench?.installed, shared, pluginSource === null ? null : pluginList, {
-			units: installed === void 0 ? null : new Set(installed.map((module) => module.unit)),
-			plugins: pluginSource === null ? null : new Set(pluginList.map((row) => row.id))
-		}),
+		landed,
 		t,
 		onChanged,
-		selfUpdate: mock?.selfUpdate ?? selfUpdate,
+		selfUpdate: effectiveSelfUpdate,
 		setPending,
 		setFailed
 	});
+	const migrationNotice = marketMigrationNotice(t, effectiveSelfUpdate);
 	const settled = marketSettled(freshness, installedRead);
 	const nothing = shown.length === 0 && self === void 0 && installedList.length === 0 && pluginList.length === 0;
 	if (!settled || (settling?.size ?? 0) > 0 && shown.length === 0 && installedList.length === 0) return /* @__PURE__ */ createElement(MarketChecking, { t });
@@ -6695,7 +6703,7 @@ function MarketView({ t, manifests, installable, capabilities, freshness, onChan
 		shared,
 		pending,
 		failed,
-		notice,
+		notice: notice ?? migrationNotice,
 		act,
 		onConfirming: setConfirming,
 		setDefault,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/core",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "个人工作台：Agent 工作台（左栏 + 常驻对话 + 自研右侧数据面板）。",
   "type": "module",
   "icon": "./icon.svg",
@@ -100,8 +100,8 @@
     "proper-lockfile": "^4.1.2",
     "which": "^7.0.0",
     "write-file-atomic": "^8.0.0",
-    "@dsh-workbench/shared": "1.0.0",
-    "@dsh-workbench/adapters-default": "1.0.0"
+    "@dsh-workbench/shared": "1.0.1",
+    "@dsh-workbench/adapters-default": "1.0.1"
   },
   "license": "MIT",
   "repository": {

package/scripts/seed-profile.sh

@@ -2,14 +2,14 @@
 #
 # 一次性引导：从 shipped 的 web 模板创建 workbench profile，
 # 继承 web 的 **bundle 清单**（这台机器上装了哪些 bundle），
-# 补上可写根那一行，并把会话 / 项目 / 附件指回跟 web 共用的数据根。
+# 补上可写根那一行；新 profile 直接跟 web 共用数据根，旧 profile 保持原状，等用户跑 migrate。
 #
 # **设置不在这里继承**（这里曾经把 web 的 cordis.patch.yml 快照一份过来）：
 # 工作台自己的 patch 是唯一真相，想同步 web 的哪几行由用户走「设置 → 配置同步」。
 # 为什么这么分（安装 vs 设置）、为什么不再是自动的：内部设计记录
 #
-# 幂等 / 可续跑：profile 已存在就跳过创建，数据根已经是共用的就什么都不写
-# —— 重复运行不会覆盖任何东西。
+# 幂等 / 可续跑：profile 已存在就跳过创建；数据根已经是共用的、或旧数据还没迁
+# （只提示 migrate）就什么都不写 —— 重复运行不会覆盖任何东西。
 # 安全：全程只**读** web 的 profile 目录，只**写** workbench 自己的目录。
 #
 # 用法:
@@ -176,10 +176,11 @@ console.log("→ profile 里那条 link: 指的是我这份装出来的副本（
 '
 fi
 
-# ── 第 3 步：数据根跟 web 共用 + 可写根那一行 ───────────────────────────
+# ── 第 3 步：数据根配置 + 可写根那一行 ─────────────────────────────────
 #
-# 会话 / 项目 / 附件不再按 profile 分家：跟 `dsh web` 和 Desktop 一样只分 profile，
-# 数据都在 `$DSH_HOME` 下（旧实例的那三行隔离补丁与旧数据由 share-data-root.mjs 收回来）。
+# 新 profile 跟 `dsh web` / Desktop 一样只分 profile，数据落在 `$DSH_HOME`。
+# 旧 profile 如果还有没迁的数据，这里只打印 migrate 提示，保持隔离、不动数据；
+# 用户自己跑 `dsh-workbench migrate` 才切共用根并并数据。
 # 每一步都幂等：已经是共用数据根的 profile 一个字节都不写。
 WORKBENCH_PROFILE="$PROFILE" DSH_HOME="$DSH_HOME" DSH_WORKBENCH_HOME="$WORKBENCH_HOME" \
   node "$REPO_DIR/scripts/share-data-root.mjs" || die "整理数据根失败（见上一行）"
@@ -202,7 +203,8 @@ fi
 
 cat <<EOF
 
-profile '$DST_PROFILE' 的骨架好了（bundle 清单 + 可写根；会话 / 项目 / 附件跟 web 共用）。
+profile '$DST_PROFILE' 的骨架好了（bundle 清单 + 可写根）。
+旧实例如果还有数据没迁，启动时会提示；要切共用根并并旧数据，跑 dsh-workbench migrate。
 
 设置按创建时的勾选从 $SRC_PROFILE_NAME 继承（只同步改已有插件的行；挂新插件的行不同步）；
 直接跑 setup 时只继承 bundle 清单，想要 web 那边的模型供应商 / 搜索源 / MCP，起工作台后去

package/scripts/share-data-root.mjs

@@ -10,6 +10,7 @@ import {
   statSync,
   writeFileSync,
 } from 'node:fs';
+import { randomUUID } from 'node:crypto';
 import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -78,6 +79,58 @@ function unionList(left, right) {
   return [...new Set([...(Array.isArray(left) ? left : []), ...(Array.isArray(right) ? right : [])])];
 }
 
+function sessionIdsOf(entry) {
+  return Array.isArray(entry?.sessionIds) ? entry.sessionIds : [];
+}
+
+function orderedIds(global, table) {
+  const seen = new Set();
+  const ids = [];
+  for (const id of Array.isArray(global?.workspaceIds) ? global.workspaceIds : []) {
+    if (table[id] === undefined || seen.has(id)) continue;
+    ids.push(id);
+    seen.add(id);
+  }
+  for (const id of Object.keys(table)) {
+    if (seen.has(id)) continue;
+    ids.push(id);
+    seen.add(id);
+  }
+  return ids;
+}
+
+function repairWorkspaceOrder(targetFile) {
+  let target;
+  try {
+    target = JSON.parse(readFileSync(targetFile, 'utf8'));
+  } catch {
+    return false;
+  }
+  if (target?.unit?.name !== 'workspace') return false;
+  const table = target.tables?.workspaces ?? {};
+  const global = target.global ?? {};
+  if (global.pendingMutation !== undefined) return false;
+  const before = Array.isArray(global.workspaceIds) ? global.workspaceIds : [];
+  const seen = new Set();
+  const order = [];
+  for (const id of before) {
+    if (table[id] === undefined || seen.has(id)) continue;
+    order.push(id);
+    seen.add(id);
+  }
+  if (global.initialized === true) {
+    for (const id of Object.keys(table)) {
+      if (seen.has(id)) continue;
+      order.push(id);
+      seen.add(id);
+    }
+  }
+  if (order.length === before.length && order.every((id, index) => id === before[index])) return false;
+  target.global = { ...global, workspaceIds: order };
+  writeAtomic(targetFile, `${JSON.stringify(target, null, 2)}\n`);
+  return true;
+}
+
 function mergeWorkspaceList(sourceFile, targetFile) {
   let source;
   try {
@@ -95,67 +148,249 @@ function mergeWorkspaceList(sourceFile, targetFile) {
   try {
     target = JSON.parse(readFileSync(targetFile, 'utf8'));
   } catch {
-    warn(`${targetFile} 读不出来，这次没并项目列表。`);
-    return 0;
+    warn(`${targetFile} 读不出来，这次没并项目列表，下次启动再试。`);
+    return null;
   }
   if (target?.unit?.name !== 'workspace') return 0;
   const sourceTable = source.tables?.workspaces ?? {};
   const targetTable = target.tables?.workspaces ?? {};
-  const byPath = new Map();
-  for (const entry of Object.values(targetTable)) {
-    if (typeof entry?.path === 'string') byPath.set(entry.path, entry);
+  const sourceGlobal = source.global ?? {};
+  const targetGlobal = target.global ?? {};
+  if (targetGlobal.pendingMutation !== undefined) {
+    warn(`${targetFile} 里有一次没做完的项目操作，这次先不并项目列表，下次启动再试。`);
+    return null;
+  }
+  const idByPath = new Map();
+  const accounted = new Map();
+  for (const [id, entry] of Object.entries(targetTable)) {
+    if (typeof entry?.path === 'string') idByPath.set(entry.path, id);
+    for (const sessionId of sessionIdsOf(entry)) {
+      if (!accounted.has(sessionId)) accounted.set(sessionId, id);
+    }
   }
+  const order = orderedIds(targetGlobal, targetTable);
+  const idMap = new Map();
   let added = 0;
-  for (const [id, entry] of Object.entries(sourceTable)) {
+  for (const sourceId of orderedIds(sourceGlobal, sourceTable)) {
+    const entry = sourceTable[sourceId];
     if (typeof entry?.path !== 'string') continue;
-    const hit = byPath.get(entry.path);
-    if (hit === undefined) {
-      targetTable[id] = entry;
-      byPath.set(entry.path, entry);
-      added += 1;
+    const hitId = idByPath.get(entry.path);
+    if (hitId !== undefined) {
+      const hit = targetTable[hitId];
+      const incoming = sessionIdsOf(entry).filter((sessionId) => {
+        const holder = accounted.get(sessionId);
+        return holder === undefined || holder === hitId;
+      });
+      hit.sessionIds = unionList(sessionIdsOf(hit), incoming);
+      for (const sessionId of hit.sessionIds) {
+        if (!accounted.has(sessionId)) accounted.set(sessionId, hitId);
+      }
+      if (typeof entry.updatedAt === 'string' && (typeof hit.updatedAt !== 'string' || entry.updatedAt > hit.updatedAt)) {
+        hit.updatedAt = entry.updatedAt;
+      }
+      idMap.set(sourceId, hitId);
       continue;
     }
-    hit.sessionIds = unionList(hit.sessionIds, entry.sessionIds);
-    if (typeof entry.updatedAt === 'string' && (typeof hit.updatedAt !== 'string' || entry.updatedAt > hit.updatedAt)) {
-      hit.updatedAt = entry.updatedAt;
+    let newId = sourceId;
+    if (targetTable[newId] !== undefined) newId = randomUUID();
+    const sessionIds = [];
+    for (const sessionId of sessionIdsOf(entry)) {
+      if (accounted.has(sessionId)) continue;
+      accounted.set(sessionId, newId);
+      sessionIds.push(sessionId);
     }
+    targetTable[newId] = { ...entry, sessionIds };
+    idByPath.set(entry.path, newId);
+    order.push(newId);
+    added += 1;
   }
+  const preferred = targetGlobal.defaultWorkspaceId;
+  const fromSource = idMap.get(sourceGlobal.defaultWorkspaceId) ?? sourceGlobal.defaultWorkspaceId;
+  const defaultWorkspaceId =
+    typeof preferred === 'string' && targetTable[preferred] !== undefined
+      ? preferred
+      : typeof fromSource === 'string' && targetTable[fromSource] !== undefined
+        ? fromSource
+        : undefined;
   target.tables = { ...(target.tables ?? {}), workspaces: targetTable };
-  const global = target.global ?? {};
-  const sourceGlobal = source.global ?? {};
-  const known = new Set(Array.isArray(global.workspaceIds) ? global.workspaceIds : []);
-  for (const id of Array.isArray(sourceGlobal.workspaceIds) ? sourceGlobal.workspaceIds : []) known.add(id);
   target.global = {
-    ...global,
-    workspaceIds: [...known],
-    archivedSessionIds: unionList(global.archivedSessionIds, sourceGlobal.archivedSessionIds),
-    pinnedSessionIds: unionList(global.pinnedSessionIds, sourceGlobal.pinnedSessionIds),
+    ...targetGlobal,
+    workspaceIds: order,
+    archivedSessionIds: unionList(targetGlobal.archivedSessionIds, sourceGlobal.archivedSessionIds),
+    pinnedSessionIds: unionList(targetGlobal.pinnedSessionIds, sourceGlobal.pinnedSessionIds),
   };
+  if (defaultWorkspaceId === undefined) delete target.global.defaultWorkspaceId;
+  else target.global.defaultWorkspaceId = defaultWorkspaceId;
   writeAtomic(targetFile, `${JSON.stringify(target, null, 2)}\n`);
   return added;
 }
 
+function repairTarget(targetFile) {
+  if (repairWorkspaceOrder(targetFile)) say(`项目顺序里有对不上的条目，已按实际项目重排（${targetFile}）。`);
+}
+
+function hasEntries(dir) {
+  try {
+    return readdirSync(dir).some((name) => name !== '.DS_Store');
+  } catch {
+    return false;
+  }
+}
+
+function legacyDataExists() {
+  if (resolve(RUNTIME_ROOT) === resolve(HOME)) return false;
+  return (
+    existsSync(join(RUNTIME_ROOT, 'storages', 'workspace.json')) ||
+    hasEntries(join(RUNTIME_ROOT, 'sessions')) ||
+    hasEntries(join(RUNTIME_ROOT, 'attachments'))
+  );
+}
+
+function missingWorkspacePaths() {
+  const sourceFile = join(RUNTIME_ROOT, 'storages', 'workspace.json');
+  const targetFile = join(HOME, 'storages', 'workspace.json');
+  if (!existsSync(sourceFile) || !existsSync(targetFile)) return [];
+  let source;
+  let target;
+  try {
+    source = JSON.parse(readFileSync(sourceFile, 'utf8'));
+    target = JSON.parse(readFileSync(targetFile, 'utf8'));
+  } catch {
+    return [];
+  }
+  if (source?.unit?.name !== 'workspace' || target?.unit?.name !== 'workspace') return [];
+  const have = new Set();
+  for (const entry of Object.values(target.tables?.workspaces ?? {})) {
+    if (typeof entry?.path === 'string') have.add(entry.path);
+  }
+  const missing = [];
+  for (const entry of Object.values(source.tables?.workspaces ?? {})) {
+    if (typeof entry?.path !== 'string' || have.has(entry.path)) continue;
+    missing.push(typeof entry.title === 'string' && entry.title !== '' ? entry.title : entry.path);
+  }
+  return missing;
+}
+
 function mergeDataRoot() {
-  if (resolve(RUNTIME_ROOT) === resolve(HOME)) return;
-  if (existsSync(MARKER)) return;
+  if (resolve(RUNTIME_ROOT) === resolve(HOME)) return { added: 0, files: 0 };
+  const targetWorkspace = join(HOME, 'storages', 'workspace.json');
   const sourceStorages = join(RUNTIME_ROOT, 'storages');
-  let count = 0;
+  let added;
+  let files = 0;
   try {
-    count += mergeWorkspaceList(join(sourceStorages, 'workspace.json'), join(HOME, 'storages', 'workspace.json'));
-    count += mergeTree(join(RUNTIME_ROOT, 'sessions'), join(HOME, 'sessions'));
-    count += mergeTree(join(RUNTIME_ROOT, 'attachments'), join(HOME, 'attachments'));
-    count += mergeTree(sourceStorages, join(HOME, 'storages'), new Set(['workspace.json']));
+    added = mergeWorkspaceList(join(sourceStorages, 'workspace.json'), targetWorkspace);
+    if (added === null) return null;
+    files += mergeTree(join(RUNTIME_ROOT, 'sessions'), join(HOME, 'sessions'));
+    files += mergeTree(join(RUNTIME_ROOT, 'attachments'), join(HOME, 'attachments'));
+    files += mergeTree(sourceStorages, join(HOME, 'storages'), new Set(['workspace.json']));
   } catch (error) {
-    warn(`并回 ${HOME} 时出错，下次启动再试：${error instanceof Error ? error.message : String(error)}`);
-    return;
+    warn(`并回 ${HOME} 时出错：${error instanceof Error ? error.message : String(error)}`);
+    return null;
   }
+  repairTarget(targetWorkspace);
+  return { added, files };
+}
+
+function writeMarker() {
   mkdirSync(dirname(MARKER), { recursive: true });
   writeFileSync(
     MARKER,
     `${JSON.stringify({ at: new Date().toISOString(), from: RUNTIME_ROOT, to: HOME }, null, 2)}\n`,
     'utf8',
   );
-  if (count > 0) say(`已把 ${RUNTIME_ROOT} 里的会话 / 项目 / 附件并回 ${HOME}（${count} 个文件，旧目录保留）。`);
+}
+
+function inspectProfile() {
+  const patch = readText(PATCH_PATH);
+  if (patch === null) return null;
+  const legacy = parseBlocks(patch).filter((block) => DATA_ROOT_IDS.has(block.id));
+  return {
+    patch,
+    ours: legacy.filter((block) => OWN_ROOT.test(block.body)),
+    custom: legacy.filter((block) => !OWN_ROOT.test(block.body)),
+  };
+}
+
+function customRootMessage(state) {
+  return `${PROFILE} 的会话 / 存储根是你自己改过的（${state.custom.map((block) => block.id).join(' / ')}）—— 这次不动它，也不并数据。`;
+}
+
+function applySharedConfig(state) {
+  if (state.custom.length > 0) {
+    warn(customRootMessage(state));
+    return false;
+  }
+  let patch = state.patch;
+  if (state.ours.length > 0) {
+    const first = Math.min(...state.ours.map((block) => block.lineStart));
+    patch = stripIsolationHeader(patch, first);
+    patch = removeBlocks(patch, (block) => DATA_ROOT_IDS.has(block.id) && OWN_ROOT.test(block.body));
+    writeAtomic(PATCH_PATH, patch);
+    say(`数据根改回共用：从 ${PROFILE} 的 profile 里去掉 ${state.ours.map((block) => block.id).join(' / ')}。`);
+  }
+  const hasSandbox = parseBlocks(patch).some((block) => block.id === 'sandbox-policy');
+  if (!hasSandbox) {
+    const sandbox = readText(SANDBOX_PATCH);
+    const row = sandbox === null ? undefined : parseBlocks(sandbox).find((block) => block.id === 'sandbox-policy');
+    if (row !== undefined) {
+      patch = appendBlocks(patch, row.body);
+      writeAtomic(PATCH_PATH, patch);
+    }
+  }
+  repairTarget(join(HOME, 'storages', 'workspace.json'));
+  return true;
+}
+
+function configureDefault() {
+  const state = inspectProfile();
+  if (state === null) return;
+  if (state.custom.length > 0) {
+    warn(customRootMessage(state));
+    return;
+  }
+  if (legacyDataExists() && !existsSync(MARKER)) {
+    warn(`检测到 ${RUNTIME_ROOT} 里还有旧会话 / 项目 / 附件，这次没有自动并。`);
+    warn('要切到共用数据根，先退出所有 dsh，再运行: dsh-workbench migrate');
+    return;
+  }
+  applySharedConfig(state);
+}
+
+function migrate() {
+  const state = inspectProfile();
+  if (state === null) {
+    warn(`找不到 ${PATCH_PATH}，先运行 dsh-workbench setup。`);
+    return 1;
+  }
+  if (state.custom.length > 0) {
+    warn(customRootMessage(state));
+    return 1;
+  }
+  if (!legacyDataExists()) {
+    applySharedConfig(state);
+    say(`没有发现 ${RUNTIME_ROOT} 里的旧数据，数据根已经是共用的。`);
+    return 0;
+  }
+  if (existsSync(MARKER) && !FORCE) {
+    const missing = missingWorkspacePaths();
+    if (missing.length > 0) {
+      say(`已经迁过一次；旧目录里还有 ${missing.length} 个项目不在共用根：${missing.join('、')}。要补并加 --force（这次 profile 保持原样）。`);
+      return 0;
+    }
+    applySharedConfig(state);
+    say('已经迁过一次；要再并一次加 --force。');
+    return 0;
+  }
+  warn('迁移前先退出所有 dsh（:3080 / :3081）；否则正在运行的实例可能覆盖刚并好的数据。');
+  const result = mergeDataRoot();
+  if (result === null) {
+    warn('这次没有迁移；profile 和旧数据都保持原样。');
+    return 1;
+  }
+  writeMarker();
+  applySharedConfig(state);
+  say(`迁移完成：新增 ${result.added} 个项目，补了 ${result.files} 个文件；旧目录保留。`);
+  return 0;
 }
 
 function stripIsolationHeader(text, blockStart) {
@@ -174,38 +409,11 @@ function stripIsolationHeader(text, blockStart) {
   return lines.join('\n');
 }
 
+const MIGRATE = process.argv.includes('--migrate') || process.argv.includes('migrate');
+const FORCE = process.argv.includes('--force');
+
 const profileManifest = join(PROFILE_DIR, 'package.json');
 if (!existsSync(profileManifest)) process.exit(0);
 
-let patch = readText(PATCH_PATH);
-if (patch === null) process.exit(0);
-
-const legacy = parseBlocks(patch).filter((block) => DATA_ROOT_IDS.has(block.id));
-const ours = legacy.filter((block) => OWN_ROOT.test(block.body));
-const custom = legacy.filter((block) => !OWN_ROOT.test(block.body));
-if (ours.length > 0) {
-  const first = Math.min(...ours.map((block) => block.lineStart));
-  patch = stripIsolationHeader(patch, first);
-  patch = removeBlocks(patch, (block) => DATA_ROOT_IDS.has(block.id) && OWN_ROOT.test(block.body));
-  writeAtomic(PATCH_PATH, patch);
-  say(`数据根改回共用：从 ${PROFILE} 的 profile 里去掉 ${ours.map((block) => block.id).join(' / ')}。`);
-}
-
-const hasSandbox = parseBlocks(patch).some((block) => block.id === 'sandbox-policy');
-if (!hasSandbox) {
-  const sandbox = readText(SANDBOX_PATCH);
-  const row = sandbox === null ? undefined : parseBlocks(sandbox).find((block) => block.id === 'sandbox-policy');
-  if (row !== undefined) {
-    patch = appendBlocks(patch, row.body);
-    writeAtomic(PATCH_PATH, patch);
-  }
-}
-
-if (custom.length > 0) {
-  warn(
-    `${PROFILE} 的会话 / 存储根是你自己改过的（${custom.map((block) => block.id).join(' / ')}）—— 这次不动它，也不并数据。`,
-  );
-  process.exit(0);
-}
-
-mergeDataRoot();
+if (MIGRATE) process.exit(migrate());
+configureDefault();