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
28 lines
1.4 KiB
TypeScript
28 lines
1.4 KiB
TypeScript
/**
|
|
* The `Branded<B>` nominal-typing primitive — a type-only utility (no runtime
|
|
* code, no harness-package dependency) shared by every package that owns a
|
|
* cross-boundary id.
|
|
*
|
|
* A brand makes structurally-identical strings non-interchangeable at the type
|
|
* level: an `AgentId` cannot be passed where a `CallId` is expected, even
|
|
* though both are plain strings at runtime. Construction goes through a per-id
|
|
* factory in the OWNING package (a plain cast inside — zero runtime cost);
|
|
* comparison, logging, and serialization all behave as ordinary strings.
|
|
*
|
|
* Policy: a package brands the ids it owns — `CallId` in dsh-llm (tool-call
|
|
* correlation), `SessionId` in dsh-session, `AgentId` in dsh-agent,
|
|
* `BashTaskId`/`OwnerToken` in dsh-bash. Branding is for ids that cross package
|
|
* boundaries and could plausibly be confused; not every string needs a brand.
|
|
* This package owns ONLY the primitive — no concrete id, no runtime code beyond
|
|
* the (erased) type — so the brand vocabulary stays dependency-free and a
|
|
* package can brand its ids without depending on an unrelated capability
|
|
* package (e.g. dsh-bash brands its ids without pulling in dsh-llm).
|
|
*
|
|
* @module @deepseek-ai/dsh-brand
|
|
*/
|
|
|
|
declare const BRAND: unique symbol
|
|
|
|
/** A string carrying a compile-time-only brand `B`. */
|
|
export type Branded<B extends string> = string & { readonly [BRAND]: B }
|