mirror of
https://github.com/ranxianglei/billion-context.git
synced 2026-11-23 01:58:16 +08:00
Merge pull request #3067 from ranxianglei/2026-10-13_fix-3060-master-lanes
fix: unblock master lanes — restore personaNamespace import + storage-render goldens after #3061
This commit is contained in:
@@ -34,6 +34,12 @@ import { emitPreflightError } from "../stream-error.js";
|
||||
import { agentProviderRecipes } from "../agent-providers.js";
|
||||
import { affinityToken, conversationHeaderSource, claudeSubagentAgentId, claudeSubagentSplit, clientConversationHeader, codexTurnIdentity, dshPersonaFingerprintApplies, instructionsFingerprintApplies, openaiSystemTextForPersona, preferPromptCacheKeyIdentity } from "../session-id.js";
|
||||
import { personaConversationOrder } from "../session-resolve.js";
|
||||
// #3060: the google-lane call site below still uses the v1 resolver (it is
|
||||
// the one lane ddf366b4 did not migrate); the import was dropped with the
|
||||
// rest of the v1 wiring, which broke typecheck and threw ReferenceError at
|
||||
// runtime on the google dsh-persona path. Restore it until that lane is
|
||||
// deliberately migrated to personaConversationOrder.
|
||||
import { personaNamespace } from "../persona-anchor.js";
|
||||
import { prefixAffinity, type AnonymousAffinity } from "../prefix-affinity.js";
|
||||
import { buildAnonymousProvenance, type AnonymousProvenance } from "../anon-provenance.js";
|
||||
import { maybeAdoptForkBlocks, maybeAdoptResume, maybeAdoptDerivedFork } from "../fork-adoption.js";
|
||||
|
||||
@@ -80,12 +80,12 @@
|
||||
"foldAt": 9,
|
||||
"editedAt": 12,
|
||||
"summaryFrom": 9,
|
||||
"stateDigest": "e47a82482ed9d3fc1201562c2c539f5432873acb264862e055c5569396040aac",
|
||||
"stateDigest": "858ed1c3988c25280181c34a9b30ddf78c86b4237eb5076ab311456a3001c322",
|
||||
"sectionDigests": {
|
||||
"state": "285aa622a037321b",
|
||||
"blockContents": "b3a9c59b22ec1a3a",
|
||||
"stats": "4271a6483e02458a",
|
||||
"metadata": "f582165dae264d64"
|
||||
"metadata": "32e9f789c44286ca"
|
||||
},
|
||||
"stateKeyDigests": {
|
||||
"blocks": "8a3021f39f1f2eb8",
|
||||
|
||||
@@ -80,12 +80,12 @@
|
||||
"foldAt": 9,
|
||||
"editedAt": 12,
|
||||
"summaryFrom": 9,
|
||||
"stateDigest": "3a6d4239e182ebb6fe02a99faf40324a963d5f74f9bb0be0b1752f47bee65497",
|
||||
"stateDigest": "7488de3b6fbb1f061c1fdc7e83b2b99009a936aef04dc36624e21fc161159903",
|
||||
"sectionDigests": {
|
||||
"state": "6e905e4ae1e678b8",
|
||||
"blockContents": "dd2de296a5bc6160",
|
||||
"stats": "ed7d3e3f253e0942",
|
||||
"metadata": "1f78ed1b58e4a77e"
|
||||
"metadata": "59f40d0ef9c2755e"
|
||||
},
|
||||
"stateKeyDigests": {
|
||||
"blocks": "bdde93b0e100e13e",
|
||||
|
||||
@@ -80,12 +80,12 @@
|
||||
"foldAt": 9,
|
||||
"editedAt": 12,
|
||||
"summaryFrom": 9,
|
||||
"stateDigest": "91d1cdd51aed493c3f1c1e4857e4a768cd43be23cc69647ca3f2376f4270e74a",
|
||||
"stateDigest": "65929f00d8a26805ef859fd9ab9197d605e0531bccb17813c3457019c617ad54",
|
||||
"sectionDigests": {
|
||||
"state": "0725cfe81690b748",
|
||||
"blockContents": "4cc83a808a659f28",
|
||||
"stats": "096da9a1f61d84d0",
|
||||
"metadata": "a615198f56928645"
|
||||
"metadata": "0fb314268fb92034"
|
||||
},
|
||||
"stateKeyDigests": {
|
||||
"blocks": "9adb53303cd4b786",
|
||||
|
||||
@@ -80,12 +80,12 @@
|
||||
"foldAt": 9,
|
||||
"editedAt": 12,
|
||||
"summaryFrom": 9,
|
||||
"stateDigest": "bbb968638e19d82d097871d73240d0dbabdbd3978fb7b6e140960c232e1de1bb",
|
||||
"stateDigest": "c326a242c21c86ec70b0c148fc8c4951cb31f449e125f97a970a7130444a1ec4",
|
||||
"sectionDigests": {
|
||||
"state": "7194736468931151",
|
||||
"blockContents": "1727e2e1faf79b55",
|
||||
"stats": "062b6eaaeb325945",
|
||||
"metadata": "cd0990da20e0f33c"
|
||||
"metadata": "3b76417727dbe3d0"
|
||||
},
|
||||
"stateKeyDigests": {
|
||||
"blocks": "0458e9c8a7bb1a99",
|
||||
|
||||
Reference in New Issue
Block a user