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

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,
+  ))
 }