feat: adapt to DSH 0.1.7-alpha.1 and yield the read-only previews
DSH 0.1.7-alpha.1 is 1299 commits past 0.1.6-alpha.2 and rewrites four
contracts this plugin was built on. The peer floor moves to
^0.1.7-alpha.1 (semver's prerelease rule means ^0.1.6-alpha.2 can never
match a 0.1.7 prerelease); 0.1.6-alpha.2 and earlier stay on v0.19.1.
Released as 0.21.0-alpha.1 (dist-tag alpha).
Hard breaks:
- dsh-settings was rewritten: register(ns, schema) is gone, a form is
addressed by the plugin row's Loader entry id and read from the
module's exported Config. The preferences are merged into Config and
marked volatile — which requires DSH's own schemastery, because only
that build wraps a volatile field in the cosmokit reference the
loader's volatile commit walks. With the public package a settings
write reports success and revision 1 while the effective value never
changes.
- ui-primitives renamed its whole icon family (IconXxx14/16 ->
IconXxxRegular/Medium): 26 imported symbols, 17 files. The failing
mode is render-time, not load-time. Five call sites that relied on the
old 14px default now pass size={14} explicitly.
- Session format v4 rejects source.kind === 'plugin'; the side-chat
boundary injection now writes plugin:dsh-better-sidebar, the same kind
DSH's own v3->v4 migration produces, so historical threads survive.
Tool results moved to role 'tool' with top-level content/isError; all
four parsers accept both shapes.
- The client session snapshot dropped subagentsByParent/jobsBySession
and the on-demand subagent-catalog observation API. The Tasks page
reads projectionsBySession and a new jobs.list route.
Yields and convergence:
- The read-only previews go to DSH's documentpreview (Office->PDF, a
spreadsheet worker, zoom, per-directory refresh); editor.canOpen
refuses those 26 extensions. Markdown, HTML (with its sandbox
switches) and the editable code buffer stay.
- The host browser kind is desktop-profile-only now, so the web e2e
lanes expect no browser entry and assert its absence.
- Link takeover claims only urlTarget links and passes the rest to the
host, fixing a regression from the 0.1.6 round: the fallback pointed
at a 'browser' type the plugin no longer registers, so http links in
its own markdown did nothing.
Also fixed, found along the way:
- The file tree refreshes live (new directory watch over the plugin's
own socket), since the plugin owns the `files` kind.
- ctx.sessions.list has no `current` field at either tag; the three
readers were dead. They now use ctx.sidebarRight.mounted.
- package.json.files was missing lib/client-locale.js.
- Two genuinely dead call sites: sessions.openSubagent/open/
refreshSubagents do not exist on the current baseline, so the
topology click, the jump-back and the retry were all no-ops.
- The test harness window shim lacked addEventListener, which the 0.1.7
primitives call at module-evaluation time; and the e2e token exchange
needs Playwright's request stack, not Node's fetch.
This commit is contained in:
1 parent
de99fd4cfb
commit
6586e3e2d3
96 files changed
+4567
-2080
No files matched your search
@@ -19,7 +19,8 @@ import { buildSidechatInheritance } from '../src/sidechat-core.ts'
|
||||
|
||||
/** One live-style event with the surface marker message events carry, and
|
||||
* the REAL message shapes the validator demands (id/role/source/content;
|
||||
* tool/result messages carry role 'user' + one tool-result block). */
|
||||
* a tool/result carries the first-class role-'tool' message 0.1.7 writes —
|
||||
* v4 refuses the retired role-'user' + `tool-result` wrapper). */
|
||||
function ev(type: string, seq: number, data: Record<string, unknown>): SidebarSessionEvent {
|
||||
const event: SidebarSessionEvent = { type, seq, time: seq * 1000, data }
|
||||
if (type === 'user/message' || type === 'assistant/message' || type === 'tool/result') {
|
||||
@@ -41,6 +42,31 @@ function assistantMessage(text: string): Record<string, unknown> {
|
||||
}
|
||||
}
|
||||
|
||||
/** The 0.1.7 tool/result message: first-class tool role, result blocks and
|
||||
* `isError` at the message's own top level (dsh-llm's createToolResultMessage). */
|
||||
function toolResultMessage(callId: string, text: string, isError = false): Record<string, unknown> {
|
||||
return {
|
||||
id: `m-${callId}`,
|
||||
role: 'tool',
|
||||
source: { kind: 'tool', callId },
|
||||
toolCallId: callId,
|
||||
content: [{ type: 'text', text }],
|
||||
isError,
|
||||
}
|
||||
}
|
||||
|
||||
/** The retired 0.1.6 shape: a role-'user' message wrapping the result in one
|
||||
* `tool-result` content block. Historical logs still carry it, but the v4
|
||||
* seed validator refuses it — the plugin's own readers must still read it. */
|
||||
function legacyToolResultMessage(callId: string, text: string, isError = false): Record<string, unknown> {
|
||||
return {
|
||||
id: `m-${callId}`,
|
||||
role: 'user',
|
||||
source: { kind: 'tool', callId },
|
||||
content: [{ type: 'tool-result', toolCallId: callId, isError, content: [{ type: 'text', text }] }],
|
||||
}
|
||||
}
|
||||
|
||||
/** A parent log with a completed turn, a pending question, and an open
|
||||
* in-progress turn (the exact shape a mid-stream thread creation sees).
|
||||
* DSH 0.1.5 logs nothing for the in-flight step: its deltas are
|
||||
@@ -90,6 +116,40 @@ describe('sidechat seed against the real dsh-session validator', () => {
|
||||
expect(child.snapshotEvents().map(event => event.type).at(-1)).toBe('session/end-seed')
|
||||
})
|
||||
|
||||
it('refuses the retired 0.1.6 tool-result wrapper (why every fixture uses the tool-role message)', () => {
|
||||
const legacy = [
|
||||
ev('user/message', 0, userMessage('q')),
|
||||
ev('turn/start', 1, { turn: 1 }),
|
||||
ev('step/start', 2, { turn: 1, step: 1 }),
|
||||
ev('tool/call', 3, { turn: 1, step: 1, callId: 'c1', name: 'bash', arguments: '{}' }),
|
||||
ev('tool/result', 4, { turn: 1, step: 1, message: legacyToolResultMessage('c1', 'ok') }),
|
||||
ev('turn/end', 5, { turn: 1, reason: { kind: 'completed' } }),
|
||||
]
|
||||
// Session format v4 made tool results first-class role-'tool' messages;
|
||||
// a seed still carrying the wrapper cannot be adopted at all.
|
||||
expect(() => Session.create('session-validator-legacy' as SessionId, legacy as never))
|
||||
.toThrow(/message must have role "tool"/)
|
||||
})
|
||||
|
||||
it('still READS a legacy 0.1.6-shaped tool result when building the snapshot (compat)', () => {
|
||||
// Historical logs keep the wrapper shape forever, so the plugin's own
|
||||
// readers must keep reading it even though the validator refuses it.
|
||||
const log = [
|
||||
ev('user/message', 0, userMessage('q')),
|
||||
ev('turn/start', 1, { turn: 1 }),
|
||||
ev('step/start', 2, { turn: 1, step: 1 }),
|
||||
ev('tool/call', 3, { turn: 1, step: 1, callId: 'c1', name: 'bash', arguments: '{"cmd":"ls"}' }),
|
||||
ev('tool/result', 4, { turn: 1, step: 1, message: legacyToolResultMessage('c1', 'legacy ok') }),
|
||||
// A second call with no result yet: the open turn cannot be closed
|
||||
// honestly, so the inheritance falls back to the snapshot — where the
|
||||
// legacy-shaped result above must still surface.
|
||||
ev('tool/call', 5, { turn: 1, step: 1, callId: 'c2', name: 'bash', arguments: '{"cmd":"sleep"}' }),
|
||||
]
|
||||
const { snapshot } = buildSidechatInheritance(log)
|
||||
expect(snapshot).not.toBeNull()
|
||||
expect(snapshot).toContain('Result: legacy ok')
|
||||
})
|
||||
|
||||
it('accepts the durable subagent descriptor the routes append to the seed', () => {
|
||||
// Regression guard for the catalog-corrupt fix: a cold thread WITHOUT a
|
||||
// descriptor renders as a 'corrupt' diagnostic in the host subagents.list.
|
||||
@@ -181,15 +241,7 @@ describe('sidechat seed fork markers vs the reconstructed inbox', () => {
|
||||
ev('step/start', 11, { turn: 2, step: 1 }),
|
||||
ev('user/message', 12, pendingMessage('m-q2', 'user', 'q2')),
|
||||
ev('tool/call', 13, { turn: 2, step: 1, callId: 'c1', name: 'bash', arguments: '{}' }),
|
||||
ev('tool/result', 14, {
|
||||
turn: 2, step: 1,
|
||||
message: {
|
||||
id: 'm-r',
|
||||
role: 'user',
|
||||
content: [{ type: 'tool-result', toolCallId: 'c1', content: [{ type: 'text', text: 'ok' }] }],
|
||||
source: { kind: 'tool', callId: 'c1' },
|
||||
},
|
||||
}),
|
||||
ev('tool/result', 14, { turn: 2, step: 1, message: toolResultMessage('c1', 'ok') }),
|
||||
ev('agent/inbox/spliced', 15, {
|
||||
target: 'next-step',
|
||||
start: 0,
|
||||
|
||||
Reference in new issue
Block a user