{t('title')}
+{t('loading')}
: null} + {state.status === 'error' ? ( +
+
+ ) : null}
+ {state.status === 'ready' ? (
+ {t('error')}
+ +
+
+
+ ) : null}
+
+
+ {state.snapshot.entries.length === 0 ? {t('catalog')}
+ {filteredEntries.length} +{t('empty')}
: null} + {state.snapshot.entries.length > 0 && filteredEntries.length === 0 + ?{t('emptySearch')}
+ : null} + {filteredEntries.length > 0 ? ( +-
+ {filteredEntries.map((entry) => {
+ const status = phaseLabel(entry.fiberPhase, t)
+ const title = moduleShortName(entry.moduleName)
+ const open = expanded === entry.entryId
+ const detailId = `${titleId}-details-${encodeURIComponent(entry.entryId)}`
+ return (
+
-
+
+ {open ? (
+ ++ ) : null} +
{entry.entryId}+-
+
- {t('configuration')} +
- {t(entry.enabled ? 'enabledTag' : 'disabledTag')} +
- {t('cordis')} +
- {status} +
++++
+ )
+ })}
+
{entry.icon}}
{entry.label}
{/* Selection marker is a trailing check (figma .Menu_cell), not a fill. */}
- {entry.id === selectedId &&
@@ -260,7 +265,7 @@ export function Menu({ open, anchor, items, selectedId, onSelect, onClose, align
const list = open && (
{ setOpen(value => !value) }}
- />
- {open && (
+ >
)
}
diff --git a/packages/client/ui-workflow-run/tests/workflow-run.client.spec.tsx b/packages/client/ui-workflow-run/tests/workflow-run.client.spec.tsx
index 196bdf1144..e4fefa5ad7 100644
--- a/packages/client/ui-workflow-run/tests/workflow-run.client.spec.tsx
+++ b/packages/client/ui-workflow-run/tests/workflow-run.client.spec.tsx
@@ -301,90 +301,170 @@ function panelProps(data: WorkflowRunChatData, sessions = listState(), openSessi
}
describe('WorkflowRunPanel', () => {
- it('defaults running runs open, terminal history closed, and keeps the current choice across data updates', () => {
+ it('forces running run and phase content open without false disclosure controls', () => {
+ const view = render( {
+ const firstMember = {
+ seq: 1, label: 'first', childId: 'child-1' as SessionId, status: 'completed' as const,
+ }
+ const phaseClean: WorkflowRunChatData = {
+ name: 'phase-cycle', status: 'running',
+ phases: [phase({ members: [firstMember] })],
+ }
+ const phaseView = render(()
+ for (const key of stored) {
+ const id = byId.get(key)
+ if (id === undefined || included.has(key)) continue
+ ordered.push(id)
+ included.add(key)
+ }
+ for (const id of sessionIds) {
+ if (included.has(id)) continue
+ ordered.push(id)
+ }
+ return ordered
+}
+
+/** Newest update first with stable Session identity as the tie-break. */
+function compareSessionRecency(a: SessionId, b: SessionId, byId: SessionListState['byId']): number {
+ const aUpdatedAt = byId[a]?.updatedAt ?? Number.NEGATIVE_INFINITY
+ const bUpdatedAt = byId[b]?.updatedAt ?? Number.NEGATIVE_INFINITY
+ if (aUpdatedAt !== bUpdatedAt) return bUpdatedAt - aUpdatedAt
+ return a < b ? -1 : 1
+}
+
+/** Reconcile one editable order account and apply its activity-promotion policy. */
+function nextSessionOrderAccount({
+ sessionIds, previousOrder, previousUpdatedAt, list, orderBy, sortByRecency,
+}: {
+ sessionIds: readonly SessionId[]
+ previousOrder: readonly string[] | undefined
+ previousUpdatedAt: Readonly>
+ list: SessionListState
+ orderBy: SessionOrderBy
+ sortByRecency: boolean
+}): { order: SessionId[]; updatedAt: Record; changed: boolean } {
+ let order = reconciledSessionOrder(sessionIds, previousOrder)
+ if (sortByRecency) {
+ order.sort((a, b) => compareSessionRecency(a, b, list.byId))
+ } else if (orderBy === 'updated') {
+ const promoted = sessionIds
+ .filter((id) => {
+ const session = list.byId[id]
+ return session !== undefined
+ && (previousUpdatedAt[id] === undefined || session.updatedAt > previousUpdatedAt[id])
+ })
+ .sort((a, b) => compareSessionRecency(a, b, list.byId))
+ if (promoted.length > 0) {
+ const promotedIds = new Set(promoted)
+ order = [...promoted, ...order.filter(id => !promotedIds.has(id))]
+ }
+ }
+ const updatedAt: Record = {}
+ for (const id of sessionIds) {
+ const session = list.byId[id]
+ if (session !== undefined) updatedAt[id] = session.updatedAt
+ }
+ const orderChanged = previousOrder === undefined
+ || order.length !== previousOrder.length
+ || order.some((id, index) => id !== previousOrder[index])
+ const timestampsChanged = Object.keys(updatedAt).length !== Object.keys(previousUpdatedAt).length
+ || Object.entries(updatedAt).some(([id, timestamp]) => previousUpdatedAt[id] !== timestamp)
+ return { order, updatedAt, changed: orderChanged || timestampsChanged }
+}
+
+/** Grouping and ordering menu; own open state so it resets with the wide chrome. */
+function ViewOptionsMenu({ groupBy, orderBy, onGroupPick, onOrderPick, t }: {
groupBy: 'workspace' | 'flat'
- onPick: (mode: 'workspace' | 'flat') => void
+ orderBy: SessionOrderBy
+ onGroupPick: (mode: 'workspace' | 'flat') => void
+ onOrderPick: (mode: SessionOrderBy) => void
t: WorkspaceBrowserProps['t']
}) {
const [open, setOpen] = useState(false)
@@ -66,23 +160,28 @@ function GroupByMenu({ groupBy, onPick, t }: {
{ type: 'label' as const, id: 'group-by', text: t('groupBy.label') },
{ id: 'workspace', label: t('groupBy.workspace') },
{ id: 'flat', label: t('groupBy.flat') },
+ { type: 'separator' as const, id: 'order-by-separator' },
+ { type: 'label' as const, id: 'order-by', text: t('orderBy.label') },
+ { id: 'manual', label: t('orderBy.manual') },
+ { id: 'updated', label: t('orderBy.updated') },
]}
- selectedId={groupBy}
+ selectedIds={[groupBy, orderBy]}
onSelect={(id) => {
- /* v8 ignore next -- narrowing guard: the heading label is not selectable, so the only arriving ids are the two modes. */
- if (id === 'workspace' || id === 'flat') onPick(id)
+ if (id === 'workspace' || id === 'flat') onGroupPick(id)
+ else if (id === 'manual' || id === 'updated') onOrderPick(id)
setOpen(false)
}}
align="end"
+ dense
// Portal: the section header clips overflow, so an in-place list would
// be cut off at the header's bounds.
portal
anchor={(
-
+
)
}
-/** Pointer-position half of a row (insert line above or below). */
-function rowHalf(e: { clientY: number; currentTarget: HTMLElement }): 'before' | 'after' {
- const rect = e.currentTarget.getBoundingClientRect()
- return e.clientY < rect.top + rect.height / 2 ? 'before' : 'after'
-}
-
/**
* One top-level 34px session row: status dot (pending user interaction outranks
* own or descendant activity), title, relative time, and the row actions menu.
@@ -322,10 +346,11 @@ function rowHalf(e: { clientY: number; currentTarget: HTMLElement }): 'before' |
* @param props.onFork - fork a session at its last completed turn.
* @param props.onArchive - archive a session by id.
* @param props.drag - optional draggable-row wiring.
+ * @param props.flat - omit the empty status slot in the hierarchy-free flat list.
* @param props.t - the browser root's locale seat.
* @returns the session row.
*/
-export function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork, onArchive, drag, t }: {
+export function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork, onArchive, drag, flat = false, t }: {
node: SessionNode
currentId: string | undefined
now: number
@@ -338,6 +363,8 @@ export function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork
onArchive: (id: SessionNode['id']) => void
/** Present only on draggable rows (workspace-group sessions outside search). */
drag?: RowDragProps | undefined
+ /** The row is rendered without a parent Workspace header. */
+ flat?: boolean | undefined
t: RowTranslate
}) {
const row = node
@@ -345,6 +372,7 @@ export function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork
const selected = node.id === currentId
const statuses = sessionStatuses(node, t)
const primaryStatus = statuses[0]
+ const showStatus = primaryStatus.state !== 'done' || row.completed
const [menuOpen, setMenuOpen] = useState(false)
// Archive hides the row through the registry-global archive set and never
// touches the session log, so it is not styled as destructive and needs no
@@ -360,6 +388,7 @@ export function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork
(
)
+/** ic_ds_globe_outline_14 — meridian globe (harness-only figma extract). */
+export const IconGlobeOutline14 = ({ size = 14, className }: IconProps) => (
+
+)
+
/** ic_ds_settings_outline_14 */
export const IconSettingsOutline14 = ({ size = 14, className }: IconProps) => (
-
+
)
}
-/** Render one durable workflow run with independent run and phase disclosure. */
+/** Render one durable workflow run with status-driven run and phase disclosure. */
export function WorkflowRunPanel({ node, sessionId, useSessions, openSession, t }: WorkflowRunPanelProps) {
- const [open, setOpen] = useState(() => node.data.status === 'running')
- const memberCount = node.data.phases.reduce((count, phase) => count + phase.members.length, 0)
+ const totalMembers = node.data.phases.reduce((count, phase) => count + phase.members.length, 0)
+ const requiresExpansion = node.data.status !== 'completed'
+ || node.data.phases.some(phaseRequiresExpansion)
const navigable = useSessions(
sessions => navigableMembers(sessions, node.data.phases, sessionId),
shallowEqual,
@@ -218,14 +247,12 @@ export function WorkflowRunPanel({ node, sessionId, useSessions, openSession, t
return (
{node.data.phases.length === 0
? {t('run.empty')}
@@ -239,7 +266,7 @@ export function WorkflowRunPanel({ node, sessionId, useSessions, openSession, t
/>
))}
- )}
+ {
e.dataTransfer.effectAllowed = 'move'
+ e.dataTransfer.setData('text/plain', node.id)
drag.start()
}}
onDragEnd={drag?.end}
@@ -392,16 +422,11 @@ export function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork
{/* Pending interaction and own or descendant activity outrank the
finished-but-unviewed reminder, which returns after activity stops
and is cleared by opening the session. */}
-
- {(primaryStatus.state !== 'done' || row.completed) && (
- <>
-
+ /** Shared editable order per Workspace group plus the browser-local flat-list account. */
+ recentSessionOrder: Record
+ /** Last observed update timestamps per order account for one-time promotion events. */
+ recentSessionUpdatedAt: Record>
+}
/**
* Annotation twin of the actions literal below (the export needs a declared
@@ -19,6 +33,16 @@ type WorkspaceViewState = { groupBy: WorkspaceGroupBy }
*/
type WorkspaceViewActions = {
setGroupBy: (draft: WorkspaceViewState, mode: WorkspaceGroupBy) => void
+ setOrderBy: (draft: WorkspaceViewState, mode: WorkspaceOrderBy) => void
+ setWorkspaceExpanded: (draft: WorkspaceViewState, key: string, expanded: boolean) => void
+ retainWorkspaceKeys: (draft: WorkspaceViewState, workspaceKeys: readonly string[]) => void
+ syncRecentSessions: (
+ draft: WorkspaceViewState,
+ workspaceKey: string,
+ order: string[],
+ updatedAt: Record,
+ ) => void
+ setRecentSessionOrder: (draft: WorkspaceViewState, workspaceKey: string, order: string[]) => void
}
/**
@@ -27,10 +51,37 @@ type WorkspaceViewActions = {
*/
export function createWorkspaceViewStore(): EngineStoreHandle {
return defineStore({
- init: (): WorkspaceViewState => ({ groupBy: 'workspace' }),
- persist: 'dsh.workspace.view',
+ init: (): WorkspaceViewState => ({
+ groupBy: 'workspace',
+ orderBy: 'manual',
+ workspaceExpansion: {},
+ recentSessionOrder: {},
+ recentSessionUpdatedAt: {},
+ }),
+ persist: 'dsh.workspace.view.v4',
actions: {
setGroupBy: (d, mode: WorkspaceGroupBy) => { d.groupBy = mode },
+ setOrderBy: (d, mode: WorkspaceOrderBy) => { d.orderBy = mode },
+ setWorkspaceExpanded: (d, key: string, expanded: boolean) => { d.workspaceExpansion[key] = expanded },
+ retainWorkspaceKeys: (d, workspaceKeys: readonly string[]) => {
+ const retained = new Set(workspaceKeys)
+ d.workspaceExpansion = Object.fromEntries(
+ Object.entries(d.workspaceExpansion).filter(([key]) => retained.has(key)),
+ )
+ d.recentSessionOrder = Object.fromEntries(
+ Object.entries(d.recentSessionOrder).filter(([key]) => retained.has(key)),
+ )
+ d.recentSessionUpdatedAt = Object.fromEntries(
+ Object.entries(d.recentSessionUpdatedAt).filter(([key]) => retained.has(key)),
+ )
+ },
+ syncRecentSessions: (d, workspaceKey: string, order: string[], updatedAt: Record) => {
+ d.recentSessionOrder[workspaceKey] = order
+ d.recentSessionUpdatedAt[workspaceKey] = updatedAt
+ },
+ setRecentSessionOrder: (d, workspaceKey: string, order: string[]) => {
+ d.recentSessionOrder[workspaceKey] = order
+ },
},
})
}
diff --git a/packages/client/ui-workspace/src/client/tree.ts b/packages/client/ui-workspace/src/client/tree.ts
index 008ab687f7..e9cbf8ed71 100644
--- a/packages/client/ui-workspace/src/client/tree.ts
+++ b/packages/client/ui-workspace/src/client/tree.ts
@@ -32,6 +32,9 @@ export interface SessionNode {
updatedAt: number
}
+/** Session order selected by the Workspace browser. */
+export type SessionOrderBy = 'manual' | 'updated'
+
/** One workspace group section: header row facts + visible top-level session rows. */
export interface GroupNode {
/** Group key: the workspace id or {@link UNGROUPED_KEY}. */
@@ -75,6 +78,8 @@ export interface SearchResultSet {
/** Viewing state consumed by the derivation. */
export interface TreeView {
expandedProjects: readonly string[]
+ /** Browser-local order for Sessions without a backing Workspace account. */
+ ungroupedOrder?: readonly string[]
}
interface Group {
@@ -136,21 +141,41 @@ function buildGroup(
order: 'account' | 'recency',
): Group {
const sessions = [...members]
- // Workspace order is workspace.sessionIds; only Ungrouped lacks an account
- // order and therefore falls back to recency.
+ // Real Workspace order comes from sessionIds. Ungrouped falls back to
+ // recency until the browser supplies its persisted local order.
if (order === 'recency') sessions.sort(byRecency)
return { key, workspaceId, cwd, createdAt, label, sessions }
}
+/** Apply a stored Ungrouped order and append newly loose Sessions by recency. */
+function orderedUngrouped(members: readonly SessionSummary[], stored: readonly string[]): SessionSummary[] {
+ const byId = new Map(members.map(session => [session.id as string, session]))
+ const included = new Set()
+ const ordered: SessionSummary[] = []
+ for (const key of stored) {
+ const session = byId.get(key)
+ if (session === undefined || included.has(key)) continue
+ ordered.push(session)
+ included.add(key)
+ }
+ for (const session of [...members].sort(byRecency)) {
+ if (included.has(session.id)) continue
+ ordered.push(session)
+ }
+ return ordered
+}
+
/**
* Group Sessions by Host Workspace: one group per entity in stable Host
* order, with members resolved from sessionIds in their stored order. Sessions
- * outside every Workspace trail in the recency-ordered Ungrouped bucket.
+ * outside every Workspace trail in the browser-local Ungrouped order, which
+ * falls back to recency before that order is initialized.
*/
function groupByWorkspace(
list: SessionListState,
workspaces: readonly WorkspaceView[],
archived: ReadonlySet,
+ ungroupedOrder: readonly string[] | undefined,
): Group[] {
const groups: Group[] = []
const accounted = new Set()
@@ -173,7 +198,15 @@ function groupByWorkspace(
.filter((s): s is SessionSummary =>
s !== undefined && !accounted.has(s.id) && sessionVisible(s, list.current, archived))
if (stray.length > 0) {
- groups.push(buildGroup(UNGROUPED_KEY, undefined, undefined, undefined, UNGROUPED_LABEL, stray, 'recency'))
+ groups.push(buildGroup(
+ UNGROUPED_KEY,
+ undefined,
+ undefined,
+ undefined,
+ UNGROUPED_LABEL,
+ ungroupedOrder === undefined ? stray : orderedUngrouped(stray, ungroupedOrder),
+ ungroupedOrder === undefined ? 'recency' : 'account',
+ ))
}
return groups
}
@@ -197,8 +230,8 @@ function sessionNode(
/**
* Derive the workspace browser groups with every session as a top-level row.
*
- * Every group shows; sessions populate under expanded groups, preserving
- * Host account order. Blank sessions are excluded except for the selected
+ * Every group shows; sessions populate under expanded groups in the selected
+ * local order. Blank sessions are excluded except for the selected
* provisional New Session row; archived sessions are excluded everywhere.
* Content search lives outside this derivation
* (see {@link deriveSearchResults}).
@@ -222,7 +255,7 @@ export function deriveGroups(
: (workspaces.find(w => w.sessionIds.includes(list.current as SessionId))?.workspaceId as string | undefined)
?? UNGROUPED_KEY
const groups: GroupNode[] = []
- for (const g of groupByWorkspace(list, workspaces, archived)) {
+ for (const g of groupByWorkspace(list, workspaces, archived, view.ungroupedOrder)) {
const expanded = expandedProjects.has(g.key)
groups.push({
key: g.key,
@@ -248,7 +281,10 @@ export function deriveGroups(
* @param archivedSessionIds - registry-global archive set.
* @returns flat rows in render order.
*/
-export function deriveFlat(list: SessionListState, archivedSessionIds: readonly SessionId[]): SessionNode[] {
+export function deriveFlat(
+ list: SessionListState,
+ archivedSessionIds: readonly SessionId[],
+): SessionNode[] {
const archived = new Set(archivedSessionIds)
const descendants = indexSubagentDescendants(list.byId)
const rows: SessionSummary[] = []
diff --git a/packages/client/ui-workspace/tests/browser-styles.client.spec.ts b/packages/client/ui-workspace/tests/browser-styles.client.spec.ts
index 4165971bff..d66baef917 100644
--- a/packages/client/ui-workspace/tests/browser-styles.client.spec.ts
+++ b/packages/client/ui-workspace/tests/browser-styles.client.spec.ts
@@ -8,6 +8,7 @@ import { fileURLToPath } from 'node:url'
import { describe, expect, it } from 'vitest'
const css = readFileSync(fileURLToPath(new URL('../src/client/WorkspaceBrowser.module.css', import.meta.url)), 'utf8')
+const rowsCss = readFileSync(fileURLToPath(new URL('../src/client/rows/Rows.module.css', import.meta.url)), 'utf8')
/**
* Declarations of one selector rule, keyed by property with whitespace collapsed.
@@ -15,21 +16,23 @@ const css = readFileSync(fileURLToPath(new URL('../src/client/WorkspaceBrowser.m
* @param selector - one exact selector, including a leading dot for local classes.
* @returns the rule's declarations, or undefined when no such rule exists.
*/
-function declarations(selector: string): Map | undefined {
- const withoutComments = css.replace(/\/\*[\s\S]*?\*\//g, ' ')
+function declarationsFrom(source: string, selector: string): Map | undefined {
+ const withoutComments = source.replace(/\/\*[\s\S]*?\*\//g, ' ')
+ const found = new Map()
for (const [, selectorList = '', body = ''] of withoutComments.matchAll(/([^{}]+)\{([^{}]*)\}/g)) {
if (!selectorList.split(',').map(value => value.trim()).includes(selector)) continue
- const found = new Map()
for (const part of body.split(';')) {
const colon = part.indexOf(':')
if (colon === -1) continue
found.set(part.slice(0, colon).trim(), part.slice(colon + 1).trim().replace(/\s+/g, ' '))
}
- return found
}
- return undefined
+ return found.size === 0 ? undefined : found
}
+const declarations = (selector: string): Map | undefined => declarationsFrom(css, selector)
+const rowDeclarations = (selector: string): Map | undefined => declarationsFrom(rowsCss, selector)
+
describe('WorkspaceBrowser.module.css list', () => {
const root = declarations('.root')
const listArea = declarations('.listArea')
@@ -45,9 +48,13 @@ describe('WorkspaceBrowser.module.css list', () => {
expect(root?.get('--dsh-session-list-scrollbar-width')).toBe('8px')
expect(root?.get('--dsh-session-list-scrollbar-offset')).toBe('2px')
expect(root?.get('padding-right')).toBe('var(--dsh-session-list-edge-inset)')
+ expect(listArea?.get('margin-left')).toBe('-4px')
+ expect(listArea?.get('padding-left')).toBe('4px')
expect(listArea?.get('margin-right')).toBe('calc(-1 * var(--dsh-session-list-edge-inset))')
expect(declarations('.fade')?.get('right')).toBe('var(--dsh-session-list-edge-inset)')
expect(list?.get('margin-right')).toBe('var(--dsh-session-list-scrollbar-offset)')
+ expect(list?.get('margin-left')).toBe('-4px')
+ expect(list?.get('padding-left')).toBe('4px')
expect(list?.get('padding-right')).toBe([
'calc(',
'var(--dsh-session-list-edge-inset)',
@@ -68,4 +75,36 @@ describe('WorkspaceBrowser.module.css list', () => {
expect(declarations('.groupSection > * + *')?.get('margin-top')).toBe('2px')
expect(declarations('.groupSection + .groupSection')?.get('margin-top')).toBe('4px')
})
+
+ it('draws drag targets as a leading chevron joined to the insertion line', () => {
+ const listTopMarker = declarations('.listTopDropIndicator')
+ const workspaceMarker = declarations('.workspaceDropBefore::before')
+ const sessionMarker = rowDeclarations('.sessionRow.dropBefore::before')
+ expect(listTopMarker?.get('top')).toBe('-8px')
+ expect(listTopMarker?.get('left')).toBe('0')
+ expect(workspaceMarker?.get('left')).toBe('0')
+ expect(sessionMarker?.get('left')).toBe('0')
+ for (const marker of [listTopMarker, workspaceMarker, sessionMarker]) {
+ expect(marker?.get('height')).toBe('12px')
+ expect(marker?.get('background')).not.toContain('radial-gradient')
+ expect(marker?.get('background')).toContain('55deg')
+ expect(marker?.get('background')).toContain('125deg')
+ expect(marker?.get('background')).toContain('calc(50% - 1px) calc(50% + 1px)')
+ expect(marker?.get('background')).toContain('0 0 / 5px 7px')
+ expect(marker?.get('background')).toContain('0 5px / 5px 7px')
+ expect(marker?.get('background')).toContain('4px 5px / calc(100% - 4px) 2px')
+ }
+ })
+
+ it('keeps the compact fade, overflow control, search field, and row heights', () => {
+ expect(declarations('.fade')?.get('height')).toBe('24px')
+ expect(declarations('.sessionOverflowButton')?.get('height')).toBe('28px')
+ expect(declarations('.searchExpanded')?.get('height')).toBe('30px')
+ expect(rowDeclarations('.projectRow')?.get('height')).toBe('34px')
+ expect(rowDeclarations('.sessionRow')?.get('height')).toBe('32px')
+ expect(rowDeclarations('.flatSessionRowWithoutStatus .title')?.get('margin-left')).toBe('0')
+ expect(rowDeclarations('.searchResultRow')?.get('min-height')).toBe('48px')
+ expect(rowDeclarations('.sessionRow.selected')?.get('background'))
+ .toBe('var(--dsw-alias-interactive-bg-hover)')
+ })
})
diff --git a/packages/client/ui-workspace/tests/rows.client.spec.tsx b/packages/client/ui-workspace/tests/rows.client.spec.tsx
index 7e0971cf72..c7a153ff5f 100644
--- a/packages/client/ui-workspace/tests/rows.client.spec.tsx
+++ b/packages/client/ui-workspace/tests/rows.client.spec.tsx
@@ -46,7 +46,7 @@ function installClipboard(writeText: (text: string) => Promise): () => voi
}
}
-const dataTransfer = { effectAllowed: '', dropEffect: '' }
+const dataTransfer = { effectAllowed: '', dropEffect: '', setData: vi.fn() }
/** jsdom lacks DragEvent — the fireEvent fallback drops clientY, so pin it on the built event. */
function fireDrag(row: HTMLElement, kind: 'dragOver' | 'drop', clientY: number): void {
@@ -57,6 +57,21 @@ function fireDrag(row: HTMLElement, kind: 'dragOver' | 'drop', clientY: number):
}
describe('workspace browser rows', () => {
+ it('omits only an empty leading status slot in the hierarchy-free flat list', () => {
+ const idle: SessionNode = {
+ id: sid('flat'), title: 'Flat Session', blank: false, running: false,
+ runningSubagentCount: 0, completed: false, updatedAt: 0,
+ }
+ const view = render( {
+ return { effectAllowed: 'uninitialized', dropEffect: 'none', setData: vi.fn() }
+}
+
function mount(overrides: Partial = {}) {
const store = createWorkspaceViewStore().create()
const props: WorkspaceBrowserProps = {
@@ -71,6 +76,7 @@ function mount(overrides: Partial = {}) {
renameWorkspace: vi.fn(async () => {}),
deleteWorkspace: vi.fn(async () => {}),
archiveSession: vi.fn(async () => {}),
+ insertWorkspaceBefore: vi.fn(async () => {}),
insertSessionBefore: vi.fn(async () => {}),
createWorkspace: vi.fn(async () => workspace('created', [])),
useDirectoryFlow: bindSnapshotSelector({ getSnapshot: () => true, subscribe: () => () => {} }),
@@ -89,6 +95,28 @@ function rerender(b: ReturnType, overrides: Partial {
+ it('prunes deleted Workspace view state only after the Workspace baseline is ready', async () => {
+ const pending = {
+ ...workspaceState([]),
+ phase: 'pending' as const,
+ state: 'loading' as const,
+ baselinesReady: false,
+ }
+ const b = mount({ useWorkspaces: hook(pending) })
+ act(() => {
+ b.store.actions.setWorkspaceExpanded('deleted', true)
+ b.store.actions.syncRecentSessions('deleted', ['session'], { session: 1 })
+ })
+ expect(b.store.getSnapshot().workspaceExpansion).toEqual({ deleted: true })
+
+ rerender(b, { useWorkspaces: hook(workspaceState([])) })
+ await waitFor(() => {
+ expect(b.store.getSnapshot().workspaceExpansion).toEqual({})
+ expect(b.store.getSnapshot().recentSessionOrder).toEqual({ [UNGROUPED_KEY]: [] })
+ expect(b.store.getSnapshot().recentSessionUpdatedAt).toEqual({ [UNGROUPED_KEY]: {} })
+ })
+ })
+
it('renders the grouped tree by default and switches to the flat list via Group by', () => {
const sessions = sessionState([summary('alpha-s', 2), summary('beta-s', 1)])
const b = mount({
@@ -100,8 +128,14 @@ describe('WorkspaceBrowser', () => {
// Sessions hidden while their group is folded.
expect(screen.queryByText('alpha-s')).toBeNull()
- fireEvent.click(screen.getByRole('button', { name: '分组方式' }))
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
expect(screen.getByText('分组方式')).toBeTruthy() // the menu heading label
+ expect(screen.getByRole('separator')).toBeTruthy()
+ expect(screen.getAllByRole('menuitem').map(item => item.textContent)).toEqual([
+ '按工作区', '单列表', '手动排序', '最近更新',
+ ])
+ expect(screen.getByRole('menuitem', { name: '按工作区' }).querySelector('svg')).toBeTruthy()
+ expect(screen.getByRole('menuitem', { name: '手动排序' }).querySelector('svg')).toBeTruthy()
fireEvent.click(screen.getByRole('menuitem', { name: '单列表' }))
// Store-driven flip: title changes, rows flatten newest-first, headers gone.
expect(b.store.getSnapshot().groupBy).toBe('flat')
@@ -111,18 +145,73 @@ describe('WorkspaceBrowser', () => {
expect(screen.getByText('beta-s')).toBeTruthy()
// Back to workspace grouping through the same menu.
- fireEvent.click(screen.getByRole('button', { name: '分组方式' }))
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ expect(screen.getByRole('menuitem', { name: '手动排序' }).hasAttribute('disabled')).toBe(false)
fireEvent.click(screen.getByRole('menuitem', { name: '按工作区' }))
expect(b.store.getSnapshot().groupBy).toBe('workspace')
expect(screen.getByText('工作区')).toBeTruthy()
// Escape closes the menu without picking.
- fireEvent.click(screen.getByRole('button', { name: '分组方式' }))
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
fireEvent.keyDown(document, { key: 'Escape' })
expect(screen.queryByRole('menu')).toBeNull()
expect(b.store.getSnapshot().groupBy).toBe('workspace')
})
+ it('persists flat-list drag order locally and applies Last updated within that account', async () => {
+ const insertSessionBefore = vi.fn(async () => {})
+ const sessions = sessionState([summary('one', 3), summary('two', 2), summary('three', 1)])
+ const workspaces = workspaceState([
+ workspace('alpha', ['one']),
+ workspace('beta', ['two']),
+ ])
+ const b = mount({
+ useSessions: hook(sessions),
+ useWorkspaces: hook(workspaces),
+ insertSessionBefore,
+ })
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: '单列表' }))
+ await waitFor(() => {
+ expect(b.store.getSnapshot().recentSessionOrder[FLAT_SESSION_ORDER_KEY])
+ .toEqual(['one', 'two', 'three'])
+ })
+
+ const one = screen.getByText('one').closest('[role="treeitem"]') as HTMLElement
+ const three = screen.getByText('three').closest('[role="treeitem"]') as HTMLElement
+ three.getBoundingClientRect = () => ({
+ top: 150, bottom: 184, left: 0, right: 200, width: 200, height: 34,
+ x: 0, y: 150, toJSON: () => ({}),
+ })
+ fireEvent.dragStart(one, { dataTransfer: dragData() })
+ fireDrag(three, 'drop', 180)
+ expect(b.store.getSnapshot().recentSessionOrder[FLAT_SESSION_ORDER_KEY])
+ .toEqual(['two', 'three', 'one'])
+ expect(insertSessionBefore).not.toHaveBeenCalled()
+
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: '最近更新' }))
+ await waitFor(() => {
+ expect(b.store.getSnapshot().recentSessionOrder[FLAT_SESSION_ORDER_KEY])
+ .toEqual(['one', 'two', 'three'])
+ })
+
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: '手动排序' }))
+ fireEvent.dragStart(one, { dataTransfer: dragData() })
+ fireDrag(three, 'drop', 180)
+ b.view.unmount()
+
+ const restored = mount({ useSessions: hook(sessions), useWorkspaces: hook(workspaces) })
+ expect(restored.store.getSnapshot().groupBy).toBe('flat')
+ expect(restored.store.getSnapshot().orderBy).toBe('manual')
+ expect(screen.getAllByRole('treeitem').map(row => row.textContent)).toEqual([
+ expect.stringContaining('two'),
+ expect.stringContaining('three'),
+ expect.stringContaining('one'),
+ ])
+ })
+
it('expands a group on click and opens a session row', () => {
const open = vi.fn()
mount({
@@ -138,6 +227,93 @@ describe('WorkspaceBrowser', () => {
expect(screen.queryByText('alpha-s')).toBeNull()
})
+ it('shows five sessions by default and clears transient show-all when the Workspace collapses', () => {
+ const items = Array.from({ length: 7 }, (_, index) => summary(`session-${index + 1}`, 7 - index))
+ const b = mount({
+ useSessions: hook(sessionState(items)),
+ useWorkspaces: hook(workspaceState([workspace('alpha', items.map(item => item.id))])),
+ })
+ fireEvent.click(screen.getByText('alpha'))
+ for (const item of items.slice(0, 5)) expect(screen.getByText(item.displayTitle)).toBeTruthy()
+ expect(screen.queryByText('session-6')).toBeNull()
+ expect(screen.queryByText('session-7')).toBeNull()
+
+ fireEvent.click(screen.getByRole('button', { name: '展开其余 2 个会话' }))
+ expect(screen.getByText('session-6')).toBeTruthy()
+ expect(screen.getByText('session-7')).toBeTruthy()
+ expect(screen.getByRole('button', { name: '收起' })).toBeTruthy()
+
+ fireEvent.click(screen.getByText('alpha'))
+ expect(b.store.getSnapshot().workspaceExpansion).toEqual({ alpha: false })
+ fireEvent.click(screen.getByText('alpha'))
+ expect(b.store.getSnapshot().workspaceExpansion).toEqual({ alpha: true })
+ expect(screen.queryByText('session-6')).toBeNull()
+ expect(screen.getByRole('button', { name: '展开其余 2 个会话' })).toBeTruthy()
+ })
+
+ it('shares one editable order across modes and promotes only while Last updated is active', async () => {
+ const initial = sessionState([summary('one', 3), summary('two', 2)])
+ const b = mount({
+ useSessions: hook(initial),
+ useWorkspaces: hook(workspaceState([workspace('alpha', ['two', 'one'])])),
+ })
+ fireEvent.click(screen.getByText('alpha'))
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: '最近更新' }))
+ await waitFor(() => {
+ const rows = screen.getAllByRole('treeitem').slice(1)
+ expect(rows[0]?.textContent).toContain('one')
+ expect(rows[1]?.textContent).toContain('two')
+ })
+
+ const [one, two] = screen.getAllByRole('treeitem').slice(1) as [HTMLElement, HTMLElement]
+ two.getBoundingClientRect = () => ({
+ top: 150, bottom: 184, left: 0, right: 200, width: 200, height: 34, x: 0, y: 150, toJSON: () => ({}),
+ })
+ fireEvent.dragStart(one, { dataTransfer: dragData() })
+ fireDrag(two, 'drop', 180)
+ expect(b.store.getSnapshot().recentSessionOrder.alpha).toEqual(['two', 'one'])
+
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: '手动排序' }))
+ expect(screen.getAllByRole('treeitem').slice(1)[0]?.textContent).toContain('two')
+
+ // User activity updates the timestamp baseline in Manual mode without
+ // changing the shared visual order.
+ const updated = sessionState([summary('one', 4), summary('two', 2)])
+ rerender(b, { useSessions: hook(updated) })
+ await waitFor(() => {
+ expect(b.store.getSnapshot().recentSessionUpdatedAt.alpha).toEqual({ one: 4, two: 2 })
+ })
+ expect(b.store.getSnapshot().recentSessionOrder.alpha).toEqual(['two', 'one'])
+ expect(screen.getAllByRole('treeitem').slice(1)[0]?.textContent).toContain('two')
+
+ // Entering Last updated performs one complete recency sort.
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: '最近更新' }))
+ await waitFor(() => {
+ expect(b.store.getSnapshot().recentSessionOrder.alpha).toEqual(['one', 'two'])
+ expect(screen.getAllByRole('treeitem').slice(1)[0]?.textContent).toContain('one')
+ })
+
+ // A later user activity timestamp promotes that Session once while the
+ // mode remains active.
+ const promoted = sessionState([summary('one', 4), summary('two', 5)])
+ rerender(b, { useSessions: hook(promoted) })
+ await waitFor(() => {
+ expect(b.store.getSnapshot().recentSessionOrder.alpha).toEqual(['two', 'one'])
+ expect(screen.getAllByRole('treeitem').slice(1)[0]?.textContent).toContain('two')
+ })
+
+ b.view.unmount()
+ const restored = mount({
+ useSessions: hook(promoted),
+ useWorkspaces: hook(workspaceState([workspace('alpha', ['two', 'one'])])),
+ })
+ expect(restored.store.getSnapshot().recentSessionOrder.alpha).toEqual(['two', 'one'])
+ expect(screen.getAllByRole('treeitem').slice(1)[0]?.textContent).toContain('two')
+ })
+
it('archives a session from the row menu and hides archived rows in both modes', async () => {
const archiveSession = vi.fn(async () => {})
const b = mount({
@@ -150,11 +326,10 @@ describe('WorkspaceBrowser', () => {
fireEvent.click(screen.getByRole('menuitem', { name: '归档会话' }))
expect(archiveSession).toHaveBeenCalledWith(sid('gone-s'))
- // The archive-set echo hides the row in grouped mode (count included) and flat mode.
+ // The archive-set echo hides the row in grouped and flat modes.
rerender(b, { useWorkspaces: hook(workspaceState([workspace('alpha', ['kept-s', 'gone-s'])], [sid('gone-s')])) })
expect(screen.queryByText('gone-s')).toBeNull()
- expect(screen.getByText('1 个会话')).toBeTruthy()
- fireEvent.click(screen.getByRole('button', { name: '分组方式' }))
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
fireEvent.click(screen.getByRole('menuitem', { name: '单列表' }))
expect(screen.getByText('kept-s')).toBeTruthy()
expect(screen.queryByText('gone-s')).toBeNull()
@@ -195,16 +370,20 @@ describe('WorkspaceBrowser', () => {
expect(screen.getByText('child-s').closest('[role="treeitem"]')?.getAttribute('draggable')).toBe('true')
})
- it('auto-expands the selected session group and starts a session from the group ＋', () => {
+ it('expands the target group before starting a session from its ＋', () => {
const startSession = vi.fn()
- mount({
- useSessions: hook(sessionState([summary('alpha-s', 1)], { current: sid('alpha-s') })),
+ const b = mount({
+ useSessions: hook(sessionState([summary('alpha-s', 1)])),
useWorkspaces: hook(workspaceState([workspace('alpha', ['alpha-s'])])),
startSession,
})
- // The current-group effect expanded the owning group without a click.
- expect(screen.getByText('alpha-s')).toBeTruthy()
+ startSession.mockImplementation(() => {
+ expect(b.store.getSnapshot().workspaceExpansion).toEqual({ alpha: true })
+ })
+ expect(screen.queryByText('alpha-s')).toBeNull()
fireEvent.click(screen.getByRole('button', { name: '在“alpha”中新建会话' }))
+ expect(b.store.getSnapshot().workspaceExpansion).toEqual({ alpha: true })
+ expect(screen.getByText('alpha-s')).toBeTruthy()
expect(startSession).toHaveBeenCalledWith(wid('alpha'))
})
@@ -253,7 +432,6 @@ describe('WorkspaceBrowser', () => {
expect(screen.getByText('新会话')).toBeTruthy()
expect(screen.queryByText('alpha-blank')).toBeNull()
expect(screen.queryByText('beta-blank')).toBeNull()
- expect(screen.getByText('1 个会话')).toBeTruthy()
rerender(b, { useSessions: hook({ ...sessions, current: staleBlank.id }) })
expect(screen.getAllByText('新会话')).toHaveLength(1)
@@ -262,9 +440,9 @@ describe('WorkspaceBrowser', () => {
expect(screen.getAllByText('新会话')).toHaveLength(1)
// Search excludes blank rows entirely — neither the canonical stored
// title nor the localized display label participates in matching.
- fireEvent.change(screen.getByPlaceholderText('搜索名称、关键词…'), { target: { value: 'new session' } })
+ fireEvent.change(screen.getByPlaceholderText('搜索会话…'), { target: { value: 'new session' } })
expect(screen.queryByText('新会话')).toBeNull()
- fireEvent.change(screen.getByPlaceholderText('搜索名称、关键词…'), { target: { value: '新会话' } })
+ fireEvent.change(screen.getByPlaceholderText('搜索会话…'), { target: { value: '新会话' } })
expect(screen.queryByText('新会话')).toBeNull()
})
@@ -279,7 +457,8 @@ describe('WorkspaceBrowser', () => {
useSessions: hook(sessions),
useWorkspaces: hook(workspaceState([workspace('alpha', ['needle-row', 'other-row'])])),
})
- const input = screen.getByPlaceholderText('搜索名称、关键词…')
+ fireEvent.click(screen.getByRole('button', { name: '搜索会话' }))
+ const input = screen.getByPlaceholderText('搜索会话…')
fireEvent.change(input, { target: { value: 'needle' } })
const resultTree = screen.getByRole('tree', { name: '搜索结果' })
expect(screen.getByText('Needle row')).toBeTruthy()
@@ -302,6 +481,27 @@ describe('WorkspaceBrowser', () => {
}
})
+ it('collapses an empty search on outside click but keeps a non-empty query expanded', () => {
+ mount()
+ const search = screen.getByRole('button', { name: '搜索会话' })
+ fireEvent.click(search)
+ expect(search.getAttribute('aria-expanded')).toBe('true')
+ fireEvent.click(document.body)
+ expect(search.getAttribute('aria-expanded')).toBe('false')
+
+ fireEvent.click(search)
+ const input = screen.getByPlaceholderText('搜索会话…')
+ fireEvent.change(input, { target: { value: ' ' } })
+ fireEvent.click(document.body)
+ expect(search.getAttribute('aria-expanded')).toBe('false')
+
+ fireEvent.click(search)
+ fireEvent.change(input, { target: { value: 'kept' } })
+ fireEvent.click(document.body)
+ expect(search.getAttribute('aria-expanded')).toBe('true')
+ expect(input.value).toBe('kept')
+ })
+
it('adds Host content hits with context, shows the result bound, and opens without clearing the query', async () => {
vi.useFakeTimers()
try {
@@ -320,7 +520,7 @@ describe('WorkspaceBrowser', () => {
open,
searchSessions,
})
- const input = screen.getByPlaceholderText('搜索名称、关键词…')
+ const input = screen.getByPlaceholderText('搜索会话…')
fireEvent.change(input, { target: { value: 'waterfall token' } })
expect(screen.getByText('正在搜索会话历史…')).toBeTruthy()
expect(screen.queryByText('Research notes')).toBeNull()
@@ -345,7 +545,7 @@ describe('WorkspaceBrowser', () => {
try {
const searchSessions = vi.fn(async () => ({ items: [], hasMore: false }))
mount({ searchSessions })
- const input = screen.getByPlaceholderText('搜索名称、关键词…')
+ const input = screen.getByPlaceholderText('搜索会话…')
expect(input.maxLength).toBe(500)
fireEvent.change(input, { target: { value: 'y'.repeat(501) } })
expect(input.value).toBe('y'.repeat(500))
@@ -376,7 +576,7 @@ describe('WorkspaceBrowser', () => {
useWorkspaces: hook(workspaceState([workspace('alpha', ['local-hit'])])),
searchSessions,
})
- fireEvent.change(screen.getByPlaceholderText('搜索名称、关键词…'), {
+ fireEvent.change(screen.getByPlaceholderText('搜索会话…'), {
target: { value: 'needle' },
})
expect(screen.getByText('Needle title')).toBeTruthy()
@@ -413,7 +613,7 @@ describe('WorkspaceBrowser', () => {
])),
searchSessions,
})
- const input = screen.getByPlaceholderText('搜索名称、关键词…')
+ const input = screen.getByPlaceholderText('搜索会话…')
fireEvent.change(input, { target: { value: 'first' } })
await act(async () => { await vi.advanceTimersByTimeAsync(250) })
const firstSignal = searchSessions.mock.calls[0]?.[1] as AbortSignal
@@ -447,7 +647,7 @@ describe('WorkspaceBrowser', () => {
? first
: Promise.resolve({ items: [], hasMore: false }))
mount({ searchSessions })
- const input = screen.getByPlaceholderText('搜索名称、关键词…')
+ const input = screen.getByPlaceholderText('搜索会话…')
fireEvent.change(input, { target: { value: 'first' } })
await act(async () => { await vi.advanceTimersByTimeAsync(250) })
@@ -470,7 +670,7 @@ describe('WorkspaceBrowser', () => {
b.store.actions.setGroupBy('flat')
rerender(b, {})
expect(screen.getByText('暂无会话')).toBeTruthy()
- fireEvent.change(screen.getByPlaceholderText('搜索名称、关键词…'), { target: { value: 'x' } })
+ fireEvent.change(screen.getByPlaceholderText('搜索会话…'), { target: { value: 'x' } })
expect(screen.getByText('正在搜索会话历史…')).toBeTruthy()
await act(async () => { await vi.advanceTimersByTimeAsync(250) })
expect(screen.getByText('无匹配会话')).toBeTruthy()
@@ -486,12 +686,12 @@ describe('WorkspaceBrowser', () => {
const b = mount({ wide: false, expandSidebar })
// No wide chrome in rail state.
expect(screen.queryByText('工作区')).toBeNull()
- expect(screen.queryByPlaceholderText('搜索名称、关键词…')).toBeNull()
+ expect(screen.queryByPlaceholderText('搜索会话…')).toBeNull()
fireEvent.click(screen.getByRole('button', { name: '搜索会话' }))
expect(expandSidebar).toHaveBeenCalledTimes(1)
// The wide flip mounts the input and focuses it after the slide.
rerender(b, { wide: true })
- const input = screen.getByPlaceholderText('搜索名称、关键词…')
+ const input = screen.getByPlaceholderText('搜索会话…')
act(() => { vi.advanceTimersByTime(300) })
expect(document.activeElement).toBe(input)
// Wide search button is decorative (tabIndex -1, no expand call).
@@ -524,6 +724,84 @@ describe('WorkspaceBrowser', () => {
expect(screen.getByText('alpha')).toBeTruthy()
})
+ it('uses the full expanded Workspace section when resolving a Workspace drop half', () => {
+ const insertWorkspaceBefore = vi.fn(async () => {})
+ const sessions = sessionState(Array.from({ length: 5 }, (_, index) => summary(`beta-${index}`, index)))
+ mount({
+ useSessions: hook(sessions),
+ useWorkspaces: hook(workspaceState([
+ workspace('alpha', []),
+ workspace('beta', sessions.ids),
+ workspace('tail', []),
+ ])),
+ insertWorkspaceBefore,
+ })
+ fireEvent.click(screen.getByText('beta'))
+ const source = screen.getByText('tail').closest('[role="treeitem"]') as HTMLElement
+ let targetSection = screen.getByText('beta').closest('[role="treeitem"]')?.parentElement as HTMLElement
+ while (targetSection.parentElement?.getAttribute('role') !== 'tree') {
+ targetSection = targetSection.parentElement as HTMLElement
+ }
+ targetSection.getBoundingClientRect = () => ({
+ top: 100, bottom: 300, left: 0, right: 200, width: 200, height: 200, x: 0, y: 100, toJSON: () => ({}),
+ })
+ fireEvent.dragStart(source, { dataTransfer: dragData() })
+ // y=190 is below the header row but still in the top half of the whole
+ // expanded section, so the target is before beta rather than after it.
+ fireDrag(targetSection, 'drop', 190)
+ expect(insertWorkspaceBefore).toHaveBeenCalledWith(wid('tail'), wid('beta'))
+ })
+
+ it('draws the first Workspace insertion boundary on the scroll container', () => {
+ mount({
+ useWorkspaces: hook(workspaceState([
+ workspace('alpha', []),
+ workspace('beta', []),
+ ])),
+ })
+ const source = screen.getByText('beta').closest('[role="treeitem"]') as HTMLElement
+ let firstSection = screen.getByText('alpha').closest('[role="treeitem"]')?.parentElement as HTMLElement
+ while (firstSection.parentElement?.getAttribute('role') !== 'tree') {
+ firstSection = firstSection.parentElement as HTMLElement
+ }
+ firstSection.getBoundingClientRect = () => ({
+ top: 100, bottom: 134, left: 0, right: 200, width: 200, height: 34, x: 0, y: 100, toJSON: () => ({}),
+ })
+ fireEvent.dragStart(source, { dataTransfer: dragData() })
+ fireDrag(firstSection, 'dragOver', 105)
+ expect(firstSection.parentElement?.className).toContain('listTopDropActive')
+ const marker = firstSection.parentElement?.previousElementSibling
+ expect(marker?.className).toContain('listTopDropIndicator')
+ })
+
+ it('accepts a document-level drop and commits the last Workspace marker on drag end', () => {
+ const insertWorkspaceBefore = vi.fn(async () => {})
+ mount({
+ useWorkspaces: hook(workspaceState([
+ workspace('alpha', []),
+ workspace('beta', []),
+ workspace('tail', []),
+ ])),
+ insertWorkspaceBefore,
+ })
+ const source = screen.getByText('tail').closest('[role="treeitem"]') as HTMLElement
+ let target = screen.getByText('beta').closest('[role="treeitem"]')?.parentElement as HTMLElement
+ while (target.parentElement?.getAttribute('role') !== 'tree') {
+ target = target.parentElement as HTMLElement
+ }
+ target.getBoundingClientRect = () => ({
+ top: 100, bottom: 134, left: 0, right: 200, width: 200, height: 34, x: 0, y: 100, toJSON: () => ({}),
+ })
+ fireEvent.dragStart(source, { dataTransfer: dragData() })
+ fireDrag(target, 'dragOver', 105)
+ const outsideDrop = createEvent.drop(document.body)
+ Object.defineProperty(outsideDrop, 'dataTransfer', { value: dragData() })
+ fireEvent(document.body, outsideDrop)
+ expect(outsideDrop.defaultPrevented).toBe(true)
+ fireEvent.dragEnd(source)
+ expect(insertWorkspaceBefore).toHaveBeenCalledWith(wid('tail'), wid('beta'))
+ })
+
it('drag reorder reports the anchor to insertSessionBefore and skips no-op drops', () => {
const insertSessionBefore = vi.fn(async () => {})
const sessions = sessionState([summary('one', 3), summary('two', 2), summary('three', 1)])
@@ -538,7 +816,7 @@ describe('WorkspaceBrowser', () => {
three.getBoundingClientRect = () => ({
top: 200, bottom: 234, left: 0, right: 200, width: 200, height: 34, x: 0, y: 200, toJSON: () => ({}),
})
- const dataTransfer = { effectAllowed: '', dropEffect: '' }
+ const dataTransfer = dragData()
fireEvent.dragStart(one, { dataTransfer })
// Drop on the top half of "three": insert one before three.
fireDrag(three, 'dragOver', 205)
@@ -559,6 +837,55 @@ describe('WorkspaceBrowser', () => {
expect(insertSessionBefore).toHaveBeenCalledTimes(1)
})
+ it('persists Ungrouped drag order in both modes without writing a Host Workspace account', async () => {
+ const insertSessionBefore = vi.fn(async () => {})
+ const sessions = sessionState([summary('one', 3), summary('two', 2), summary('three', 1)])
+ const b = mount({
+ useSessions: hook(sessions),
+ useWorkspaces: hook(workspaceState([])),
+ insertSessionBefore,
+ })
+ fireEvent.click(screen.getByText('未分组'))
+
+ const dragAfter = (sourceTitle: string, targetTitle: string): void => {
+ const source = screen.getByText(sourceTitle).closest('[role="treeitem"]') as HTMLElement
+ const target = screen.getByText(targetTitle).closest('[role="treeitem"]') as HTMLElement
+ target.getBoundingClientRect = () => ({
+ top: 150, bottom: 184, left: 0, right: 200, width: 200, height: 34, x: 0, y: 150, toJSON: () => ({}),
+ })
+ fireEvent.dragStart(source, { dataTransfer: dragData() })
+ fireDrag(target, 'drop', 180)
+ }
+
+ dragAfter('one', 'three')
+ expect(b.store.getSnapshot().recentSessionOrder[UNGROUPED_KEY]).toEqual(['two', 'three', 'one'])
+ dragAfter('two', 'one')
+ expect(b.store.getSnapshot().recentSessionOrder[UNGROUPED_KEY]).toEqual(['three', 'one', 'two'])
+ expect(insertSessionBefore).not.toHaveBeenCalled()
+
+ fireEvent.click(screen.getByRole('button', { name: '视图选项' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: '最近更新' }))
+ await waitFor(() => {
+ expect(b.store.getSnapshot().recentSessionOrder[UNGROUPED_KEY]).toEqual(['one', 'two', 'three'])
+ })
+ dragAfter('one', 'three')
+ expect(b.store.getSnapshot().recentSessionOrder[UNGROUPED_KEY]).toEqual(['two', 'three', 'one'])
+ expect(insertSessionBefore).not.toHaveBeenCalled()
+
+ b.view.unmount()
+ const restored = mount({
+ useSessions: hook(sessions),
+ useWorkspaces: hook(workspaceState([])),
+ insertSessionBefore,
+ })
+ expect(restored.store.getSnapshot().recentSessionOrder[UNGROUPED_KEY]).toEqual(['two', 'three', 'one'])
+ expect(screen.getAllByRole('treeitem').slice(1).map(row => row.textContent)).toEqual([
+ expect.stringContaining('two'),
+ expect.stringContaining('three'),
+ expect.stringContaining('one'),
+ ])
+ })
+
it('still sends the reorder when the dragged row left the group mid-drag', () => {
const insertSessionBefore = vi.fn(async () => {})
const sessions = sessionState([summary('one', 2), summary('two', 1)])
@@ -569,7 +896,7 @@ describe('WorkspaceBrowser', () => {
})
fireEvent.click(screen.getByText('alpha'))
const one = screen.getByText('one').closest('[role="treeitem"]') as HTMLElement
- fireEvent.dragStart(one, { dataTransfer: { effectAllowed: '', dropEffect: '' } })
+ fireEvent.dragStart(one, { dataTransfer: dragData() })
// The host dropped "one" from the workspace account while the drag is in
// flight: the source index is gone but the drop still resolves its anchor.
rerender(b, { useWorkspaces: hook(workspaceState([workspace('alpha', ['two'])])) })
@@ -594,7 +921,7 @@ describe('WorkspaceBrowser', () => {
two.getBoundingClientRect = () => ({
top: 150, bottom: 184, left: 0, right: 200, width: 200, height: 34, x: 0, y: 150, toJSON: () => ({}),
})
- const dataTransfer = { effectAllowed: '', dropEffect: '' }
+ const dataTransfer = dragData()
fireEvent.dragStart(one, { dataTransfer })
fireEvent.dragEnd(one)
// The drag ended: rows no longer accept drops.
@@ -608,6 +935,28 @@ describe('WorkspaceBrowser', () => {
expect(insertSessionBefore).toHaveBeenCalledWith(wid('alpha'), sid('one'), undefined)
})
+ it('accepts a document-level drop and commits the last Session marker on drag end', () => {
+ const insertSessionBefore = vi.fn(async () => {})
+ mount({
+ useSessions: hook(sessionState([summary('one', 2), summary('two', 1)])),
+ useWorkspaces: hook(workspaceState([workspace('alpha', ['one', 'two'])])),
+ insertSessionBefore,
+ })
+ fireEvent.click(screen.getByText('alpha'))
+ const [one, two] = screen.getAllByRole('treeitem').slice(1) as [HTMLElement, HTMLElement]
+ two.getBoundingClientRect = () => ({
+ top: 150, bottom: 184, left: 0, right: 200, width: 200, height: 34, x: 0, y: 150, toJSON: () => ({}),
+ })
+ fireEvent.dragStart(one, { dataTransfer: dragData() })
+ fireDrag(two, 'dragOver', 180)
+ const outsideDrop = createEvent.drop(document.body)
+ Object.defineProperty(outsideDrop, 'dataTransfer', { value: dragData() })
+ fireEvent(document.body, outsideDrop)
+ expect(outsideDrop.defaultPrevented).toBe(true)
+ fireEvent.dragEnd(one)
+ expect(insertSessionBefore).toHaveBeenCalledWith(wid('alpha'), sid('one'), undefined)
+ })
+
it('logs and keeps the order when the reorder call rejects', async () => {
const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
try {
@@ -623,7 +972,7 @@ describe('WorkspaceBrowser', () => {
two.getBoundingClientRect = () => ({
top: 150, bottom: 184, left: 0, right: 200, width: 200, height: 34, x: 0, y: 150, toJSON: () => ({}),
})
- const dataTransfer = { effectAllowed: '', dropEffect: '' }
+ const dataTransfer = dragData()
fireEvent.dragStart(one, { dataTransfer })
fireDrag(two, 'drop', 180)
await waitFor(() => { expect(warn).toHaveBeenCalledWith('session reorder rejected:', expect.any(Error)) })
@@ -778,7 +1127,7 @@ describe('WorkspaceBrowser', () => {
useSessions: hook(sessions),
useWorkspaces: hook(workspaceState([workspace('alpha', ['needle-a'])])),
})
- fireEvent.change(screen.getByPlaceholderText('搜索名称、关键词…'), { target: { value: 'needle' } })
+ fireEvent.change(screen.getByPlaceholderText('搜索会话…'), { target: { value: 'needle' } })
const row = screen.getByText('Needle A').closest('[role="treeitem"]') as HTMLElement
expect(row.hasAttribute('draggable')).toBe(false)
})
diff --git a/packages/host/README.i18n.yaml b/packages/host/README.i18n.yaml
index 3eb8fe7eb8..84e471c7fb 100644
--- a/packages/host/README.i18n.yaml
+++ b/packages/host/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/host/README.md
-README.md: 926cb0b6b87a8ee76cb2dab745a31f620f4e7f5c
-README.zh.md: 7ef057ee56e56ddc2baa7092ccbe44fb161b7448
+README.md: 1c3b6ab3192fe35a5532183414e45d1b02325e57
+README.zh.md: a062d5fce055e3266953993d532a86bec1375377
diff --git a/packages/host/README.md b/packages/host/README.md
index 926cb0b6b8..1c3b6ab319 100644
--- a/packages/host/README.md
+++ b/packages/host/README.md
@@ -13,6 +13,7 @@ The host side of the dsh web GUI: the API gateway every client shape shares, and
| [`directory-picker-native/`](directory-picker-native/README.md) | Native directory-picker backend and browser interaction | registers `ctx.directoryPicker` |
| [`directory-picker-browse/`](directory-picker-browse/README.md) | In-app directory-browser backend and interaction | registers `ctx.directoryPicker` |
| [`directory-picker-auto/`](directory-picker-auto/README.md) | Host-adaptive picker composition | mounts a backend |
+| [`plugin-inventory/`](plugin-inventory/README.md) | Read-only projection of current Loader entries | Remote `pluginInventory/list` |
`apiproxy` remains transport-independent; [`client/connection`](../client/connection/README.md) supplies the browser/HTTP carrier. Picker implementations replace one another behind the shared seam.
diff --git a/packages/host/README.zh.md b/packages/host/README.zh.md
index 7ef057ee56..a062d5fce0 100644
--- a/packages/host/README.zh.md
+++ b/packages/host/README.zh.md
@@ -13,6 +13,7 @@ dsh Web GUI 的宿主侧：所有客户端形态共享的 API 网关，以及承
| [`directory-picker-native/`](directory-picker-native/README.md) | 原生目录选择器后端和浏览器交互 | 注册 `ctx.directoryPicker` |
| [`directory-picker-browse/`](directory-picker-browse/README.md) | 应用内目录浏览器后端和交互 | 注册 `ctx.directoryPicker` |
| [`directory-picker-auto/`](directory-picker-auto/README.md) | 宿主自适应选择器组合 | 挂载一个后端 |
+| [`plugin-inventory/`](plugin-inventory/README.md) | 当前 Loader 条目的只读投影 | Remote `pluginInventory/list` |
`apiproxy` 保持传输无关；[`client/connection`](../client/connection/README.md) 提供浏览器／HTTP 载体。选择器实现可在共享 seam 后互相替换。
diff --git a/packages/host/apiproxy/README.i18n.yaml b/packages/host/apiproxy/README.i18n.yaml
index 1345dbcbcd..a0e3b413c1 100644
--- a/packages/host/apiproxy/README.i18n.yaml
+++ b/packages/host/apiproxy/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/host/apiproxy/README.md
-README.md: 541ebdb7a6802286b9b698575136534486387a8c
-README.zh.md: 595ef03c24873272fa78ad67289b264458083614
+README.md: 5915d20b176ed6eccdb2c939bdf58b0a122271c5
+README.zh.md: e1128323c45c8388562582de25cf8c68d936fac0
diff --git a/packages/host/apiproxy/README.md b/packages/host/apiproxy/README.md
index 541ebdb7a6..5915d20b17 100644
--- a/packages/host/apiproxy/README.md
+++ b/packages/host/apiproxy/README.md
@@ -42,7 +42,7 @@ Pending queued input is a live control-plane contract, not conversation history.
Background tasks ride the same live-push posture. When `ctx.tasks` is composed, the gateway subscribes to its change feed and broadcasts a whole `session/tasks` snapshot after every registry commit that alters what a session can see — registration, the stopping transition, settlement, and owner-disposal removal — plus a subscription baseline for each session that already has tasks (an absent baseline is the empty set; a change that empties a set still sends `[]`). A change carrying an owner reads through that exact `Agent`, so a push stays correct while its scope tears down; the baseline reads `ctx.agents.get(sessionId)`, which yields only unowned tasks for a session with no live Agent and never resumes a cold one. An unowned change fans out to every subscribed session, because unowned tasks are visible to every caller. The wire `TaskView` drops `ownerSession`, `reported`, and `outputLimitBytes`: the frame's own `sessionId` carries the first, and the other two are internal notice and model-presentation policy. A composition without the registry emits no such frames.
-Workspace and Session lists are separate reconnect baselines. `workspace.create({ path })` adopts an existing canonical directory and permits basename-derived titles to repeat. `workspace.delete` removes only the Workspace registration, `session.create` accepts an optional preallocated Session id, and `host/workspace-changed`, `host/workspace-removed`, plus `host/session-added` carry committed increments in either arrival order. `workspace.archiveSession` adds one session to the registry-global archive set and answers the full updated set; `workspace.list` carries that set as the reconnect baseline and `host/archived-sessions-changed` pushes the full snapshot after every durable change. Archiving hides the session from grouping surfaces without touching its log or its workspace account; a session neither live nor persisted fails with `session-not-found`. Registration deletion preserves the directory and session logs; its Sessions remain in `session.list` and become Ungrouped. `SessionSummary.blank` and the `host/session-added` frame carry the derived zero-events bit: clients hide blank sessions and reuse them per workspace, flip blank on the first `host/session-status(running:true)`, and treat `session.list` as the reconnect authority; cold summaries are never blank because lazy persistence keeps never-appended sessions out of `list()`.
+Workspace and Session lists are separate reconnect baselines. `workspace.create({ path })` adopts an existing canonical directory and permits basename-derived titles to repeat. `workspace.insertBefore({ workspaceId, beforeWorkspaceId? })` commits one registry-order move and answers the complete order; a pure reorder emits `host/workspace-order-changed` with that complete order, while unknown sources or anchors return `workspace-not-found`. `workspace.delete` removes only the Workspace registration, `session.create` accepts an optional preallocated Session id, and `host/workspace-changed`, `host/workspace-removed`, plus `host/session-added` carry committed increments in either arrival order. `workspace.archiveSession` adds one session to the registry-global archive set and answers the full updated set; `workspace.list` carries that set as the reconnect baseline and `host/archived-sessions-changed` pushes the full snapshot after every durable change. Archiving hides the session from grouping surfaces without touching its log or its workspace account; a session neither live nor persisted fails with `session-not-found`. Registration deletion preserves the directory and session logs; its Sessions remain in `session.list` and become Ungrouped. `SessionSummary.blank` and the `host/session-added` frame carry the derived zero-events bit: clients hide blank sessions and reuse them per workspace, flip blank on the first `host/session-status(running:true)`, and treat `session.list` as the reconnect authority; cold summaries are never blank because lazy persistence keeps never-appended sessions out of `list()`.
`session.search` is a bounded content-search projection over the sessions visible through `session.list`. The gateway asks the optional `ctx.sessionQuery` service for globally ranked current-surface user, assistant, and steering matches, consumes that stream until it has at most 20 visible session/snippet pairs plus one lookahead, and revalidates every hit against the list-derived authorization set before returning it. Provider pages start at 20 hits; when a first-page request rejects that limit, the gateway probes 10, 5, 2, then 1 and retains the learned size for continuation and stale-generation restarts. Returned snippets contain at most 240 Unicode code points, and the response schema independently enforces that bound at each client boundary. Keeping the authorization set in Host memory avoids SQLite's variable ceiling for large valid corpora without weakening visibility or ranking.
diff --git a/packages/host/apiproxy/README.zh.md b/packages/host/apiproxy/README.zh.md
index 595ef03c24..e1128323c4 100644
--- a/packages/host/apiproxy/README.zh.md
+++ b/packages/host/apiproxy/README.zh.md
@@ -42,7 +42,7 @@ Settings 分节中的 `reasoningEffort` 在 agent-default-model 插件配置中
后台任务沿用同一种实时推送姿态。当组合中有 `ctx.tasks` 时，网关订阅它的变更订阅，并在注册表每一次改变某个会话可见内容的提交后——注册、转入 stopping、结算，以及 owner 销毁时的移除——广播一份完整的 `session/tasks` 快照，另外为每个已经有任务的会话发送订阅 baseline（没有 baseline 即表示空集；把集合清空的那次变更仍然发送 `[]`）。带 owner 的变更通过那个确切的 `Agent` 读取，因此推送在其 scope 拆除期间依然正确；baseline 读 `ctx.agents.get(sessionId)`，对没有活体 Agent 的会话只得到无主任务，且绝不恢复冷会话。无主变更向每一个已订阅会话扇出，因为无主任务对所有调用方可见。线路上的 `TaskView` 丢弃 `ownerSession`、`reported` 和 `outputLimitBytes`：第一个由帧自身的 `sessionId` 携带，另外两个分别是内部通知位和模型呈现策略。没有该注册表的组合不发出这类帧。
-Workspace 列表与 Session 列表是相互独立的重连基线。`workspace.create({ path })` 会接纳已有的规范目录，并允许由 basename 派生的标题重复。`workspace.delete` 只移除 Workspace 注册记录，`session.create` 接受可选的预分配 Session id，`host/workspace-changed`、`host/workspace-removed` 与 `host/session-added` 则以任意到达顺序携带已提交的增量。`workspace.archiveSession` 向注册表级全局归档集合添加一个会话，并应答完整的更新后集合；`workspace.list` 携带该集合作为重连基线，`host/archived-sessions-changed` 在每次持久变更后推送完整快照。归档只把会话从各分组视图中隐藏，不触碰其日志和 workspace 记账；既非实时也未持久化的会话以 `session-not-found` 失败。删除注册记录会保留目录和会话日志；相关 Session 仍留在 `session.list` 中，并进入 Ungrouped。`SessionSummary.blank` 与 `host/session-added` 帧携带派生的零事件位：客户端隐藏空白会话并按 workspace 复用它们，在首个 `host/session-status(running:true)` 时翻转 blank，并以 `session.list` 作为重连权威；冷会话摘要永远不是空白：惰性持久化让从未追加过事件的会话根本不出现在 `list()` 中。
+Workspace 列表与 Session 列表是相互独立的重连基线。`workspace.create({ path })` 会接纳已有的规范目录，并允许由 basename 派生的标题重复。`workspace.insertBefore({ workspaceId, beforeWorkspaceId? })` 提交一次注册表顺序移动并应答完整顺序；单纯重排序会通过 `host/workspace-order-changed` 推送同一份完整顺序，而未知来源或锚点返回 `workspace-not-found`。`workspace.delete` 只移除 Workspace 注册记录，`session.create` 接受可选的预分配 Session id，`host/workspace-changed`、`host/workspace-removed` 与 `host/session-added` 则以任意到达顺序携带已提交的增量。`workspace.archiveSession` 向注册表级全局归档集合添加一个会话，并应答完整的更新后集合；`workspace.list` 携带该集合作为重连基线，`host/archived-sessions-changed` 在每次持久变更后推送完整快照。归档只把会话从各分组视图中隐藏，不触碰其日志和 workspace 记账；既非实时也未持久化的会话以 `session-not-found` 失败。删除注册记录会保留目录和会话日志；相关 Session 仍留在 `session.list` 中，并进入 Ungrouped。`SessionSummary.blank` 与 `host/session-added` 帧携带派生的零事件位：客户端隐藏空白会话并按 workspace 复用它们，在首个 `host/session-status(running:true)` 时翻转 blank，并以 `session.list` 作为重连权威；冷会话摘要永远不是空白：惰性持久化让从未追加过事件的会话根本不出现在 `list()` 中。
`session.search` 是以 `session.list` 所列会话为范围的有界内容搜索投影。网关向可选的 `ctx.sessionQuery` 服务请求全局排序后的当前内容视图中的 user、assistant 和 steering 匹配项，并持续消费该结果流，直到获得至多 20 个可见会话／snippet 对及一个前瞻项；返回前仍会依据从列表推导的授权集合重新校验每个命中。提供方分页初始请求 20 个命中；如果第一页请求因这一上限被拒绝，网关会依次探测 10、5、2、1，并在续传和陈旧世代重启中沿用探测所得的页面大小。返回的 snippet 最多包含 240 个 Unicode 码点，响应 schema 则会在每个客户端边界独立强制执行该上限。将授权集合保留在宿主内存中，可在不削弱可见性或排序的前提下避开有效大型语料库的 SQLite 变量上限。
diff --git a/packages/host/apiproxy/src/api-proxy.ts b/packages/host/apiproxy/src/api-proxy.ts
index 5a22398aa9..c9567256db 100644
--- a/packages/host/apiproxy/src/api-proxy.ts
+++ b/packages/host/apiproxy/src/api-proxy.ts
@@ -25,7 +25,7 @@ import { isUserInvocable } from '@deepseek-ai/dsh-skill'
import type { Workspace, WorkspaceRecord } from '@deepseek-ai/dsh-workspace'
import {
workspaceDomainState, workspaceRecord, WorkspaceId as brandWorkspaceId,
- WorkspaceMoveInvalidError, WorkspaceUnknownSessionError,
+ WorkspaceMoveInvalidError, WorkspaceOrderInvalidError, WorkspaceUnknownSessionError,
} from '@deepseek-ai/dsh-workspace'
// Type-only: brings the `ctx.tools` Context merge into this program (viewFor reads presenters).
import {
@@ -2758,6 +2758,20 @@ export function createApiProxy(ctx: Context, defaults: ApiProxyDefaults): ApiPro
return ok(request, { deleted: true as const })
},
+ async insertBefore(request) {
+ const { workspaceId, beforeWorkspaceId } = request.payload
+ try {
+ const workspaceIds = await ctx.workspace.insertBefore(
+ brandWorkspaceId(workspaceId),
+ beforeWorkspaceId === undefined ? undefined : brandWorkspaceId(beforeWorkspaceId),
+ )
+ return ok(request, { workspaceIds: [...workspaceIds] })
+ } catch (error: unknown) {
+ if (!(error instanceof WorkspaceOrderInvalidError)) throw error
+ return workspaceNotFound(request, error.workspaceId)
+ }
+ },
+
async insertSessionBefore(request) {
const { payload } = request
const workspace = ctx.workspace.get(brandWorkspaceId(payload.workspaceId))
@@ -3412,9 +3426,11 @@ export function createApiProxy(ctx: Context, defaults: ApiProxyDefaults): ApiPro
host(_request, signal) {
const queue = new FrameQueue>()
+ const committedWorkspaces = ctx.workspace.list()
const committedWorkspaceIds = new Set(
- ctx.workspace.list().map(workspace => String(workspace.id)),
+ committedWorkspaces.map(workspace => String(workspace.id)),
)
+ let committedWorkspaceOrder = committedWorkspaces.map(workspace => workspace.id)
// Frame-dedup baseline, same posture as committedWorkspaceIds: the
// stream opens against the current set; workspace.list re-baselines
// reconnecting clients, so only later changes need frames.
@@ -3445,6 +3461,9 @@ export function createApiProxy(ctx: Context, defaults: ApiProxyDefaults): ApiPro
if (change.table === '') {
if (change.operation !== 'put') return
const state = workspaceDomainState.parse(change.value)
+ const orderChanged = state.workspaceIds.length === committedWorkspaceOrder.length
+ && state.workspaceIds.every(workspaceId => committedWorkspaceIds.has(String(workspaceId)))
+ && state.workspaceIds.some((workspaceId, index) => workspaceId !== committedWorkspaceOrder[index])
for (const workspaceId of state.workspaceIds) {
if (committedWorkspaceIds.has(workspaceId)) continue
const workspace = ctx.workspace.get(workspaceId)
@@ -3454,6 +3473,13 @@ export function createApiProxy(ctx: Context, defaults: ApiProxyDefaults): ApiPro
committedWorkspaceIds.add(workspaceId)
queue.push(frame({ type: 'host/workspace-changed', workspace: workspaceView(workspace) }))
}
+ committedWorkspaceOrder = [...state.workspaceIds]
+ if (orderChanged) {
+ queue.push(frame({
+ type: 'host/workspace-order-changed',
+ workspaceIds: [...state.workspaceIds],
+ }))
+ }
if (state.archivedSessionIds.length !== archivedSessionIds.length
|| state.archivedSessionIds.some((id, index) => id !== archivedSessionIds[index])) {
archivedSessionIds = state.archivedSessionIds
diff --git a/packages/host/apiproxy/src/api/events.schema.ts b/packages/host/apiproxy/src/api/events.schema.ts
index c8ddf99e8d..8b88186582 100644
--- a/packages/host/apiproxy/src/api/events.schema.ts
+++ b/packages/host/apiproxy/src/api/events.schema.ts
@@ -82,6 +82,7 @@ export const hostFrameSchema = z.discriminatedUnion('type', [
z.object({ type: z.literal('host/agent-error'), sessionId: sessionIdSchema, message: z.string() }),
z.object({ type: z.literal('host/workspace-changed'), workspace: workspaceViewSchema }),
z.object({ type: z.literal('host/workspace-removed'), workspaceId: workspaceIdSchema }),
+ z.object({ type: z.literal('host/workspace-order-changed'), workspaceIds: z.array(workspaceIdSchema) }),
z.object({ type: z.literal('host/archived-sessions-changed'), archivedSessionIds: z.array(sessionIdSchema) }),
// args stays wide, the same posture as session/projection's value: the frame
// arrives from JSON.parse, so every element is already a JSON value, and the
diff --git a/packages/host/apiproxy/src/api/events.ts b/packages/host/apiproxy/src/api/events.ts
index 901379b181..beba99b595 100644
--- a/packages/host/apiproxy/src/api/events.ts
+++ b/packages/host/apiproxy/src/api/events.ts
@@ -119,7 +119,8 @@ export type MuxFrame =
* workspace mutation (create/attach/order change — the client upserts, while
* `workspace.list` provides the reconnect baseline); workspace-removed is the
* committed registration-deletion increment and never implies directory or
- * session-log deletion; archived-sessions-changed pushes the full registry
+ * session-log deletion; workspace-order-changed pushes the complete durable
+ * registry order after a reorder; archived-sessions-changed pushes the full registry
* archive set after every durable change (same full-snapshot posture as
* workspace-changed — `workspace.list` re-baselines it on reconnect).
*/
@@ -138,6 +139,7 @@ export type HostFrame =
| { type: 'host/agent-error'; sessionId: SessionId; message: string }
| { type: 'host/workspace-changed'; workspace: WorkspaceView }
| { type: 'host/workspace-removed'; workspaceId: WorkspaceView['workspaceId'] }
+ | { type: 'host/workspace-order-changed'; workspaceIds: WorkspaceView['workspaceId'][] }
| { type: 'host/archived-sessions-changed'; archivedSessionIds: SessionId[] }
/**
* One allowlisted host cordis event forwarded verbatim. The allowlist is
diff --git a/packages/host/apiproxy/src/api/rpc-map.ts b/packages/host/apiproxy/src/api/rpc-map.ts
index f81ac842af..80dede1799 100644
--- a/packages/host/apiproxy/src/api/rpc-map.ts
+++ b/packages/host/apiproxy/src/api/rpc-map.ts
@@ -47,6 +47,7 @@ export interface RpcMethodMap {
'workspace.create': WorkspaceApi['create']
'workspace.rename': WorkspaceApi['rename']
'workspace.delete': WorkspaceApi['delete']
+ 'workspace.insertBefore': WorkspaceApi['insertBefore']
'workspace.insertSessionBefore': WorkspaceApi['insertSessionBefore']
'workspace.archiveSession': WorkspaceApi['archiveSession']
'skill.list': SkillsApi['list']
diff --git a/packages/host/apiproxy/src/api/workspace.schema.ts b/packages/host/apiproxy/src/api/workspace.schema.ts
index 5ad5a0b96b..b57305141c 100644
--- a/packages/host/apiproxy/src/api/workspace.schema.ts
+++ b/packages/host/apiproxy/src/api/workspace.schema.ts
@@ -66,6 +66,17 @@ export const workspaceDeleteValueSchema = z.object({
deleted: z.literal(true),
}) satisfies z.ZodType>>
+/** workspace.insertBefore request payload (anchor omitted = append to end). */
+export const workspaceInsertBeforeRequestSchema = z.object({
+ workspaceId: workspaceIdSchema,
+ beforeWorkspaceId: workspaceIdSchema.optional(),
+}) satisfies z.ZodType>>
+
+/** workspace.insertBefore response value: the complete durable display order. */
+export const workspaceInsertBeforeValueSchema = z.object({
+ workspaceIds: z.array(workspaceIdSchema),
+}) satisfies z.ZodType>>
+
/** workspace.insertSessionBefore request payload (anchor omitted = append to end). */
export const workspaceInsertSessionBeforeRequestSchema = z.object({
workspaceId: workspaceIdSchema,
diff --git a/packages/host/apiproxy/src/api/workspace.ts b/packages/host/apiproxy/src/api/workspace.ts
index 64feb27f80..d36d0c406e 100644
--- a/packages/host/apiproxy/src/api/workspace.ts
+++ b/packages/host/apiproxy/src/api/workspace.ts
@@ -73,6 +73,15 @@ export interface WorkspaceApi {
delete(request: RpcRequest<{ workspaceId: WorkspaceId }>):
Promise>
+ /**
+ * Moves one Workspace within the registry display order,
+ * DOM-insertBefore-like. An omitted anchor appends to the end.
+ */
+ insertBefore(request: RpcRequest<{
+ workspaceId: WorkspaceId
+ beforeWorkspaceId?: WorkspaceId
+ }>): Promise>
+
/**
* Moves an accounted session within its workspace's manual order,
* DOM-insertBefore-like: with `beforeSessionId` the session is inserted
diff --git a/packages/host/apiproxy/src/fetch/client.ts b/packages/host/apiproxy/src/fetch/client.ts
index e4b6a2bed6..70e3ece58f 100644
--- a/packages/host/apiproxy/src/fetch/client.ts
+++ b/packages/host/apiproxy/src/fetch/client.ts
@@ -35,6 +35,7 @@ import {
workspaceArchiveSessionValueSchema,
workspaceCreateValueSchema,
workspaceDeleteValueSchema,
+ workspaceInsertBeforeValueSchema,
workspaceInsertSessionBeforeValueSchema,
workspaceListValueSchema,
workspaceRenameValueSchema,
@@ -116,6 +117,7 @@ export interface IApiClient {
create(payload: RequestPayload<'workspace.create'>, signal?: AbortSignal): Promise>>
rename(payload: RequestPayload<'workspace.rename'>, signal?: AbortSignal): Promise>>
delete(payload: RequestPayload<'workspace.delete'>, signal?: AbortSignal): Promise>>
+ insertBefore(payload: RequestPayload<'workspace.insertBefore'>, signal?: AbortSignal): Promise>>
insertSessionBefore(payload: RequestPayload<'workspace.insertSessionBefore'>, signal?: AbortSignal): Promise>>
archiveSession(payload: RequestPayload<'workspace.archiveSession'>, signal?: AbortSignal): Promise>>
}
@@ -193,6 +195,7 @@ const UNARY_VALUE_SCHEMAS: { [K in keyof RpcMethodMap]: z.ZodType this.callUnary('workspace.create', payload, signal),
rename: (payload, signal) => this.callUnary('workspace.rename', payload, signal),
delete: (payload, signal) => this.callUnary('workspace.delete', payload, signal),
+ insertBefore: (payload, signal) => this.callUnary('workspace.insertBefore', payload, signal),
insertSessionBefore: (payload, signal) => this.callUnary('workspace.insertSessionBefore', payload, signal),
archiveSession: (payload, signal) => this.callUnary('workspace.archiveSession', payload, signal),
}
diff --git a/packages/host/apiproxy/src/fetch/handler.ts b/packages/host/apiproxy/src/fetch/handler.ts
index 1361bb9b1f..4e8800348a 100644
--- a/packages/host/apiproxy/src/fetch/handler.ts
+++ b/packages/host/apiproxy/src/fetch/handler.ts
@@ -38,6 +38,7 @@ import {
workspaceArchiveSessionRequestSchema,
workspaceCreateRequestSchema,
workspaceDeleteRequestSchema,
+ workspaceInsertBeforeRequestSchema,
workspaceInsertSessionBeforeRequestSchema,
workspaceListRequestSchema,
workspaceRenameRequestSchema,
@@ -112,6 +113,7 @@ const UNARY_ROUTES: UnaryRoutes = {
'workspace.create': { schema: workspaceCreateRequestSchema, invoke: (api, r) => api.workspace.create(r) },
'workspace.rename': { schema: workspaceRenameRequestSchema, invoke: (api, r) => api.workspace.rename(r) },
'workspace.delete': { schema: workspaceDeleteRequestSchema, invoke: (api, r) => api.workspace.delete(r) },
+ 'workspace.insertBefore': { schema: workspaceInsertBeforeRequestSchema, invoke: (api, r) => api.workspace.insertBefore(r) },
'workspace.insertSessionBefore': { schema: workspaceInsertSessionBeforeRequestSchema, invoke: (api, r) => api.workspace.insertSessionBefore(r) },
'workspace.archiveSession': { schema: workspaceArchiveSessionRequestSchema, invoke: (api, r) => api.workspace.archiveSession(r) },
'skill.list': { schema: skillListRequestSchema, invoke: (api, r) => api.skills.list(r) },
diff --git a/packages/host/apiproxy/tests/api-proxy-workspace.spec.ts b/packages/host/apiproxy/tests/api-proxy-workspace.spec.ts
index 7c3c39e9e1..4c2506c395 100644
--- a/packages/host/apiproxy/tests/api-proxy-workspace.spec.ts
+++ b/packages/host/apiproxy/tests/api-proxy-workspace.spec.ts
@@ -319,6 +319,50 @@ describe('workspace.create', () => {
})
})
+describe('workspace.insertBefore', () => {
+ it('commits the complete order, streams one order frame, and maps unknown ids', async () => {
+ const { api, ctx, root } = await harness()
+ const first = expectOk(await api.workspace.create(request({ path: stageDir(root, 'first') }))).workspace
+ const second = expectOk(await api.workspace.create(request({ path: stageDir(root, 'second') }))).workspace
+ const third = expectOk(await api.workspace.create(request({ path: stageDir(root, 'third') }))).workspace
+
+ const abort = new AbortController()
+ const listWorkspaces = vi.spyOn(ctx.workspace, 'list')
+ const stream: AsyncIterator> =
+ api.events.host(request({}), abort.signal)[Symbol.asyncIterator]()
+ expect(listWorkspaces).toHaveBeenCalledTimes(1)
+ const changed = nextHostFrame(stream)
+ const reordered = expectOk(await api.workspace.insertBefore(request({
+ workspaceId: first.workspaceId,
+ beforeWorkspaceId: second.workspaceId,
+ })))
+ expect(reordered.workspaceIds).toEqual([third.workspaceId, first.workspaceId, second.workspaceId])
+ expect(await changed).toMatchObject({
+ payload: {
+ type: 'host/workspace-order-changed',
+ workspaceIds: [third.workspaceId, first.workspaceId, second.workspaceId],
+ },
+ })
+ expect(expectOk(await api.workspace.list(request({}))).items.map(item => item.workspaceId))
+ .toEqual(reordered.workspaceIds)
+
+ const missingSource = await api.workspace.insertBefore(request({
+ workspaceId: 'missing' as WorkspaceId,
+ }))
+ expect(missingSource.result).toMatchObject({
+ ok: false, error: { code: 'workspace-not-found', details: { workspaceId: 'missing' } },
+ })
+ const missingAnchor = await api.workspace.insertBefore(request({
+ workspaceId: first.workspaceId,
+ beforeWorkspaceId: 'missing-anchor' as WorkspaceId,
+ }))
+ expect(missingAnchor.result).toMatchObject({
+ ok: false, error: { code: 'workspace-not-found', details: { workspaceId: 'missing-anchor' } },
+ })
+ abort.abort()
+ })
+})
+
describe('session creation and Workspace membership', () => {
it('attaches a preallocated idempotent session while cwd-only sessions stay ungrouped', async () => {
const { api, ctx, root } = await harness()
diff --git a/packages/host/apiproxy/tests/client-handler.spec.ts b/packages/host/apiproxy/tests/client-handler.spec.ts
index 15888b3cfb..4130d8f210 100644
--- a/packages/host/apiproxy/tests/client-handler.spec.ts
+++ b/packages/host/apiproxy/tests/client-handler.spec.ts
@@ -85,6 +85,7 @@ function scriptedApi(overrides: {
create: r => ok(r, { workspace: { workspaceId: 'w1' as never, path: '/t', title: 't', sessionIds: [], createdAt: '0', updatedAt: '0' }, created: true }),
rename: r => ok(r, { workspace: { workspaceId: 'w1' as never, path: '/t', title: 't', sessionIds: [], createdAt: '0', updatedAt: '0' } }),
delete: r => ok(r, { deleted: true as const }),
+ insertBefore: r => ok(r, { workspaceIds: [r.payload.workspaceId] }),
insertSessionBefore: r => ok(r, { workspace: { workspaceId: 'w1' as never, path: '/t', title: 't', sessionIds: [], createdAt: '0', updatedAt: '0' } }),
archiveSession: r => ok(r, { archivedSessionIds: [r.payload.sessionId] }),
},
@@ -218,7 +219,7 @@ describe('unary round trip', () => {
expect(response.result).toEqual({ ok: true, value: { sessionId: 's-child' } })
})
- it('routes workspace rename, delete, and insertSessionBefore through the wire', async () => {
+ it('routes workspace rename, delete, and ordering through the wire', async () => {
const api = scriptedApi()
const c = client(api)
const renamed = await c.workspace.rename({ workspaceId: 'w1' as never, title: 'next' })
@@ -227,6 +228,11 @@ describe('unary round trip', () => {
expect(blankTitle.result).toMatchObject({ ok: false, error: { code: 'bad-request' } })
const deleted = await c.workspace.delete({ workspaceId: 'w1' as never })
expect(deleted.result).toEqual({ ok: true, value: { deleted: true } })
+ const workspaceOrder = await c.workspace.insertBefore({
+ workspaceId: 'w1' as never,
+ beforeWorkspaceId: 'w2' as never,
+ })
+ expect(workspaceOrder.result).toEqual({ ok: true, value: { workspaceIds: ['w1'] } })
const anchored = await c.workspace.insertSessionBefore({ workspaceId: 'w1' as never, sessionId: sid('s1'), beforeSessionId: sid('s2') })
expect(anchored.result.ok).toBe(true)
const appended = await c.workspace.insertSessionBefore({ workspaceId: 'w1' as never, sessionId: sid('s1') })
diff --git a/packages/host/apiproxy/tests/fetch-carrier.spec.ts b/packages/host/apiproxy/tests/fetch-carrier.spec.ts
index 4ce3d084e0..2000f708ba 100644
--- a/packages/host/apiproxy/tests/fetch-carrier.spec.ts
+++ b/packages/host/apiproxy/tests/fetch-carrier.spec.ts
@@ -179,6 +179,9 @@ function fakeApi(overrides: Partial<{ muxFrames: MuxFrame[]; hostFrames: HostFra
async delete(request) {
return { rpcId: request.rpcId, result: { ok: true, value: { deleted: true as const } } }
},
+ async insertBefore(request) {
+ return { rpcId: request.rpcId, result: { ok: true, value: { workspaceIds: [request.payload.workspaceId] } } }
+ },
async insertSessionBefore(request) {
return {
rpcId: request.rpcId,
diff --git a/packages/host/apiproxy/tests/rpc-schemas.spec.ts b/packages/host/apiproxy/tests/rpc-schemas.spec.ts
index c8e81964b9..b78a03de07 100644
--- a/packages/host/apiproxy/tests/rpc-schemas.spec.ts
+++ b/packages/host/apiproxy/tests/rpc-schemas.spec.ts
@@ -23,6 +23,7 @@ import {
workspaceArchiveSessionRequestSchema, workspaceArchiveSessionValueSchema,
workspaceCreateRequestSchema, workspaceCreateValueSchema, workspaceIdSchema,
workspaceDeleteRequestSchema, workspaceDeleteValueSchema,
+ workspaceInsertBeforeRequestSchema, workspaceInsertBeforeValueSchema,
workspaceInsertSessionBeforeRequestSchema, workspaceInsertSessionBeforeValueSchema,
workspaceListRequestSchema, workspaceListValueSchema,
workspaceRenameRequestSchema, workspaceRenameValueSchema, workspaceViewSchema,
@@ -394,6 +395,17 @@ describe('workspace domain schemas', () => {
expect(workspaceDeleteValueSchema.parse({ deleted: true })).toEqual({ deleted: true })
expect(() => workspaceDeleteValueSchema.parse({ deleted: false })).toThrow()
})
+
+ it('insertBefore accepts an anchored or anchorless Workspace move and returns the complete order', () => {
+ expect(workspaceInsertBeforeRequestSchema.parse({
+ workspaceId: 'w1', beforeWorkspaceId: 'w2',
+ }).beforeWorkspaceId).toBe('w2')
+ expect(workspaceInsertBeforeRequestSchema.parse({ workspaceId: 'w1' }).beforeWorkspaceId)
+ .toBeUndefined()
+ expect(() => workspaceInsertBeforeRequestSchema.parse({ beforeWorkspaceId: 'w2' })).toThrow()
+ expect(workspaceInsertBeforeValueSchema.parse({ workspaceIds: ['w2', 'w1'] }).workspaceIds)
+ .toEqual(['w2', 'w1'])
+ })
})
describe('skills domain schemas', () => {
diff --git a/docs/user/guide/quickstart.i18n.yaml b/packages/host/plugin-inventory/README.i18n.yaml
similarity index 55%
rename from docs/user/guide/quickstart.i18n.yaml
rename to packages/host/plugin-inventory/README.i18n.yaml
index 0cca002d4f..e9fc3f9a09 100644
--- a/docs/user/guide/quickstart.i18n.yaml
+++ b/packages/host/plugin-inventory/README.i18n.yaml
@@ -1,6 +1,6 @@
# Bilingual-pair consistency record (docs/i18n/README.md): the git blob hash of each
# 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 docs/user/guide/quickstart.md
-quickstart.md: e93e5a430f0cb345728581cd6fa3175ffd20b7d1
-quickstart.zh.md: 69cde830bb802ef19cc1204685395b957a0e02e3
+# pnpm run verify-translation-pairing --write packages/host/plugin-inventory/README.md
+README.md: 23fbf07d7900ecc881f81b5da3f8cbe6a45669de
+README.zh.md: 87058cde595b83e980b8f3cec4192e6099b8d9ea
diff --git a/packages/host/plugin-inventory/README.md b/packages/host/plugin-inventory/README.md
new file mode 100644
index 0000000000..23fbf07d79
--- /dev/null
+++ b/packages/host/plugin-inventory/README.md
@@ -0,0 +1,22 @@
+# @deepseek-ai/dsh-host-plugin-inventory
+
+English | [中文](README.zh.md)
+
+Read-only Host projection of the current Cordis Loader tree. `PluginInventoryService` registers the `pluginInventory` service and publishes one generated direct Remote, `pluginInventory/list`. Every call reads `ctx.loader.entries()` directly, skips structural group rows, and returns the remaining entries in Loader order with only their Loader entry id, module specifier, effective enablement, and current root Fiber phase.
+
+The phase is `pending`, `loading`, `active`, `failed`, or `unloading`; it is `null` when the entry has no live root Fiber. The snapshot is intentionally point-in-time: Loader remains the sole lifecycle authority, while this package owns no cache, history, provenance model, event stream, or mutation path. Its public payload types live under `./types`, and TypeRT generates the Host and Client Remote artifacts exposed by `./typert` and `./remote`.
+
+The service is Remote-only and deliberately declares no same-process Cordis `Context` merge. Client packages consume it through the explicit [`api-remotes`](../../api/remotes/README.md) assembly rather than importing the Host implementation.
+
+## Model Experience
+
+None, as this Host-only inventory projection registers no prompt, tool, message, or provider request.
+
+#### KV Cache effect
+
+None; this package never assembles model input.
+
+## Known Limitations and Deferred Work
+
+- **Point-in-time state only** — the result contains no durable failure history or subscription; a missing root Fiber is reported as `null`, regardless of why no live root exists.
+- **No provenance or mutation** — the service does not identify which bundle, profile, or override introduced an entry, and it cannot enable, disable, add, or remove plugins.
diff --git a/packages/host/plugin-inventory/README.zh.md b/packages/host/plugin-inventory/README.zh.md
new file mode 100644
index 0000000000..87058cde59
--- /dev/null
+++ b/packages/host/plugin-inventory/README.zh.md
@@ -0,0 +1,22 @@
+# @deepseek-ai/dsh-host-plugin-inventory
+
+[English](README.md) | 中文
+
+当前 Cordis Loader 树的只读 Host 投影。`PluginInventoryService` 注册 `pluginInventory` 服务，并发布一个由 TypeRT 生成的直接 Remote：`pluginInventory/list`。每次调用都直接读取 `ctx.loader.entries()`，跳过结构性的 group 行，再按 Loader 顺序返回其余条目，并且只包含 Loader 条目 id、模块标识、有效启用状态与当前根 Fiber 阶段。
+
+阶段为 `pending`、`loading`、`active`、`failed` 或 `unloading`；条目没有存活的根 Fiber 时则为 `null`。该快照刻意只表示调用当下：Loader 仍是唯一的生命周期权威，本包不拥有缓存、历史、来源模型、事件流或修改路径。公开 payload 类型位于 `./types`，TypeRT 生成由 `./typert` 与 `./remote` 导出的 Host 和 Client Remote 产物。
+
+该服务仅供 Remote 使用，刻意不声明同进程 Cordis `Context` merge。Client 包通过显式的 [`api-remotes`](../../api/remotes/README.md) 组合消费它，而不导入 Host 实现。
+
+## 模型体验
+
+无，因为这个仅限 Host 的清单投影不注册提示词、工具、消息或提供方请求。
+
+#### KV Cache 影响
+
+无；本包从不组装模型输入。
+
+## 已知限制与暂缓事项
+
+- **仅表示调用当下** —— 结果不包含持久的失败历史或订阅；只要不存在存活的根 Fiber，就会报告 `null`，而不区分其原因。
+- **无来源与修改能力** —— 服务不识别条目由哪个 bundle、profile 或 override 引入，也不能启用、停用、添加或移除插件。
diff --git a/packages/host/plugin-inventory/package.json b/packages/host/plugin-inventory/package.json
new file mode 100644
index 0000000000..ac51ce4aa8
--- /dev/null
+++ b/packages/host/plugin-inventory/package.json
@@ -0,0 +1,68 @@
+{
+ "name": "@deepseek-ai/dsh-host-plugin-inventory",
+ "description": "Read-only Remote projection of current Cordis Loader plugin state",
+ "version": "0.0.1-rc.2",
+ "publishConfig": {
+ "access": "restricted"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/deepseek-ai/deepseek-harness.git",
+ "directory": "packages/host/plugin-inventory"
+ },
+ "type": "module",
+ "main": "lib/index.js",
+ "types": "lib/types/index.d.ts",
+ "exports": {
+ ".": {
+ "types": "./lib/types/index.d.ts",
+ "default": "./lib/index.js"
+ },
+ "./invariant": {
+ "types": "./lib/types/invariant.d.ts",
+ "default": "./lib/invariant.js"
+ },
+ "./types": {
+ "types": "./lib/types/types.d.ts",
+ "default": "./lib/types/types.js"
+ },
+ "./typert": {
+ "types": "./lib/typert.host.d.ts",
+ "default": "./lib/typert.host.js"
+ },
+ "./remote": {
+ "types": "./lib/typert.remote-client.d.ts",
+ "default": "./lib/typert.remote-client.js"
+ },
+ "./src/*": "./src/*",
+ "./package.json": "./package.json"
+ },
+ "files": [
+ "lib/index.js",
+ "lib/invariant.js",
+ "lib/types/**/*.js",
+ "lib/types/**/*.d.ts",
+ "lib/typert.host.js",
+ "lib/typert.host.d.ts",
+ "lib/typert.remote-client.js",
+ "lib/typert.remote-client.d.ts"
+ ],
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "zod": "^4.4.3"
+ },
+ "peerDependencies": {
+ "@deepseek-ai/cordis-plugin-loader": "workspace:^",
+ "@deepseek-ai/dsh-brand": "workspace:^",
+ "@deepseek-ai/dsh-invariants": "workspace:^",
+ "@deepseek-ai/dsh-type-meta": "workspace:^",
+ "@deepseek-ai/cordis": "workspace:^"
+ },
+ "devDependencies": {
+ "@deepseek-ai/cordis-plugin-loader": "workspace:^",
+ "@deepseek-ai/dsh-brand": "workspace:^",
+ "@deepseek-ai/dsh-invariants": "workspace:^",
+ "@deepseek-ai/dsh-type-meta": "workspace:^",
+ "@deepseek-ai/cordis": "workspace:^"
+ }
+}
diff --git a/packages/host/plugin-inventory/src/index.ts b/packages/host/plugin-inventory/src/index.ts
new file mode 100644
index 0000000000..5bc4db936a
--- /dev/null
+++ b/packages/host/plugin-inventory/src/index.ts
@@ -0,0 +1,72 @@
+/** Read-only projection of the current Cordis Loader plugin entries. */
+
+import type { Context, FiberState } from '@deepseek-ai/cordis'
+import type {} from '@deepseek-ai/cordis-plugin-loader'
+import { GatewayService, Remote } from '@deepseek-ai/dsh-type-meta'
+// TypeRT-generated ./typert and ./remote artifacts import Zod at runtime.
+import type {} from 'zod'
+import type {
+ PluginEntryId,
+ PluginFiberPhase,
+ PluginInventoryEntry,
+ PluginInventorySnapshot,
+} from './types.ts'
+
+export type * from './types.ts'
+
+/** Brand an existing Loader-tree entry id at the owning boundary. */
+function pluginEntryId(value: string): PluginEntryId {
+ return value as PluginEntryId
+}
+
+/** Runtime mirror: FiberState is a cross-package const enum. */
+const FIBER_STATE = {
+ PENDING: 0 as FiberState.PENDING,
+ LOADING: 1 as FiberState.LOADING,
+ ACTIVE: 2 as FiberState.ACTIVE,
+ FAILED: 3 as FiberState.FAILED,
+ DISPOSED: 4 as FiberState.DISPOSED,
+ UNLOADING: 5 as FiberState.UNLOADING,
+} as const
+
+/** Complete public projection of Cordis Fiber states. */
+const FIBER_PHASE = {
+ [FIBER_STATE.PENDING]: 'pending',
+ [FIBER_STATE.LOADING]: 'loading',
+ [FIBER_STATE.ACTIVE]: 'active',
+ [FIBER_STATE.FAILED]: 'failed',
+ [FIBER_STATE.DISPOSED]: null,
+ [FIBER_STATE.UNLOADING]: 'unloading',
+} as const satisfies Record
+
+/** Remote-only service exposing the Loader's current non-group entry state. */
+export class PluginInventoryService extends GatewayService {
+ static inject = ['loader']
+
+ constructor(ctx: Context) {
+ super(ctx, 'pluginInventory')
+ }
+
+ /**
+ * Read the Loader directly on every call. Cordis's internal plugin/status
+ * events already maintain Entry.fiber and Fiber.state, so a second cache
+ * would only add another lifecycle truth to keep synchronized.
+ * @returns Current non-group Loader entries in Loader order.
+ */
+ @Remote('list')
+ list(): PluginInventorySnapshot {
+ const entries: PluginInventoryEntry[] = []
+ for (const entry of this.ctx.loader.entries()) {
+ if (entry.options.group) continue
+ entries.push({
+ entryId: pluginEntryId(entry.id),
+ moduleName: entry.options.name,
+ enabled: !entry.disabled,
+ fiberPhase: entry.fiber === undefined ? null : FIBER_PHASE[entry.fiber.state],
+ })
+ }
+ return { entries }
+ }
+}
+
+export default PluginInventoryService
diff --git a/packages/host/plugin-inventory/src/invariant.ts b/packages/host/plugin-inventory/src/invariant.ts
new file mode 100644
index 0000000000..34acc058aa
--- /dev/null
+++ b/packages/host/plugin-inventory/src/invariant.ts
@@ -0,0 +1,20 @@
+/** Package-owned invariant companion. @module @deepseek-ai/dsh-host-plugin-inventory/invariant */
+
+/* jscpd:ignore-start */
+import type { Context } from '@deepseek-ai/cordis'
+import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
+
+const PACKAGE_NAME = '@deepseek-ai/dsh-host-plugin-inventory'
+
+/** Cordis companion plugin name. */
+export const name = 'host-plugin-inventory-invariant'
+/** Service required before the companion can reserve package ownership. */
+export const inject = ['invariants']
+
+/** No runtime invariant: every snapshot is projected directly from Loader-owned state. */
+const install: InvariantInstaller = () => {}
+
+/** Register this package's invariant companion. */
+export const apply = (ctx: Context): Promise<() => void> =>
+ Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))
+/* jscpd:ignore-end */
diff --git a/packages/host/plugin-inventory/src/types.ts b/packages/host/plugin-inventory/src/types.ts
new file mode 100644
index 0000000000..f5678fc3c2
--- /dev/null
+++ b/packages/host/plugin-inventory/src/types.ts
@@ -0,0 +1,28 @@
+import type { Branded } from '@deepseek-ai/dsh-brand'
+
+/** Stable Loader-tree identity of one configured plugin entry. */
+export type PluginEntryId = Branded<'PluginEntryId'>
+
+/** Lifecycle state of an entry's root Fiber, or null when it has no live root Fiber. */
+export type PluginFiberPhase =
+ | 'pending'
+ | 'loading'
+ | 'active'
+ | 'failed'
+ | 'unloading'
+ | null
+
+/** One non-group Loader entry exposed to trusted clients. */
+export interface PluginInventoryEntry {
+ readonly entryId: PluginEntryId
+ /** Exact module specifier imported by the Loader entry. */
+ readonly moduleName: string
+ /** Effective Loader enablement, including disabled ancestor groups. */
+ readonly enabled: boolean
+ readonly fiberPhase: PluginFiberPhase
+}
+
+/** Point-in-time inventory returned by the plugin inventory Remote. */
+export interface PluginInventorySnapshot {
+ readonly entries: readonly PluginInventoryEntry[]
+}
diff --git a/packages/host/plugin-inventory/tests/invariant.spec.ts b/packages/host/plugin-inventory/tests/invariant.spec.ts
new file mode 100644
index 0000000000..d7e3b99fd8
--- /dev/null
+++ b/packages/host/plugin-inventory/tests/invariant.spec.ts
@@ -0,0 +1,16 @@
+import { Context } from '@deepseek-ai/cordis'
+import { describe, expect, it } from 'vitest'
+import InvariantService from '@deepseek-ai/dsh-invariants'
+import * as PluginInventoryInvariant from '../src/invariant.ts'
+
+describe('plugin-inventory invariant companion', () => {
+ it('registers the package-owned empty installer', async () => {
+ const ctx = new Context()
+ await ctx.plugin(InvariantService, { enabled: true })
+ const fiber = ctx.plugin(PluginInventoryInvariant)
+ await expect(fiber.await()).resolves.toBeDefined()
+ await fiber.dispose()
+ await expect(ctx.plugin(PluginInventoryInvariant).await()).resolves.toBeDefined()
+ await ctx.fiber.dispose()
+ })
+})
diff --git a/packages/host/plugin-inventory/tests/inventory.spec.ts b/packages/host/plugin-inventory/tests/inventory.spec.ts
new file mode 100644
index 0000000000..e979d34306
--- /dev/null
+++ b/packages/host/plugin-inventory/tests/inventory.spec.ts
@@ -0,0 +1,89 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import { Context, type Plugin } from '@deepseek-ai/cordis'
+import Loader from '@deepseek-ai/cordis-plugin-loader'
+import { remoteMethods } from '@deepseek-ai/dsh-type-meta'
+import PluginInventoryService from '../src/index.ts'
+
+const contexts: Context[] = []
+
+afterEach(async () => {
+ await Promise.all(contexts.splice(0).map(ctx => ctx.fiber.dispose()))
+})
+
+const activePlugin: Plugin.Function = () => {}
+const pendingPlugin: Plugin.Object = {
+ inject: ['neverReady'],
+ apply() {},
+}
+
+async function harness(): Promise<{
+ ctx: Context
+ inventory: PluginInventoryService
+}> {
+ const ctx = new Context()
+ contexts.push(ctx)
+ await ctx.plugin(Loader)
+ ctx.loader.builtins.active = activePlugin
+ ctx.loader.builtins.pending = pendingPlugin
+ await ctx.plugin(PluginInventoryService)
+ const inventory = ctx.get('pluginInventory') as PluginInventoryService
+ return { ctx, inventory }
+}
+
+describe('PluginInventoryService', () => {
+ it('publishes one direct list method under the pluginInventory namespace', async () => {
+ const { inventory } = await harness()
+ expect(inventory.typertGateway).toMatchObject({
+ serviceKey: 'pluginInventory',
+ namespace: 'pluginInventory',
+ })
+ expect(remoteMethods(inventory)).toEqual([
+ { method: 'list', invocation: { kind: 'direct' } },
+ ])
+ })
+
+ it('projects current non-group Loader entries without a second cache', async () => {
+ const { ctx, inventory } = await harness()
+ const activeId = await ctx.loader.create({ name: 'cordis:active' })
+ const pendingId = await ctx.loader.create({ name: 'cordis:pending' })
+ const disabledId = await ctx.loader.create({
+ name: 'cordis:not-installed',
+ disabled: true,
+ })
+ await ctx.loader.create({ name: 'cordis:active', group: true })
+
+ expect(inventory.list()).toEqual({
+ entries: [
+ {
+ entryId: activeId,
+ moduleName: 'cordis:active',
+ enabled: true,
+ fiberPhase: 'active',
+ },
+ {
+ entryId: pendingId,
+ moduleName: 'cordis:pending',
+ enabled: true,
+ fiberPhase: 'pending',
+ },
+ {
+ entryId: disabledId,
+ moduleName: 'cordis:not-installed',
+ enabled: false,
+ fiberPhase: null,
+ },
+ ],
+ })
+
+ await ctx.loader.update(activeId, { disabled: true })
+ expect(inventory.list().entries.find(entry => entry.entryId === activeId)).toEqual({
+ entryId: activeId,
+ moduleName: 'cordis:active',
+ enabled: false,
+ fiberPhase: null,
+ })
+
+ await ctx.loader.remove(pendingId)
+ expect(inventory.list().entries.some(entry => entry.entryId === pendingId)).toBe(false)
+ })
+})
diff --git a/packages/host/plugin-inventory/tsconfig.json b/packages/host/plugin-inventory/tsconfig.json
new file mode 100644
index 0000000000..524783f8b8
--- /dev/null
+++ b/packages/host/plugin-inventory/tsconfig.json
@@ -0,0 +1,27 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "rootDir": "src",
+ "outDir": "lib/types"
+ },
+ "include": [
+ "src"
+ ],
+ "references": [
+ {
+ "path": "../../../vendor/cordis"
+ },
+ {
+ "path": "../../../vendor/loader"
+ },
+ {
+ "path": "../../util/brand"
+ },
+ {
+ "path": "../../typert/type-meta"
+ },
+ {
+ "path": "../../support/invariants"
+ }
+ ]
+}
diff --git a/packages/sandbox/sandbox-local/tests/local.spec.ts b/packages/sandbox/sandbox-local/tests/local.spec.ts
index 1586df3947..389f23a011 100644
--- a/packages/sandbox/sandbox-local/tests/local.spec.ts
+++ b/packages/sandbox/sandbox-local/tests/local.spec.ts
@@ -32,6 +32,16 @@ async function setup(config: Config = {}, internals: LocalSandboxProvider['inter
return { ctx, sandbox }
}
+/**
+ * A path inside a fresh temp dir where no file is written, pinning the
+ * built-entry `existsSync` check to false. Without it the resolution depends on
+ * whether the checkout has run `build:lib:host`, which emits
+ * `sandbox-windows-acl/lib/runner.js`.
+ */
+function absentRunnerEntry(): string {
+ return join(mkdtempSync(join(tmpdir(), 'dsh-absent-acl-entry-')), 'runner.js')
+}
+
/** Write an executable fake `landlock-run` that answers `--probe` with `report`. */
function fakeLauncher(report = 'landlock: fully enforced'): string {
const dir = mkdtempSync(join(tmpdir(), 'dsh-fake-landlock-'))
@@ -395,15 +405,31 @@ describe('the windows-acl probe (runner invocation contract)', () => {
})
it('runs the REAL default probe against the resolved runner invocation when none is injected', async () => {
- // The default probe spawns the exact runner argv confine would use — the
- // runner source through tsx on a lib-less checkout. The windows-acl
- // runner cannot init off win32, so the probe reads unusable and the walk
- // falls through to the injected bwrap verdict on every host.
+ // No entry injected: this covers the production resolution through
+ // import.meta.resolve. Which arm of the existsSync check it takes depends
+ // on whether the checkout has run build:lib:host (which emits
+ // sandbox-windows-acl/lib/runner.js), so this asserts only what holds
+ // either way — the runner cannot init off win32, so the probe reads
+ // unusable and the walk falls through to the injected bwrap verdict.
const { sandbox } = await setup({}, { chain: ['windows-acl', 'bwrap'], probeBwrap: () => true })
const confined = sandbox.confine(['true'], RO)
expect(confined.argv[0]).toBe('bwrap')
}, 30_000)
+ it('falls back to the runner source through tsx when the built entry is absent', async () => {
+ // The absent entry pins the source-through-tsx arm regardless of build
+ // state: on a checkout where build:lib:host has run, the real resolution
+ // above takes the built-entry arm instead and would leave this uncovered.
+ const { sandbox } = await setup({}, {
+ chain: ['windows-acl', 'bwrap'],
+ probeWindowsAcl: () => true,
+ windowsAclRunnerEntry: absentRunnerEntry(),
+ })
+ const confined = sandbox.confine(['true'], RO)
+ expect(confined.argv.slice(0, 3)).toEqual([process.execPath, '--import', 'tsx/esm'])
+ expect(confined.argv[3]).toMatch(/runner\.ts$/)
+ })
+
it('reads an empty runner invocation as unusable (the probe\'s empty-argv guard)', async () => {
// windowsAclRunnerInvocation always yields [node, ...] in product; an
// override returning [] exercises the default probe's empty-argv guard.
diff --git a/packages/self-modification/tool-cordis/src/api-catalog.ts b/packages/self-modification/tool-cordis/src/api-catalog.ts
index 071eafbb0a..000a4c3db8 100644
--- a/packages/self-modification/tool-cordis/src/api-catalog.ts
+++ b/packages/self-modification/tool-cordis/src/api-catalog.ts
@@ -1384,6 +1384,10 @@ export const SERVICE_API: readonly ServiceApiEntry[] = [
signature: 'delete(id: WorkspaceId): Promise',
jsDoc: '/**\n * Delete one workspace registration while retaining its directory and every\n * session log. The durable order is updated before the table deletion; a\n * failed table write restores the prior order and keeps the entity\n * published. Unknown ids are an idempotent no-op for domain callers.\n * @param id - Workspace registration to remove.\n * @returns `true` when a record was deleted, `false` when it was unknown.\n */',
},
+ {
+ signature: 'insertBefore(id: WorkspaceId, beforeId?: WorkspaceId): Promise',
+ jsDoc: '/**\n * Move one workspace within the durable display order, DOM-insertBefore-like.\n * With an anchor it lands before that workspace; without one it appends.\n * @param id - Workspace to move.\n * @param beforeId - Workspace anchor; omitted appends.\n * @returns the complete committed workspace order.\n */',
+ },
{
signature: 'archiveSession(sessionId: SessionId): Promise',
jsDoc: '/**\n * Archive one session durably. The session must exist (live or in session\n * persistence); its workspace accounting — or lack of one — is irrelevant.\n * An already archived id resolves without writing.\n * @param sessionId - The session to archive.\n * @returns resolution after durability.\n */',
diff --git a/packages/workspace/workspace/README.i18n.yaml b/packages/workspace/workspace/README.i18n.yaml
index 63d5ce0e8e..caeadcc3d8 100644
--- a/packages/workspace/workspace/README.i18n.yaml
+++ b/packages/workspace/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/workspace/workspace/README.md
-README.md: 057765e38de9cc700210eb8edeb1ddc7ffc861ff
-README.zh.md: 7416875dbf2ee1652f6e1fa1663144d7407a1ae7
+README.md: 4f7e2925ca7572dc3cc32c2a294bd1f40b243254
+README.zh.md: 2f4f38dea881b2c8a2bb135c8f7b1b3c88b9190a
diff --git a/packages/workspace/workspace/README.md b/packages/workspace/workspace/README.md
index 057765e38d..4f7e2925ca 100644
--- a/packages/workspace/workspace/README.md
+++ b/packages/workspace/workspace/README.md
@@ -10,9 +10,10 @@ The entity/storage rationale lives in the [domain Agent Note](../../../.agents/n
- `ctx.workspace.create(path, title?)` — canonicalizes `path` via `fs.realpath`, rejects a nonexistent or non-directory path, creates at most one record per canonical path, and prepends a new record to durable workspace order. Repeated calls for that path return the existing workspace without changing its title; different paths may share a display title.
- `ctx.workspace.get(id)` / `list()` / `resolveByPath(path)` — cache-served lookups. `list()` is synchronous and follows durable registry order; `resolveByPath` is async because it applies the same `realpath` canon and rejects a missing path rather than creating it.
+- `ctx.workspace.insertBefore(id, before?)` — moves a registered Workspace within durable registry order, DOM-insertBefore-like: before the anchor, or appended when the anchor is omitted. A source or anchor absent from the registry rejects without writing; a self-anchor or move to the current position resolves without writing. The returned id list is the complete committed order.
- `ctx.workspace.delete(id)` — removes only the Workspace registration, its durable order entry, and its session account. Unknown ids return `false`; a removed record returns `true`. The directory, user files, live Sessions, and persisted session logs are never touched, so those Sessions become Ungrouped. A table-write failure restores the prior order and published entity.
- `Workspace.attachSession(id)` — validates a live or persisted session header cwd against the workspace path and prepends a new id. Unknown sessions, absent/unresolvable/non-directory cwd values, and mismatches reject without writing. `detachSession` removes only the candidate index entry.
-- `Workspace.insertSessionBefore(id, before?)` — moves an accounted session within the manual order, DOM-insertBefore-like: before the anchor, or appended when the anchor is omitted. A session or anchor absent from the account rejects without writing; a move to the current position resolves without writing. Workspace order never changes.
+- `Workspace.insertSessionBefore(id, before?)` — moves an accounted session within the manual order, DOM-insertBefore-like: before the anchor, or appended when the anchor is omitted. A session or anchor absent from the account rejects without writing; a move to the current position resolves without writing. Registry Workspace order never changes.
- `ctx.workspace.archiveSession(id)` / `archivedSessionIds` — the registry-global archive set, layered over workspace accounting: an archived session disappears from grouping surfaces but keeps its session log and its `sessionIds` slot, so a future unarchive restores its position. Archiving accepts any live or persisted session (accounted or Ungrouped), resolves without writing for an already archived id, and rejects an unknown id. State written before the field existed parses with an empty set.
- `Workspace.sessionIds` — synchronous id-plus-canonical-cwd membership projection in durable candidate order. Missing headers, invalid cwd values, and mismatches are filtered; the next workspace mutation prunes them. A medium indexing one session under two workspaces, claiming one path from two records, or diverging from durable workspace order rejects at startup.
- `Workspace.status()` — uncached directory check, `'ok' | 'missing-dir'`; a missing directory never mutates the record.
diff --git a/packages/workspace/workspace/README.zh.md b/packages/workspace/workspace/README.zh.md
index 7416875dbf..2f4f38dea8 100644
--- a/packages/workspace/workspace/README.zh.md
+++ b/packages/workspace/workspace/README.zh.md
@@ -10,9 +10,10 @@ DeepSeek Harness 的 Workspace 实体注册表（`ctx.workspace`）：通过领
- `ctx.workspace.create(path, title?)`：规范化 `path` 时使用 `fs.realpath`，拒绝不存在或非目录的路径，每个规范路径最多创建一条记录，并将新记录前置到持久 workspace 顺序。对同一路径重复调用会返回现有 workspace，且不改变其标题；不同路径可以共用显示标题。
- `ctx.workspace.get(id)`/`list()`/`resolveByPath(path)`：由缓存提供的查找。`list()` 为同步操作，并遵循持久注册表顺序；`resolveByPath` 为异步操作，因为它采用相同的 `realpath` 规范化方式，并会拒绝缺失路径，而不是创建路径。
+- `ctx.workspace.insertBefore(id, before?)`：在持久注册表顺序内移动一个已注册 Workspace，语义类似 DOM 的 insertBefore：插到锚点之前，省略锚点则追加到末尾。来源或锚点不在注册表中时拒绝且不写入；以自身为锚点或移动到当前位置时直接完成且不写入。返回的 id 列表是完整的已提交顺序。
- `ctx.workspace.delete(id)`：只移除 Workspace 注册记录、对应的持久顺序条目及会话归属记录。未知 id 返回 `false`，成功移除记录则返回 `true`。目录、用户文件、活跃会话和持久化会话日志绝不受影响，因此相关会话会进入 Ungrouped。表写入失败时会恢复原顺序和此前发布的实体。
- `Workspace.attachSession(id)`：对照 workspace 路径验证实时或已持久化的会话头 cwd，并将新 id 前置。未知会话、缺失／无法解析／非目录的 cwd 值和不匹配情况都会在不写入的前提下被拒绝。`detachSession` 只移除候选索引条目。
-- `Workspace.insertSessionBefore(id, before?)`：在手动顺序内移动一个已记账的会话，语义类似 DOM 的 insertBefore：插到锚点之前，省略锚点则追加到末尾。会话或锚点不在记账中时拒绝且不写入；移动到当前位置时直接完成且不写入。Workspace 顺序绝不改变。
+- `Workspace.insertSessionBefore(id, before?)`：在手动顺序内移动一个已记账的会话，语义类似 DOM 的 insertBefore：插到锚点之前，省略锚点则追加到末尾。会话或锚点不在记账中时拒绝且不写入；移动到当前位置时直接完成且不写入。注册表中的 Workspace 顺序绝不改变。
- `ctx.workspace.archiveSession(id)`/`archivedSessionIds`：覆盖在 workspace 记账之上的注册表级全局归档集合：被归档的会话从各分组视图中消失，但其会话日志和 `sessionIds` 席位保持不变，未来取消归档时可恢复原位置。归档接受任何实时或已持久化的会话（无论已记账还是 Ungrouped），对已归档的 id 直接完成而不写入，并拒绝未知 id。在该字段出现之前写入的状态解析为一个空集合。
- `Workspace.sessionIds`：按持久候选顺序提供同步 id 加规范 cwd 成员投影。缺失头部、无效 cwd 值和不匹配情况都被过滤；下一次 workspace 变更会剪除它们。如果同一存储介质将一个会话索引到两个 workspace 下、用两条记录声明同一路径，或偏离持久 workspace 顺序，启动会被拒绝。
- `Workspace.status()`：未缓存的目录检查，返回 `'ok' | 'missing-dir'`；目录缺失绝不会改动记录。
diff --git a/packages/workspace/workspace/src/index.ts b/packages/workspace/workspace/src/index.ts
index d972085939..5d1f3296d8 100644
--- a/packages/workspace/workspace/src/index.ts
+++ b/packages/workspace/workspace/src/index.ts
@@ -52,6 +52,17 @@ export class WorkspaceUnknownSessionError extends Error {
}
}
+/** A workspace reorder named a source or anchor absent from the durable registry order. */
+export class WorkspaceOrderInvalidError extends Error {
+ /**
+ * @param workspaceId - Missing source or anchor id.
+ */
+ constructor(readonly workspaceId: WorkspaceId) {
+ super(`cannot reorder unknown workspace '${workspaceId}'`)
+ this.name = 'WorkspaceOrderInvalidError'
+ }
+}
+
declare module '@deepseek-ai/cordis' {
interface Context {
@@ -189,6 +200,30 @@ export class WorkspaceRegistry extends Service {
return this.enqueueOperation(() => this.deleteKnown(id))
}
+ /**
+ * Move one workspace within the durable display order, DOM-insertBefore-like.
+ * With an anchor it lands before that workspace; without one it appends.
+ * @param id - Workspace to move.
+ * @param beforeId - Workspace anchor; omitted appends.
+ * @returns the complete committed workspace order.
+ */
+ insertBefore(id: WorkspaceId, beforeId?: WorkspaceId): Promise {
+ return this.enqueueOperation(async () => {
+ const state = this.requireState()
+ if (!state.workspaceIds.includes(id)) throw new WorkspaceOrderInvalidError(id)
+ if (beforeId !== undefined && !state.workspaceIds.includes(beforeId)) {
+ throw new WorkspaceOrderInvalidError(beforeId)
+ }
+ if (beforeId === id) return state.workspaceIds
+ const without = state.workspaceIds.filter(workspaceId => workspaceId !== id)
+ const at = beforeId === undefined ? without.length : without.indexOf(beforeId)
+ const workspaceIds = [...without.slice(0, at), id, ...without.slice(at)]
+ if (sameIds(workspaceIds, state.workspaceIds)) return state.workspaceIds
+ await this.setState({ ...state, workspaceIds })
+ return workspaceIds
+ })
+ }
+
/**
* The registry-global archive set: sessions hidden from every grouping
* surface. Archiving never touches workspace accounting — an archived
diff --git a/packages/workspace/workspace/tests/workspace.spec.ts b/packages/workspace/workspace/tests/workspace.spec.ts
index 3c4b6185fb..c04980eecd 100644
--- a/packages/workspace/workspace/tests/workspace.spec.ts
+++ b/packages/workspace/workspace/tests/workspace.spec.ts
@@ -10,7 +10,11 @@ import type { DomainChanged } from '@deepseek-ai/dsh-storage-domain'
import SessionStore, { SessionId } from '@deepseek-ai/dsh-session'
import type { SessionHeader } from '@deepseek-ai/dsh-session'
import { MemoryMediaPool, MemoryStorageBackend } from '../../../storage/storage-domain/tests/helpers/memory-backend.ts'
-import WorkspaceRegistry, { WorkspaceId, WorkspaceMoveInvalidError } from '../src/index.ts'
+import WorkspaceRegistry, {
+ WorkspaceId,
+ WorkspaceMoveInvalidError,
+ WorkspaceOrderInvalidError,
+} from '../src/index.ts'
import type { WorkspaceDomainState, WorkspaceRecord } from '../src/index.ts'
const DOMAIN_VERSION = 2
@@ -568,6 +572,49 @@ describe('WorkspaceRegistry create and lookup', () => {
})
})
+describe('Workspace registry ordering', () => {
+ it('moves a workspace before an anchor or to the end and restores that order after restart', async () => {
+ const firstDir = await makeDir('order-first')
+ const secondDir = await makeDir('order-second')
+ const thirdDir = await makeDir('order-third')
+ const result = await harness()
+ const first = await result.registry.create(firstDir)
+ const second = await result.registry.create(secondDir)
+ const third = await result.registry.create(thirdDir)
+ expect(result.registry.list().map(item => item.id)).toEqual([third.id, second.id, first.id])
+
+ await expect(result.registry.insertBefore(first.id, second.id))
+ .resolves.toEqual([third.id, first.id, second.id])
+ await expect(result.registry.insertBefore(third.id))
+ .resolves.toEqual([first.id, second.id, third.id])
+ expect(storedState(result.pool).workspaceIds).toEqual([first.id, second.id, third.id])
+
+ const restarted = await harness({ pool: result.pool })
+ expect(restarted.registry.list().map(item => item.id)).toEqual([first.id, second.id, third.id])
+ })
+
+ it('keeps self-anchored and already-positioned moves write-free and rejects unknown ids', async () => {
+ const firstDir = await makeDir('order-noop-first')
+ const secondDir = await makeDir('order-noop-second')
+ const result = await harness()
+ const first = await result.registry.create(firstDir)
+ const second = await result.registry.create(secondDir)
+ const written = result.changes.length
+
+ await result.registry.insertBefore(second.id, second.id)
+ await result.registry.insertBefore(second.id, first.id)
+ await result.registry.insertBefore(first.id)
+ expect(result.changes).toHaveLength(written)
+ expect(result.registry.list().map(item => item.id)).toEqual([second.id, first.id])
+
+ await expect(result.registry.insertBefore(WorkspaceId('missing')))
+ .rejects.toBeInstanceOf(WorkspaceOrderInvalidError)
+ await expect(result.registry.insertBefore(second.id, WorkspaceId('missing-anchor')))
+ .rejects.toMatchObject({ workspaceId: 'missing-anchor' })
+ expect(result.changes).toHaveLength(written)
+ })
+})
+
describe('Workspace session ordering', () => {
it('prepends new attaches and keeps repeat attach idempotent', async () => {
const dir = await makeDir('attach-order')
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d87640c791..f737e1ed15 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -846,6 +846,9 @@ importers:
'@deepseek-ai/dsh-goal':
specifier: workspace:^
version: link:../../goal/goal
+ '@deepseek-ai/dsh-host-plugin-inventory':
+ specifier: workspace:^
+ version: link:../../host/plugin-inventory
'@deepseek-ai/dsh-invariants':
specifier: workspace:^
version: link:../../support/invariants
@@ -1593,6 +1596,9 @@ importers:
'@deepseek-ai/dsh-client-ui-plugin-config':
specifier: workspace:^
version: link:../../client/ui-plugin-config
+ '@deepseek-ai/dsh-client-ui-plugins':
+ specifier: workspace:^
+ version: link:../../client/ui-plugins
'@deepseek-ai/dsh-client-ui-question':
specifier: workspace:^
version: link:../../client/ui-question
@@ -1656,6 +1662,9 @@ importers:
'@deepseek-ai/dsh-host-directory-picker-native':
specifier: workspace:^
version: link:../../host/directory-picker-native
+ '@deepseek-ai/dsh-host-plugin-inventory':
+ specifier: workspace:^
+ version: link:../../host/plugin-inventory
'@deepseek-ai/dsh-host-webserver':
specifier: workspace:^
version: link:../../host/webserver
@@ -2582,6 +2591,48 @@ importers:
specifier: ^18.2.0
version: 18.3.1
+ packages/client/ui-plugins:
+ devDependencies:
+ '@deepseek-ai/cordis':
+ specifier: workspace:^
+ version: link:../../../vendor/cordis
+ '@deepseek-ai/dsh-api-remotes':
+ specifier: workspace:^
+ version: link:../../api/remotes
+ '@deepseek-ai/dsh-client-locale':
+ specifier: workspace:^
+ version: link:../locale
+ '@deepseek-ai/dsh-client-runtime':
+ specifier: workspace:^
+ version: link:../runtime
+ '@deepseek-ai/dsh-client-test-runtime':
+ specifier: workspace:^
+ version: link:../test-runtime
+ '@deepseek-ai/dsh-client-ui-primitives':
+ specifier: workspace:^
+ version: link:../ui-primitives
+ '@deepseek-ai/dsh-client-ui-settings':
+ specifier: workspace:^
+ version: link:../ui-settings
+ '@deepseek-ai/dsh-client-ui-slots':
+ specifier: workspace:^
+ version: link:../ui-slots
+ '@deepseek-ai/dsh-invariants':
+ specifier: workspace:^
+ version: link:../../support/invariants
+ '@testing-library/react':
+ specifier: ^16.1.0
+ version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ '@types/react':
+ specifier: ~18.3.1
+ version: 18.3.31
+ react:
+ specifier: ^18.2.0
+ version: 18.3.1
+ react-dom:
+ specifier: ^18.2.0
+ version: 18.3.1(react@18.3.1)
+
packages/client/ui-primitives:
dependencies:
'@shikijs/langs':
@@ -4951,6 +5002,28 @@ importers:
specifier: workspace:^
version: link:../../support/invariants
+ packages/host/plugin-inventory:
+ dependencies:
+ zod:
+ specifier: ^4.4.3
+ version: 4.4.3
+ devDependencies:
+ '@deepseek-ai/cordis':
+ specifier: workspace:^
+ version: link:../../../vendor/cordis
+ '@deepseek-ai/cordis-plugin-loader':
+ specifier: workspace:^
+ version: link:../../../vendor/loader
+ '@deepseek-ai/dsh-brand':
+ specifier: workspace:^
+ version: link:../../util/brand
+ '@deepseek-ai/dsh-invariants':
+ specifier: workspace:^
+ version: link:../../support/invariants
+ '@deepseek-ai/dsh-type-meta':
+ specifier: workspace:^
+ version: link:../../typert/type-meta
+
packages/host/webserver:
dependencies:
'@deepseek-ai/schemastery':
diff --git a/python/sdk/README.i18n.yaml b/python/sdk/README.i18n.yaml
index e13a2ccd31..d1a9bbc81b 100644
--- a/python/sdk/README.i18n.yaml
+++ b/python/sdk/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 python/sdk/README.md
-README.md: 8cf366c27c8a604391ea85e298ba725e9987d428
-README.zh.md: a9258ce9aee9bce973107b49114d4ed6e81441e4
+README.md: 686cb46b6d3d12baaf2afdeba10def23d7a08edb
+README.zh.md: 6414560deedbb76dd6f8571526251acd1c3f6a80
diff --git a/python/sdk/README.md b/python/sdk/README.md
index 8cf366c27c..686cb46b6d 100644
--- a/python/sdk/README.md
+++ b/python/sdk/README.md
@@ -40,7 +40,7 @@ with DeepSeekHarness(
`provider` selects a provider route registered by the chosen Cordis composition; `model` is the model id resolved by that adapter. `max_tokens` is an optional positive per-request output-token cap for the root agent and its in-process descendants; omission leaves the provider default in control. Compaction summaries keep the separate limit configured by their compaction plugin. The bundled default composition registers `deepseek-official`. A custom composition can mount `llm-pi-ai`, configure provider-specific credentials/endpoints there, and select any provider/model present in pi-ai's installed catalog.
-The [Python SDK tutorial](../../docs/user/guide/python-sdk.md) uses a complete standalone Cordis file to demonstrate installation, direct SDK usage, and runs without the Web UI.
+The [Python SDK tutorial](../../docs/user/guide/python-sdk.md) provides an ordered installation and first-run path without the Web UI. The [`jsonrpc-agent` example](../../examples/jsonrpc-agent/README.md) owns the complete standalone Cordis file used there.
`Session.run()` owns an activity interval from its prompt's durable inbox receipt through the next whole-agent idle and returns `RunResult(session_id, final_response, finish_reason, events, notifications, session_root)`. `final_response` is the last committed root-session assistant text in the interval. `finish_reason` is the `kind` of the last root-session `turn/end` in the interval, such as `completed`, `max-tokens`, or `error`, and is `None` when no turn ended. A `turn/end` without a string `data.reason.kind` violates the runtime protocol and raises `SdkProtocolError`. Both result fields describe the owned interval rather than an output or ending causally assigned to the prompt. Steering, injected context, and other queued work may contribute before idle.
diff --git a/python/sdk/README.zh.md b/python/sdk/README.zh.md
index a9258ce9ae..6414560dee 100644
--- a/python/sdk/README.zh.md
+++ b/python/sdk/README.zh.md
@@ -37,7 +37,7 @@ with DeepSeekHarness(
`provider` 用于选择当前 Cordis 组合已注册的提供方路由；`model` 是该适配器解析的模型 ID。`max_tokens` 是可选的正整数，用于限制根 agent（智能体）及其进程内后代每次请求的输出 token；省略时由提供方默认值控制。压缩摘要继续使用压缩插件单独配置的上限。内置默认组合注册 `deepseek-official`。自定义组合可以挂载 `llm-pi-ai`，在其中配置各提供方的凭据与端点，再选择 pi-ai 已安装目录中的任意提供方/模型组合。
-[Python SDK 教程](../../docs/user/guide/python-sdk.md)使用完整的独立 Cordis 文件演示安装方式、直接调用 SDK，以及在不使用 Web UI 的情况下运行 agent。
+[Python SDK 教程](../../docs/user/guide/python-sdk.md)提供不使用 Web UI 的顺序安装与首次运行路径。[`jsonrpc-agent` 示例](../../examples/jsonrpc-agent/README.md)归属该教程使用的完整独立 Cordis 文件。
`Session.run()` 拥有一个从提示词进入持久 inbox 时开始、到整个 agent 下一次进入空闲状态为止的活动区间，并返回 `RunResult(session_id, final_response, finish_reason, events, notifications, session_root)`。`final_response` 是该区间内根会话最后提交的助手文本。`finish_reason` 是该区间内根会话最后一个 `turn/end` 的 `kind`，例如 `completed`、`max-tokens` 或 `error`；没有轮次结束时为 `None`。缺少字符串 `data.reason.kind` 的 `turn/end` 违反运行时协议，并会抛出 `SdkProtocolError`。两个结果字段描述的都是自有活动区间，而不是因果上归属于该提示词的输出或结束原因。steering（中途引导）、注入的上下文和其他排队工作都可能在进入空闲状态前参与其中。
diff --git a/scripts/project-doc-site.spec.ts b/scripts/project-doc-site.spec.ts
index 107f2c1034..b5f5218de7 100644
--- a/scripts/project-doc-site.spec.ts
+++ b/scripts/project-doc-site.spec.ts
@@ -5,7 +5,7 @@ import { existsSync, globSync, mkdirSync, mkdtempSync, readFileSync, realpathSyn
import { tmpdir } from 'node:os'
import { basename, join, resolve } from 'node:path'
import { afterEach, describe, expect, it } from 'vitest'
-import { docsPages, type DocsPage } from '../website/docs.ts'
+import { docsPages, landingLink, routeLink, sectionSpec, type DocsPage } from '../website/docs.ts'
import {
addProjectionFrontmatter, projectedPageContent, publishableImage, rewriteMarkdown,
} from './project-doc-site.ts'
@@ -364,6 +364,63 @@ describe('docsPages locale routes', () => {
})
})
+describe('sidebar ordering', () => {
+ it('places every section a sidebar collection owns', () => {
+ for (const page of docsPages) {
+ if (page.sidebar === null) continue
+ expect(() => sectionSpec(page.locale, page.section), page.route).not.toThrow()
+ }
+ })
+
+ it('refuses a section with no declared placement', () => {
+ expect(() => sectionSpec('root', '数据结构'))
+ .toThrow('Sidebar section "数据结构" has no placement in the root locale.')
+ })
+
+ it('declares placements per locale rather than in one shared list', () => {
+ // `SDK` labels a group in both locales, so one shared list would have to
+ // rank it against `入门` and against `Guide` at the same position.
+ expect(sectionSpec('root', 'SDK').index).toBeGreaterThan(sectionSpec('root', '入门').index)
+ expect(sectionSpec('en', 'SDK').index).toBeGreaterThan(sectionSpec('en', 'Guide').index)
+ expect(() => sectionSpec('en', '入门')).toThrow()
+ expect(() => sectionSpec('root', 'Guide')).toThrow()
+ })
+
+ it('lands every navigation item on a page the manifest publishes', () => {
+ // The navigation bar named `/guide/` while the manifest published the guide's
+ // first page at `guide/quickstart.md`, so the item served a 404.
+ const collections = [
+ ['root', 'zh-guide'], ['root', 'zh-develop'], ['root', 'zh-reference'],
+ ['en', 'en-guide'], ['en', 'en-develop'], ['en', 'en-reference'],
+ ] as const
+ const published = new Set(docsPages.map(page => routeLink(page.route)))
+ for (const [locale, collection] of collections) {
+ expect(published, `${locale}/${collection}`).toContain(landingLink(locale, collection))
+ }
+ })
+
+ it('collapses the subsystem groups and leaves the smaller ones open', () => {
+ expect(sectionSpec('root', '执行与工具').collapsed).toBe(true)
+ expect(sectionSpec('en', 'Execution and tools').collapsed).toBe(true)
+ expect(sectionSpec('root', '概念').collapsed).toBeUndefined()
+ })
+
+ it('gives each page its own position within a section', () => {
+ // Sidebar entries sort by order alone, so a shared value leaves the two
+ // pages ranked by whichever manifest block happens to be concatenated
+ // first rather than by an intent the manifest states.
+ const taken = new Map()
+ const collisions: string[] = []
+ for (const page of docsPages) {
+ const slot = `${page.locale}/${String(page.sidebar)}/${page.section}#${page.order}`
+ const holder = taken.get(slot)
+ if (holder === undefined) taken.set(slot, page.label)
+ else collisions.push(`${slot}: ${holder} / ${page.label}`)
+ }
+ expect(collisions).toEqual([])
+ })
+})
+
describe('addProjectionFrontmatter', () => {
it('adds frontmatter to an ordinary Markdown page', () => {
expect(addProjectionFrontmatter('# Guide\n', { source: 'docs/guide.md' })).toBe(
@@ -411,6 +468,25 @@ describe('projectedPageContent', () => {
expect(projectedPageContent(markdown, page('zh-guide'))).toBe(markdown)
})
+ it('drops the language switcher the navigation bar already offers', () => {
+ expect(projectedPageContent('# Guide\n\nEnglish | [中文](./en/guide)\n\nBody.\n', page('zh-guide')))
+ .toBe('# Guide\n\nBody.\n')
+ expect(projectedPageContent('# 指南\n\n[English](./en/guide) | 中文\n\n正文。\n', page('zh-guide')))
+ .toBe('# 指南\n\n正文。\n')
+ })
+
+ it('drops the repository badge every page links from its footer', () => {
+ const badge = '[](https://github.com/deepseek-ai/deepseek-harness)'
+ expect(projectedPageContent(`# Guide\n\nBody.\n\n${badge}\n`, page('zh-guide')))
+ .toBe('# Guide\n\nBody.\n')
+ })
+
+ it('keeps a switcher-shaped line that is not the page header', () => {
+ // A tutorial showing the convention must still render the example.
+ const sample = '# Guide\n\nA\n\nB\n\nC\n\nD\n\nE\n\nEnglish | [中文](./x)\n'
+ expect(projectedPageContent(sample, page('zh-guide'))).toBe(sample)
+ })
+
it('rejects a locale home source without frontmatter', () => {
expect(() => projectedPageContent('# Harness\n', page(null)))
.toThrow('locale home source "docs/index.zh.md" must start with YAML frontmatter')
diff --git a/scripts/project-doc-site.ts b/scripts/project-doc-site.ts
index e7acc73998..1d0ea9072a 100644
--- a/scripts/project-doc-site.ts
+++ b/scripts/project-doc-site.ts
@@ -292,6 +292,37 @@ export function addProjectionFrontmatter(markdown: string, page: Pick LANGUAGE_SWITCHER.test(line))
+ // Only the switcher introducing the page qualifies; further down the same
+ // text is prose or a sample rather than the page's own header.
+ if (switcher !== -1 && switcher < 8) {
+ lines.splice(switcher, lines[switcher + 1] === '' ? 2 : 1)
+ }
+ const badge = lines.findLastIndex(line => REPOSITORY_BADGE.test(line))
+ if (badge !== -1) {
+ lines.splice(lines[badge - 1] === '' ? badge - 1 : badge, lines[badge - 1] === '' ? 2 : 1)
+ }
+ return lines.join('\n')
+}
+
/**
* Select the Markdown rendered for one published page.
*
@@ -300,7 +331,7 @@ export function addProjectionFrontmatter(markdown: string, page: Pick`:\n\n```sh\npnpm dsh --profile web # the browser UI\npnpm dsh plugin --profile tui add # install a plugin into a custom profile\npnpm dsh --profile tui # boot it\n```\n\nThe [CLI reference](apps/cli/README.md#profiles) describes profile layout, layer semantics, and config dump commands.\n\n### Headless\n\nRun one task, print the final answer, and exit:\n\n```sh\npnpm dsh --profile headless \"summarize this workspace\"\n```\n\n### Automation and SDKs\n\nFrom a source checkout with `DEEPSEEK_API_KEY` in the environment or its root `.env`, start the ACP automation server:\n\n```sh\npnpm run demo:acp\n```\n\nThe [Python SDK](python/README.md) drives a bundled JSON-RPC runtime. The [examples](examples/README.md) cover the runnable headless, ACP, JSON-RPC, Code Mode, and self-referential compositions.\n\n## Why DeepSeek Harness\n\nBuilt-in capabilities cover file reading, editing, and search; shell and persistent PTY execution; reusable skills; task tracking, goals, plans, todos, and background tasks; subagents and workflows; sandboxing and approvals; settings and credentials; persistent, resumable, forkable, and queryable sessions; LSP and web access; context compaction; and telemetry. Each composition selects the subset appropriate to its surface. The Web UI includes Plan Mode.\n\n- **Everything is a plugin.** Models, tools, policies, storage, context management, and interfaces are composable [Cordis plugins](docs/user/develop/basic/index.md), so deployments can extend or replace behavior without forking the agent loop. See the [architecture](docs/architecture.md) for the underlying design.\n- **Runs are reconstructable.** Anything visible to the model is logged in the authoritative session stream; persistence, resume/fork/query, replay, telemetry, and UIs derive from the same events. See the [session-log architecture](docs/architecture.md#session-log).\n- **Code Mode (opt-in).** It exposes a `run_code` tool and a generated TypeScript SDK; only program output re-enters model context. See [Code Mode](packages/core/tools/README.md#code-mode).\n- **Self-referential Cordis tools are opt-in.** They let the agent inspect its live runtime and mount or unmount plugins while it runs. See the [Cordis tools](packages/self-modification/tool-cordis/README.md).\n\n## Community\n\nFollow DeepSeek Harness on Twitter for project updates.\n\n## Development\n\nStart with the [development guide](docs/development.md) and read the [architecture](docs/architecture.md) before changing packages.\n\nFor agents, follow [AGENTS.md](AGENTS.md).\n\nDeepSeek Harness is currently in internal testing.\n\n## License\n\n[BSD 3-Clause](LICENSE)\n\nThird-party dependencies and their licenses are disclosed in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).\n\n## Contributing\n\nRead [CONTRIBUTING.md](CONTRIBUTING.md) before contributing to this repository.\n"
+ "content": "# DeepSeek Harness\n\nEnglish | [中文](README.zh.md)\n\nDeepSeek Harness (`dsh`) is an open-source coding agent built on the DeepSeek Harness SDK.\n\nIt uses an architecture where **everything is a plugin**.\n\n## Internal testing notice\n\nDeepSeek Harness is under internal testing. Features and interfaces may change.\n\nThe internal build uploads all Session Logs by default to help diagnose reported problems. Set `DSH_TELEMETRY_DISABLED=1` to disable telemetry. Send feedback through the internal WeChat group.\n\n## Run\n\nInstall Node.js ^22.19 or >= 24 and pnpm 11, then run the published package:\n\n```sh\nnpx @deepseek-ai/dsh web\n```\n\nThe command initializes the Web profile and prints the Web UI URL, which is `http://127.0.0.1:3080` by default. Open it, add a DeepSeek API key under **Settings → Models**, then start a session. The invoking directory is the default workspace; try `Summarize this repository and identify its main packages.`\n\nContinue with the [Web UI guide](docs/user/guide/).\n\n### Run from source\n\nTo run a repository checkout instead:\n\n```sh\ngit clone https://github.com/deepseek-harness/deepseek-harness.git\ncd deepseek-harness\npnpm install\npnpm dsh web\n```\n\nThe last command builds the repository and opens the same Web UI path.\n\n## Profiles and plugins\n\nA profile is an ordered list of plugin bundles. The shipped `web` profile powers `dsh web`. Manage a profile with `dsh plugin --profile `, which forwards the remaining arguments to pnpm in that profile's directory:\n\n```sh\nnpx -p @deepseek-ai/dsh dsh plugin --profile web add \nnpx -p @deepseek-ai/dsh dsh plugin --profile web remove \n```\n\n`add`, `remove`, `update`, `why`, and other pnpm commands work unchanged. The command initializes a missing profile before changing its packages and updates its bundle list from installed packages that declare `dsh.bundle`. See the [CLI reference](apps/cli/reference/README.md#plugin-management) for the exact behavior.\n\nThe [CLI reference](apps/cli/README.md) covers headless execution and custom profiles. The [Python SDK](python/README.md) and [examples](examples/README.md) cover programmatic and custom compositions.\n\n## Community\n\nFollow DeepSeek Harness on Twitter for project updates.\n\n## Development\n\nStart with the [development guide](docs/development.md) and read the [architecture](docs/architecture.md) before changing packages.\n\nFor agents, follow [AGENTS.md](AGENTS.md).\n\n## License\n\n[BSD 3-Clause](LICENSE)\n\nThird-party dependencies and their licenses are disclosed in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).\n\n## Contributing\n\nRead [CONTRIBUTING.md](CONTRIBUTING.md) before contributing to this repository.\n"
},
{
"role": "assistant",
- "content": "# DeepSeek Harness\n\n[English](README.md) | 中文\n\nDeepSeek Harness（`dsh`）是一款基于 DeepSeek Harness SDK 构建的开源 coding agent（智能体）。\n\n它采用了**一切皆插件**的架构。\n\n## 内测声明\n\nDeepSeek Harness 正处于内部测试阶段，功能和接口可能发生变化。\n\n为帮助诊断上报的问题，内测版本默认上传所有会话日志。设置 `DSH_TELEMETRY_DISABLED=1` 可关闭遥测。请通过内部企业微信群反馈问题和建议。\n\n## 从源码运行\n\n克隆本仓库，完成[依赖安装和 API 密钥配置](docs/user/guide/quickstart.md#step-1-install-and-configure-the-api-key)，然后运行：\n\n```sh\npnpm dsh web\n```\n\n## 使用 DeepSeek Harness\n\n### Web UI\n\n请从仓库根目录启动推荐的本地界面：\n\n```sh\npnpm dsh web\n```\n\n该命令会先构建仓库，再启动 Web UI。Web UI 默认通过 `http://127.0.0.1:3080` 提供服务。\n\n### Profile\n\n源码 CLI（命令行界面）会启动 profile：按序叠放的插件组合包 patch 层，之上再叠加你在 `$DSH_HOME/profiles/` 中的自有覆盖层：\n\n```sh\npnpm dsh --profile web # the browser UI\npnpm dsh plugin --profile tui add # install a plugin into a custom profile\npnpm dsh --profile tui # boot it\n```\n\nprofile 布局、层语义与配置输出命令详见 [CLI（命令行界面）参考](apps/cli/README.md#profiles)。\n\n### Headless\n\n运行一项任务，打印最终答案后退出：\n\n```sh\npnpm dsh --profile headless \"summarize this workspace\"\n```\n\n### 自动化与 SDK\n\n在源码检出中通过环境变量或根目录 `.env` 设置 `DEEPSEEK_API_KEY`，然后启动 ACP（Agent Client Protocol）自动化服务器：\n\n```sh\npnpm run demo:acp\n```\n\n[Python SDK](python/README.md) 驱动随附的 JSON-RPC 运行时。[示例](examples/README.md)涵盖可运行的 headless、ACP、JSON-RPC、Code Mode 和自指组合。\n\n## 为什么选择 DeepSeek Harness\n\n内置功能涵盖文件读取、编辑与搜索、shell 和持久 PTY 执行、可复用 skill（技能）、任务跟踪、目标、计划、待办事项与后台任务、subagent 与工作流、沙箱与审批、设置与凭据、可持久化、恢复、fork 与查询的会话、LSP 与 Web 访问、上下文压缩（context compaction），以及遥测。每个组合只选用适合其使用方式的能力子集。Web UI 包含 Plan Mode。\n\n- **一切皆插件。** 模型、工具、策略、存储、上下文管理和界面均为可组合的 [Cordis 插件](docs/user/develop/basic/index.md)，部署方无需 fork agent loop（智能体循环）即可扩展或替换行为。底层设计见[架构文档](docs/architecture.md)。\n- **运行可重建。** 凡是模型可见的内容，都会记录在权威会话流中；持久化、恢复／fork／查询、回放、遥测和 UI 均从同一组事件派生。参见[会话日志架构](docs/architecture.md#session-log)。\n- **Code Mode（需显式启用）。** 它会提供 `run_code` 工具和生成的 TypeScript SDK，只有程序输出会重新进入模型上下文。参见 [Code Mode](packages/core/tools/README.md#code-mode)。\n- **自指 Cordis 工具需显式启用。** 这些工具可让 agent 检查自身的实时运行时，并在运行中挂载或卸载插件。参见 [Cordis 工具](packages/self-modification/tool-cordis/README.md)。\n\n## 社区\n\n扫描二维码，或打开 DeepSeek Harness 微信社区申请页面 申请加入。\n\n ` 管理 profile；该命令会在对应 profile 目录中将剩余参数转发给 pnpm：\n\n```sh\nnpx -p @deepseek-ai/dsh dsh plugin --profile web add \nnpx -p @deepseek-ai/dsh dsh plugin --profile web remove \n```\n\n`add`、`remove`、`update`、`why` 等 pnpm 命令均可直接使用。该命令会先初始化不存在的 profile，再修改其中的包，并根据声明了 `dsh.bundle` 的已安装包更新 bundle 列表。准确行为见 [CLI 参考](apps/cli/reference/README.md#plugin-management)。\n\n[CLI（命令行界面）参考](apps/cli/README.md)介绍 headless 执行与自定义 profile。[Python SDK](python/README.md) 和[示例](examples/README.md)介绍程序化组合与自定义组合。\n\n## 社区\n\n扫描二维码，或打开 DeepSeek Harness 微信社区申请页面 申请加入。\n\n> = {
'packages/client/ui-settings': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
'packages/client/ui-settings-general': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
'packages/client/ui-models': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
+ 'packages/client/ui-plugins': { kind: 'none', reason: 'Browser-side inventory projection; registers nothing model-facing.' },
'packages/client/locale': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
'packages/client/web': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
'packages/examples/agent-spine-demo': { kind: 'indirect', reason: 'The bundle only mounts model-facing child plugins.' },
@@ -106,6 +107,7 @@ const SENTENCE_MODEL_EXPERIENCE: Readonly> = {
'packages/host/directory-picker-native': { kind: 'none', reason: 'The GUI-host picking backend registers nothing model-facing.' },
'packages/host/webserver': { kind: 'none', reason: 'The HTTP carrier bridges browser and API handler and registers nothing model-facing.' },
'packages/host/frontend-static': { kind: 'none', reason: 'The SPA dist server answers browser asset requests and registers nothing model-facing.' },
+ 'packages/host/plugin-inventory': { kind: 'none', reason: 'Host-side read-only Loader projection; registers nothing model-facing.' },
'packages/bundle/base': { kind: 'indirect', reason: 'The bundle is a patch-list carrier; each inserted row\'s package owns its model-facing behavior.' },
'packages/bundle/headless': { kind: 'none', reason: 'The one-shot runner submits the task as an ordinary user message; prompts and tools belong to the composed base and headless bundles.' },
'packages/llm/llm': { kind: 'none', reason: 'The adapter registry forwards already-assembled requests unchanged.' },
diff --git a/tsconfig.base.json b/tsconfig.base.json
index ff8e58e361..b373642dab 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -161,6 +161,8 @@
"@deepseek-ai/dsh-host-apiproxy/client": ["./packages/host/apiproxy/src/fetch/client.ts"],
"@deepseek-ai/dsh-host-apiproxy/*": ["./packages/host/apiproxy/src/*"],
"@deepseek-ai/dsh-host-webserver": ["./packages/host/webserver/src"],
+ "@deepseek-ai/dsh-host-plugin-inventory": ["./packages/host/plugin-inventory/src"],
+ "@deepseek-ai/dsh-host-plugin-inventory/types": ["./packages/host/plugin-inventory/src/types.ts"],
"@deepseek-ai/dsh-client-ui-slots": ["./packages/client/ui-slots/src"],
"@deepseek-ai/dsh-client-ui-attachment": ["./packages/client/ui-attachment/src"],
"@deepseek-ai/dsh-client-ui-primitives": ["./packages/client/ui-primitives/src"],
@@ -199,6 +201,7 @@
"@deepseek-ai/dsh-client-ui-settings": ["./packages/client/ui-settings/src"],
"@deepseek-ai/dsh-client-ui-settings-general": ["./packages/client/ui-settings-general/src"],
"@deepseek-ai/dsh-client-ui-models": ["./packages/client/ui-models/src"],
+ "@deepseek-ai/dsh-client-ui-plugins": ["./packages/client/ui-plugins/src"],
"@deepseek-ai/dsh-client-locale": ["./packages/client/locale/src"],
"@deepseek-ai/dsh-client-web": ["./packages/client/web/src"],
// sdk/ folders are role-named without their npm-side sdk/jsonrpc prefixes,
diff --git a/tsconfig.client.json b/tsconfig.client.json
index ce48a77ea9..3a84926202 100644
--- a/tsconfig.client.json
+++ b/tsconfig.client.json
@@ -19,7 +19,10 @@
"packages/client/*/src/css-modules.d.ts",
"packages/client/*/tests/**/*.ts",
"packages/client/*/tests/**/*.tsx",
- "packages/api/gateway/tests/client.spec.ts",
+ "packages/*/*/tests/**/*.client.spec.ts",
+ "packages/*/*/tests/**/*.client.spec.tsx",
+ "packages/*/*/tests/**/*.client.tsx",
+ "packages/*/*/tests/**/*.client.ts",
"packages/client/tsdown.client.ts",
"scripts/client-bundle-css.spec.ts",
"scripts/client-bundle-purity.spec.ts"
@@ -81,6 +84,7 @@
{ "path": "./packages/client/ui-settings" },
{ "path": "./packages/client/ui-settings-general" },
{ "path": "./packages/client/ui-models" },
+ { "path": "./packages/client/ui-plugins" },
{ "path": "./packages/client/locale" },
{ "path": "./packages/client/web" },
{ "path": "./apps/web" }
diff --git a/tsconfig.host.json b/tsconfig.host.json
index 133e60b50c..20229f0594 100644
--- a/tsconfig.host.json
+++ b/tsconfig.host.json
@@ -29,6 +29,7 @@
"apps/web/tests/settings-chrome.e2e.ts",
"apps/web/tests/models-settings.e2e.ts",
"apps/web/tests/onboarding-deepseek-config.e2e.ts",
+ "apps/web/tests/onboarding-usable-provider.e2e.ts",
"apps/web/tests/remote-welcome.e2e.ts",
"apps/web/tests/workspace-management.e2e.ts",
"apps/web/tests/replay-round-trip.e2e.ts",
@@ -93,12 +94,11 @@
// and the package test glob above needs no per-file entry.
"exclude": [
"packages/client/*/src/**",
- "packages/client/*/tests/**/*.client.ts",
- "packages/client/*/tests/**/*.client.tsx",
- "packages/client/*/tests/**/*.client.spec.ts",
- "packages/client/*/tests/**/*.client.spec.tsx",
+ "packages/*/*/tests/**/*.client.ts",
+ "packages/*/*/tests/**/*.client.tsx",
+ "packages/*/*/tests/**/*.client.spec.ts",
+ "packages/*/*/tests/**/*.client.spec.tsx",
"packages/client/tsdown.client.ts",
- "packages/api/gateway/tests/client.spec.ts",
"scripts/client-bundle-css.spec.ts",
"packages/typert/generator/tests/fixtures/**",
"scripts/client-bundle-purity.spec.ts"
@@ -282,6 +282,7 @@
{ "path": "./packages/host/directory-picker-browse" },
{ "path": "./packages/host/directory-picker-native" },
{ "path": "./packages/host/frontend-static" },
+ { "path": "./packages/host/plugin-inventory" },
{ "path": "./packages/host/webserver" },
{ "path": "./packages/sdk/client" },
{ "path": "./packages/sdk/protocol" },
diff --git a/website/.vitepress/config.ts b/website/.vitepress/config.ts
index 4cef3f0a67..e451ecb68c 100644
--- a/website/.vitepress/config.ts
+++ b/website/.vitepress/config.ts
@@ -1,52 +1,34 @@
/** VitePress configuration for the locally projected documentation site. */
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
import type { DefaultTheme, PageData } from 'vitepress'
import type { ViteDevServer } from 'vite'
import { withMermaid } from 'vitepress-plugin-mermaid'
-import { docsPages, type DocsPage } from '../docs.ts'
+import { landingLink, orderedPages, routeLink, sectionSpec, type DocsLocale, type DocsPage } from '../docs.ts'
import { docsSourceFiles, projectDocs } from '../../scripts/project-doc-site.ts'
projectDocs()
-const sectionOrder = [
- '入门',
- '基础',
- '框架能力',
- '实战',
- 'Cordis 教程',
- '概念',
- '生成参考',
- 'Cordis API',
- '数据结构',
- '开发手册',
- 'Guide',
- 'Basics',
- 'Framework',
- 'Practice',
- 'Cordis tutorial',
- 'Concepts',
- 'Generated reference',
- 'Cordis Core API',
- 'Data structures',
- 'Cookbook',
-]
-
-function sidebar(collection: DocsPage['sidebar']): DefaultTheme.SidebarItem[] {
- const pages = docsPages.filter(page => page.sidebar === collection)
- const sections = new Map()
- for (const page of pages) {
- const entries = sections.get(page.section) ?? []
+function sidebar(locale: DocsLocale, collection: NonNullable): DefaultTheme.SidebarItem[] {
+ // `orderedPages` already sorts by section placement, so insertion order
+ // carries the group order and each group keeps its pages in sequence.
+ const groups = new Map()
+ for (const page of orderedPages(locale, collection)) {
+ const entries = groups.get(page.section) ?? []
entries.push(page)
- sections.set(page.section, entries)
+ groups.set(page.section, entries)
}
- return [...sections.entries()]
- .sort(([left], [right]) => sectionOrder.indexOf(left) - sectionOrder.indexOf(right))
- .map(([text, entries]) => ({
+ return [...groups.entries()].map(([text, entries]) => {
+ const { collapsed } = sectionSpec(locale, text)
+ return {
text,
- items: entries
- .sort((left, right) => left.order - right.order)
- .map(page => ({ text: page.label, link: `/${page.route.replace(/(?:index)?\.md$/, '')}` })),
- }))
+ // A present `collapsed` is what makes the default theme render the
+ // group as collapsible at all, so an open group must omit the key.
+ ...(collapsed === undefined ? {} : { collapsed }),
+ items: entries.map(page => ({ text: page.label, link: routeLink(page.route) })),
+ }
+ })
}
function watchCanonicalDocs(server: ViteDevServer): void {
@@ -107,10 +89,102 @@ const sharedTheme: Pick` would freeze the mark at the colors the file declares.
+ */
+const wordmark = readFileSync(resolve(import.meta.dirname, '../public/wordmark.svg'), 'utf8')
+ .trim()
+ .replace('
\n ![\"DeepSeek](\"assets/community-wecom-survey.png\")
\n
\n \n