fix(workspace): keep the default Workspace path language-neutral
The first-use directory name and its stored title came from the Client's startup language, so one product decision carried two incompatible requirements: a path addressed by shell commands, tool arguments, @path references, and session logs, and a label a reader reads. The controller now owns the fixed `default-workspace` directory name and the registry titles the Workspace after that same segment, so `workspace.initializeDefault` takes no request at all — WorkspaceInitializeDefaultRequest and its name validation are gone, and the registry resolver returns a path instead of a path and title. No language reaches the Host. Browser consumers label a Workspace through the new `workspaceDisplayTitle`: a title still equal to the automatic one reads as the localized default name from the `common` namespace, every other title reads verbatim. The Workspace browser resolves it once at the store read, so rows, hover card, search meta, and the rename and delete dialogs inherit it; the hero picker and the Conversation chip resolve it too. Confirming a rename stores the text on screen, which is what stops a row following the language.
This commit is contained in:
1 parent
5e25475857
commit
ff1c7d415f
53 files changed
+297
-195
No files matched your search
@@ -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/api/workspace-controller/README.md
|
||||
README.md: b1ca97465625817c28615cbff1badb564ccc29fe
|
||||
README.zh.md: 7f7dbd49c0ef0ebbcb49dfeb6d736dc03e96565c
|
||||
README.md: ab96bb0114106d5c43e261c31b324c853f1ddea1
|
||||
README.zh.md: bcf713306eaea0b3177881ba7e63c6c4bbd297ea
|
||||
@@ -29,9 +29,11 @@ The Client entry provides `ClientWorkspaceModel` and `createWorkspaceStateStream
|
||||
<a id="first-use-workspace"></a>
|
||||
### First-use Workspace
|
||||
|
||||
`workspace.initializeDefault({ directoryName, title })` returns the durable default Workspace; the Client service exposes the same request as `workspaces.initializeDefault(request, signal?)`. The [Workspace Client](../../client/ui-workspace/README.md) resolves these names from its startup language. The Host places the directory under its account's `<Documents>/deepseek-harness`, including on remote Web hosts. The directory name must be one non-blank segment without separators, colon, NUL, surrounding whitespace, or a trailing dot; the title must be non-blank. OS filename restrictions also apply. Linux system lookup requires `xdg-user-dir` with an enabled Documents directory; hosts without it must configure `documentsDirectory` or use the folder picker.
|
||||
`workspace.initializeDefault()` returns the durable default Workspace; the Client service exposes it as `workspaces.initializeDefault(signal?)`. It takes no request: the Host owns the fixed `default-workspace` directory name, and the registry derives the initial title from that same segment, so one installation keeps one on-disk path and one stored title in every language. The Host places the directory under its account's `<Documents>/deepseek-harness`, including on remote Web hosts. OS filename restrictions apply. Linux system lookup requires `xdg-user-dir` with an enabled Documents directory; hosts without it must configure `documentsDirectory` or use the folder picker.
|
||||
|
||||
The [Workspace registry](../../workspace/workspace/README.md#first-use-workspace) owns eligibility, directory creation, and durable initialization. An existing default Workspace is returned without another Documents lookup; request names do not rename it. Ineligible first use returns `undefined`, so startup can leave directory selection to the user. Invalid names reject with `gateway/bad-request`; lookup and creation failures use standard Remote error handling. Initialization creates no Session and sends no message.
|
||||
The [Workspace registry](../../workspace/workspace/README.md#first-use-workspace) owns eligibility, directory creation, and durable initialization. An existing default Workspace is returned without another Documents lookup and is never renamed or relocated. Ineligible first use returns `undefined`, so startup can leave directory selection to the user. Lookup and creation failures use standard Remote error handling. Initialization creates no Session and sends no message.
|
||||
|
||||
`DEFAULT_WORKSPACE_DIRECTORY` and `workspaceDisplayTitle(title, localizedDefault)` are published from `./default-workspace` for browser consumers: a Workspace still carrying the automatic title reads as the reader's localized default name, and every other title reads verbatim. A Workspace the user renamed to exactly `default-workspace` — or a folder of that name adopted from the picker — is labeled as the default; nothing else depends on the distinction.
|
||||
|
||||
| Configuration | Default | Purpose |
|
||||
| --- | --- | --- |
|
||||
|
||||
@@ -29,9 +29,11 @@ Client 入口提供 `ClientWorkspaceModel` 和 `createWorkspaceStateStream()`。
|
||||
<a id="first-use-workspace"></a>
|
||||
### 首次使用工作区
|
||||
|
||||
`workspace.initializeDefault({ directoryName, title })` 返回持久化的默认工作区;Client service 通过 `workspaces.initializeDefault(request, signal?)` 提供同一请求。[Workspace Client](../../client/ui-workspace/README.zh.md)按启动时的语言解析这些名称。Host 将目录放在其账户的 `<Documents>/deepseek-harness` 下,远程 Web Host 也遵循此规则。目录名必须是非空的单个片段,不能含分隔符、冒号、NUL、首尾空白或末尾句点;标题不能为空。操作系统的文件名限制同样适用。Linux 系统查询要求存在 `xdg-user-dir` 且启用了 Documents 目录;不具备该条件的 Host 必须配置 `documentsDirectory` 或使用文件夹选择器。
|
||||
`workspace.initializeDefault()` 返回持久化的默认工作区;Client service 通过 `workspaces.initializeDefault(signal?)` 提供该操作。它不接受请求参数:固定目录名 `default-workspace` 由 Host 拥有,注册表也以同一路径片段作为初始标题,因此任何语言下同一安装环境都只有一个磁盘路径和一个存储标题。Host 将目录放在其账户的 `<Documents>/deepseek-harness` 下,远程 Web Host 也遵循此规则。操作系统的文件名限制同样适用。Linux 系统查询要求存在 `xdg-user-dir` 且启用了 Documents 目录;不具备该条件的 Host 必须配置 `documentsDirectory` 或使用文件夹选择器。
|
||||
|
||||
[Workspace 注册表](../../workspace/workspace/README.zh.md#first-use-workspace)负责资格判断、目录创建和持久化初始化。已有默认工作区直接返回,不再查询 Documents;请求中的名称不会将其重命名。不满足首次使用条件时返回 `undefined`,启动流程可将目录选择留给用户。名称无效时以 `gateway/bad-request` 拒绝;查询和创建失败遵循标准 Remote 错误处理。初始化不创建 Session,也不发送消息。
|
||||
[Workspace 注册表](../../workspace/workspace/README.zh.md#first-use-workspace)负责资格判断、目录创建和持久化初始化。已有默认工作区直接返回,不再查询 Documents,也不会被重命名或迁移。不满足首次使用条件时返回 `undefined`,启动流程可将目录选择留给用户。查询和创建失败遵循标准 Remote 错误处理。初始化不创建 Session,也不发送消息。
|
||||
|
||||
`./default-workspace` 为浏览器消费方导出 `DEFAULT_WORKSPACE_DIRECTORY` 与 `workspaceDisplayTitle(title, localizedDefault)`:仍保留自动标题的工作区按读者语言显示默认名称,其他标题一律原样显示。被用户重命名为 `default-workspace` 的工作区,或从选择器采用的同名文件夹,也会按默认工作区显示;除显示之外没有其他行为依赖该判断。
|
||||
|
||||
| 配置 | 默认值 | 用途 |
|
||||
| --- | --- | --- |
|
||||
|
||||
@@ -26,6 +26,10 @@
|
||||
"types": "./lib/types/client/index.d.ts",
|
||||
"default": "./lib/client.js"
|
||||
},
|
||||
"./default-workspace": {
|
||||
"types": "./lib/types/default-workspace.d.ts",
|
||||
"default": "./lib/types/default-workspace.js"
|
||||
},
|
||||
"./typert": {
|
||||
"types": "./lib/typert.host.d.ts",
|
||||
"default": "./lib/typert.host.js"
|
||||
|
||||
@@ -19,7 +19,7 @@ export { WorkspaceArchiveError, WorkspaceController, WorkspaceCreateError } from
|
||||
export type { IWorkspaces, WorkspaceSource } from './service.ts'
|
||||
export type {
|
||||
SessionActivity, SessionActivityItem, SessionActivityKind, SessionActivityKindMap, WorkspaceId,
|
||||
WorkspaceInitializeDefaultRequest, WorkspaceView,
|
||||
WorkspaceView,
|
||||
} from '../types.ts'
|
||||
|
||||
type WorkspaceBaselineFrame = Extract<WorkspaceFollowFrame, { type: 'baseline' }>
|
||||
|
||||
@@ -12,7 +12,6 @@ import type {
|
||||
WorkspaceCreateValue,
|
||||
WorkspaceDeleteValue,
|
||||
WorkspaceInsertSessionBeforeRequest,
|
||||
WorkspaceInitializeDefaultRequest,
|
||||
WorkspaceOrderValue,
|
||||
WorkspacePinSessionRequest,
|
||||
WorkspacePinValue,
|
||||
@@ -104,14 +103,11 @@ export class ClientWorkspaceModel implements WorkspaceFollowSink {
|
||||
|
||||
/**
|
||||
* Initialize the default Workspace and merge its authoritative row.
|
||||
* @param request - initial directory name and title.
|
||||
* @param signal - caller lifetime.
|
||||
* @returns generated Remote result.
|
||||
*/
|
||||
async initializeDefault(
|
||||
request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal,
|
||||
): Promise<RemoteResult<WorkspaceValue | undefined>> {
|
||||
const result = await this.remote.initializeDefault(request, signal)
|
||||
async initializeDefault(signal?: AbortSignal): Promise<RemoteResult<WorkspaceValue | undefined>> {
|
||||
const result = await this.remote.initializeDefault(signal)
|
||||
if (result.ok && result.value !== undefined) this.upsert(result.value.workspace)
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import { Service, type Context } from '@deepseek-ai/cordis'
|
||||
import type { SessionId } from '@deepseek-ai/dsh-session/types'
|
||||
import type { RemoteFailure } from '@deepseek-ai/dsh-typert-protocol'
|
||||
import type { WorkspaceId } from '@deepseek-ai/dsh-workspace/types'
|
||||
import type { WorkspaceInitializeDefaultRequest, WorkspaceView } from '../types.ts'
|
||||
import type { WorkspaceView } from '../types.ts'
|
||||
import type { ClientWorkspaceModel, WorkspaceSnapshot } from './model.ts'
|
||||
|
||||
/** Structured create failure for callers that distinguish Host business errors. */
|
||||
@@ -55,11 +55,10 @@ export interface IWorkspaces {
|
||||
create(input: { path: string }): Promise<WorkspaceView>
|
||||
/**
|
||||
* Initialize or reuse the default Workspace.
|
||||
* @param request - initial directory name and title.
|
||||
* @param signal - caller lifetime.
|
||||
* @returns the prepared Workspace, or undefined when first-use initialization is ineligible; rejects on preparation failure.
|
||||
*/
|
||||
initializeDefault(request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal): Promise<WorkspaceView | undefined>
|
||||
initializeDefault(signal?: AbortSignal): Promise<WorkspaceView | undefined>
|
||||
/**
|
||||
* Rename a Workspace.
|
||||
* @param workspaceId - target Workspace.
|
||||
@@ -134,8 +133,8 @@ export class WorkspaceController extends Service implements IWorkspaces {
|
||||
return result.value.workspace
|
||||
}
|
||||
|
||||
async initializeDefault(request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal): Promise<WorkspaceView | undefined> {
|
||||
const result = await this.model.initializeDefault(request, signal)
|
||||
async initializeDefault(signal?: AbortSignal): Promise<WorkspaceView | undefined> {
|
||||
const result = await this.model.initializeDefault(signal)
|
||||
if (!result.ok) throw new WorkspaceCreateError(result.error)
|
||||
return result.value?.workspace
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { homedir } from 'node:os'
|
||||
import { posix, win32 } from 'node:path'
|
||||
import { runNativeCommand, type NativeCommandRunner } from '@deepseek-ai/dsh-native-command'
|
||||
import { DEFAULT_WORKSPACE_DIRECTORY } from './default-workspace.ts'
|
||||
|
||||
/** Platform observations replaceable in directory-resolution tests. */
|
||||
interface DocumentsDirectoryInternals {
|
||||
@@ -28,14 +29,12 @@ export function validateDocumentsDirectory(directory: string, platform: NodeJS.P
|
||||
|
||||
/**
|
||||
* Resolve the first-use directory on the Host without creating files.
|
||||
* @param directoryName - validated single directory name supplied by the Client.
|
||||
* @param documentsDirectory - explicit deployment override for the system Documents directory.
|
||||
* @param signal - caller lifetime and lookup deadline.
|
||||
* @param internals - platform facts and native command runner.
|
||||
* @returns the absolute candidate path.
|
||||
*/
|
||||
export async function defaultWorkspaceDirectory(
|
||||
directoryName: string,
|
||||
documentsDirectory: string | undefined,
|
||||
signal: AbortSignal,
|
||||
internals: DocumentsDirectoryInternals = {},
|
||||
@@ -75,5 +74,5 @@ export async function defaultWorkspaceDirectory(
|
||||
}
|
||||
directory = validateDocumentsDirectory(directory, platform)
|
||||
signal.throwIfAborted()
|
||||
return paths.join(directory, 'deepseek-harness', directoryName)
|
||||
return paths.join(directory, 'deepseek-harness', DEFAULT_WORKSPACE_DIRECTORY)
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
/**
|
||||
* Fixed first-use Workspace naming, shared by the Host that creates the
|
||||
* directory and by browser consumers that label the resulting row. A pure fold
|
||||
* with no imports, so client bundles inline it instead of requesting a
|
||||
* module-table row this package does not publish.
|
||||
* @module @deepseek-ai/dsh-api-workspace-controller/default-workspace
|
||||
*/
|
||||
|
||||
/**
|
||||
* Leaf directory name of the first-use Workspace under
|
||||
* `<Documents>/deepseek-harness`. Language-neutral, so one installation keeps
|
||||
* one on-disk path across language switches. The registry derives the initial
|
||||
* title from this same segment, which is the title
|
||||
* {@link workspaceDisplayTitle} recognizes as automatic.
|
||||
*/
|
||||
export const DEFAULT_WORKSPACE_DIRECTORY = 'default-workspace'
|
||||
|
||||
/**
|
||||
* The text one Workspace is labeled with. A Workspace still carrying the
|
||||
* automatic first-use title reads as the caller's localized default name; every
|
||||
* other title reads verbatim in every language. A title the user typed as
|
||||
* exactly {@link DEFAULT_WORKSPACE_DIRECTORY} is labeled as the default too;
|
||||
* nothing else depends on the distinction.
|
||||
* @param title - stored Workspace title.
|
||||
* @param localizedDefault - the default Workspace name in the active language.
|
||||
* @returns the title to display.
|
||||
*/
|
||||
export function workspaceDisplayTitle(title: string, localizedDefault: string): string {
|
||||
return title === DEFAULT_WORKSPACE_DIRECTORY ? localizedDefault : title
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import { Context } from '@deepseek-ai/cordis'
|
||||
import z from '@deepseek-ai/schemastery'
|
||||
import { Remote, RemoteError, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol'
|
||||
import { Remote, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol'
|
||||
import { WorkspaceCommands } from './commands.ts'
|
||||
import { DirectoryPickerController } from './directory-picker.ts'
|
||||
import { WorkspaceFeed, workspaceView } from './feed.ts'
|
||||
@@ -16,7 +16,6 @@ import type {
|
||||
WorkspaceDeleteValue,
|
||||
WorkspaceFollowFrame,
|
||||
WorkspaceInsertBeforeRequest,
|
||||
WorkspaceInitializeDefaultRequest,
|
||||
WorkspaceInsertSessionBeforeRequest,
|
||||
WorkspaceOrderValue,
|
||||
WorkspacePinSessionRequest,
|
||||
@@ -89,24 +88,20 @@ export class WorkspaceController extends TypertRemoteService {
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize or reuse the default Workspace during first-use startup.
|
||||
* @param request - initial directory name and title; never rename an existing default.
|
||||
* Initialize or reuse the default Workspace during first-use startup. The
|
||||
* directory name is fixed, so the Host never renames or relocates an
|
||||
* existing default; its initial title is that same name, which browser
|
||||
* consumers label in the reader's language.
|
||||
* @param signal - caller lifetime; cancels native directory lookup.
|
||||
* @returns the durable Workspace, or undefined when first-use initialization is ineligible; creates no Session or message.
|
||||
*/
|
||||
@Remote('initializeDefault')
|
||||
async initializeDefault(request: WorkspaceInitializeDefaultRequest, signal: AbortSignal): Promise<WorkspaceValue | undefined> {
|
||||
const { directoryName, title } = request
|
||||
if (directoryName.trim() === '' || directoryName !== directoryName.trim()
|
||||
|| directoryName.endsWith('.') || /[/\\:\0]/.test(directoryName) || title.trim() === '') {
|
||||
throw new RemoteError('gateway/bad-request', 'default Workspace requires a directory name and non-blank title', {})
|
||||
}
|
||||
async initializeDefault(signal: AbortSignal): Promise<WorkspaceValue | undefined> {
|
||||
const workspace = await this.ctx.workspaceRegistry.initializeDefault(async () => {
|
||||
const timeout = AbortSignal.timeout(this.config.documentsLookupTimeoutMs)
|
||||
const path = await defaultWorkspaceDirectory(
|
||||
directoryName, this.config.documentsDirectory, AbortSignal.any([signal, timeout]),
|
||||
return await defaultWorkspaceDirectory(
|
||||
this.config.documentsDirectory, AbortSignal.any([signal, timeout]),
|
||||
)
|
||||
return { path, title }
|
||||
})
|
||||
return workspace === undefined ? undefined : { workspace: workspaceView(workspace) }
|
||||
}
|
||||
|
||||
@@ -66,14 +66,6 @@ export interface WorkspaceCreateRequest {
|
||||
readonly path: string
|
||||
}
|
||||
|
||||
/** Names chosen by the first-use Client before default Workspace initialization. */
|
||||
export interface WorkspaceInitializeDefaultRequest {
|
||||
/** Host rejects blank names, separators, colon, NUL, surrounding whitespace, and trailing dots; OS filename restrictions also apply. */
|
||||
readonly directoryName: string
|
||||
/** Initial display title, retained across language changes. */
|
||||
readonly title: string
|
||||
}
|
||||
|
||||
/** Created or previously registered Workspace. */
|
||||
export interface WorkspaceCreateValue {
|
||||
readonly workspace: WorkspaceView
|
||||
|
||||
@@ -4,36 +4,36 @@ import { defaultWorkspaceDirectory, validateDocumentsDirectory } from '../src/de
|
||||
|
||||
describe('system Documents directory', () => {
|
||||
it.each([
|
||||
['darwin', '/Users/a/文档/\n', '/Users/a/文档/deepseek-harness/默认工作区', 'osascript'],
|
||||
['win32', 'D:\\Redirected Documents\r\n', 'D:\\Redirected Documents\\deepseek-harness\\默认工作区', 'powershell.exe'],
|
||||
['linux', '/home/a/My Documents\n', '/home/a/My Documents/deepseek-harness/默认工作区', 'xdg-user-dir'],
|
||||
['darwin', '/Users/a/文档/\n', '/Users/a/文档/deepseek-harness/default-workspace', 'osascript'],
|
||||
['win32', 'D:\\Redirected Documents\r\n', 'D:\\Redirected Documents\\deepseek-harness\\default-workspace', 'powershell.exe'],
|
||||
['linux', '/home/a/My Documents\n', '/home/a/My Documents/deepseek-harness/default-workspace', 'xdg-user-dir'],
|
||||
] as const)('uses the %s account directory and preserves spaces and Unicode', async (platform, stdout, path, command) => {
|
||||
const run = vi.fn<NativeCommandRunner>(async () => ({ stdout, stderr: '' }))
|
||||
const signal = new AbortController().signal
|
||||
await expect(defaultWorkspaceDirectory('默认工作区', undefined, signal, { platform, run })).resolves.toBe(path)
|
||||
await expect(defaultWorkspaceDirectory(undefined, signal, { platform, run })).resolves.toBe(path)
|
||||
expect(run).toHaveBeenCalledWith(command, expect.any(Array), signal)
|
||||
})
|
||||
|
||||
it.each(['Default workspace', '默认工作区', 'default-workspace'])('uses the configured directory with name %s', async (folder) => {
|
||||
it('uses the configured directory without a system lookup', async () => {
|
||||
const run = vi.fn<NativeCommandRunner>()
|
||||
await expect(defaultWorkspaceDirectory(folder, '/documents', new AbortController().signal, { platform: 'linux', run }))
|
||||
.resolves.toBe(`/documents/deepseek-harness/${folder}`)
|
||||
await expect(defaultWorkspaceDirectory('/documents', new AbortController().signal, { platform: 'linux', run }))
|
||||
.resolves.toBe('/documents/deepseek-harness/default-workspace')
|
||||
expect(run).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it.each(['', '\r\n', '/home/a\n'])('rejects an unavailable XDG directory %j', async (stdout) => {
|
||||
const run: NativeCommandRunner = async () => ({ stdout, stderr: '' })
|
||||
await expect(defaultWorkspaceDirectory('Default workspace', undefined, new AbortController().signal, { platform: 'linux', home: '/home/a', run }))
|
||||
await expect(defaultWorkspaceDirectory(undefined, new AbortController().signal, { platform: 'linux', home: '/home/a', run }))
|
||||
.rejects.toThrow('unavailable')
|
||||
})
|
||||
|
||||
it('propagates lookup failure and cancellation', async () => {
|
||||
const run: NativeCommandRunner = async () => { throw new Error('lookup denied') }
|
||||
await expect(defaultWorkspaceDirectory('Default workspace', undefined, new AbortController().signal, { platform: 'darwin', run }))
|
||||
await expect(defaultWorkspaceDirectory(undefined, new AbortController().signal, { platform: 'darwin', run }))
|
||||
.rejects.toThrow('lookup denied')
|
||||
await expect(defaultWorkspaceDirectory('Default workspace', '/documents', AbortSignal.abort(), { platform: 'linux' }))
|
||||
await expect(defaultWorkspaceDirectory('/documents', AbortSignal.abort(), { platform: 'linux' }))
|
||||
.rejects.toThrow()
|
||||
await expect(defaultWorkspaceDirectory('Default workspace', undefined, new AbortController().signal, { platform: 'freebsd' }))
|
||||
await expect(defaultWorkspaceDirectory(undefined, new AbortController().signal, { platform: 'freebsd' }))
|
||||
.rejects.toThrow('unavailable')
|
||||
})
|
||||
|
||||
|
||||
@@ -176,18 +176,18 @@ describe('ClientWorkspaceModel', () => {
|
||||
const model = modelFor(remote)
|
||||
baseline(model)
|
||||
const signal = new AbortController().signal
|
||||
await expect(model.initializeDefault({ directoryName: '默认工作区', title: '默认工作区' }, signal)).resolves.toMatchObject({ ok: true })
|
||||
expect(remote.initializeDefault).toHaveBeenCalledWith({ directoryName: '默认工作区', title: '默认工作区' }, signal)
|
||||
await expect(model.initializeDefault(signal)).resolves.toMatchObject({ ok: true })
|
||||
expect(remote.initializeDefault).toHaveBeenCalledWith(signal)
|
||||
expect(model.getSnapshot().items.map(item => item.workspaceId)).toEqual(['default'])
|
||||
const before = model.getSnapshot()
|
||||
remote.initializeDefault.mockResolvedValueOnce(remoteOk(undefined))
|
||||
await expect(model.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' }))
|
||||
await expect(model.initializeDefault())
|
||||
.resolves.toEqual({ ok: true, value: undefined })
|
||||
expect(model.getSnapshot()).toBe(before)
|
||||
remote.initializeDefault.mockResolvedValueOnce(workspaceError(
|
||||
new RemoteError('gateway/bad-request', 'choose a folder', {}),
|
||||
))
|
||||
await expect(model.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' })).resolves.toMatchObject({ ok: false })
|
||||
await expect(model.initializeDefault()).resolves.toMatchObject({ ok: false })
|
||||
expect(model.getSnapshot()).toBe(before)
|
||||
})
|
||||
|
||||
|
||||
@@ -318,8 +318,7 @@ describe('WorkspaceController', () => {
|
||||
const controller = new WorkspaceController(client.ctx, model)
|
||||
const before = model.getSnapshot()
|
||||
mock.remote.workspace.initializeDefault.mockResolvedValueOnce({ ok: true, value: undefined })
|
||||
await expect(controller.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' }))
|
||||
.resolves.toBeUndefined()
|
||||
await expect(controller.initializeDefault()).resolves.toBeUndefined()
|
||||
expect(model.getSnapshot()).toBe(before)
|
||||
})
|
||||
|
||||
@@ -331,7 +330,7 @@ describe('WorkspaceController', () => {
|
||||
|
||||
expect(controller.list).toBe(model)
|
||||
expect(client.ctx.workspaces.list).toBe(model)
|
||||
await expect(controller.initializeDefault({ directoryName: '默认工作区', title: '默认工作区' }, new AbortController().signal)).resolves.toMatchObject({ workspaceId: 'default' })
|
||||
await expect(controller.initializeDefault(new AbortController().signal)).resolves.toMatchObject({ workspaceId: 'default' })
|
||||
await expect(controller.create({ path: '/work/created' })).resolves.toMatchObject({ workspaceId: 'created' })
|
||||
await expect(controller.rename(wid('one'), 'renamed')).resolves.toMatchObject({ title: 'renamed' })
|
||||
await expect(controller.insertBefore(wid('one'))).resolves.toBeUndefined()
|
||||
@@ -344,7 +343,6 @@ describe('WorkspaceController', () => {
|
||||
await expect(controller.unpinSession(sid('session'))).resolves.toBeUndefined()
|
||||
await expect(controller.delete(wid('one'))).resolves.toBeUndefined()
|
||||
// Each command crosses the wire as one positional request object.
|
||||
expect(mock.log.requests('workspace/initializeDefault')).toEqual([{ directoryName: '默认工作区', title: '默认工作区' }])
|
||||
expect(mock.log.requests('workspace/create')).toEqual([{ path: '/work/created' }])
|
||||
expect(mock.log.requests('workspace/rename')).toEqual([{ workspaceId: 'one', title: 'renamed' }])
|
||||
expect(mock.log.requests('workspace/insertBefore')).toEqual([{ workspaceId: 'one' }])
|
||||
@@ -364,7 +362,7 @@ describe('WorkspaceController', () => {
|
||||
const missingSession = new RemoteError('session/not-found', 'missing session', { sessionId: sid('session') })
|
||||
|
||||
mock.remote.workspace.initializeDefault.mockResolvedValueOnce(err(new RemoteError('gateway/internal', 'directory denied', {})))
|
||||
await expect(controller.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' })).rejects.toBeInstanceOf(WorkspaceCreateError)
|
||||
await expect(controller.initializeDefault()).rejects.toBeInstanceOf(WorkspaceCreateError)
|
||||
|
||||
mock.remote.workspace.create.mockResolvedValueOnce(err(new RemoteError('workspace/invalid-path', 'missing path', { path: '/missing' })))
|
||||
const create = controller.create({ path: '/missing' })
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { existsSync, mkdirSync, mkdtempSync, realpathSync, rmSync } from 'node:fs'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { basename, join } from 'node:path'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import { Context } from '@deepseek-ai/cordis'
|
||||
import SessionStore, { SessionId } from '@deepseek-ai/dsh-session'
|
||||
@@ -10,6 +10,7 @@ import { RemoteError } from '@deepseek-ai/dsh-typert-protocol'
|
||||
import WorkspaceRegistry from '@deepseek-ai/dsh-workspace'
|
||||
import type { WorkspaceId } from '@deepseek-ai/dsh-workspace/types'
|
||||
import WorkspaceController from '../src/index.ts'
|
||||
import { DEFAULT_WORKSPACE_DIRECTORY } from '../src/default-workspace.ts'
|
||||
import { WorkspaceFeed } from '../src/feed.ts'
|
||||
import type { WorkspaceFollowFrame } from '../src/types.ts'
|
||||
import { MemoryStorageBackend } from '../../../storage/storage-domain/tests/helpers/memory-backend.ts'
|
||||
@@ -450,53 +451,30 @@ describe('WorkspaceController follow', () => {
|
||||
describe('first-use Remote', () => {
|
||||
it('reuses an initialized Workspace without looking up system Documents', async () => {
|
||||
const { controller, ctx, root } = await harness({ systemDocuments: true })
|
||||
const workspace = await ctx.workspaceRegistry.initializeDefault(async () => ({ path: root, title: 'Existing default' }))
|
||||
const workspace = await ctx.workspaceRegistry.initializeDefault(async () => root)
|
||||
const signal = AbortSignal.abort()
|
||||
await expect(controller.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' }, signal))
|
||||
.resolves.toMatchObject({ workspace: { workspaceId: workspace!.id, path: root, title: 'Existing default' } })
|
||||
await expect(controller.initializeDefault(signal))
|
||||
.resolves.toMatchObject({ workspace: { workspaceId: workspace!.id, path: root, title: basename(root) } })
|
||||
})
|
||||
|
||||
it.each(['', ' ', '.', '..', '../outside', 'nested/name', 'nested\\name', 'C:outside', 'name\0', '.. ', 'tail.'])(
|
||||
'rejects invalid directory name %j before invoking the registry', async (directoryName) => {
|
||||
const { controller, ctx } = await harness()
|
||||
const initialize = vi.spyOn(ctx.workspaceRegistry, 'initializeDefault').mockResolvedValue(undefined)
|
||||
await expect(controller.initializeDefault({ directoryName, title: 'Default workspace' }, new AbortController().signal))
|
||||
.rejects.toMatchObject({ code: 'gateway/bad-request' })
|
||||
expect(initialize).not.toHaveBeenCalled()
|
||||
},
|
||||
)
|
||||
|
||||
it('rejects a blank initial title before invoking the registry', async () => {
|
||||
const { controller, ctx } = await harness()
|
||||
const initialize = vi.spyOn(ctx.workspaceRegistry, 'initializeDefault').mockResolvedValue(undefined)
|
||||
await expect(controller.initializeDefault({ directoryName: 'default-workspace', title: ' ' }, new AbortController().signal))
|
||||
.rejects.toMatchObject({ code: 'gateway/bad-request' })
|
||||
expect(initialize).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('uses the requested display title independently of the directory name', async () => {
|
||||
const { controller, root } = await harness()
|
||||
const result = await controller.initializeDefault({ directoryName: 'default-workspace', title: 'Default workspace' }, new AbortController().signal)
|
||||
expect(result?.workspace).toMatchObject({ path: join(root, 'deepseek-harness', 'default-workspace'), title: 'Default workspace' })
|
||||
})
|
||||
|
||||
it('returns a durable Workspace without allocating a Session', async () => {
|
||||
it('returns a durable Workspace named after its fixed directory without allocating a Session', async () => {
|
||||
const { controller, ctx, root } = await harness()
|
||||
const signal = new AbortController().signal
|
||||
const result = await controller.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' }, signal)
|
||||
expect(result!.workspace.path).toBe(join(root, 'deepseek-harness', 'Default workspace'))
|
||||
const result = await controller.initializeDefault(signal)
|
||||
expect(result!.workspace.path).toBe(join(root, 'deepseek-harness', DEFAULT_WORKSPACE_DIRECTORY))
|
||||
expect(result!.workspace.title).toBe(DEFAULT_WORKSPACE_DIRECTORY)
|
||||
expect(existsSync(result!.workspace.path)).toBe(true)
|
||||
expect(ctx.sessions.list()).toEqual([])
|
||||
expect(await controller.initializeDefault({ directoryName: '默认工作区', title: '默认工作区' }, signal)).toEqual(result)
|
||||
expect(await controller.initializeDefault(signal)).toEqual(result)
|
||||
})
|
||||
|
||||
it('skips ineligible first use and propagates preparation failures', async () => {
|
||||
const { controller, ctx, root } = await harness()
|
||||
await ctx.workspaceRegistry.create(root)
|
||||
await expect(controller.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' }, new AbortController().signal))
|
||||
await expect(controller.initializeDefault(new AbortController().signal))
|
||||
.resolves.toBeUndefined()
|
||||
vi.spyOn(ctx.workspaceRegistry, 'initializeDefault').mockRejectedValueOnce(new Error('permission denied'))
|
||||
await expect(controller.initializeDefault({ directoryName: 'Default workspace', title: 'Default workspace' }, new AbortController().signal))
|
||||
await expect(controller.initializeDefault(new AbortController().signal))
|
||||
.rejects.toThrow('permission denied')
|
||||
})
|
||||
})
|
||||
@@ -9,6 +9,7 @@
|
||||
"src/client/index.ts",
|
||||
"src/client/model.ts",
|
||||
"src/client/service.ts",
|
||||
"src/default-workspace.ts",
|
||||
"src/types.ts"
|
||||
],
|
||||
"references": [
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
"src/index.ts",
|
||||
"src/types.ts",
|
||||
"src/commands.ts",
|
||||
"src/default-workspace.ts",
|
||||
"src/directory-picker.ts",
|
||||
"src/feed.ts",
|
||||
"src/default-directory.ts"
|
||||
|
||||
Reference in new issue
Block a user