@wowyuarm/dsh-agent-team 0.1.14 → 0.1.15

package/packages/client-agent-team/lib/types/client/index.js

@@ -1,6 +1,6 @@
 import agentTeamRemote from '@wowyuarm/dsh-agent-team/remote';
 import { HumanSettingsSection } from "./HumanSettingsSection.js";
-import { HUMAN_PROFILE_NAMESPACE, TeamHumanIdentity } from "./human-identity.js";
+import { TeamHumanIdentity } from "./human-identity.js";
 import { bytesToBase64 } from "./attachment-preview.js";
 import { TeamNavigation } from "./navigation.js";
 import { TeamChangeStream, TeamReadStream } from "./team-changes.js";
@@ -13,8 +13,27 @@ import { en, zh } from "./locales.js";
 export { TeamNavigation } from "./navigation.js";
 const NS = 'team';
 export const inject = [
-    'slots', 'workspaces', 'locale', 'remote', 'remote.session', 'sessions', 'connection', 'conversation',
+    'slots', 'workspaces', 'locale', 'remote', 'remote.session', 'sessions', 'connection', 'conversation', 'uiWorkspace',
 ];
+/**
+ * 0.1.7 moved the conversation selection into the workspace service: the
+ * rendered session is the one holding its `mainView` reference (the shipped
+ * consumers read the same projection), so the Team client reads the selection
+ * through retention instead of a service-owned `current`.
+ */
+function currentMainSessionId(ctx) {
+    const sessions = ctx.sessions;
+    return Object.values(sessions.list.getSnapshot().byId)
+        .find(session => (session.retainedBy.mainView ?? 0) > 0)?.id;
+}
+/**
+ * Session ids this client opened as Member views, per client instance. The
+ * 0.1.7 workspace service exposes no clear, so a dead return target leaves
+ * the departed Member selection in place; excluding Member sessions from the
+ * next capture keeps that stale selection from becoming a false return
+ * target.
+ */
+const openedMemberSessions = new WeakMap();
 function registerModeShadow(ctx, navigation, changes, reads, drafts, humanIdentity, name, component, extraInject, 
 // Keyed seats (`main`) address one panel by key; the reserved 'conversation'
 // key is where the shipped Conversation registers, so the Team seat shadows
@@ -24,14 +43,16 @@ entryKey) {
     // views (see registerModeShadow), so the shipped conversation root renders
     // the selected Member Session inside the Team shell.
     const openMemberSessionImpl = (sessionId) => {
-        const sessions = ctx.sessions;
         const snapshot = navigation.getSnapshot();
-        const current = sessions.list.getSnapshot().current;
+        const current = currentMainSessionId(ctx);
         // The return target is captured on first entry only — switching between
         // Member Sessions must keep pointing at the Human's original session.
-        const returnTo = snapshot.memberSessionId === undefined && current !== undefined && current !== sessionId ? current : undefined;
+        const memberSessions = openedMemberSessions.get(ctx) ?? new Set();
+        openedMemberSessions.set(ctx, memberSessions);
+        memberSessions.add(sessionId);
+        const returnTo = snapshot.memberSessionId === undefined && current !== undefined && current !== sessionId && !memberSessions.has(current) ? current : undefined;
         navigation.actions().enterMemberSession(sessionId, returnTo);
-        sessions.open(sessionId);
+        ctx.uiWorkspace.openSession(sessionId);
     };
     // Remote bindings shared by every Team slot; surface-specific entries extend it below.
     const sharedRemotes = {
@@ -126,16 +147,8 @@ function applyUi(ctx) {
     // The Human's own identity: one projection every seat reads, refreshed once
     // after a profile write so a rename reaches the timeline and the member refs
     // without a reload. Reads are demand-driven — the first seat that subscribes
-    // starts the read.
-    // The profile page writes through the settings transport. It arrives from the
-    // settings plugin, and Cordis refuses a `remote.<namespace>` read that was
-    // never injected, so the binding is an optional injection rather than either
-    // a hard activation dependency (a settings-less host would lose Team mode
-    // entirely) or an undeclared read (which throws at the first write).
-    let settingsTransport;
-    ctx.inject(['remote.settings'], (scope) => {
-        settingsTransport = scope.remote.settings;
-    });
+    // starts the read. The profile page writes back through the Team Remote, so
+    // the Client never names the Host's own profile entry.
     const humanIdentity = new TeamHumanIdentity({
         loadProfile: () => ctx.remote.agentTeam.humanProfile({}),
         loadAvatarUrl: async (avatarRef) => {
@@ -155,12 +168,13 @@ function applyUi(ctx) {
         void disposeDrafts();
     }, 'agent-team: navigation service');
     // The one restore owner: leaving an embedded Member Session view must
-    // rebind the underlying current session, or the stale Member current later
-    // masks to undefined when the Host disposes that session (rollover) and
-    // the conversation seat remounts. Takeover is conditional — only when the
-    // current still IS the departed Member session — so a selection someone
-    // else made in the meantime survives. A dead return target clears instead
-    // of opening an unknown id.
+    // rebind the underlying selection, or the departed Member session stays the
+    // workspace service's `mainView` retention into the next Member entry's
+    // return-target capture. Takeover is conditional — only when the selection
+    // still IS the departed Member session — so a selection someone else made
+    // in the meantime survives. A dead return target keeps the departed
+    // selection: 0.1.7 exposes no public clear, and the retention is inert
+    // behind the Team seat until the next open.
     ctx.effect(() => {
         let previous = navigation.getSnapshot();
         const restore = () => {
@@ -170,13 +184,10 @@ function applyUi(ctx) {
             previous = snapshot;
             if (departed === undefined || snapshot.memberSessionId !== undefined)
                 return;
-            const sessions = ctx.sessions;
-            if (sessions.list.getSnapshot().current !== departed)
+            if (currentMainSessionId(ctx) !== departed)
                 return;
-            if (returnTo !== undefined && sessions.list.getSnapshot().byId[returnTo] !== undefined)
-                sessions.open(returnTo);
-            else
-                sessions.clear();
+            if (returnTo !== undefined && ctx.sessions.list.getSnapshot().byId[returnTo] !== undefined)
+                ctx.uiWorkspace.openSession(returnTo);
         };
         const unsubscribe = navigation.subscribe(restore);
         return () => {
@@ -213,7 +224,7 @@ function applyUi(ctx) {
             navigation,
             ...navigation.actions(),
             // The footer is the only surface that leaves Team mode; closing the
-            // embedded Member Session view rebinds the underlying current through
+            // embedded Member Session view rebinds the underlying selection through
             // the same root-scope restore owner, so there is exactly one restore
             // path and no double open.
             leaveTeam: () => {
@@ -225,12 +236,12 @@ function applyUi(ctx) {
     registerModeShadow(ctx, navigation, changes, reads, drafts, humanIdentity, 'sidebar.workspaces', TeamWorkspaceBrowser);
     registerModeShadow(ctx, navigation, changes, reads, drafts, humanIdentity, 'main', TeamConversation, undefined, 'conversation');
     registerModeShadow(ctx, navigation, changes, reads, drafts, humanIdentity, 'sidebar.settings', TeamMembersAction, () => ({ loadMemberGroups }));
-    // The Human profile page: one settings section over the `agent-team-human`
-    // namespace, ordered between General (0) and Models (10) so identity sits
-    // near the top. Writes go through the settings controller, which answers
-    // with the Host's own rejection reason (a name collides, an empty one), and
-    // the shared identity re-reads afterwards, so a rename lands in the timeline
-    // and the member refs at the same moment the page shows it.
+    // The Human profile page: one settings section, ordered between General (0)
+    // and Models (10) so identity sits near the top. Writes go through the Team
+    // Remote, which answers with the Host's own rejection reason (a name
+    // collides, an empty one), and the shared identity re-reads afterwards, so a
+    // rename lands in the timeline and the member refs at the same moment the
+    // page shows it.
     ctx.slots.inject('settings.section', () => ctx.slots.register({
         name: 'settings.section',
         id: 'team-human',
@@ -240,10 +251,7 @@ function applyUi(ctx) {
         inject: () => ({
             identity: humanIdentity,
             saveName: async (name) => {
-                const settings = settingsTransport;
-                if (settings === undefined)
-                    return 'the settings service is unavailable';
-                const saved = await settings.update(HUMAN_PROFILE_NAMESPACE, { name }, undefined);
+                const saved = await ctx.remote.agentTeam.setHumanProfile({ name });
                 if (!saved.ok)
                     return saved.error.message;
                 await humanIdentity.refresh();
@@ -257,10 +265,7 @@ function applyUi(ctx) {
                 });
                 if (!put.ok)
                     return put.error.message;
-                const settings = settingsTransport;
-                if (settings === undefined)
-                    return 'the settings service is unavailable';
-                const saved = await settings.update(HUMAN_PROFILE_NAMESPACE, { avatarRef: put.value.avatarRef }, undefined);
+                const saved = await ctx.remote.agentTeam.setHumanProfile({ avatarRef: put.value.avatarRef });
                 if (!saved.ok)
                     return saved.error.message;
                 await humanIdentity.refresh();
@@ -270,14 +275,10 @@ function applyUi(ctx) {
                 const { avatarRef } = humanIdentity.getSnapshot();
                 if (avatarRef === undefined)
                     return undefined;
-                const settings = settingsTransport;
-                if (settings === undefined)
-                    return 'the settings service is unavailable';
                 // Bytes first, then the reference: a failed clear leaves a readable
-                // avatar instead of a reference to bytes nobody can load. Clearing one
-                // field is a path op — a merge patch cannot express removal.
+                // avatar instead of a reference to bytes nobody can load.
                 await ctx.remote.agentTeam.removeHumanAvatar({ avatarRef });
-                const cleared = await settings.mutate(HUMAN_PROFILE_NAMESPACE, [{ op: 'unset', path: ['avatarRef'] }], undefined);
+                const cleared = await ctx.remote.agentTeam.setHumanProfile({ avatarRef: null });
                 if (!cleared.ok)
                     return cleared.error.message;
                 await humanIdentity.refresh();

package/packages/client-agent-team/lib/types/client/multi-menu-field.js

@@ -4,7 +4,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 // without closing the list so several entries can be picked in one pass; the
 // capped card scrolls internally through long catalogs.
 import { useState } from 'react';
-import { IconChevronDownOutline14, Menu } from '@deepseek-ai/dsh-client-ui-primitives';
+import { IconChevronDownOutlineRegular, Menu } from '@deepseek-ai/dsh-client-ui-primitives';
 import createCss from './create.module.css';
 import css from './sidebar.module.css';
 /**
@@ -26,5 +26,5 @@ export function MultiMenuField({ label, options, selected, onToggle, disabled =
         ...(option.disabled === true ? { disabled: true } : {}),
         ...(option.icon === undefined ? {} : { icon: option.icon }),
     }));
-    return (_jsxs("div", { className: createCss.field, children: [_jsx("span", { children: label }), options.length === 0 && emptyText !== undefined ? _jsx("small", { className: css.editHint, children: emptyText }) : (_jsx(Menu, { open: open, portal: true, className: createCss.menuCap, items: items, selectedIds: selected, onSelect: id => { onToggle(id); }, onClose: () => { setOpen(false); }, anchor: _jsxs("button", { type: "button", className: createCss.selectTrigger, "aria-label": label, "aria-haspopup": "menu", "aria-expanded": open, disabled: disabled, onClick: () => { setOpen(value => !value); }, children: [_jsx("span", { className: createCss.selectValue, children: selected.length === 0 ? triggerEmptyLabel : formatCount(selected.length) }), _jsx("span", { className: `${createCss.chevron} ${open ? createCss.chevronOpen : ''}`, "aria-hidden": true, children: _jsx(IconChevronDownOutline14, {}) })] }) }))] }));
+    return (_jsxs("div", { className: createCss.field, children: [_jsx("span", { children: label }), options.length === 0 && emptyText !== undefined ? _jsx("small", { className: css.editHint, children: emptyText }) : (_jsx(Menu, { open: open, portal: true, className: createCss.menuCap, items: items, selectedIds: selected, onSelect: id => { onToggle(id); }, onClose: () => { setOpen(false); }, anchor: _jsxs("button", { type: "button", className: createCss.selectTrigger, "aria-label": label, "aria-haspopup": "menu", "aria-expanded": open, disabled: disabled, onClick: () => { setOpen(value => !value); }, children: [_jsx("span", { className: createCss.selectValue, children: selected.length === 0 ? triggerEmptyLabel : formatCount(selected.length) }), _jsx("span", { className: `${createCss.chevron} ${open ? createCss.chevronOpen : ''}`, "aria-hidden": true, children: _jsx(IconChevronDownOutlineRegular, {}) })] }) }))] }));
 }

package/packages/client-agent-team/lib/types/client/slots.d.ts

@@ -58,7 +58,7 @@ export type TeamSidebarProps = PropsRuntime<'sidebar.workspaces'> & PropsLocale<
     /**
      * Host clear-context remote kept as a hidden migration escape hatch.
      * The visible row action is retired: Members manage their own context
-     * through the context_rollover tool (see docs/architecture.md).
+     * through the context_rollover tool (see docs/architecture/README.md).
      */
     clearMemberContext: (request: AgentTeamClearMemberContextRequest) => Promise<RemoteResult<AgentTeamClearMemberContextResult>>;
     archiveMember: (request: AgentTeamArchiveMemberRequest) => Promise<RemoteResult<AgentTeamArchiveMemberResult>>;

package/packages/tool-agent-team/README.md

@@ -21,7 +21,7 @@ Every agent-facing render carries absolute event instants in the fixed Team coor
 
 Canonical results expose stable refs, optional Task status, Thread revision, Claim history, Attention, and unread facts as structured fields. The model-visible renders follow the action decision surface: the write token appears only on a fully drained `team_thread read` and a committed public mutation; browsing results (`team_view`, `team_inbox`, status/follow/unfollow, `history`, `team_claim list`) and all typed rejections render no revision and no token. Typed `unread_required` and `stale_revision` results keep the structured fields needed to reread and retry deliberately. Tool execution resolves the exact live `exec.agent`; arguments cannot select or impersonate the actor, and the optional `workspace` selector can only pick among that actor's participated Workspaces. Write request identity derives from sessionId plus tool callId. `context_rollover` and `context_checkpoint` conclude the Agent turn (a rollover must not be followed by old-generation work, and a checkpoint resolves at its containing turn's end); every other Team tool returns to the model loop.
 
-The complete implemented protocol is documented in [`../../docs/team-collaboration.md`](../../docs/team-collaboration.md).
+The complete implemented protocol is documented in [`../../docs/team-collaboration/README.md`](../../docs/team-collaboration/README.md).
 
 ## Composition
 

package/packages/tool-agent-team/README.zh.md

@@ -21,7 +21,7 @@ mention 在 Message 正文里撰写，形如 `@Handle`（`@` 必需、大小写
 
 Canonical result 以结构化字段暴露稳定 refs、可选 Task status、Thread revision、Claim history、Attention 和未读 facts。模型可见的渲染遵循 action decision surface：写令牌只出现在未读清零的 `team_thread read` 与一次已提交的 public mutation 上；浏览类结果（`team_view`、`team_inbox`、status/follow/unfollow、`history`、`team_claim list`）与所有类型化拒绝都不渲染 revision 与令牌。类型化的 `unread_required` 与 `stale_revision` 结果保留重新读取和审慎重试所需的结构化字段。工具执行通过准确的 live `exec.agent` 解析 actor；参数不能选择或冒充 actor，可选的 `workspace` 选择器只能在该 actor 已参与的 Workspace 中选择。写操作的 request identity 由 sessionId 与 tool callId 派生。`context_rollover` 与 `context_checkpoint` 结束 Agent turn；其余 Team tools 将结果返回模型循环，不主动结束 turn。
 
-完整的已实现协议见 [`../../docs/team-collaboration.md`](../../docs/team-collaboration.md)。
+完整的已实现协议见 [`../../docs/team-collaboration/README.md`](../../docs/team-collaboration/README.md)。
 
 ## Composition
 

package/packages/agent-team/lib/preset-roster.js

@@ -1,15 +0,0 @@
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import AgentPresets from '@deepseek-ai/dsh-agent-presets';
-export const inject = ['loader'];
-/** Bundle-private Agent preset roster. The composition must isolate `agentPresets` around this provider and AgentTeam. */
-export function apply(ctx) {
-    const here = dirname(fileURLToPath(import.meta.url));
-    const root = resolve(here, '../preset');
-    ctx.plugin(AgentPresets, {
-        default: 'team-member',
-        roots: [{ path: root, trust: 'system' }],
-        includeShippedRoot: false,
-        includeUserRoot: false,
-    });
-}