From cbc6a1ddb88f338fa46293ba1d82e28fca617fdc Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 4 Apr 2026 08:36:20 +0100
Subject: [PATCH] fix: restore main type surfaces

---
 src/agents/acp-spawn.ts                    | 13 +++++++++----
 src/agents/live-cache-regression-runner.ts | 10 +++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/agents/acp-spawn.ts b/src/agents/acp-spawn.ts
index febc4e0e7d8..478441117f7 100644
--- a/src/agents/acp-spawn.ts
+++ b/src/agents/acp-spawn.ts
@@ -108,8 +108,7 @@ export const ACP_SPAWN_ERROR_CODES = [
 ] as const;
 export type SpawnAcpErrorCode = (typeof ACP_SPAWN_ERROR_CODES)[number];
 
-type SpawnAcpAcceptedResult = {
-  status: "accepted";
+type SpawnAcpResultFields = {
   childSessionKey?: string;
   runId?: string;
   mode?: SpawnAcpMode;
@@ -117,9 +116,15 @@ type SpawnAcpAcceptedResult = {
   note?: string;
 };
 
-type SpawnAcpFailedResult = {
+type SpawnAcpAcceptedResult = SpawnAcpResultFields & {
+  status: "accepted";
+  childSessionKey: string;
+  runId: string;
+  mode: SpawnAcpMode;
+};
+
+type SpawnAcpFailedResult = SpawnAcpResultFields & {
   status: "forbidden" | "error";
-  childSessionKey?: string;
   error: string;
   errorCode: SpawnAcpErrorCode;
 };
diff --git a/src/agents/live-cache-regression-runner.ts b/src/agents/live-cache-regression-runner.ts
index 35970ac6a01..446d25f6d91 100644
--- a/src/agents/live-cache-regression-runner.ts
+++ b/src/agents/live-cache-regression-runner.ts
@@ -33,6 +33,7 @@ type CacheUsage = {
   cacheRead?: number;
   cacheWrite?: number;
 };
+type BaselineLane = CacheLane | "disabled";
 type CacheRun = {
   hitRate: number;
   suffix: string;
@@ -348,8 +349,15 @@ function formatUsage(usage: CacheUsage | undefined) {
   return `cacheRead=${usage?.cacheRead ?? 0} cacheWrite=${usage?.cacheWrite ?? 0} input=${usage?.input ?? 0}`;
 }
 
+function resolveBaselineFloor(
+  provider: ProviderKey,
+  lane: BaselineLane,
+): LiveCacheFloor | undefined {
+  return (LIVE_CACHE_REGRESSION_BASELINE[provider] as Record<string, LiveCacheFloor>)[lane];
+}
+
 function assertAgainstBaseline(params: {
-  lane: string;
+  lane: BaselineLane;
   provider: ProviderKey;
   result: LaneResult;
   regressions: string[];