@jingyi0605/codingns4dsh 0.2.0-beta.2 → 0.2.0-rc.3

package/data/build/dist/client/peer-host-native-projection.d.ts

@@ -18,6 +18,7 @@ export interface PeerHostVirtualSessionSummary {
     readonly running: boolean;
     readonly blank: boolean;
     readonly cwd?: string;
+    readonly adapterId?: string;
     readonly projections: {
         readonly kind: 'cached';
         readonly values: {
@@ -27,7 +28,13 @@ export interface PeerHostVirtualSessionSummary {
 }
 export interface PeerHostNativeProjection {
     /** 记录新的聚合快照；返回 true 表示与上一次不同，调用方据此刷新原生数据。 */
-    setAggregate(results: readonly AggregateHostResult[]): boolean;
+    setAggregate(results: readonly AggregateHostResult[], orderedWorkspaceIds?: readonly string[]): boolean;
+    /** 更新 Host 侧持久化的全局 Workspace 顺序；顺序变化必须触发原生 Store 刷新。 */
+    setWorkspaceOrder(orderedWorkspaceIds: readonly string[]): boolean;
+    /** 当前 Host 侧返回的混合 Workspace 顺序。 */
+    workspaceOrder(): readonly string[];
+    /** 当前本地 Host 的稳定 ID，用于把原生裸 Workspace ID 映射到虚拟顺序 ID。 */
+    localHostId(): string | undefined;
     /** 当前全部虚拟工作区（供原生 Workspace Store 合并）。 */
     workspaces(): readonly PeerHostVirtualWorkspaceView[];
     /** 当前全部虚拟会话摘要（供 `session/list` 响应合并）。 */
@@ -35,6 +42,15 @@ export interface PeerHostNativeProjection {
     /** 订阅聚合变化；原生 Store 的订阅会转发到这里。 */
     subscribe(listener: () => void): () => void;
 }
+/**
+ * 为混合工作区生成只用于原生侧栏树归属的稳定路径。
+ *
+ * DSH 会把 `workspace.path` 的目录前缀关系解释成父子工作区。不同 Host 的真实
+ * 路径以及本地工作区之间都可能发生前缀重叠，因此列表层不能继续暴露真实目录。
+ * 这里使用不对应本机文件系统的 URI，并把完整虚拟 ID 编码成单一段，保证所有
+ * 工作区都是同一层的兄弟节点。文件和会话请求仍使用所属 Host 的真实路径。
+ */
+export declare function createPeerHostWorkspaceDisplayPath(virtualWorkspaceId: string): string;
 /**
  * 把 PeerHost 聚合摘要投影成 DSH 原生列表可直接消费的虚拟资源。
  *

package/data/build/dist/client/peer-host-native-projection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer-host-native-projection.d.ts","sourceRoot":"","sources":["../../../../src/client/peer-host-native-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAoD,MAAM,kCAAkC,CAAA;AAG7H,kEAAkE;AAClE,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,oCAAoC;IACpC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,MAAM,EAAE,CAAA;IAC9C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B;AAED,iEAAiE;AACjE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAC/F;AAED,MAAM,WAAW,wBAAwB;IACvC,6CAA6C;IAC7C,YAAY,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,GAAG,OAAO,CAAA;IAC9D,yCAAyC;IACzC,UAAU,IAAI,SAAS,4BAA4B,EAAE,CAAA;IACrD,yCAAyC;IACzC,QAAQ,IAAI,SAAS,6BAA6B,EAAE,CAAA;IACpD,iCAAiC;IACjC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,IAAI,wBAAwB,CAwBzE"}
+{"version":3,"file":"peer-host-native-projection.d.ts","sourceRoot":"","sources":["../../../../src/client/peer-host-native-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAoD,MAAM,kCAAkC,CAAA;AAI7H,kEAAkE;AAClE,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,oCAAoC;IACpC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,MAAM,EAAE,CAAA;IAC9C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B;AAED,iEAAiE;AACjE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAC/F;AAED,MAAM,WAAW,wBAAwB;IACvC,6CAA6C;IAC7C,YAAY,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EAAE,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAA;IACvG,wDAAwD;IACxD,iBAAiB,CAAC,mBAAmB,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAA;IAClE,mCAAmC;IACnC,cAAc,IAAI,SAAS,MAAM,EAAE,CAAA;IACnC,uDAAuD;IACvD,WAAW,IAAI,MAAM,GAAG,SAAS,CAAA;IACjC,yCAAyC;IACzC,UAAU,IAAI,SAAS,4BAA4B,EAAE,CAAA;IACrD,yCAAyC;IACzC,QAAQ,IAAI,SAAS,6BAA6B,EAAE,CAAA;IACpD,iCAAiC;IACjC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAErF;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,IAAI,wBAAwB,CA8CzE"}

package/data/build/dist/client/peer-host-native-projection.js

@@ -1,4 +1,16 @@
 import { createVirtualSessionId, createVirtualWorkspaceId } from '../shared/contracts/peer-host.js';
+import { publishSessionAdapter } from './session-adapter-cache.js';
+/**
+ * 为混合工作区生成只用于原生侧栏树归属的稳定路径。
+ *
+ * DSH 会把 `workspace.path` 的目录前缀关系解释成父子工作区。不同 Host 的真实
+ * 路径以及本地工作区之间都可能发生前缀重叠，因此列表层不能继续暴露真实目录。
+ * 这里使用不对应本机文件系统的 URI，并把完整虚拟 ID 编码成单一段，保证所有
+ * 工作区都是同一层的兄弟节点。文件和会话请求仍使用所属 Host 的真实路径。
+ */
+export function createPeerHostWorkspaceDisplayPath(virtualWorkspaceId) {
+    return `codingns-peer-host://${encodeURIComponent(virtualWorkspaceId)}`;
+}
 /**
  * 把 PeerHost 聚合摘要投影成 DSH 原生列表可直接消费的虚拟资源。
  *
@@ -9,20 +21,44 @@ import { createVirtualSessionId, createVirtualWorkspaceId } from '../shared/cont
 export function createPeerHostNativeProjection() {
     let workspaces = [];
     let sessions = [];
+    let orderedWorkspaceIds = [];
+    let localHostId;
     const listeners = new Set();
     return {
-        setAggregate(results) {
+        setAggregate(results, nextOrderedWorkspaceIds) {
             const next = projectAggregate(results);
-            const changed = !sameWorkspaces(workspaces, next.workspaces) || !sameSessions(sessions, next.sessions);
+            // 某次摘要失败可能暂时不带本地 Host；保留上一次稳定 ID，避免原生裸 ID
+            // 在这一轮被误当成未知项而跳到远端工作区之后。
+            const nextLocalHostId = next.localHostId ?? localHostId;
+            const nextOrder = nextOrderedWorkspaceIds === undefined
+                ? orderedWorkspaceIds
+                : normalizeWorkspaceOrder(nextOrderedWorkspaceIds);
+            const changed = !sameWorkspaces(workspaces, next.workspaces)
+                || !sameSessions(sessions, next.sessions)
+                || !sameIds(orderedWorkspaceIds, nextOrder)
+                || localHostId !== nextLocalHostId;
             if (!changed)
                 return false;
             // 无变化时保留原引用：下游 Store 快照与 useSyncExternalStore 依赖引用稳定。
             workspaces = next.workspaces;
             sessions = next.sessions;
+            orderedWorkspaceIds = sameIds(orderedWorkspaceIds, nextOrder) ? orderedWorkspaceIds : nextOrder;
+            localHostId = nextLocalHostId;
+            for (const listener of [...listeners])
+                listener();
+            return true;
+        },
+        setWorkspaceOrder(nextOrderedWorkspaceIds) {
+            const next = normalizeWorkspaceOrder(nextOrderedWorkspaceIds);
+            if (sameIds(orderedWorkspaceIds, next))
+                return false;
+            orderedWorkspaceIds = next;
             for (const listener of [...listeners])
                 listener();
             return true;
         },
+        workspaceOrder: () => orderedWorkspaceIds,
+        localHostId: () => localHostId,
         workspaces: () => workspaces,
         sessions: () => sessions,
         subscribe(listener) {
@@ -36,6 +72,7 @@ export function createPeerHostNativeProjection() {
 function projectAggregate(results) {
     const workspaces = [];
     const sessions = [];
+    const localHostId = results.find((host) => host.targetHostId === null)?.hostId;
     for (const host of results) {
         // 本地 Host 的资源由 DSH 自己提供；只投影远端，避免与原生条目重复。
         if (host.targetHostId === null)
@@ -47,13 +84,17 @@ function projectAggregate(results) {
             sessions.push(...projected.sessions);
         }
     }
-    return { workspaces, sessions };
+    return { workspaces, sessions, localHostId };
+}
+function normalizeWorkspaceOrder(ids) {
+    return [...new Set(ids.filter((id) => typeof id === 'string' && id.trim() !== ''))];
 }
 function projectWorkspace(virtualHostId, workspace) {
     const virtualWorkspaceId = createVirtualWorkspaceId(virtualHostId, workspace.workspaceId);
-    // 原生文件面板按工作区 path 解析目录，必须用远端真实根目录而不是 workspaceId，
-    // 否则目标端会拿 workspaceId 当文件路径并报 `no entry at "<workspaceId>"`。
-    const path = workspace.path;
+    // 真实路径保留给会话摘要和远端请求；Workspace Store 的 path 使用独立显示值，
+    // 防止 DSH 把本地与远端目录前缀识别成父子关系。
+    const displayPath = createPeerHostWorkspaceDisplayPath(virtualWorkspaceId);
+    const realPath = workspace.path;
     const sessionIds = [];
     const archivedSessionIds = [];
     const sessions = [];
@@ -66,7 +107,7 @@ function projectWorkspace(virtualHostId, workspace) {
         sessionIds.push(virtualSessionId);
         if (archived)
             archivedSessionIds.push(virtualSessionId);
-        sessions.push(projectSession(virtualSessionId, session, path));
+        sessions.push(projectSession(virtualSessionId, session, realPath));
         updatedAt = Math.max(updatedAt, session.updatedAt);
     };
     for (const session of workspace.sessions)
@@ -76,7 +117,7 @@ function projectWorkspace(virtualHostId, workspace) {
     return {
         workspace: {
             workspaceId: virtualWorkspaceId,
-            path,
+            path: displayPath,
             // Host 归属不再写进标题文本：侧栏由彩色标签表达，标题保持干净，可搜索、
             // 可重命名，也不会污染 hover 卡片与重命名初值。
             title: workspace.displayName,
@@ -90,6 +131,8 @@ function projectWorkspace(virtualHostId, workspace) {
     };
 }
 function projectSession(virtualSessionId, session, cwd) {
+    if (session.adapterId !== undefined)
+        publishSessionAdapter(virtualSessionId, session.adapterId);
     return {
         agentAvailable: true,
         sessionId: virtualSessionId,
@@ -100,6 +143,7 @@ function projectSession(virtualSessionId, session, cwd) {
         cwd,
         // DSH 列表行的标题只读投影值：cached 块只填没有原生水位的键，适合跨 Host 摘要。
         projections: { kind: 'cached', values: { title: session.title } },
+        ...(session.adapterId === undefined ? {} : { adapterId: session.adapterId }),
     };
 }
 function sameWorkspaces(previous, next) {
@@ -131,6 +175,8 @@ function sameSessions(previous, next) {
             && session.updatedAt === candidate.updatedAt
             && session.running === candidate.running
             && session.blank === candidate.blank
+            && session.cwd === candidate.cwd
+            && session.adapterId === candidate.adapterId
             && session.projections.values.title === candidate.projections.values.title;
     });
 }

package/data/build/dist/client/peer-host-native-projection.js.map

@@ -1 +1 @@
-{"version":3,"file":"peer-host-native-projection.js","sourceRoot":"","sources":["../../../../src/client/peer-host-native-projection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"peer-host-native-projection.js","sourceRoot":"","sources":["../../../../src/client/peer-host-native-projection.ts"],"names":[],"mappings":"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"}

package/data/build/dist/client/peer-host-native-store-projection.d.ts

@@ -1,15 +1,19 @@
 import type { Context } from '@deepseek-ai/cordis';
-import type { PeerHostNativeProjection } from './peer-host-native-projection.js';
+import { type PeerHostNativeProjection } from './peer-host-native-projection.js';
 /**
  * 把虚拟工作区就地投影进 DSH 原生 Workspace Store。
  *
  * 原生侧栏在插件 apply 时按引用捕获 `workspaces.list`（`slots.provideRoot` 的 hooks
  * 与组件字段持有的是同一个对象），替换服务属性对它不可见；因此这里只改写这个对象
- * 自己的读取方法，写入口保持原生行为，禁用 PeerHost 后可以原样还原。
+ * 自己的读取方法，并就地包装拖拽写入口，禁用 PeerHost 后可以原样还原。
  */
 export declare function installPeerHostNativeStoreProjection(input: {
     readonly uiContext: Context | undefined;
     readonly projection: PeerHostNativeProjection;
+    /** 将原生拖拽写入 Host 侧持久化的混合顺序。 */
+    readonly moveWorkspace?: (virtualWorkspaceId: string, beforeVirtualWorkspaceId: string | null) => Promise<readonly string[]>;
+    /** 拖拽发生在首次聚合完成前时，主动刷新 Host 顺序并更新投影。 */
+    readonly refreshWorkspaceOrder?: () => Promise<readonly string[]>;
 }): () => void;
 /**
  * 触发一次原生会话列表刷新。

package/data/build/dist/client/peer-host-native-store-projection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer-host-native-store-projection.d.ts","sourceRoot":"","sources":["../../../../src/client/peer-host-native-store-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,wBAAwB,EAAgC,MAAM,kCAAkC,CAAA;AAG9G;;;;;;GAMG;AACH,wBAAgB,oCAAoC,CAAC,KAAK,EAAE;IAC1D,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,UAAU,EAAE,wBAAwB,CAAA;CAC9C,GAAG,MAAM,IAAI,CAmCb;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CASjG"}
+{"version":3,"file":"peer-host-native-store-projection.d.ts","sourceRoot":"","sources":["../../../../src/client/peer-host-native-store-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAsC,KAAK,wBAAwB,EAAqC,MAAM,kCAAkC,CAAA;AAcvJ;;;;;;GAMG;AACH,wBAAgB,oCAAoC,CAAC,KAAK,EAAE;IAC1D,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,UAAU,EAAE,wBAAwB,CAAA;IAC7C,8BAA8B;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,MAAM,EAAE,wBAAwB,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAA;IAC5H,uCAAuC;IACvC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAA;CAClE,GAAG,MAAM,IAAI,CAwDb;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CASjG"}

package/data/build/dist/client/peer-host-native-store-projection.js

@@ -1,32 +1,46 @@
+import { createPeerHostWorkspaceDisplayPath } from './peer-host-native-projection.js';
+import { createVirtualWorkspaceId, parseVirtualWorkspaceId } from '../shared/contracts/peer-host.js';
 import { readNativeService, readNativeWorkspaceListStore } from './native-workspace-store.js';
 /**
  * 把虚拟工作区就地投影进 DSH 原生 Workspace Store。
  *
  * 原生侧栏在插件 apply 时按引用捕获 `workspaces.list`（`slots.provideRoot` 的 hooks
  * 与组件字段持有的是同一个对象），替换服务属性对它不可见；因此这里只改写这个对象
- * 自己的读取方法，写入口保持原生行为，禁用 PeerHost 后可以原样还原。
+ * 自己的读取方法，并就地包装拖拽写入口，禁用 PeerHost 后可以原样还原。
  */
 export function installPeerHostNativeStoreProjection(input) {
     const store = readNativeWorkspaceListStore(input.uiContext);
     if (store === undefined)
         return () => undefined;
+    const service = readNativeService(input.uiContext, 'workspaces');
+    const serviceRecord = isRecord(service) ? service : undefined;
+    const sessionStoreValue = readNativeService(input.uiContext, 'sessions', 'list');
+    const sessionStore = isSnapshotStore(sessionStoreValue) ? sessionStoreValue : undefined;
     const ownsGetSnapshot = Object.hasOwn(store, 'getSnapshot');
     const ownsSubscribe = Object.hasOwn(store, 'subscribe');
     const originalGetSnapshot = store.getSnapshot;
     const originalSubscribe = store.subscribe;
+    const originalInsertBefore = serviceRecord?.insertBefore;
+    const ownsInsertBefore = serviceRecord === undefined ? false : Object.hasOwn(serviceRecord, 'insertBefore');
     // `useSyncExternalStore` 要求快照引用稳定：按（原生快照, 虚拟资源）两个引用记忆化，
     // 聚合没变时返回同一个合并结果，避免原生组件无限重渲染。
     let cachedBase;
     let cachedVirtual;
+    let cachedOrder;
+    let cachedLocalHostId;
     let cachedMerged;
     store.getSnapshot = function patchedGetSnapshot() {
         const base = originalGetSnapshot.call(this);
         const virtual = input.projection.workspaces();
-        if (base === cachedBase && virtual === cachedVirtual)
+        const order = input.projection.workspaceOrder();
+        const localHostId = input.projection.localHostId();
+        if (base === cachedBase && virtual === cachedVirtual && order === cachedOrder && localHostId === cachedLocalHostId)
             return cachedMerged;
         cachedBase = base;
         cachedVirtual = virtual;
-        cachedMerged = mergeWorkspaceSnapshot(base, virtual);
+        cachedOrder = order;
+        cachedLocalHostId = localHostId;
+        cachedMerged = mergeWorkspaceSnapshot(base, virtual, order, localHostId);
         return cachedMerged;
     };
     store.subscribe = function patchedSubscribe(listener) {
@@ -37,6 +51,8 @@ export function installPeerHostNativeStoreProjection(input) {
             disposeStore();
         };
     };
+    const patchedInsertBefore = installWorkspaceInsertBeforeProjection(serviceRecord, originalInsertBefore, input);
+    const restoreSessionStore = installSessionDisplayPathProjection(store, sessionStore);
     return () => {
         if (ownsGetSnapshot)
             store.getSnapshot = originalGetSnapshot;
@@ -46,6 +62,17 @@ export function installPeerHostNativeStoreProjection(input) {
             store.subscribe = originalSubscribe;
         else
             delete store.subscribe;
+        if (serviceRecord !== undefined && patchedInsertBefore !== undefined && serviceRecord.insertBefore === patchedInsertBefore) {
+            if (ownsInsertBefore) {
+                if (originalInsertBefore === undefined)
+                    delete serviceRecord.insertBefore;
+                else
+                    serviceRecord.insertBefore = originalInsertBefore;
+            }
+            else
+                delete serviceRecord.insertBefore;
+        }
+        restoreSessionStore();
     };
 }
 /**
@@ -66,25 +93,293 @@ export async function refreshPeerHostNativeSessions(uiContext) {
         // 原生刷新失败只影响远端会话可见性，本机列表保持可用。
     }
 }
-/** 原生快照追加虚拟工作区与虚拟归档集合；快照形状不符时原样返回，注入失败不影响本机数据。 */
-function mergeWorkspaceSnapshot(snapshot, virtual) {
+/** 合并并按 Host 侧顺序排列工作区；快照形状不符时原样返回，注入失败不影响本机数据。 */
+function mergeWorkspaceSnapshot(snapshot, virtual, orderedWorkspaceIds, localHostId) {
     const record = asRecord(snapshot);
-    if (record === null || !Array.isArray(record.items) || virtual.length === 0)
+    if (record === null || !Array.isArray(record.items))
         return snapshot;
-    const known = new Set(record.items.flatMap((item) => {
+    const items = record.items;
+    const known = new Set(items.flatMap((item) => {
         const workspaceId = asRecord(item)?.workspaceId;
-        return typeof workspaceId === 'string' ? [workspaceId] : [];
+        if (typeof workspaceId !== 'string')
+            return [];
+        const normalized = normalizeWorkspaceId(workspaceId, localHostId);
+        return normalized === workspaceId ? [workspaceId] : [workspaceId, normalized];
     }));
     const injected = virtual.filter((workspace) => !known.has(workspace.workspaceId));
     const archivedSessionIds = mergeArchivedSessionIds(record.archivedSessionIds, virtual);
-    if (injected.length === 0 && archivedSessionIds === undefined)
+    const orderedItems = orderWorkspaceItems([...items, ...injected], orderedWorkspaceIds, localHostId);
+    const mergedItems = normalizeWorkspaceDisplayPaths(orderedItems, localHostId);
+    const itemsChanged = mergedItems.length !== items.length || mergedItems.some((item, index) => item !== items[index]);
+    if (!itemsChanged && archivedSessionIds === undefined)
         return snapshot;
     return {
         ...record,
-        items: [...record.items, ...injected],
+        items: mergedItems,
         ...(archivedSessionIds === undefined ? {} : { archivedSessionIds }),
     };
 }
+/**
+ * 原生 Remote 返回的远端工作区可能已经存在于底层 Store，此时不会走 injected
+ * 分支；本地条目也可能因真实目录前缀形成树层级。按虚拟 ID统一规范化 path，
+ * 保证所有工作区在 DSH 列表中都是同层兄弟节点。
+ */
+function normalizeWorkspaceDisplayPaths(items, localHostId) {
+    let changed = false;
+    const normalized = items.map((item) => {
+        const record = asRecord(item);
+        const workspaceId = record?.workspaceId;
+        if (record === null || typeof workspaceId !== 'string')
+            return item;
+        const parsed = parseVirtualWorkspaceId(workspaceId);
+        // 底层 Store 的本地条目仍是裸 ID；聚合确认本地 Host 后也为它们生成
+        // 虚拟显示路径，消除本地工作区之间原有的目录树父子关系，保证远端可以
+        // 与任意本地条目互相拖拽。
+        const virtualWorkspaceId = parsed !== null
+            ? workspaceId
+            : localHostId === undefined ? undefined : createVirtualWorkspaceId(localHostId, workspaceId);
+        if (virtualWorkspaceId === undefined)
+            return item;
+        const displayPath = createPeerHostWorkspaceDisplayPath(virtualWorkspaceId);
+        if (record.path === displayPath)
+            return item;
+        changed = true;
+        return { ...record, path: displayPath };
+    });
+    return changed ? normalized : items;
+}
+/**
+ * 原生会话列表只把空白会话的 cwd 用于判断是否能复用。工作区树扁平化后，
+ * 让空白行看到同一个显示路径即可保留该判断；正式会话继续保留真实 cwd，
+ * 避免 Git、文件面板或远端工具拿到虚拟 URI。
+ */
+function installSessionDisplayPathProjection(workspaceStore, sessionStore) {
+    if (sessionStore === undefined)
+        return () => undefined;
+    const originalGetSnapshot = sessionStore.getSnapshot;
+    const originalSubscribe = sessionStore.subscribe;
+    const ownsGetSnapshot = Object.hasOwn(sessionStore, 'getSnapshot');
+    const ownsSubscribe = Object.hasOwn(sessionStore, 'subscribe');
+    let cachedBase;
+    let cachedWorkspaceSnapshot;
+    let cachedMerged;
+    const patchedGetSnapshot = function patchedSessionGetSnapshot() {
+        const base = originalGetSnapshot.call(this);
+        const workspaceSnapshot = workspaceStore.getSnapshot();
+        if (base === cachedBase && workspaceSnapshot === cachedWorkspaceSnapshot)
+            return cachedMerged;
+        cachedBase = base;
+        cachedWorkspaceSnapshot = workspaceSnapshot;
+        cachedMerged = mergeBlankSessionCwds(base, workspaceSnapshot);
+        return cachedMerged;
+    };
+    const patchedSubscribe = function patchedSessionSubscribe(listener) {
+        const disposeStore = originalSubscribe.call(this, listener);
+        const disposeWorkspace = workspaceStore.subscribe(listener);
+        return () => {
+            disposeWorkspace();
+            disposeStore();
+        };
+    };
+    sessionStore.getSnapshot = patchedGetSnapshot;
+    sessionStore.subscribe = patchedSubscribe;
+    return () => {
+        if (sessionStore.getSnapshot === patchedGetSnapshot) {
+            if (ownsGetSnapshot)
+                sessionStore.getSnapshot = originalGetSnapshot;
+            else
+                delete sessionStore.getSnapshot;
+        }
+        if (sessionStore.subscribe === patchedSubscribe) {
+            if (ownsSubscribe)
+                sessionStore.subscribe = originalSubscribe;
+            else
+                delete sessionStore.subscribe;
+        }
+    };
+}
+function mergeBlankSessionCwds(snapshot, workspaceSnapshot) {
+    const state = asRecord(snapshot);
+    const byId = state?.byId;
+    const workspaceState = asRecord(workspaceSnapshot);
+    const items = Array.isArray(workspaceState?.items) ? workspaceState.items : [];
+    if (state === null || !isRecord(byId) || items.length === 0)
+        return snapshot;
+    let changed = false;
+    const nextById = { ...byId };
+    for (const [id, value] of Object.entries(byId)) {
+        const session = asRecord(value);
+        if (session === null || session.blank !== true)
+            continue;
+        const workspace = items.find((item) => {
+            const record = asRecord(item);
+            return Array.isArray(record?.sessionIds) && record.sessionIds.includes(id);
+        });
+        const displayPath = asRecord(workspace)?.path;
+        if (typeof displayPath !== 'string' || displayPath === '' || session.cwd === displayPath)
+            continue;
+        nextById[id] = { ...session, cwd: displayPath };
+        changed = true;
+    }
+    return changed ? { ...state, byId: nextById } : snapshot;
+}
+function installWorkspaceInsertBeforeProjection(service, original, input) {
+    const moveWorkspace = input.moveWorkspace;
+    if (service === undefined || typeof original !== 'function' || moveWorkspace === undefined)
+        return undefined;
+    const originalInsertBefore = original;
+    // 原生拖拽可能在上一次 RPC 尚未返回时再次触发；串行化移动，保证后一个操作
+    // 基于已经确认的顺序计算，避免响应乱序把列表写回旧位置。
+    let moveQueue = Promise.resolve();
+    const execute = async function (workspaceId, beforeWorkspaceId) {
+        if (typeof workspaceId !== 'string')
+            return callOriginalInsertBefore(originalInsertBefore, this, workspaceId, beforeWorkspaceId);
+        let localHostId = input.projection.localHostId();
+        let sourceVirtualId = normalizeWorkspaceId(workspaceId, localHostId);
+        let beforeVirtualId = beforeWorkspaceId === undefined || beforeWorkspaceId === null
+            ? null
+            : typeof beforeWorkspaceId === 'string' ? normalizeWorkspaceId(beforeWorkspaceId, localHostId) : null;
+        const sourceIsVirtual = parseVirtualWorkspaceId(workspaceId) !== null;
+        const beforeIsVirtual = typeof beforeWorkspaceId === 'string' && parseVirtualWorkspaceId(beforeWorkspaceId) !== null;
+        let previousOrder = input.projection.workspaceOrder();
+        // 本地原生条目在 localHostId 尚未从聚合快照到达时仍是裸 ID；Host 端会按
+        // 本地注册表把它解析成虚拟 ID，因此这类输入也可以先提交。远端虚拟 ID
+        // 必须保持合法格式，不能把任意字符串交给顺序 RPC。
+        const idsReady = () => (sourceVirtualId !== null || !sourceIsVirtual)
+            && (beforeWorkspaceId === undefined || beforeWorkspaceId === null || beforeVirtualId !== null || !beforeIsVirtual);
+        // 原生 Remote 可能先把虚拟工作区写入列表，聚合摘要随后才到达。
+        // 顺序快照暂时缺少该 ID 并不意味着拖拽无效；Host Registry 会把合法的
+        // 虚拟 ID作为延迟聚合/离线墓碑纳入顺序文件，不能在客户端提前拒绝。
+        const orderReady = () => idsReady();
+        // 裸本地 ID可以由 Host 端按稳定 localHostId 解析；拖拽路径不能为了补齐
+        // 聚合摘要而同步等待远端超时。顺序快照缺项也由 Host Registry 记录墓碑。
+        const needsHydration = !idsReady();
+        if ((needsHydration || !orderReady()) && input.refreshWorkspaceOrder !== undefined) {
+            try {
+                const refreshedOrder = await input.refreshWorkspaceOrder();
+                input.projection.setWorkspaceOrder(refreshedOrder);
+                previousOrder = input.projection.workspaceOrder();
+                localHostId = input.projection.localHostId();
+                sourceVirtualId = normalizeWorkspaceId(workspaceId, localHostId);
+                beforeVirtualId = beforeWorkspaceId === undefined || beforeWorkspaceId === null
+                    ? null
+                    : typeof beforeWorkspaceId === 'string' ? normalizeWorkspaceId(beforeWorkspaceId, localHostId) : null;
+            }
+            catch {
+                // 下面统一走稳定的拒绝分支；不要把网络或旧 Host 错误透传给原生 Controller。
+            }
+        }
+        if (!idsReady() || !orderReady()) {
+            if (sourceIsVirtual || beforeIsVirtual)
+                throw new Error('PeerHost Workspace 顺序尚未就绪，拒绝把虚拟 ID发给原生 Host');
+            return callOriginalInsertBefore(originalInsertBefore, this, workspaceId, beforeWorkspaceId);
+        }
+        if (sourceVirtualId === null && sourceIsVirtual) {
+            if (sourceIsVirtual || beforeIsVirtual)
+                throw new Error('PeerHost Workspace 顺序尚未就绪，拒绝把虚拟 ID发给原生 Host');
+            return callOriginalInsertBefore(originalInsertBefore, this, workspaceId, beforeWorkspaceId);
+        }
+        if (beforeWorkspaceId !== undefined && beforeWorkspaceId !== null && beforeVirtualId === null && beforeIsVirtual) {
+            throw new Error('PeerHost Workspace 顺序尚未就绪，拒绝把虚拟 ID发给原生 Host');
+        }
+        const sourceId = sourceVirtualId ?? workspaceId;
+        const beforeId = beforeVirtualId ?? (typeof beforeWorkspaceId === 'string' ? beforeWorkspaceId : null);
+        const previousBefore = previousOrder[previousOrder.indexOf(sourceId) + 1] ?? null;
+        // 先更新投影，原生侧栏可以立即完成布局；Host 顺序 RPC 只负责持久化。
+        // 网络失败时恢复拖拽前的顺序，避免显示层与持久层分叉。
+        const optimisticOrder = moveWorkspaceOrder(previousOrder, sourceId, beforeId);
+        input.projection.setWorkspaceOrder(optimisticOrder);
+        let nextOrder;
+        try {
+            nextOrder = await moveWorkspace(sourceId, beforeId);
+        }
+        catch (error) {
+            input.projection.setWorkspaceOrder(previousOrder);
+            throw error;
+        }
+        input.projection.setWorkspaceOrder(nextOrder);
+        // 远端条目没有本机实体；跨 Host 拖动只需要更新 Host 侧顺序。涉及本地项时，
+        // 仍让原生 Controller 更新自己的局部顺序，避免 DSH 的本地 Store 失去写入语义。
+        if (!sourceIsVirtual && (beforeWorkspaceId === undefined || beforeWorkspaceId === null || !beforeIsVirtual)) {
+            try {
+                await callOriginalInsertBefore(originalInsertBefore, this, workspaceId, beforeWorkspaceId);
+            }
+            catch (error) {
+                if (previousOrder.includes(sourceId)) {
+                    try {
+                        const rollbackOrder = await moveWorkspace(sourceId, previousBefore);
+                        input.projection.setWorkspaceOrder(rollbackOrder);
+                    }
+                    catch {
+                        // Host 侧顺序已经成功写入时，原生 Controller 失败不应掩盖原始错误。
+                    }
+                }
+                throw error;
+            }
+        }
+        return undefined;
+    };
+    const patched = function (workspaceId, beforeWorkspaceId) {
+        const operation = moveQueue.then(() => execute.call(this, workspaceId, beforeWorkspaceId));
+        moveQueue = operation.then(() => undefined, () => undefined);
+        return operation;
+    };
+    service.insertBefore = patched;
+    return patched;
+}
+/** 在等待 Host 应答期间计算本地混合顺序；缺失项按墓碑锚点规则补入。 */
+function moveWorkspaceOrder(current, sourceId, beforeId) {
+    const next = current.filter((id) => id !== sourceId);
+    if (beforeId !== null && !next.includes(beforeId))
+        next.push(beforeId);
+    if (beforeId === null)
+        next.push(sourceId);
+    else
+        next.splice(next.indexOf(beforeId), 0, sourceId);
+    return next;
+}
+function callOriginalInsertBefore(original, receiver, workspaceId, beforeWorkspaceId) {
+    if (beforeWorkspaceId === undefined || beforeWorkspaceId === null)
+        return original.call(receiver, workspaceId);
+    return original.call(receiver, workspaceId, beforeWorkspaceId);
+}
+function orderWorkspaceItems(items, orderedWorkspaceIds, localHostId) {
+    if (orderedWorkspaceIds.length === 0 || items.length < 2)
+        return items;
+    // 本地摘要短暂不可用时，Host 端 order 只会返回远端活动项；此时不能把本机
+    // 原生条目误判成“未知新项”并整体推到远端之后，保留原生顺序等待下一轮聚合。
+    if (localHostId === undefined && items.some((item) => {
+        const workspaceId = asRecord(item)?.workspaceId;
+        return typeof workspaceId === 'string' && parseVirtualWorkspaceId(workspaceId) === null;
+    }))
+        return items;
+    const hasLocalItem = localHostId !== undefined && items.some((item) => {
+        const workspaceId = asRecord(item)?.workspaceId;
+        return typeof workspaceId === 'string' && parseVirtualWorkspaceId(workspaceId) === null;
+    });
+    const hasLocalOrder = localHostId !== undefined && orderedWorkspaceIds.some((id) => parseVirtualWorkspaceId(id)?.hostId === localHostId);
+    if (hasLocalItem && !hasLocalOrder)
+        return items;
+    const ranks = new Map(orderedWorkspaceIds.map((id, index) => [id, index]));
+    const entries = items.map((item, index) => {
+        const workspaceId = asRecord(item)?.workspaceId;
+        const normalized = typeof workspaceId === 'string' ? normalizeWorkspaceId(workspaceId, localHostId) : null;
+        return { item, index, normalized };
+    });
+    // 聚合与顺序 RPC 可能跨越一次刷新边界：若当前快照中有条目尚未出现在
+    // 顺序列表，暂时保留原生顺序，避免把该条目错误地推到列表尾部造成抖动。
+    if (entries.some((entry) => entry.normalized === null || !ranks.has(entry.normalized)))
+        return items;
+    return entries
+        .map((entry) => ({ ...entry, rank: ranks.get(entry.normalized) }))
+        .sort((left, right) => left.rank - right.rank || left.index - right.index)
+        .map((entry) => entry.item);
+}
+function normalizeWorkspaceId(workspaceId, localHostId) {
+    if (parseVirtualWorkspaceId(workspaceId) !== null)
+        return workspaceId;
+    return localHostId === undefined ? null : createVirtualWorkspaceId(localHostId, workspaceId);
+}
 /**
  * 把虚拟归档会话并入 Registry 级归档集合。
  *
@@ -111,4 +406,7 @@ function asRecord(value) {
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+function isSnapshotStore(value) {
+    return isRecord(value) && typeof value.getSnapshot === 'function' && typeof value.subscribe === 'function';
+}
 //# sourceMappingURL=peer-host-native-store-projection.js.map