@lincyaw/dsh 0.2.0-rc.14 → 0.2.0-rc.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/dist/client.js +151 -150
- package/build/dist/client.json +3 -0
- package/package.json +7 -7
- package/src/client/agent-requests.ts +47 -0
- package/src/client/dsh.d.ts +12 -0
- package/src/node/dsh-types.ts +31 -1
- package/src/node/tools.ts +37 -4
package/build/dist/client.json
CHANGED
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
"../kernel/src/contracts/service.ts",
|
|
16
16
|
"../kernel/src/contracts/agent.ts",
|
|
17
17
|
"../kernel/src/contracts/authoring.ts",
|
|
18
|
+
"../kernel/src/contracts/capture.ts",
|
|
18
19
|
"../kernel/src/contracts/document-reads.ts",
|
|
19
20
|
"../kernel/src/contracts/anchors.ts",
|
|
20
21
|
"../kernel/src/contracts/checks.ts",
|
|
@@ -177,6 +178,7 @@
|
|
|
177
178
|
"../workbench/src/document-editor/schema.tsx",
|
|
178
179
|
"../workbench/src/document-editor/file-input.ts",
|
|
179
180
|
"../workbench/src/document-editor/clipboard.ts",
|
|
181
|
+
"../workbench/src/document-editor/page-body.ts",
|
|
180
182
|
"../workbench/src/document-editor/authoring.tsx",
|
|
181
183
|
"../workbench/src/document-editor/comments.ts",
|
|
182
184
|
"../workbench/src/document-editor/DocumentComments.tsx",
|
|
@@ -217,6 +219,7 @@
|
|
|
217
219
|
"../workbench/src/panels/ProductionPanel.tsx",
|
|
218
220
|
"../workbench/src/panels/PageRenameDialog.tsx",
|
|
219
221
|
"../workbench/src/panels/PageDeleteDialog.tsx",
|
|
222
|
+
"../workbench/src/document-editor/insertion-place.ts",
|
|
220
223
|
"../workbench/src/document-editor/DocumentEditor.tsx",
|
|
221
224
|
"../workbench/src/document-editor/block-preview-messages.ts",
|
|
222
225
|
"../workbench/src/document-editor/DocumentBlockFallback.tsx",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lincyaw/dsh",
|
|
3
|
-
"version": "0.2.0-rc.
|
|
3
|
+
"version": "0.2.0-rc.15",
|
|
4
4
|
"description": "Presmium's bundle for DeepSeek Harness: the workbench of presmium studio, its host side (Presmium's tools, approvals, document context, skills and routes) and its client side (the root layout and the workbench's panels, precompiled) (experimental)",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -84,10 +84,10 @@
|
|
|
84
84
|
"jiti": "^2.7.0",
|
|
85
85
|
"ws": "8.22.0",
|
|
86
86
|
"zod": "4.4.3",
|
|
87
|
-
"@lincyaw/cli": "1.0.0-rc.
|
|
88
|
-
"@lincyaw/
|
|
89
|
-
"@lincyaw/
|
|
90
|
-
"@lincyaw/
|
|
87
|
+
"@lincyaw/cli": "1.0.0-rc.16",
|
|
88
|
+
"@lincyaw/skills": "1.0.0-rc.16",
|
|
89
|
+
"@lincyaw/mcp": "1.0.0-rc.16",
|
|
90
|
+
"@lincyaw/kernel": "1.0.0-rc.16"
|
|
91
91
|
},
|
|
92
92
|
"peerDependencies": {
|
|
93
93
|
"@deepseek-ai/dsh": "0.2.1-alpha.4"
|
|
@@ -103,8 +103,8 @@
|
|
|
103
103
|
"react": "18.3.1",
|
|
104
104
|
"react-dom": "18.3.1",
|
|
105
105
|
"react-resizable-panels": "^4.14.5",
|
|
106
|
-
"@lincyaw/design": "1.0.0-rc.
|
|
107
|
-
"@lincyaw/workbench": "0.2.0-rc.
|
|
106
|
+
"@lincyaw/design": "1.0.0-rc.16",
|
|
107
|
+
"@lincyaw/workbench": "0.2.0-rc.15"
|
|
108
108
|
},
|
|
109
109
|
"scripts": {}
|
|
110
110
|
}
|
|
@@ -9,6 +9,9 @@ import { CLIENT_MESSAGES } from './messages.ts'
|
|
|
9
9
|
* the repair of the selected document's diagnostics. Each is prompted on the session after its document context is
|
|
10
10
|
* set, and the conversation is shown. Without a usable model nothing is sent: the conversation is shown, where the
|
|
11
11
|
* composer offers to set one up, and the request answers with that in the author's terms.
|
|
12
|
+
*
|
|
13
|
+
* Drafts (the slash menu's animation request) go into the session's composer instead, for the author to finish and
|
|
14
|
+
* send. Without a model the composer's takeover shows over the draft, which waits beneath it.
|
|
12
15
|
*/
|
|
13
16
|
export function registerAgentRequests(ctx: DshClientContext, workbench: Workbench, setup: AssistantSetup): void {
|
|
14
17
|
ctx.inject(['sessions', 'layout'], inner => inner.effect(() => {
|
|
@@ -61,4 +64,48 @@ export function registerAgentRequests(ctx: DshClientContext, workbench: Workbenc
|
|
|
61
64
|
update()
|
|
62
65
|
return () => { off(); offRequests?.() }
|
|
63
66
|
}, 'presmium: hand the author\'s requests to the current session'))
|
|
67
|
+
|
|
68
|
+
ctx.inject(['sessions', 'layout', 'conversation'], inner => inner.effect(() => {
|
|
69
|
+
let offDrafts: (() => void) | undefined
|
|
70
|
+
let active: DshSessionBinding | undefined
|
|
71
|
+
const update = () => {
|
|
72
|
+
const row = mainViewAgentSession(inner.sessions.list.getSnapshot().byId)
|
|
73
|
+
const binding = row && inner.sessions.binding(row.id)
|
|
74
|
+
if (binding === active) return
|
|
75
|
+
offDrafts?.()
|
|
76
|
+
offDrafts = undefined
|
|
77
|
+
active = binding
|
|
78
|
+
if (!row || !binding) return
|
|
79
|
+
// Whatever the author wrote stays above the draft; a draft put here and not changed since is replaced by the next.
|
|
80
|
+
let last: { kept: string, text: string } | undefined
|
|
81
|
+
offDrafts = workbench.onAgentDraft(draft => {
|
|
82
|
+
if (active !== binding || inner.sessions.binding(row.id) !== binding) throw new Error('no-conversation')
|
|
83
|
+
const input = inner.conversation.input.for(binding.ctx)
|
|
84
|
+
const { draft: current, phase } = input.state.getSnapshot()
|
|
85
|
+
if (phase !== 'plain') throw new Error('no-conversation')
|
|
86
|
+
const kept = last && current.trim() === (last.kept + last.text).trim() ? last.kept : current.trim() ? `${current.trimEnd()}\n` : ''
|
|
87
|
+
const text = kept + draft.text
|
|
88
|
+
last = { kept, text: draft.text }
|
|
89
|
+
input.setDraft(text)
|
|
90
|
+
inner.layout.selectPanel(null)
|
|
91
|
+
// The composer takes the keyboard once the conversation is shown (under the takeover it stays where it was).
|
|
92
|
+
// Focus brings back the caret the composer last held, which the draft does not move: the browser's selection
|
|
93
|
+
// goes to the end of the focused editor, and the composer's editor follows it.
|
|
94
|
+
const frame = (then: () => void) => requestAnimationFrame(() => requestAnimationFrame(then))
|
|
95
|
+
if (setup.readiness.getSnapshot() !== 'missing') frame(() => {
|
|
96
|
+
input.focus()
|
|
97
|
+
frame(() => {
|
|
98
|
+
const editor = document.activeElement
|
|
99
|
+
if (!(editor instanceof HTMLElement) || !editor.isContentEditable || input.state.getSnapshot().draft !== text) return
|
|
100
|
+
const selection = getSelection()
|
|
101
|
+
selection?.selectAllChildren(editor)
|
|
102
|
+
selection?.collapseToEnd()
|
|
103
|
+
})
|
|
104
|
+
})
|
|
105
|
+
})
|
|
106
|
+
}
|
|
107
|
+
const off = inner.sessions.list.subscribe(update)
|
|
108
|
+
update()
|
|
109
|
+
return () => { off(); offDrafts?.() }
|
|
110
|
+
}, 'presmium: put the author\'s drafts in the current session\'s composer'))
|
|
64
111
|
}
|
package/src/client/dsh.d.ts
CHANGED
|
@@ -125,6 +125,17 @@ interface DshSessionBinding {
|
|
|
125
125
|
beginSubmission(input: { mode: 'queue', text: string, attachments: [] }): { requestId: string, abandon(): void }
|
|
126
126
|
prompt(content: { type: 'text', text: string }[], mode: 'queue', signal: AbortSignal | undefined, requestId: string): Promise<{ ok: true, value: { accepted: true } } | { ok: false, error: { code: string, message: string } }>
|
|
127
127
|
}
|
|
128
|
+
/** The session's scope, which addresses its composer through `conversation.input`. */
|
|
129
|
+
ctx: unknown
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/** A session's composer (`SessionInput` of `@deepseek-ai/dsh-client-ui-conversation`), as far as it is used here. */
|
|
133
|
+
interface DshSessionInput {
|
|
134
|
+
/** Replaces the whole draft with plain text; the caret lands at its end. */
|
|
135
|
+
setDraft(text: string): void
|
|
136
|
+
/** Gives the keyboard back to the composer, with the caret it last held. */
|
|
137
|
+
focus(): void
|
|
138
|
+
readonly state: DshObservable<{ draft: string, phase: 'plain' | 'adjudicating' | 'claimed' | 'submitting' }>
|
|
128
139
|
}
|
|
129
140
|
|
|
130
141
|
interface DshClientContext {
|
|
@@ -141,6 +152,7 @@ interface DshClientContext {
|
|
|
141
152
|
sidebarRight: { active(): { id: string, kind: string, contentId: string } | undefined, close(id: string): void, isExpanded(): boolean, toggleExpanded(): void }
|
|
142
153
|
layout: { selectPanel(id: string | null): void }
|
|
143
154
|
sessions: { list: DshObservable<{ byId: Record<string, { id: string, cwd?: string, retainedBy: { mainView?: number } }> }>, binding(id: string): DshSessionBinding | undefined }
|
|
155
|
+
conversation: { input: { for(scope: unknown): DshSessionInput } }
|
|
144
156
|
uiWorkspace: { openWorkspace(id: string, beforeOpen?: (sessionId: string) => void): Promise<void>, startSession(id?: string): void }
|
|
145
157
|
workspaces: { list: DshObservable<{ items: readonly { workspaceId: string, path: string }[] }> }
|
|
146
158
|
configForms: {
|
package/src/node/dsh-types.ts
CHANGED
|
@@ -9,6 +9,8 @@ export interface DshLogger {
|
|
|
9
9
|
export interface DshSession {
|
|
10
10
|
readonly id: string
|
|
11
11
|
readonly header?: { cwd?: string }
|
|
12
|
+
/** The route the session's latest model request resolved to (its latest `request/context`). */
|
|
13
|
+
requestContext(): { provider: string, model: string } | undefined
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
export interface DshAgent {
|
|
@@ -20,6 +22,8 @@ export interface DshAgent {
|
|
|
20
22
|
|
|
21
23
|
export interface DshToolExecution {
|
|
22
24
|
readonly callId: string
|
|
25
|
+
/** The registry's identity of the call, the same in `execute` and `projectContent`. */
|
|
26
|
+
readonly token: symbol
|
|
23
27
|
readonly name: string
|
|
24
28
|
readonly arguments: unknown
|
|
25
29
|
readonly agent?: DshAgent
|
|
@@ -31,12 +35,38 @@ export type DshPreDecision =
|
|
|
31
35
|
| { kind: 'deny', reason: string }
|
|
32
36
|
| { kind: 'ask', reason?: string, displayReason?: { en: string, [locale: string]: string } }
|
|
33
37
|
|
|
38
|
+
export type DshImageMediaType = 'image/png' | 'image/jpeg' | 'image/webp' | 'image/gif'
|
|
39
|
+
|
|
40
|
+
/** A durable image of dsh's attachment store (`ImageAttachmentRef`). */
|
|
41
|
+
export interface DshImageRef {
|
|
42
|
+
attachmentId: string
|
|
43
|
+
mediaType: DshImageMediaType
|
|
44
|
+
bytes: number
|
|
45
|
+
width: number
|
|
46
|
+
height: number
|
|
47
|
+
name?: string
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export type DshContentBlock = { type: 'text', text: string } | { type: 'image', attachment: DshImageRef }
|
|
51
|
+
|
|
34
52
|
export interface DshToolDefinition {
|
|
35
53
|
name: string
|
|
36
54
|
description: string
|
|
37
55
|
parameters: Record<string, unknown>
|
|
38
|
-
output: { schema: Record<string, unknown>, render(args: unknown, value: unknown):
|
|
56
|
+
output: { schema: Record<string, unknown>, render(args: unknown, value: unknown): DshContentBlock[] }
|
|
39
57
|
execute(args: unknown, exec: DshToolExecution): Promise<unknown>
|
|
58
|
+
/** Content prepared during `execute` that replaces `output.render`'s, installed before `tools/post-execute`. */
|
|
59
|
+
projectContent?(exec: Readonly<DshToolExecution>, result: { readonly isError: boolean }): DshContentBlock[] | undefined
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/** dsh's `attachments` service (`@deepseek-ai/dsh-attachment`), as far as tool results with images use it. */
|
|
63
|
+
export interface DshAttachments {
|
|
64
|
+
saveImages(inputs: readonly { data: Uint8Array, mediaType: DshImageMediaType, name?: string }[]): Promise<readonly DshImageRef[]>
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/** dsh's `llm` service, as far as the input a model takes is concerned. */
|
|
68
|
+
export interface DshLlm {
|
|
69
|
+
resolveModelInfo(provider: string, model: string, signal?: AbortSignal): Promise<{ inputModalities?: readonly string[] }>
|
|
40
70
|
}
|
|
41
71
|
|
|
42
72
|
export interface DshTools {
|
package/src/node/tools.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import type {
|
|
1
|
+
import { errorMessage } from '@lincyaw/kernel'
|
|
2
|
+
import type { CalledImage, ListedTool } from '@lincyaw/mcp/client'
|
|
3
|
+
import type { DshAgent, DshAttachments, DshContentBlock, DshContext, DshImageMediaType, DshLlm, DshToolDefinition, DshToolExecution } from './dsh-types.ts'
|
|
3
4
|
import type { DocumentBinding } from './bindings.ts'
|
|
4
5
|
|
|
5
6
|
export const name = 'presmium-tools'
|
|
@@ -7,7 +8,33 @@ export const inject = ['presmium', 'tools']
|
|
|
7
8
|
|
|
8
9
|
export const PREFIX = 'presmium__'
|
|
9
10
|
|
|
10
|
-
|
|
11
|
+
const IMAGE_TYPES = new Set<string>(['image/png', 'image/jpeg', 'image/webp', 'image/gif'])
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* A tool result's images as dsh's durable image blocks, which reach the model beside the text; only when the model of
|
|
15
|
+
* the session's latest request declares image input, as dsh's own MCP client does. Otherwise, and when the attachment
|
|
16
|
+
* store refuses them, one line says they were left out (the text names their files where the tool has any) and the call
|
|
17
|
+
* still succeeds.
|
|
18
|
+
*/
|
|
19
|
+
async function imageBlocks(ctx: DshContext, tool: string, images: CalledImage[], exec: DshToolExecution): Promise<DshContentBlock[]> {
|
|
20
|
+
const leftOut = (why: string): DshContentBlock[] => [{ type: 'text', text: `[${images.length} image${images.length === 1 ? '' : 's'} not attached: ${why}]` }]
|
|
21
|
+
const attachments = ctx.get('attachments') as DshAttachments | undefined
|
|
22
|
+
const llm = ctx.get('llm') as DshLlm | undefined
|
|
23
|
+
const { provider, model } = exec.agent?.session.requestContext() ?? {}
|
|
24
|
+
if (!attachments || !llm || !provider || !model) return leftOut('this session takes no images')
|
|
25
|
+
const info = await llm.resolveModelInfo(provider, model, exec.signal).catch(() => undefined)
|
|
26
|
+
if (!info?.inputModalities?.includes('image')) return leftOut(`the model ${model} does not take images`)
|
|
27
|
+
if (images.some(image => !IMAGE_TYPES.has(image.mimeType))) return leftOut('not PNG, JPEG, WebP or GIF')
|
|
28
|
+
try {
|
|
29
|
+
const refs = await attachments.saveImages(images.map((image, n) => ({ data: Buffer.from(image.data, 'base64'), mediaType: image.mimeType as DshImageMediaType, name: `${tool}-${n + 1}.${image.mimeType.slice('image/'.length)}` })))
|
|
30
|
+
return refs.map(attachment => ({ type: 'image', attachment }))
|
|
31
|
+
} catch (error) {
|
|
32
|
+
return leftOut(errorMessage(error))
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function definition(ctx: DshContext, binding: DocumentBinding, tool: ListedTool): DshToolDefinition {
|
|
37
|
+
const prepared = new Map<symbol, DshContentBlock[]>()
|
|
11
38
|
return {
|
|
12
39
|
name: `${PREFIX}${tool.name}`,
|
|
13
40
|
description: tool.description,
|
|
@@ -16,8 +43,14 @@ function definition(binding: DocumentBinding, tool: ListedTool): DshToolDefiniti
|
|
|
16
43
|
async execute(args, exec) {
|
|
17
44
|
const result = await binding.client.call(tool.name, (args ?? {}) as Record<string, unknown>, exec.signal)
|
|
18
45
|
if (result.isError) throw new Error(result.text)
|
|
46
|
+
if (result.images.length > 0) prepared.set(exec.token, [...result.text ? [{ type: 'text' as const, text: result.text }] : [], ...await imageBlocks(ctx, tool.name, result.images, exec)])
|
|
19
47
|
return result.text
|
|
20
48
|
},
|
|
49
|
+
projectContent(exec, result) {
|
|
50
|
+
const content = prepared.get(exec.token)
|
|
51
|
+
prepared.delete(exec.token)
|
|
52
|
+
return result.isError ? undefined : content
|
|
53
|
+
},
|
|
21
54
|
}
|
|
22
55
|
}
|
|
23
56
|
|
|
@@ -34,7 +67,7 @@ export function apply(ctx: DshContext): void {
|
|
|
34
67
|
registered.set(agent, {
|
|
35
68
|
binding, tools: binding?.tools,
|
|
36
69
|
stop: binding?.toolChanges.watch(() => { if (agent.status === 'idle') install(agent, binding) }),
|
|
37
|
-
dispose: binding?.tools.map(tool => agent.ctx.tools.register(definition(binding, tool))) ?? [],
|
|
70
|
+
dispose: binding?.tools.map(tool => agent.ctx.tools.register(definition(ctx, binding, tool))) ?? [],
|
|
38
71
|
})
|
|
39
72
|
}
|
|
40
73
|
const sync = async (agent: DshAgent) => {
|