Shared-surface conflicts resolve as unions: the fixture serves all five projection keys (title/todos/permissions/plan/goal) with the /permission and /plan command mirrors side by side, the connection specs assert the five-key baseline and the shifted approval/question replay indices, and the cli roster/deps, tsconfig aggregate, and README allowlist carry both lines' rows. Plan-side content lands verbatim from master. One end-state consolidation both branches half-did: with questions (ui-question) and approvals (ApprovalPanel) each owning a composer takeover, PendingCard retires outright — ChatView renders no pending placeholder, the card component and its specs go, and both README halves state the takeover-only contract.
55 lines
841 B
JSON
55 lines
841 B
JSON
{
|
|
"extends": "../../../tsconfig.base.client.json",
|
|
"compilerOptions": {
|
|
"rootDir": "src",
|
|
"outDir": "lib/types"
|
|
},
|
|
"include": [
|
|
"src"
|
|
],
|
|
"references": [
|
|
{
|
|
"path": "../../../vendor/cordis"
|
|
},
|
|
{
|
|
"path": "../ui-slots"
|
|
},
|
|
{
|
|
"path": "../ui-primitives"
|
|
},
|
|
{
|
|
"path": "../web-react"
|
|
},
|
|
{
|
|
"path": "../runtime"
|
|
},
|
|
{
|
|
"path": "../../session-projection/session-projection"
|
|
},
|
|
{
|
|
"path": "../../plan/plan-mode"
|
|
},
|
|
{
|
|
"path": "../../todo/tool-todo"
|
|
},
|
|
{
|
|
"path": "../ui-slash"
|
|
},
|
|
{
|
|
"path": "../ui-layout"
|
|
},
|
|
{
|
|
"path": "../locale"
|
|
},
|
|
{
|
|
"path": "../../support/invariants"
|
|
},
|
|
{
|
|
"path": "../../ui/permission"
|
|
}
|
|
],
|
|
"exclude": [
|
|
"**/*.legacy.*"
|
|
]
|
|
}
|