Type-only change (brands are zero-cost casts; no runtime/wire impact). Closes the two gaps in the "brand ids that cross package boundaries" policy and fixes the dependency direction so a capability package never pulls in an unrelated one. - Extract the `Branded<B>` primitive into a new standalone type-only package `@deepseek-ai/dsh-brand` (packages/util/brand) with no harness-package deps. dsh-llm keeps its owned CallId but imports Branded from dsh-brand; dsh-session, dsh-agent, and dsh-bash all import Branded from there. dsh-bash depends on dsh-brand ALONE — never on dsh-llm or dsh-session (the architectural fix: a generic execution backend must not couple to the LLM or session vocabulary). - Mint BashTaskId + OwnerToken in dsh-bash and thread them through BashTask.id, the get/ownerOf/list/readOutput/kill seam, the bash-local generation site, and the dsh-tool-bash validate/access surface. OwnerToken is a DISTINCT brand from SessionId so the seam stays decoupled; dsh-tool-bash is the single boundary that casts SessionId -> OwnerToken. - Brand at the SOURCE, not via mid-pipeline casts: agent-loop's Config types agents[].id as AgentId and resumeSessionId as SessionId, so the brand enters at the config boundary and the inner create()/resume casts disappear (only the genuinely-new per-run session-id string is cast). - Stop brand erosion: propagate CallId/SessionId/AgentId to the registry/store Map keys and public params/exports (SessionStore, AgentRegistry + factory options, the ACP session-id surface + ToolPresenter CallId map, the persistence coordinator, invariants pendingCalls, the pi-ai tool-call maps). - Docs: document BashTaskId/OwnerToken in bash.md (type-equiv re-pasted), point the Branded type-equiv at dsh-brand, fix stale param types in the session/ agent/bash READMEs, regenerate the cordis catalog + module graph. Implements docs/rfc/proposed/architecture/2026-06-20-branded-ids.md
138 lines
6.6 KiB
TypeScript
138 lines
6.6 KiB
TypeScript
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { Context } from 'cordis'
|
|
import { mkdtemp, rm } from 'node:fs/promises'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import LlmService from '@deepseek-ai/dsh-llm'
|
|
import SessionStore, { SessionId } from '@deepseek-ai/dsh-session'
|
|
import SystemPrompt from '@deepseek-ai/dsh-system-prompt'
|
|
import ToolRegistry from '@deepseek-ai/dsh-tools'
|
|
import AgentRegistry, { AgentId } from '@deepseek-ai/dsh-agent'
|
|
import SessionPersistenceJsonl from '@deepseek-ai/dsh-session-persistence-jsonl'
|
|
import AgentLoop, { ReactLoopAgent } from '@deepseek-ai/dsh-agent-loop'
|
|
import { MockAdapter, textResponse } from './mock-adapter.ts'
|
|
|
|
const dirs: string[] = []
|
|
afterEach(async () => { for (const d of dirs.splice(0)) await rm(d, { recursive: true, force: true }) })
|
|
|
|
function waitForIdle(ctx: Context, agent: ReactLoopAgent): Promise<void> {
|
|
return new Promise((resolve) => {
|
|
const dispose = ctx.on('agent/status', (subject, status) => {
|
|
if (subject === agent && status === 'idle') { dispose(); resolve() }
|
|
})
|
|
})
|
|
}
|
|
|
|
describe('config-driven session id', () => {
|
|
it('config-driven create uses a fresh ${id}-session-<uuid> per run (restart-safe)', async () => {
|
|
const root = await mkdtemp(join(tmpdir(), 'dsh-cfg-session-'))
|
|
dirs.push(root)
|
|
const idPattern = /^cfg-session-[0-9a-f-]{36}$/
|
|
// Run 1: a config agent persists a turn under a generated session id.
|
|
const ctx1 = new Context()
|
|
await ctx1.plugin(LlmService)
|
|
await ctx1.plugin(SessionStore)
|
|
await ctx1.plugin(SystemPrompt)
|
|
await ctx1.plugin(ToolRegistry)
|
|
await ctx1.plugin(AgentRegistry)
|
|
await ctx1.plugin(AgentLoop, { agents: [{ id: AgentId('cfg'), model: 'mock', systemPrompt: '' }] })
|
|
await ctx1.plugin(SessionPersistenceJsonl, { root })
|
|
ctx1.llm.registerAdapter(['mock'], new MockAdapter([textResponse('cfg')]))
|
|
const a1 = ctx1.agents.get(AgentId('cfg')) as ReactLoopAgent
|
|
expect(a1.session.id).toMatch(idPattern)
|
|
a1.send([{ type: 'text', text: 'q' }], { source: { kind: 'user' } })
|
|
await waitForIdle(ctx1, a1)
|
|
await ctx1.fiber.dispose()
|
|
|
|
// Run 2 over the SAME root: a fresh id means no on-disk collision (a fixed
|
|
// ${id}-session would crash here with "already has a persisted log").
|
|
const ctx2 = new Context()
|
|
await ctx2.plugin(LlmService)
|
|
await ctx2.plugin(SessionStore)
|
|
await ctx2.plugin(SystemPrompt)
|
|
await ctx2.plugin(ToolRegistry)
|
|
await ctx2.plugin(AgentRegistry)
|
|
await ctx2.plugin(AgentLoop, { agents: [{ id: AgentId('cfg'), model: 'mock', systemPrompt: '' }] })
|
|
await ctx2.plugin(SessionPersistenceJsonl, { root })
|
|
ctx2.llm.registerAdapter(['mock'], new MockAdapter([textResponse('cfg2')]))
|
|
const a2 = ctx2.agents.get(AgentId('cfg')) as ReactLoopAgent
|
|
expect(a2.session.id).toMatch(idPattern)
|
|
expect(a2.session.id).not.toBe(a1.session.id)
|
|
a2.send([{ type: 'text', text: 'q2' }], { source: { kind: 'user' } })
|
|
await waitForIdle(ctx2, a2)
|
|
await ctx2.fiber.dispose()
|
|
})
|
|
|
|
it('config-driven resumeSessionId continues a persisted session (env-var resume)', async () => {
|
|
const root = await mkdtemp(join(tmpdir(), 'dsh-cfg-resume-'))
|
|
dirs.push(root)
|
|
|
|
// Run 1: a programmatically-created agent on a KNOWN session id persists a
|
|
// completed turn, so run 2 has a concrete id to resume.
|
|
const ctx1 = new Context()
|
|
await ctx1.plugin(LlmService)
|
|
await ctx1.plugin(SessionStore)
|
|
await ctx1.plugin(SystemPrompt)
|
|
await ctx1.plugin(ToolRegistry)
|
|
await ctx1.plugin(AgentRegistry)
|
|
await ctx1.plugin(AgentLoop, { agents: [] })
|
|
await ctx1.plugin(SessionPersistenceJsonl, { root })
|
|
ctx1.llm.registerAdapter(['mock'], new MockAdapter([textResponse('first')]))
|
|
const a1 = ctx1.agents.create({ agentId: AgentId('main'), sessionId: SessionId('sticky-1') }).agent as ReactLoopAgent
|
|
a1.send([{ type: 'text', text: 'remember me' }], { source: { kind: 'user' } })
|
|
await waitForIdle(ctx1, a1)
|
|
await ctx1.fiber.dispose()
|
|
|
|
// Run 2: a CONFIG agent with resumeSessionId continues that session. The
|
|
// resume is deferred until sessionPersistence loads (ctx.inject), so wait
|
|
// for the agent to appear, then assert it is on the resumed id with history.
|
|
const ctx2 = new Context()
|
|
await ctx2.plugin(LlmService)
|
|
await ctx2.plugin(SessionStore)
|
|
await ctx2.plugin(SystemPrompt)
|
|
await ctx2.plugin(ToolRegistry)
|
|
await ctx2.plugin(AgentRegistry)
|
|
await ctx2.plugin(AgentLoop, { agents: [{ id: AgentId('main'), model: 'mock', systemPrompt: '', resumeSessionId: SessionId('sticky-1') }] })
|
|
await ctx2.plugin(SessionPersistenceJsonl, { root })
|
|
ctx2.llm.registerAdapter(['mock'], new MockAdapter([textResponse('second')]))
|
|
|
|
// The deferred resume runs on a microtask after the backend is available.
|
|
let resumed: ReactLoopAgent | undefined
|
|
for (let i = 0; i < 50 && !resumed; i++) {
|
|
await new Promise(r => setTimeout(r, 5))
|
|
resumed = ctx2.agents.get(AgentId('main')) as ReactLoopAgent | undefined
|
|
}
|
|
expect(resumed).toBeDefined()
|
|
// The live session id IS the resumed id (NOT a fresh ${id}-session-<uuid>),
|
|
// and the prior turn's user message is in the derived history.
|
|
expect(resumed!.session.id).toBe('sticky-1')
|
|
const derived = resumed!.session.deriveMessages()
|
|
expect(JSON.stringify(derived)).toContain('remember me')
|
|
await ctx2.fiber.dispose()
|
|
})
|
|
|
|
it('config-driven resume of a missing session is contained: logs a warning, no agent, no crash', async () => {
|
|
const root = await mkdtemp(join(tmpdir(), 'dsh-cfg-resume-miss-'))
|
|
dirs.push(root)
|
|
const ctx = new Context()
|
|
await ctx.plugin(LlmService)
|
|
await ctx.plugin(SessionStore)
|
|
await ctx.plugin(SystemPrompt)
|
|
await ctx.plugin(ToolRegistry)
|
|
await ctx.plugin(AgentRegistry)
|
|
await ctx.plugin(AgentLoop, { agents: [{ id: AgentId('main'), model: 'mock', systemPrompt: '', resumeSessionId: SessionId('does-not-exist') }] })
|
|
const warn = vi.spyOn((ctx.agentLoop as unknown as { ctx: { logger: { warn: (...a: unknown[]) => void } } }).ctx.logger, 'warn')
|
|
.mockImplementation(() => undefined)
|
|
await ctx.plugin(SessionPersistenceJsonl, { root })
|
|
ctx.llm.registerAdapter(['mock'], new MockAdapter([textResponse('x')]))
|
|
|
|
// The deferred resume fails (no such session on disk). It must be contained:
|
|
// a warning is logged, no 'main' agent is registered, and the app stays up.
|
|
await new Promise(r => setTimeout(r, 200))
|
|
expect(ctx.agents.get(AgentId('main'))).toBeUndefined()
|
|
expect(warn).toHaveBeenCalledWith(expect.stringContaining('config-driven resume of "does-not-exist" failed'))
|
|
warn.mockRestore()
|
|
await ctx.fiber.dispose()
|
|
})
|
|
})
|