340c9ba576
Injected context reached the transcript as one anonymous shape whose expanded body was the whole message serialized as inline JSON, so the escaping collapsed the only readable part — the model-facing prose — into a single line. `MessageSource` gains an optional producer-declared `form`, a small semantic vocabulary of information shapes independent of `kind`: kind says who produced the context, form says what shape it is, so several producers may share one presentation. Two values ship. `instructions` (workspace-context) lists the reconciled files above their text and keeps the `<system-reminder>` framing verbatim, because the framing is part of what the model read. `catalog` moves dsh-tool-skill off the shared plugin kind onto a `skill-catalog` source carrying the published name/description entries, and the body lists those instead of re-parsing `<available_skills>` out of the prose. Catalog identity moves with it: the republish digest now covers the durable entries, deleting the text-slicing that recovered them from a logged message. Everything else renders the opaque body — the model-facing text with its real line breaks, then the remaining provenance as fields. That is the documented default, not a leftover: a resumed, forked, or foreign log must render whether or not its producer is mounted here, which is why the classification lives in the durable source rather than a client-side table keyed by producer.
91 lines
2.2 KiB
TypeScript
91 lines
2.2 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type {
|
|
ConversationContext, ConversationNode, RequestView,
|
|
} from '@deepseek-ai/dsh-client-runtime/client'
|
|
import {
|
|
deriveTrajectoryContextBranches,
|
|
trajectoryBranchContainsRequest,
|
|
} from '../src/client/context-branches.ts'
|
|
|
|
const checkpoint = {
|
|
kind: 'context',
|
|
seq: 100,
|
|
time: 100,
|
|
content: [],
|
|
source: { kind: 'plugin', plugin: 'compact' },
|
|
provenance: { role: 'inject', label: 'compact' },
|
|
form: null,
|
|
} as ConversationNode
|
|
|
|
const abandoned = {
|
|
kind: 'assistant',
|
|
seq: 20,
|
|
time: 20,
|
|
turn: 1,
|
|
step: 1,
|
|
blocks: [{ kind: 'text', text: 'abandoned' }],
|
|
} as ConversationNode
|
|
|
|
const current = {
|
|
kind: 'user',
|
|
seq: 110,
|
|
time: 110,
|
|
content: [{ type: 'text', text: 'rewound' }],
|
|
source: { kind: 'plugin', plugin: 'rewind' },
|
|
} as ConversationNode
|
|
|
|
function request(
|
|
purpose: RequestView['purpose'],
|
|
startSeq: number,
|
|
resultSeq?: number,
|
|
replacementSeq?: number,
|
|
): RequestView {
|
|
const base = {
|
|
startSeq,
|
|
startedAt: startSeq,
|
|
completedAt: startSeq + 1,
|
|
status: 'complete' as const,
|
|
...(resultSeq === undefined ? {} : { resultSeq }),
|
|
}
|
|
return purpose === 'assistant'
|
|
? { ...base, purpose, turn: 1, step: 1 }
|
|
: {
|
|
...base,
|
|
purpose,
|
|
turn: 1,
|
|
step: 0,
|
|
...(replacementSeq === undefined ? {} : { replacementSeq }),
|
|
}
|
|
}
|
|
|
|
describe('trajectory context branches', () => {
|
|
it('inherits nodes and requests by retained surface position rather than seq cutoff', () => {
|
|
const contexts: ConversationContext[] = [
|
|
{ id: 0, nodes: [checkpoint, abandoned] },
|
|
{
|
|
id: 1,
|
|
parentId: 0,
|
|
origin: 'rewind',
|
|
originSeq: 110,
|
|
nodes: [checkpoint, current],
|
|
},
|
|
]
|
|
const branches = deriveTrajectoryContextBranches(contexts)
|
|
const successor = branches[1]!
|
|
|
|
expect(successor.nodes.map(node => node.seq)).toEqual([110])
|
|
expect(trajectoryBranchContainsRequest(
|
|
successor,
|
|
request('assistant', 10, 20),
|
|
)).toBe(false)
|
|
expect(trajectoryBranchContainsRequest(
|
|
successor,
|
|
request('compaction', 90, 95, 100),
|
|
)).toBe(true)
|
|
expect(trajectoryBranchContainsRequest(
|
|
successor,
|
|
request('assistant', 111),
|
|
)).toBe(true)
|
|
})
|
|
})
|