@lincyaw/dsh 0.2.0-rc.5 → 0.2.0-rc.50
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/client.mjs +0 -2
- package/build/dist/client.js +298 -297
- package/build/dist/client.json +53 -36
- package/cordis.patch.yml +1 -0
- package/package.json +8 -8
- package/src/client/agent-requests.ts +47 -0
- package/src/client/contract.ts +0 -6
- package/src/client/dsh.d.ts +12 -0
- package/src/client/index.tsx +2 -3
- package/src/client/messages.ts +2 -10
- package/src/client/styles.css +0 -42
- package/src/client/workspace-events.ts +9 -7
- package/src/node/bindings.ts +90 -6
- package/src/node/context.ts +16 -26
- package/src/node/dsh-types.ts +31 -1
- package/src/node/launch.ts +10 -5
- package/src/node/policy.ts +12 -3
- package/src/node/routes.ts +7 -1
- package/src/node/service.ts +7 -1
- package/src/node/tools.ts +61 -5
- package/src/node/turns.ts +12 -8
- package/src/node/workspace-events.ts +6 -4
- package/src/workspace-events.ts +2 -1
- package/src/client/mascot.tsx +0 -37
package/src/node/turns.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { errorMessage } from '@lincyaw/kernel'
|
|
|
3
3
|
import { isInside } from '@lincyaw/kernel/node'
|
|
4
4
|
import type { DshAgent, DshContext, DshToolExecution } from './dsh-types.ts'
|
|
5
5
|
import { WORKSPACE_ROUTES } from './server-routes.ts'
|
|
6
|
+
import { isCandidateTool, PREFIX, resolvePresmiumCall } from './tools.ts'
|
|
6
7
|
|
|
7
8
|
// What a writing tool answers when the change cannot be recorded. The AI reads it and tells the author in their own
|
|
8
9
|
// language, so it names what the author sees (Version History) and none of the internals behind it.
|
|
@@ -83,7 +84,8 @@ export function apply(ctx: DshContext): void {
|
|
|
83
84
|
if (path === 'open' && response.status === 404) throw new Error(NOT_RECORDED)
|
|
84
85
|
let reason = text
|
|
85
86
|
try {
|
|
86
|
-
|
|
87
|
+
const failure = JSON.parse(text) as { error?: string, next?: string, paths?: string[] }
|
|
88
|
+
reason = [failure.error, failure.paths?.join(', '), failure.next].filter(Boolean).join(' ') || reason
|
|
87
89
|
} catch {
|
|
88
90
|
}
|
|
89
91
|
throw new Error(reason || `the review answered ${response.status}`)
|
|
@@ -100,9 +102,14 @@ export function apply(ctx: DshContext): void {
|
|
|
100
102
|
})
|
|
101
103
|
|
|
102
104
|
ctx.on('tools/execute', async (exec: DshToolExecution, next: () => Promise<unknown>) => {
|
|
103
|
-
if (!
|
|
105
|
+
if (!exec.agent) return next()
|
|
104
106
|
const { root } = await ctx.presmium.server.ready
|
|
105
107
|
if (!isInside(ctx.presmium.bindings.workingDirectoryOf(exec.agent), root)) return next()
|
|
108
|
+
await ctx.presmium.bindings.candidateOf(exec.agent)
|
|
109
|
+
const binding = ctx.presmium.bindings.bindingOf(exec.agent)
|
|
110
|
+
const target = exec.name.startsWith(PREFIX) ? await resolvePresmiumCall(binding, exec) : undefined
|
|
111
|
+
const tool = target?.tool
|
|
112
|
+
if (!WRITING_TOOLS.has(exec.name) && (!tool || tool.kind === 'read' || !isCandidateTool(tool))) return next()
|
|
106
113
|
const document = ctx.presmium.bindings.bindingOf(exec.agent)?.document.dir ?? ''
|
|
107
114
|
const agentSessionId = rootAgentSessionOf(exec.agent.session.id)
|
|
108
115
|
const state = turnStateOf(agentSessionId)
|
|
@@ -113,12 +120,9 @@ export function apply(ctx: DshContext): void {
|
|
|
113
120
|
}
|
|
114
121
|
state.document = document
|
|
115
122
|
state.wrote = true
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
await postReview(document, agentSessionId, 'step', { ...state.turn !== undefined ? { turn: state.turn } : {}, label: labelOf(exec), tool: exec.name })
|
|
120
|
-
.catch((error: unknown) => log.warn(`presmium-turns: no checkpoint after ${exec.name} in ${agentSessionId}: ${errorMessage(error)}`))
|
|
121
|
-
}
|
|
123
|
+
const result = await next()
|
|
124
|
+
await postReview(document, agentSessionId, 'step', { ...state.turn !== undefined ? { turn: state.turn } : {}, label: labelOf(target ? { ...exec, name: PREFIX + target.tool.name, arguments: target.arguments } : exec), tool: target ? PREFIX + target.tool.name : exec.name })
|
|
125
|
+
return result
|
|
122
126
|
})
|
|
123
127
|
|
|
124
128
|
ctx.on('agent/created', ({ agent }: { agent: LiveAgent }) => {
|
|
@@ -94,13 +94,15 @@ export function apply(ctx: EventContext): void {
|
|
|
94
94
|
const current = () => !closed && !controller.signal.aborted && subscriptions.get(command.id) === entry
|
|
95
95
|
void ctx.presmium.server.ready.then(endpoint => {
|
|
96
96
|
if (!current()) return
|
|
97
|
-
if (command.topic === 'authoring-client') {
|
|
97
|
+
if (command.topic === 'authoring-client' || command.topic === 'authoring-window') {
|
|
98
|
+
const resource = command.topic === 'authoring-window' ? 'authoring-windows' : 'authoring-clients'
|
|
99
|
+
const documentQuery: Record<string, string> = command.topic === 'authoring-client' ? { document: command.document } : {}
|
|
98
100
|
// Keep the client credential on the trusted host, off browser messages and MCP reads.
|
|
99
101
|
let lease: AuthoringClientLease | undefined
|
|
100
102
|
let publication: Promise<void> = Promise.resolve()
|
|
101
103
|
let publications = 0
|
|
102
104
|
const post = async (kind: string, value: unknown) => {
|
|
103
|
-
const path = `${WORKSPACE_ROUTES}
|
|
105
|
+
const path = `${WORKSPACE_ROUTES}${resource}/${kind}?${new URLSearchParams(documentQuery)}`
|
|
104
106
|
const response = await ctx.presmium.server.request(path, { method: 'POST', body: value, signal: controller.signal })
|
|
105
107
|
if (!response.ok) throw new Error('client-publication-refused')
|
|
106
108
|
return response.json() as Promise<unknown>
|
|
@@ -120,8 +122,8 @@ export function apply(ctx: EventContext): void {
|
|
|
120
122
|
if (!current()) return
|
|
121
123
|
if (!validateAuthoringClientLease(value)) throw new Error('client-registration-invalid')
|
|
122
124
|
lease = value
|
|
123
|
-
const query = new URLSearchParams({
|
|
124
|
-
const path = `${WORKSPACE_ROUTES}
|
|
125
|
+
const query = new URLSearchParams({ ...documentQuery, clientId: lease.clientId, epoch: lease.epoch, connectionId: lease.connectionId })
|
|
126
|
+
const path = `${WORKSPACE_ROUTES}${resource}/events?${query}`
|
|
125
127
|
source = new EventSource(new URL(path, endpoint.url), {
|
|
126
128
|
fetch: (_address, init) => ctx.presmium.server.request(path, { headers: { ...Object.fromEntries(new Headers(init?.headers)), 'X-Presmium-Authoring-Client': value.credential }, signal: init?.signal ? AbortSignal.any([controller.signal, init.signal]) : controller.signal }),
|
|
127
129
|
})
|
package/src/workspace-events.ts
CHANGED
|
@@ -12,6 +12,7 @@ const approvals = z.strictObject({ type: z.literal('subscribe'), id: subscriptio
|
|
|
12
12
|
|
|
13
13
|
export const workspaceEventCommand = z.union([
|
|
14
14
|
z.strictObject({ type: z.literal('subscribe'), id: subscriptionId, topic: z.literal('authoring-client'), document: z.string().max(1024), clientId: subscriptionId, epoch: subscriptionId, snapshot: z.unknown() }),
|
|
15
|
+
z.strictObject({ type: z.literal('subscribe'), id: subscriptionId, topic: z.literal('authoring-window'), clientId: subscriptionId, epoch: subscriptionId, snapshot: z.unknown() }),
|
|
15
16
|
z.strictObject({ type: z.literal('authoring-client-publish'), id: subscriptionId, connectionId: subscriptionId, sequence: z.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER), kind: z.enum(['state', 'ack']), value: z.unknown() }),
|
|
16
17
|
viewerSite, viewerControl, approvals,
|
|
17
18
|
z.strictObject({ type: z.literal('subscribe'), id: subscriptionId, topic: z.enum(WORKSPACE_EVENT_TOPICS), document: z.string().max(1024) }),
|
|
@@ -26,6 +27,6 @@ export const workspaceEventMessage = z.discriminatedUnion('type', [
|
|
|
26
27
|
z.strictObject({ type: z.literal('event'), id: subscriptionId, event: z.string().max(40).optional(), data: z.string() }),
|
|
27
28
|
])
|
|
28
29
|
|
|
29
|
-
export type WorkspaceEventTopic = typeof WORKSPACE_EVENT_TOPICS[number] | 'viewer-site' | 'viewer-control' | 'approvals' | 'authoring-client'
|
|
30
|
+
export type WorkspaceEventTopic = typeof WORKSPACE_EVENT_TOPICS[number] | 'viewer-site' | 'viewer-control' | 'approvals' | 'authoring-client' | 'authoring-window'
|
|
30
31
|
export type WorkspaceEventCommand = z.infer<typeof workspaceEventCommand>
|
|
31
32
|
export type WorkspaceEventMessage = z.infer<typeof workspaceEventMessage>
|
package/src/client/mascot.tsx
DELETED
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import { PmMascot, PmSegmented, setMascotEnabled, useAssistantMascot, useMascotEnabled, WorkbenchProvider } from '@lincyaw/workbench'
|
|
2
|
-
import type { Workbench } from '@lincyaw/workbench'
|
|
3
|
-
import { MASCOT_SETTING, MASCOT_SLOT } from './contract.ts'
|
|
4
|
-
import { useClientMessages } from './messages.ts'
|
|
5
|
-
|
|
6
|
-
/** The session header's standard prop: a selector over the bound session's snapshot. */
|
|
7
|
-
type UseSession = <T>(select: (snapshot: { running?: boolean }) => T) => T
|
|
8
|
-
|
|
9
|
-
function Kitten({ running }: { running: boolean }) {
|
|
10
|
-
return <span className="pmw-conversation-mascot"><PmMascot size="small" action={useAssistantMascot(running)} /></span>
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
function MascotSetting({ workbench }: { workbench: Workbench }) {
|
|
14
|
-
const t = useClientMessages(workbench)
|
|
15
|
-
const on = useMascotEnabled()
|
|
16
|
-
return (
|
|
17
|
-
<div className="pmw-mascot-setting pm-ui" data-pmw-setting="mascot">
|
|
18
|
-
<div className="pmw-mascot-setting__copy">
|
|
19
|
-
<p className="pmw-mascot-setting__title">{t.mascot}</p>
|
|
20
|
-
<p className="pmw-mascot-setting__hint">{t.mascotHint}</p>
|
|
21
|
-
</div>
|
|
22
|
-
<PmSegmented label={t.mascot} value={on ? 'show' : 'hide'} options={[{ value: 'show', label: t.mascotShow }, { value: 'hide', label: t.mascotHide }]} onChange={value => setMascotEnabled(value === 'show')} />
|
|
23
|
-
</div>
|
|
24
|
-
)
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
/** Puts the kitten in the conversation's header, where it acts out what the assistant is doing, and its switch in
|
|
28
|
-
* Settings → General. */
|
|
29
|
-
export function registerMascot(ctx: DshClientContext, workbench: Workbench): void {
|
|
30
|
-
ctx.effect(() => ctx.slots.inject(MASCOT_SLOT.name, () => ctx.slots.register({ name: MASCOT_SLOT.name, id: MASCOT_SLOT.id, order: -100 }, ({ useSession }: { useSession: UseSession }) => {
|
|
31
|
-
const running = useSession(snapshot => Boolean(snapshot.running))
|
|
32
|
-
return <WorkbenchProvider workbench={workbench}><Kitten running={running} /></WorkbenchProvider>
|
|
33
|
-
})), 'presmium: the kitten beside the conversation')
|
|
34
|
-
ctx.effect(() => ctx.slots.inject(MASCOT_SETTING.name, () => ctx.slots.register({ name: MASCOT_SETTING.name, id: MASCOT_SETTING.id, order: 1000 }, () => (
|
|
35
|
-
<WorkbenchProvider workbench={workbench}><MascotSetting workbench={workbench} /></WorkbenchProvider>
|
|
36
|
-
))), 'presmium: the kitten\'s switch in Settings')
|
|
37
|
-
}
|