Merge branch 'master' into feat/session-completed-dot

packages/client/ui-workspace/README.i18n.yaml

@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write packages/client/ui-workspace/README.md
-README.md: 3107793233d18c65b12a9a91a5be85d22acc733a
-README.zh.md: 98912ac079a13fa62d5829d7d2469ff63c3da5bb
+README.md: bd7313b560e76378e4fff274c99bb976819aebae
+README.zh.md: 734a897b9cb9c3469d8f402b13bff4b62753f9b2

packages/client/ui-workspace/README.md

@@ -14,7 +14,7 @@ The Session row's Fork action forks at the source's last completed turn, increme
 
 Session rows render the runtime's live `pendingInteraction` classification: approvals report **Waiting for approval**, plan reviews report **Plan awaiting review**, and ordinary questions report **Waiting for answer**. Every pending interaction uses an amber warning dot that takes precedence over the running indicator; ordinary rows repeat the localized status in their hover card, and both ordinary and search-result rows carry the same text as a visually hidden label for assistive technology. Running uses the blue indicator and its hidden label; an idle row leaves the reserved status slot empty.
 
-Both target slots are declared by other plugins, so `apply` registers through declaration-aware deferral and re-registers after a declaring slot is restored.
+Both target slots are declared by other plugins, so `apply` uses `slots.inject()` to register for each declaration lifetime and re-register after a declaring slot is restored.
 
 The shared sidebar projection hides rows whose durable Session summary has `origin: 'subagent'`; users enter those conversations through the selected parent's subagent header catalog. Ordinary forks remain visible because lineage alone does not set that origin. The runtime keeps hidden rows available for conversation, title, and addressed transport state.
 

packages/client/ui-workspace/README.zh.md

@@ -14,7 +14,7 @@ Session 行内的 Fork 操作在源会话最后一个已完成轮次处 fork，
 
 Session 行渲染运行时的实时 `pendingInteraction` 分类：审批显示**等待审批**，计划审阅显示**计划待审**，普通问题显示**等待回答**。每个待处理交互都使用一枚琥珀色警告点，优先级高于运行指示器；普通行的悬浮卡片重复显示本地化状态，普通行和搜索结果行则都以相同文本提供面向辅助技术的视觉隐藏标签。运行状态使用蓝色指示器及其隐藏标签；空闲行会保留空的状态槽位。
 
-两个目标 slot 都由其他插件声明，因此 `apply` 通过声明感知的延迟机制完成注册，并在声明该 slot 的插件恢复后重新注册。
+两个目标 slot 都由其他插件声明，因此 `apply` 使用 `slots.inject()` 在各自的声明生命周期内完成注册，并在目标 slot 的声明恢复后重新注册。
 
 共享侧边栏投影会隐藏持久化 Session 摘要中带有 `origin: 'subagent'` 的行；用户从所选 parent 的 subagent 页头目录进入这些对话。普通 fork 仍然可见，因为仅有谱系不会设置该 origin。运行时仍保留隐藏行，供对话、标题与已寻址传输状态使用。
 

packages/client/ui-workspace/src/client/index.ts

@@ -8,7 +8,6 @@
  * client half (see the contract module doc). Export discipline:
  * packages/client/AGENTS.md.
  */
-import { deferRegistration } from '@deepseek-ai/dsh-client-ui-slots'
 import type { HostObservable } from '@deepseek-ai/dsh-client-ui-slots'
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
@@ -40,8 +39,8 @@ const NS = 'workspace'
  * the ui-sidebar / ui-conversation applies, whose activation order relative
  * to this one is NOT constrained: dshClient.inject edges are informational
  * (loading/prefetch metadata, never apply sequencing) and neither owner
- * provides a waitable service. apply therefore registers via
- * declaration-aware deferral instead of assuming order.
+ * provides a waitable service. apply therefore depends on each slot
+ * declaration through `slots.inject()` instead of assuming order.
  */
 export const inject = ['slots', 'sessions', 'workspaces', 'locale']
 
@@ -103,36 +102,25 @@ export function apply(ctx: ClientContext): void {
     createWorkspace: input => ctx.workspaces.create(input),
     hooks: { directoryFlow: pickerFlowSource },
   })
-  // Declaration-aware registration (deferRegistration): each owner's
-  // declaring apply may activate after this one, and a register into an
-  // undeclared slot throws; the deferral also re-registers after an HMR
-  // collapse re-declares the slot. Each registration declares its own
-  // directory-flow child hole in the same call (declaration = render
-  // authorization, one table).
-  ctx.effect(() => {
-    const deferred = [
-      deferRegistration(ctx.slots, 'sidebar.workspaces', WorkspaceBrowser, () =>
-        ctx.slots.register(
-          {
-            name: 'sidebar.workspaces',
-            children: { 'sidebar.workspaces.directoryFlow': { kind: 'single', scope: 'root' } },
-            store: createWorkspaceViewStore(),
-            inject: browserInjected,
-            locale: NS,
-          },
-          WorkspaceBrowser,
-        )),
-      deferRegistration(ctx.slots, 'conversation.hero.workspace', WorkspacePicker, () =>
-        ctx.slots.register(
-          {
-            name: 'conversation.hero.workspace',
-            children: { 'conversation.hero.workspace.directoryFlow': { kind: 'single', scope: 'root' } },
-            inject: pickerInjected,
-            locale: NS,
-          },
-          WorkspacePicker,
-        )),
-    ]
-    return () => { for (const entry of deferred) entry.dispose() }
-  }, 'ui-workspace: browser + picker registrations')
+  // Each registration declares its directory-flow child in the same call;
+  // slot injection follows both the owner and declaration HMR lifetimes.
+  ctx.slots.inject('sidebar.workspaces', () => ctx.slots.register(
+    {
+      name: 'sidebar.workspaces',
+      children: { 'sidebar.workspaces.directoryFlow': { kind: 'single', scope: 'root' } },
+      store: createWorkspaceViewStore(),
+      inject: browserInjected,
+      locale: NS,
+    },
+    WorkspaceBrowser,
+  ))
+  ctx.slots.inject('conversation.hero.workspace', () => ctx.slots.register(
+    {
+      name: 'conversation.hero.workspace',
+      children: { 'conversation.hero.workspace.directoryFlow': { kind: 'single', scope: 'root' } },
+      inject: pickerInjected,
+      locale: NS,
+    },
+    WorkspacePicker,
+  ))
 }