Tianyi Cui
d6a2ab30c8
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
45 lines
1.7 KiB
TypeScript
45 lines
1.7 KiB
TypeScript
import { afterEach, describe, expect, it } from 'vitest'
|
|
import type { Context } from 'cordis'
|
|
import { AgentId } from '@deepseek-ai/dsh-agent'
|
|
import { codingHarness, finalText, SYSTEM_PROMPT, waitForIdle } from './harness.ts'
|
|
|
|
/**
|
|
* The first place a REAL model meets the REAL bash tool: the cheap canary
|
|
* before the coding-task e2e. Key-gated (see vitest.e2e.config.ts).
|
|
*/
|
|
|
|
let ctx: Context | undefined
|
|
|
|
afterEach(async () => {
|
|
// Always dispose the harness, even on failure/retry/timeout: agent-loop
|
|
// teardown stops the loop and LocalBashExecutor teardown kills any
|
|
// process the model left behind.
|
|
await ctx?.fiber.dispose()
|
|
ctx = undefined
|
|
})
|
|
|
|
describe.skipIf(!process.env.DEEPSEEK_API_KEY)('full loop: real model + real bash tool', () => {
|
|
it('runs a bash command on request and reports its output', async () => {
|
|
ctx = await codingHarness(process.cwd())
|
|
const agent = ctx.agentLoop.create(AgentId('e2e-loop'), {
|
|
model: 'deepseek-v4-flash',
|
|
systemPrompt: SYSTEM_PROMPT,
|
|
})
|
|
|
|
agent.send([{ type: 'text', text: 'Run `echo e2e-ok` with the bash tool and tell me its exact output.' }])
|
|
await waitForIdle(ctx, agent)
|
|
|
|
const events = [...agent.session.events]
|
|
const calls = events.filter(event => event.type === 'tool/call')
|
|
expect(calls.length).toBeGreaterThan(0)
|
|
expect(calls.some(event => event.data.name === 'bash')).toBe(true)
|
|
|
|
const results = events.filter(event => event.type === 'tool/result')
|
|
const resultTexts = results.flatMap(event =>
|
|
event.data.content.filter(block => block.type === 'text').map(block => block.text))
|
|
expect(resultTexts.some(text => text.includes('e2e-ok'))).toBe(true)
|
|
|
|
expect(finalText(events)).toContain('e2e-ok')
|
|
}, 120_000)
|
|
})
|