dsh-git-worktree 0.7.3 → 0.7.4

package/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## [Unreleased]
 
+## [0.7.4] - 2026-09-04
+
+`0.7.4` 修复 `0.7.3` 在 DeepSeek Harness `0.1.2-rc.1` Web Client 中的启动循环依赖。插件现在先恢复被受控派生替换的官方 `uiWorkspace` 服务，再延迟加载依赖 Conversation 的 Worktree 界面。
+
+### Fixed
+
+- 将官方 Workspace Client 与 Worktree ToolView/Pre-session/Target/Review UI 拆分为两个 Cordis 激活阶段，消除 `dsh-git-worktree → conversation → uiWorkspace → dsh-git-worktree` 循环等待。
+- 顶层 Client fiber 只等待官方 Workspace 的公开 prerequisites；`conversation` 与 `connection` 留在子 fiber，服务后续出现时再注册其余 Worktree UI。
+- 增加无 Conversation 启动图回归和发布门禁，确保插件先提供 `uiWorkspace`，且官方 Workspace Slot declaration tree 仍只注册一次。
+
 ## [0.7.3] - 2026-09-03
 
 `0.7.3` 将插件完整适配到 DeepSeek Harness `0.1.2-rc.1` 的 Host、Client、Remote Gateway 与 Workspace 模块边界，并重写中英文项目首页，让安装要求、Worktree 工作方式与安全限制更容易理解。
@@ -265,6 +275,7 @@
 
 - 发布初版生产级 Worktree 管理、基础 apply/finish/discard 生命周期和安全清理。
 
+[0.7.4]: https://github.com/wloops/dsh-git-worktree/compare/v0.7.3...v0.7.4
 [0.7.3]: https://github.com/wloops/dsh-git-worktree/compare/v0.7.2...v0.7.3
 [0.7.2]: https://github.com/wloops/dsh-git-worktree/compare/v0.7.1...v0.7.2
 [0.7.1]: https://github.com/wloops/dsh-git-worktree/compare/v0.7.0...v0.7.1

package/README.en.md

@@ -75,6 +75,12 @@ See the [full usage guide](docs/USAGE.en.md) for detailed actions, recovery scen
 
 Before upgrading an existing Harness installation, handle Host data migration: `0.1.2-rc.1` removes the optional SQLite Session backend, so use an older Harness version to export that data first. Code Mode is now named PTC mode, while existing conversation records remain readable. Launch applications and install this plugin through a `dsh` Profile.
 
+After upgrading Harness from an earlier release, if the web UI shows **Failed to load plugins**, install version `0.7.4` or later and restart Harness. Releases through `0.7.2` depend on the discontinued `dsh-client-runtime`; `0.7.3` can also form a `conversation` / `uiWorkspace` activation cycle in the rc.1 Web Client.
+
+```bash
+dsh plugin --profile web add dsh-git-worktree@0.7.4
+```
+
 ### Install
 
 ```bash
@@ -84,7 +90,7 @@ dsh plugin --profile web add dsh-git-worktree
 Or install a specific version:
 
 ```bash
-dsh plugin --profile web add github:wloops/dsh-git-worktree#v0.7.3
+dsh plugin --profile web add github:wloops/dsh-git-worktree#v0.7.4
 ```
 
 Open a Git Workspace and enable **Worktree** when creating a Session. An existing Local Session can also let the model call `worktree_create`.

package/README.md

@@ -75,6 +75,12 @@ flowchart LR
 
 从旧 Harness 升级时请先处理 Host 数据迁移：`0.1.2-rc.1` 已移除可选 SQLite Session 后端，旧数据需使用旧版 Harness 导出；Code Mode 已更名为 PTC mode，但现有会话记录仍可读取。应用和本插件统一通过 `dsh` Profile 启动与安装。
 
+从旧版 Harness 升级后，如果 Web 界面提示 **Failed to load plugins**，请安装 `0.7.4` 或更高版本并重启 Harness。`0.7.2` 及更早版本依赖已停止发布的 `dsh-client-runtime`；`0.7.3` 在 rc.1 Web Client 中还可能形成 `conversation` / `uiWorkspace` 循环等待。
+
+```bash
+dsh plugin --profile web add dsh-git-worktree@0.7.4
+```
+
 ### 安装
 
 ```bash
@@ -84,7 +90,7 @@ dsh plugin --profile web add dsh-git-worktree
 也可以安装指定版本：
 
 ```bash
-dsh plugin --profile web add github:wloops/dsh-git-worktree#v0.7.3
+dsh plugin --profile web add github:wloops/dsh-git-worktree#v0.7.4
 ```
 
 安装后打开 Git Workspace，在新建 Session 时启用 **Worktree**；已有 Local Session 也可以让模型调用 `worktree_create` 创建隔离 Session。

package/lib/client/console-remote/index.d.ts

@@ -3,6 +3,11 @@ import type { ClientRemote } from '@deepseek-ai/dsh-api-gateway/client';
 import type { WorktreeConsoleAdapter } from '../../console-contract.js';
 import { type GitWorktreeRemote } from '../../console-remote/remote.js';
 export { createWorktreeConsoleRemoteAdapter } from './adapter.js';
+/**
+ * Activate on the same prerequisites as the official Workspace Client. The
+ * conversation-dependent Worktree surfaces run in a child fiber below so the
+ * Workspace service can break the uiConversation -> uiWorkspace boot edge.
+ */
 export declare const inject: string[];
 interface ConsoleClientContext extends Context {
     remote: ClientRemote & {

package/lib/client/console-remote/index.js

@@ -1,8 +1,15 @@
 import contribution from '../../console-remote/remote.js';
 import { apply as applyToolViews, inject as toolViewInject } from '../index.js';
+import { registerManagedWorkspaceSidebar } from '../workspace-sidebar/index.js';
+import { inject as officialWorkspaceInject } from 'virtual:dsh-official-workspace-client';
 import { createWorktreeConsoleRemoteAdapter } from './adapter.js';
 export { createWorktreeConsoleRemoteAdapter } from './adapter.js';
-export const inject = [...toolViewInject, 'remote'];
+/**
+ * Activate on the same prerequisites as the official Workspace Client. The
+ * conversation-dependent Worktree surfaces run in a child fiber below so the
+ * Workspace service can break the uiConversation -> uiWorkspace boot edge.
+ */
+export const inject = [...officialWorkspaceInject];
 /** Mount the package-owned strict Remote contribution in this Client fiber. */
 export async function apply(ctx) {
     const disposeRemote = await ctx.remote.$mount(contribution);
@@ -12,6 +19,13 @@ export async function apply(ctx) {
         throw new Error('Worktree Console Remote namespace 挂载失败');
     const adapter = createWorktreeConsoleRemoteAdapter(remote);
     ctx.provide('worktreeConsole', adapter);
-    applyToolViews(ctx, adapter);
+    // The official ui-workspace row is disabled by cordis.patch.yml. Restore its
+    // service and Slot declarations before uiConversation becomes available.
+    registerManagedWorkspaceSidebar(ctx, adapter);
+    // The remaining Worktree views consume conversation/connection. Keeping
+    // them in a child fiber prevents those services from blocking uiWorkspace.
+    ctx.inject(toolViewInject, child => {
+        applyToolViews(child, adapter);
+    });
 }
 //# sourceMappingURL=index.js.map

package/lib/client/console-remote/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/console-remote/index.ts"],"names":[],"mappings":"AAGA,OAAO,YAAwC,MAAM,gCAAgC,CAAA;AACrF,OAAO,EAAE,KAAK,IAAI,cAAc,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAA;AAEjE,OAAO,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAA;AAEjE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,GAAG,cAAc,EAAE,QAAQ,CAAC,CAAA;AAYnD,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,GAAyB;IACnD,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IAC3D,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAkC,CAAA;IAC7E,IAAI,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IACnF,MAAM,OAAO,GAAG,kCAAkC,CAAC,MAAM,CAAC,CAAA;IAC1D,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IACvC,cAAc,CAAC,GAAsD,EAAE,OAAO,CAAC,CAAA;AACjF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/console-remote/index.ts"],"names":[],"mappings":"AAGA,OAAO,YAAwC,MAAM,gCAAgC,CAAA;AACrF,OAAO,EAAE,KAAK,IAAI,cAAc,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAA;AAC/E,OAAO,EAAE,MAAM,IAAI,uBAAuB,EAAE,MAAM,uCAAuC,CAAA;AACzF,OAAO,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAA;AAEjE,OAAO,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAA;AAEjE;;;;GAIG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,GAAG,uBAAuB,CAAC,CAAA;AAYlD,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,GAAyB;IACnD,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IAC3D,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAkC,CAAA;IAC7E,IAAI,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IACnF,MAAM,OAAO,GAAG,kCAAkC,CAAC,MAAM,CAAC,CAAA;IAC1D,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAEvC,6EAA6E;IAC7E,yEAAyE;IACzE,+BAA+B,CAC7B,GAAuE,EACvE,OAAO,CACR,CAAA;IAED,wEAAwE;IACxE,2EAA2E;IAC3E,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,EAAE;QACjC,cAAc,CAAC,KAAwD,EAAE,OAAO,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/lib/client/index.d.ts

@@ -7,7 +7,7 @@ interface ClientContextLike {
     get(name: string): unknown;
     effect(setup: () => void | (() => void), label?: string): void;
     slots: {
-        inject(name: 'tool.call.toolview' | 'conversation.session.header.actions' | 'conversation.input.dock' | 'conversation.input.left' | 'sidebar.workspaces', callback: () => unknown): void;
+        inject(name: 'tool.call.toolview' | 'conversation.session.header.actions' | 'conversation.input.dock' | 'conversation.input.left', callback: () => unknown): void;
         register(descriptor: Record<string, unknown>, component: ComponentType<any>): unknown;
     };
 }

package/lib/client/index.js

@@ -5,7 +5,6 @@ import { WORKTREE_STYLES } from './styles.js';
 import { registerPreSessionWorktree } from './pre-session/index.js';
 import { registerTargetConsole } from './target-console/index.js';
 import { TARGET_CONSOLE_STYLES } from './target-console/target-console.styles.js';
-import { registerManagedWorkspaceSidebar } from './workspace-sidebar/index.js';
 export { registerTargetConsole } from './target-console/index.js';
 export const WORKTREE_CONSOLE_ADAPTER_SERVICE = 'worktreeConsole';
 /** Required client services. */
@@ -40,7 +39,6 @@ export function apply(ctx, adapterOverride) {
     if (adapter !== undefined) {
         registerTargetConsole({ slots: ctx.slots }, adapter, services);
         registerPreSessionWorktree({ slots: ctx.slots }, adapter, services);
-        registerManagedWorkspaceSidebar(ctx, adapter);
     }
 }
 //# sourceMappingURL=index.js.map

package/lib/client/index.js.map

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

package/lib/client.js

@@ -9671,6 +9671,61 @@ const TARGET_CONSOLE_STYLES = String.raw`
 }
 `;
 
+//#endregion
+//#region src/client/index.tsx
+const WORKTREE_CONSOLE_ADAPTER_SERVICE = "worktreeConsole";
+/** Required client services. */
+const inject$1 = [
+	"slots",
+	"workspaces",
+	"sessions",
+	"conversation",
+	"connection",
+	"locale"
+];
+function servicesOf(ctx) {
+	return {
+		workspaces: ctx.get("workspaces"),
+		sessions: ctx.get("sessions"),
+		conversation: ctx.get("conversation")
+	};
+}
+/** Register replay-stable keyed rows and one scoped stylesheet. */
+function apply$1(ctx, adapterOverride) {
+	const services = servicesOf(ctx);
+	const adapter = adapterOverride ?? ctx.get(WORKTREE_CONSOLE_ADAPTER_SERVICE);
+	ctx.effect(() => {
+		const style = document.createElement("style");
+		style.dataset.dshGitWorktree = "true";
+		style.textContent = `${WORKTREE_STYLES}\n${TARGET_CONSOLE_STYLES}`;
+		document.head.append(style);
+		return () => {
+			style.remove();
+		};
+	}, "dsh-git-worktree: styles");
+	const CreateRow = (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorktreeCreateRow, {
+		...props,
+		services
+	});
+	const ReviewRow = (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorktreeReviewRow, {
+		...props,
+		services,
+		adapter
+	});
+	ctx.slots.inject("tool.call.toolview", () => ctx.slots.register({
+		name: "tool.call.toolview",
+		key: "worktree_create"
+	}, CreateRow));
+	ctx.slots.inject("tool.call.toolview", () => ctx.slots.register({
+		name: "tool.call.toolview",
+		key: "worktree_ready_for_review"
+	}, ReviewRow));
+	if (adapter !== void 0) {
+		registerTargetConsole({ slots: ctx.slots }, adapter, services);
+		registerPreSessionWorktree({ slots: ctx.slots }, adapter, services);
+	}
+}
+
 //#endregion
 //#region \0virtual:dsh-official-workspace-client
 const modules = {
@@ -12667,62 +12722,6 @@ function registerManagedWorkspaceSidebar(ctx, adapter) {
 	apply$2(officialContextProxy(ctx, adapter));
 }
 
-//#endregion
-//#region src/client/index.tsx
-const WORKTREE_CONSOLE_ADAPTER_SERVICE = "worktreeConsole";
-/** Required client services. */
-const inject$1 = [
-	"slots",
-	"workspaces",
-	"sessions",
-	"conversation",
-	"connection",
-	"locale"
-];
-function servicesOf(ctx) {
-	return {
-		workspaces: ctx.get("workspaces"),
-		sessions: ctx.get("sessions"),
-		conversation: ctx.get("conversation")
-	};
-}
-/** Register replay-stable keyed rows and one scoped stylesheet. */
-function apply$1(ctx, adapterOverride) {
-	const services = servicesOf(ctx);
-	const adapter = adapterOverride ?? ctx.get(WORKTREE_CONSOLE_ADAPTER_SERVICE);
-	ctx.effect(() => {
-		const style = document.createElement("style");
-		style.dataset.dshGitWorktree = "true";
-		style.textContent = `${WORKTREE_STYLES}\n${TARGET_CONSOLE_STYLES}`;
-		document.head.append(style);
-		return () => {
-			style.remove();
-		};
-	}, "dsh-git-worktree: styles");
-	const CreateRow = (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorktreeCreateRow, {
-		...props,
-		services
-	});
-	const ReviewRow = (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorktreeReviewRow, {
-		...props,
-		services,
-		adapter
-	});
-	ctx.slots.inject("tool.call.toolview", () => ctx.slots.register({
-		name: "tool.call.toolview",
-		key: "worktree_create"
-	}, CreateRow));
-	ctx.slots.inject("tool.call.toolview", () => ctx.slots.register({
-		name: "tool.call.toolview",
-		key: "worktree_ready_for_review"
-	}, ReviewRow));
-	if (adapter !== void 0) {
-		registerTargetConsole({ slots: ctx.slots }, adapter, services);
-		registerPreSessionWorktree({ slots: ctx.slots }, adapter, services);
-		registerManagedWorkspaceSidebar(ctx, adapter);
-	}
-}
-
 //#endregion
 //#region src/client/console-remote/adapter.ts
 function transport(message) {
@@ -12798,7 +12797,12 @@ function createWorktreeConsoleRemoteAdapter(remote) {
 
 //#endregion
 //#region src/client/console-remote/index.ts
-const inject = [...inject$1, "remote"];
+/**
+* Activate on the same prerequisites as the official Workspace Client. The
+* conversation-dependent Worktree surfaces run in a child fiber below so the
+* Workspace service can break the uiConversation -> uiWorkspace boot edge.
+*/
+const inject = [...inject$2];
 /** Mount the package-owned strict Remote contribution in this Client fiber. */
 async function apply(ctx) {
 	const disposeRemote = await ctx.remote.$mount(remote_default);
@@ -12807,7 +12811,10 @@ async function apply(ctx) {
 	if (remote === void 0) throw new Error("Worktree Console Remote namespace 挂载失败");
 	const adapter = createWorktreeConsoleRemoteAdapter(remote);
 	ctx.provide("worktreeConsole", adapter);
-	apply$1(ctx, adapter);
+	registerManagedWorkspaceSidebar(ctx, adapter);
+	ctx.inject(inject$1, (child) => {
+		apply$1(child, adapter);
+	});
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-git-worktree",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "Experimental Git worktree Session Targets for DeepSeek Harness with isolated sessions, review checkpoints, human-confirmed delivery, and safe recovery.",
   "type": "module",
   "main": "lib/index.js",

package/scripts/check-publish.mjs

@@ -211,8 +211,10 @@ if (!clientExports || typeof clientExports.apply !== 'function' || !Array.isArra
   fail('client bundle factory did not return apply + inject')
 }
 if (!clientExports.inject.includes('remote')) fail('client bundle must inject the official Remote service before $mount')
-if (!clientExports.inject.includes('conversation')) fail('client bundle must inject the public conversation service for pre-session draft transfer')
-ok(`${clientRel} registers ${manifest.name} through the browser ModuleLoader contract`)
+if (!clientExports.inject.includes('remote.directoryPicker')) fail('client bundle must wait for the official directory-picker Remote before restoring uiWorkspace')
+if (clientExports.inject.includes('conversation')) fail('client bundle root must not wait for conversation: uiConversation depends on the uiWorkspace restored by this plugin')
+if (clientExports.inject.includes('connection')) fail('client bundle root must keep connection-dependent Worktree views in the deferred child fiber')
+ok(`${clientRel} registers ${manifest.name} through the browser ModuleLoader contract without a uiWorkspace/uiConversation boot cycle`)
 
 // 7. Release CI and npm's prepublish lifecycle require committed source identity;
 // local review builds intentionally run against a dirty managed Worktree.