Merge nucleic/olive-yarn-koala-pgd2 into dev

This commit is contained in:
2026-07-21 21:37:27 -07:00
parent c885a2f6b8
commit aecadbcc35
2 changed files with 10 additions and 0 deletions
@@ -804,6 +804,10 @@ final class HostConnection {
// phone never sends the fetch verbs (it doesn't advertise `canMirrorCarbon`), so // phone never sends the fetch verbs (it doesn't advertise `canMirrorCarbon`), so
// these arrive only if a future host misroutes; ignoring them is the contract. // these arrive only if a future host misroutes; ignoring them is the contract.
break break
case .carbonLockDecision, .carbonLockLedgerAdvanced:
// Carbon lock verbs (CARBON_SHARDING §17.5): phones never acquire and hold no
// ledger fold — the lock viewer rides the sync-protocol snapshots. Inert (D13).
break
case .transcriptReverted(let reverted): case .transcriptReverted(let reverted):
// The owner reverted/undid this chat — the transcript was truncated to `throughSeq`. // The owner reverted/undid this chat — the transcript was truncated to `throughSeq`.
// Tell RemoteStore first (it records the applied revert epoch so the summary-level // Tell RemoteStore first (it records the applied revert epoch so the summary-level
@@ -2839,6 +2839,10 @@ final class RemoteStore: ObservableObject {
// mirror — no Carbon store, no key custody — so these verbs are never issued from // mirror — no Carbon store, no key custody — so these verbs are never issued from
// iOS. Inert by contract. // iOS. Inert by contract.
break break
case .carbonLockAcquire, .carbonLockRelease:
// Carbon lock verbs (CARBON_SHARDING §17.5): phones never acquire (D13) — the
// lock viewer stays a read-only sync-protocol surface. Inert by contract.
break
case .unsubscribe(let id), .interrupt(let id), .deleteSession(let id), .discard(let id), case .unsubscribe(let id), .interrupt(let id), .deleteSession(let id), .discard(let id),
.integrate(let id, _), .renameSession(let id, _), .setFavorite(let id, _), .integrate(let id, _), .renameSession(let id, _), .setFavorite(let id, _),
.setArchived(let id, _), .setSessionModel(let id, _), .setSessionEffort(let id, _), .setArchived(let id, _), .setSessionModel(let id, _), .setSessionEffort(let id, _),
@@ -3042,6 +3046,8 @@ final class RemoteStore: ObservableObject {
demoRun(id, userText: input.plainText ?? "") demoRun(id, userText: input.plainText ?? "")
case .fetchCarbonHeads, .fetchCarbonManifests, .fetchCarbonShards, .carbonShardAck: case .fetchCarbonHeads, .fetchCarbonManifests, .fetchCarbonShards, .carbonShardAck:
break // Carbon replication: never issued from iOS (D13); inert in demo too. break // Carbon replication: never issued from iOS (D13); inert in demo too.
case .carbonLockAcquire, .carbonLockRelease:
break // Carbon locks (§17.5): phones never acquire (D13); inert in demo too.
case .startChat(let req): case .startChat(let req):
demoStartChat(req) demoStartChat(req)
case .approvalRespond(let id, let decision): case .approvalRespond(let id, let decision):