* feat(workspace): stop a Session's running work before archiving it Archiving was a pure visibility write, so a Session archived mid-turn kept running out of sight. The Workspace registry now owns archive admission through two Host events: `workspace/session-activity` reports what still runs and refuses the plain archive as `workspace/session-active`; `workspace/session-stop`, requested with `stopActivity`, stops that work the way the user's own stop actions do before the archive write. The API Session Controller reports and stops turns, subagent descendants, and owned jobs and rejects any model step for an archived Session; the Schedule plugin reports and deletes active reminders. The sidebar turns the refusal into a stop-and-archive confirmation listing the Host's answer. * test(workspace): pin the widened archive signature and prove child liveness by heartbeat The Client inspect catalog spec pins archiveSession's new options parameter, and the archive e2e reads the Bash child's liveness from a heartbeat file instead of a pid: the Linux sandbox runs the tool in its own PID namespace, so the pid it reports is not comparable from the test. * test(workspace): cover the archive-admission providers and dialog to the per-file gate Drop the provider's unused disposer and the dialog's unreachable confirm guard, read reminders without a catch that no composition can reach, and add the cases the coverage lane found missing: a stop without a jobs registry, a looping lineage, a descendant whose projections reject, the dialog's Escape guard and non-Error reason, and a family merged by another provider. * fix(workspace): write the archive before stopping, gate subagent lineage, and delete reminders under the schedule barriers Review round on #4765. The registry now writes the archive set before it dispatches `workspace/session-stop`, so the durable set already gates every wake the stops induce; the controller's `agent/pre-step` gate also blocks subagent descendants of an archived Session and contains each cancel or kill on its own. The Schedule plugin's stop listener runs as a management delete in the agent's transaction queue between the same two persistence barriers the `schedule_delete` tool uses. The confirm dialog selects singular or plural English lines and keys list rows by index. Docs: archive-admission section with type-equiv blocks on the workspace subsystem page, write-first order and residual windows in the READMEs and the Agent Note, and the missing zh reminders sentence. * test(web): scope the question composer's New Session wait to the Sessions tree The wide sidebar's New Session button carries the same visible label as a fresh session row, so the unscoped `getByText` either settled on the button before the row existed or hit a strict-mode violation once the row rendered first, which is how the snapshots lane failed on ece68c2ab5. Waiting inside the Sessions tree names the row alone. * fix(schedule): answer archive admission from the owned runtime's fold, not the projection registry The `sessionProjections.snapshot` API is the Client projection view and is not a Host read path (review on #4765). `ScheduleRuntime.activeRecords()` folds the live log the way every drive does, and the archive-admission listeners ask the owned runtime for that fold: a session without a live agent or without an owned runtime has nothing armed to fire, so it reports nothing and has nothing to stop. Covers the runtime-less agent, a fold that turns unreadable at the persistence barrier, and the stopping/faulted runtime answering nothing. * refactor(subagent): report and stop subagent descendants from the Subagent runtime The `subagent` family of archive admission moves out of the API Session Controller into `dsh-subagent`, which records the lineage at delegation and owns the descriptor (review on #4765): `SubagentRuntime` answers `workspace/session-activity` with the running descendants, labelled from each child's descriptor through a live Session observation, and `workspace/session-stop` by cancelling each of them with the parent cause. The controller keeps turns, owned jobs, and the lineage step gate, and composes its provider through `ctx.plugin(SessionActivityProvider)` with declared injections instead of a bare installer call. `dsh-workspace` becomes an optional type-only peer of `dsh-subagent`. * refactor(jobs): answer archive admission for owned jobs from the job registry seam The `job` family moves out of the API Session Controller into `dsh-jobs` (review on #4765): the seam's constructor installs the `workspace/session-activity` and `workspace/session-stop` listeners for every implementation through the abstract `list` and `kill` alone, so the controller no longer knows the jobs vocabulary and keeps only the turn family and the archived-lineage step gate. `dsh-workspace` becomes an optional type-only peer of `dsh-jobs`. * refactor(workspace): leave SessionActivityKindMap empty and let each provider merge its family The workspace package no longer names any activity family (review on #4765): `SessionActivityKindMap` is empty, and each provider merges its own key from a module both its faces import — `turn` in the API Session Controller's types, `job` in the job registry seam's view, `subagent` in the Subagent runtime's control types, `schedule` in the Schedule plugin's types. The confirm dialog imports those modules for its cases and keeps the generic line for any other key; the registry and controller suites merge test-owned families instead of borrowing the providers'. * refactor(agent): report and stop the running turn from the Agent registry The `turn` family moves out of the API Session Controller into `dsh-agent` (review on #4765): the registry's constructor installs the `workspace/session-activity` and `workspace/session-stop` listeners for every Agent it publishes, answering with its own lookup and cancelling the turn with the user cause, and merges the `turn` key from its client-safe types. The controller keeps only the archived-lineage step gate, renamed `ArchivedSessionGate`. `dsh-workspace` becomes an optional type-only peer of `dsh-agent`; the workspace package depends on none of the providers, so the edge stays acyclic. Since #3127 a foreground Bash command is a registered job from its start, so the archive dialog lists it beside the turn; the e2e and its ARIA golden expect that row, and the capture keeps the running job by design.
253 lines
9.3 KiB
TypeScript
253 lines
9.3 KiB
TypeScript
/** Workspace command implementation and stable Remote failure mapping. */
|
|
|
|
import type { Context } from '@deepseek-ai/cordis'
|
|
import type { Workspace } from '@deepseek-ai/dsh-workspace'
|
|
import {
|
|
WorkspaceActiveSessionError,
|
|
WorkspaceArchivedSessionPinError,
|
|
WorkspaceId,
|
|
WorkspaceMoveInvalidError,
|
|
WorkspaceOrderInvalidError,
|
|
WorkspaceUnknownSessionError,
|
|
} from '@deepseek-ai/dsh-workspace'
|
|
import { RemoteError, remoteErrorOf } from '@deepseek-ai/dsh-typert-protocol'
|
|
import { workspaceView } from './feed.ts'
|
|
import type {
|
|
WorkspaceArchiveSessionRequest,
|
|
WorkspaceArchiveValue,
|
|
WorkspaceCreateRequest,
|
|
WorkspaceCreateValue,
|
|
WorkspaceDeleteRequest,
|
|
WorkspaceDeleteValue,
|
|
WorkspaceInsertBeforeRequest,
|
|
WorkspaceInsertSessionBeforeRequest,
|
|
WorkspaceOrderValue,
|
|
WorkspacePinSessionRequest,
|
|
WorkspacePinValue,
|
|
WorkspaceRenameRequest,
|
|
WorkspaceUnarchiveSessionRequest,
|
|
WorkspaceUnpinSessionRequest,
|
|
WorkspaceValue,
|
|
} from './types.ts'
|
|
|
|
/** Implements Workspace mutations against the authoritative registry. */
|
|
export class WorkspaceCommands {
|
|
private operationTail = Promise.resolve()
|
|
|
|
/** @param ctx - Host context containing the Workspace registry. */
|
|
constructor(private readonly ctx: Context) {}
|
|
|
|
/**
|
|
* Create or resolve one Workspace over an existing directory.
|
|
* @param request - directory path to register.
|
|
* @returns the Workspace and whether this call created it.
|
|
*/
|
|
create(request: WorkspaceCreateRequest): Promise<WorkspaceCreateValue> {
|
|
return this.enqueue(async () => {
|
|
try {
|
|
const existing = await this.ctx.workspaceRegistry.resolveByPath(request.path)
|
|
if (existing !== undefined) {
|
|
return { workspace: workspaceView(existing), created: false }
|
|
}
|
|
const workspace = await this.ctx.workspaceRegistry.create(request.path)
|
|
return { workspace: workspaceView(workspace), created: true }
|
|
} catch (error) {
|
|
if (remoteErrorOf(error) !== undefined) throw error
|
|
throw new RemoteError(
|
|
'workspace/invalid-path',
|
|
`cannot create a Workspace at "${request.path}": ${errorMessage(error)}`,
|
|
{ path: request.path },
|
|
{ cause: error },
|
|
)
|
|
}
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Rename one Workspace after serializing title ownership checks.
|
|
* @param request - Workspace identity and proposed title.
|
|
* @returns the updated Workspace projection.
|
|
*/
|
|
rename(request: WorkspaceRenameRequest): Promise<WorkspaceValue> {
|
|
const title = request.title.trim()
|
|
if (title === '') {
|
|
return Promise.reject(new RemoteError('gateway/bad-request', 'Workspace rename requires a non-blank title', {}))
|
|
}
|
|
return this.enqueue(async () => {
|
|
const workspace = this.requireWorkspace(request.workspaceId)
|
|
if (title !== workspace.title) {
|
|
if (this.ctx.workspaceRegistry.list().some(candidate =>
|
|
candidate.id !== workspace.id && candidate.title === title)) {
|
|
throw new RemoteError(
|
|
'workspace/name-conflict',
|
|
`Workspace name '${title}' is already in use`,
|
|
{ name: title },
|
|
)
|
|
}
|
|
await workspace.setTitle(title)
|
|
}
|
|
return { workspace: workspaceView(workspace) }
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Delete one Workspace registration without deleting its directory or Sessions.
|
|
* @param request - Workspace identity to remove.
|
|
* @returns deletion confirmation.
|
|
*/
|
|
delete(request: WorkspaceDeleteRequest): Promise<WorkspaceDeleteValue> {
|
|
return this.enqueue(async () => {
|
|
if (!await this.ctx.workspaceRegistry.delete(WorkspaceId(request.workspaceId))) {
|
|
throw workspaceNotFound(request.workspaceId)
|
|
}
|
|
return { deleted: true }
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Move one Workspace within the durable registry order.
|
|
* @param request - moved Workspace and optional anchor.
|
|
* @returns the complete resulting Workspace order.
|
|
*/
|
|
async insertBefore(request: WorkspaceInsertBeforeRequest): Promise<WorkspaceOrderValue> {
|
|
try {
|
|
const workspaceIds = await this.ctx.workspaceRegistry.insertBefore(
|
|
WorkspaceId(request.workspaceId),
|
|
request.beforeWorkspaceId === undefined
|
|
? undefined
|
|
: WorkspaceId(request.beforeWorkspaceId),
|
|
)
|
|
return { workspaceIds: [...workspaceIds] }
|
|
} catch (error) {
|
|
if (!(error instanceof WorkspaceOrderInvalidError)) throw error
|
|
throw workspaceNotFound(error.workspaceId)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Move one accounted Session within a Workspace's manual order.
|
|
* @param request - Workspace, Session, and optional anchor identities.
|
|
* @returns the updated Workspace projection.
|
|
*/
|
|
async insertSessionBefore(request: WorkspaceInsertSessionBeforeRequest): Promise<WorkspaceValue> {
|
|
const workspace = this.requireWorkspace(request.workspaceId)
|
|
try {
|
|
await workspace.insertSessionBefore(request.sessionId, request.beforeSessionId)
|
|
} catch (error) {
|
|
if (!(error instanceof WorkspaceMoveInvalidError)) throw error
|
|
throw new RemoteError(
|
|
'workspace/move-invalid',
|
|
error.message,
|
|
{
|
|
workspaceId: request.workspaceId,
|
|
sessionId: request.sessionId,
|
|
...request.beforeSessionId === undefined
|
|
? {}
|
|
: { beforeSessionId: request.beforeSessionId },
|
|
},
|
|
{ cause: error },
|
|
)
|
|
}
|
|
return { workspace: workspaceView(workspace) }
|
|
}
|
|
|
|
/**
|
|
* Add one known Session to the registry-global archive set. Without
|
|
* `stopActivity` a Session with running work is refused as
|
|
* `workspace/session-active` with the activity the registry's providers
|
|
* reported; with it, the providers stop that work first.
|
|
* @param request - Session identity to archive and whether to stop its work.
|
|
* @returns the complete resulting archive set.
|
|
*/
|
|
async archiveSession(request: WorkspaceArchiveSessionRequest): Promise<WorkspaceArchiveValue> {
|
|
try {
|
|
await this.ctx.workspaceRegistry.archiveSession(
|
|
request.sessionId,
|
|
request.stopActivity === true ? { stopActivity: true } : {},
|
|
)
|
|
} catch (error) {
|
|
if (error instanceof WorkspaceUnknownSessionError) {
|
|
throw new RemoteError('session/not-found', error.message, { sessionId: request.sessionId }, { cause: error })
|
|
}
|
|
if (error instanceof WorkspaceActiveSessionError) {
|
|
throw new RemoteError(
|
|
'workspace/session-active',
|
|
error.message,
|
|
{ sessionId: request.sessionId, activity: error.activity },
|
|
{ cause: error },
|
|
)
|
|
}
|
|
throw error
|
|
}
|
|
return { archivedSessionIds: [...this.ctx.workspaceRegistry.archivedSessionIds] }
|
|
}
|
|
|
|
/**
|
|
* Drop one Session from the registry-global archive set. An id that is not
|
|
* archived is not an error: the call is idempotent, so a lost race with
|
|
* another surface resolves as a no-op.
|
|
* @param request - Session identity to unarchive.
|
|
* @returns the complete resulting archive set.
|
|
*/
|
|
async unarchiveSession(request: WorkspaceUnarchiveSessionRequest): Promise<WorkspaceArchiveValue> {
|
|
await this.ctx.workspaceRegistry.unarchiveSession(request.sessionId)
|
|
return { archivedSessionIds: [...this.ctx.workspaceRegistry.archivedSessionIds] }
|
|
}
|
|
|
|
/**
|
|
* Add one known unarchived Session to the registry-global pin set.
|
|
* @param request - Session identity to pin.
|
|
* @returns the complete resulting pin set, most recently pinned first.
|
|
*/
|
|
async pinSession(request: WorkspacePinSessionRequest): Promise<WorkspacePinValue> {
|
|
try {
|
|
await this.ctx.workspaceRegistry.pinSession(request.sessionId)
|
|
} catch (error) {
|
|
if (error instanceof WorkspaceUnknownSessionError) {
|
|
throw new RemoteError('session/not-found', error.message, { sessionId: request.sessionId }, { cause: error })
|
|
}
|
|
if (error instanceof WorkspaceArchivedSessionPinError) {
|
|
throw new RemoteError('gateway/bad-request', error.message, {}, { cause: error })
|
|
}
|
|
throw error
|
|
}
|
|
return { pinnedSessionIds: [...this.ctx.workspaceRegistry.pinnedSessionIds] }
|
|
}
|
|
|
|
/**
|
|
* Drop one Session from the registry-global pin set. An id that is not
|
|
* pinned is not an error: the call is idempotent, so a lost race with
|
|
* another surface resolves as a no-op.
|
|
* @param request - Session identity to unpin.
|
|
* @returns the complete resulting pin set, most recently pinned first.
|
|
*/
|
|
async unpinSession(request: WorkspaceUnpinSessionRequest): Promise<WorkspacePinValue> {
|
|
await this.ctx.workspaceRegistry.unpinSession(request.sessionId)
|
|
return { pinnedSessionIds: [...this.ctx.workspaceRegistry.pinnedSessionIds] }
|
|
}
|
|
|
|
private requireWorkspace(workspaceId: WorkspaceId): Workspace {
|
|
const workspace = this.ctx.workspaceRegistry.get(WorkspaceId(workspaceId))
|
|
if (workspace === undefined) throw workspaceNotFound(workspaceId)
|
|
return workspace
|
|
}
|
|
|
|
private enqueue<T>(operation: () => Promise<T>): Promise<T> {
|
|
const result = this.operationTail.then(operation)
|
|
this.operationTail = result.then(() => undefined, () => undefined)
|
|
return result
|
|
}
|
|
}
|
|
|
|
function workspaceNotFound(workspaceId: WorkspaceId): RemoteError<'workspace/not-found'> {
|
|
return new RemoteError(
|
|
'workspace/not-found',
|
|
`Workspace "${workspaceId}" not found`,
|
|
{ workspaceId },
|
|
)
|
|
}
|
|
|
|
function errorMessage(error: unknown): string {
|
|
return error instanceof Error ? error.message : String(error)
|
|
}
|