@superblocksteam/cli 2.0.130-next.2 → 2.0.130-next.3

package/dist/{chunk-MRVVM4MF.js → chunk-TOZ7A6XG.js}

@@ -1,7 +1,7 @@
 if (typeof process === 'object' && process !== null &&
     process.env !== null && typeof process.env === 'object') {
   process.env.DD_GIT_REPOSITORY_URL = 'https://token@github.com/superblocksteam/superblocks.git';
-  process.env.DD_GIT_COMMIT_SHA = '334d120e1782b730c7c817675025f281cded2a2d';
+  process.env.DD_GIT_COMMIT_SHA = 'a3b0270c89c725582637135fe235efbb7e4e8d80';
 }
 import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
@@ -22,17 +22,17 @@ import {
   require_re,
   require_semver,
   require_valid
-} from "./chunk-2CF5BVZN.js";
+} from "./chunk-RLK4IGZE.js";
 import {
   require_dd_trace,
   require_js_yaml,
   require_module_details_from_path,
   require_p_limit,
   require_path_to_regexp
-} from "./chunk-4HSCNKDX.js";
+} from "./chunk-I46WMOVI.js";
 import {
   require_commonjs
-} from "./chunk-65336RGK.js";
+} from "./chunk-I4W6X4VH.js";
 import {
   debounce_default,
   get_default,
@@ -49,13 +49,13 @@ import {
   require_lib,
   require_slugify,
   throttle_default
-} from "./chunk-LEMT7T2E.js";
+} from "./chunk-IS2VPPQA.js";
 import {
   require_dc_polyfill
-} from "./chunk-72H2Q762.js";
+} from "./chunk-L4DHTBVN.js";
 import {
   require_token_error
-} from "./chunk-KGKK6ZNP.js";
+} from "./chunk-J7WHG2MR.js";
 import {
   SpanKind,
   SpanStatusCode,
@@ -65,7 +65,7 @@ import {
   init_esm,
   metrics,
   trace
-} from "./chunk-HKOWMZY5.js";
+} from "./chunk-BFITK36F.js";
 import {
   __commonJS,
   __esm,
@@ -74,7 +74,7 @@ import {
   __toCommonJS,
   __toESM,
   init_cjs_shims
-} from "./chunk-CJCNHJUQ.js";
+} from "./chunk-DBRCJRC3.js";
 
 // ../../../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/constants.js
 var require_constants3 = __commonJS({
@@ -97073,15 +97073,15 @@ var require_api_files = __commonJS({
     exports.readAppApiYamlFile = readAppApiYamlFile4;
     exports.resolveLanguageSpecificStepContentFromBlocks = resolveLanguageSpecificStepContentFromBlocks2;
     async function writeApiFiles3(...args) {
-      const esmFunction = await import("./api-GPW6H52S.js");
+      const esmFunction = await import("./api-HC4NYIUZ.js");
       return esmFunction.writeApiFiles(...args);
     }
     async function readAppApiYamlFile4(...args) {
-      const esmFunction = await import("./api-GPW6H52S.js");
+      const esmFunction = await import("./api-HC4NYIUZ.js");
       return esmFunction.readAppApiYamlFile(...args);
     }
     async function resolveLanguageSpecificStepContentFromBlocks2(...args) {
-      const esmFunction = await import("./api-GPW6H52S.js");
+      const esmFunction = await import("./api-HC4NYIUZ.js");
       return esmFunction.resolveLanguageSpecificStepContentFromBlocks(...args);
     }
   }
@@ -106717,19 +106717,19 @@ var require_getMachineId = __commonJS({
       if (!getMachineIdImpl) {
         switch (process5.platform) {
           case "darwin":
-            getMachineIdImpl = (await import("./getMachineId-darwin-P4SBJXEE.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-darwin-O42KXLBH.js")).getMachineId;
             break;
           case "linux":
-            getMachineIdImpl = (await import("./getMachineId-linux-BP2YOBNV.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-linux-GDN6VP2A.js")).getMachineId;
             break;
           case "freebsd":
-            getMachineIdImpl = (await import("./getMachineId-bsd-OESKFPYR.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-bsd-KFFBZDSI.js")).getMachineId;
             break;
           case "win32":
-            getMachineIdImpl = (await import("./getMachineId-win-MATQAJM5.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-win-BRBRRUXE.js")).getMachineId;
             break;
           default:
-            getMachineIdImpl = (await import("./getMachineId-unsupported-OM76MT2H.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-unsupported-LYCZROMT.js")).getMachineId;
             break;
         }
       }
@@ -115721,19 +115721,19 @@ var require_getMachineId2 = __commonJS({
       if (!getMachineIdImpl) {
         switch (process5.platform) {
           case "darwin":
-            getMachineIdImpl = (await import("./getMachineId-darwin-X3L75J64.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-darwin-2LECXTWI.js")).getMachineId;
             break;
           case "linux":
-            getMachineIdImpl = (await import("./getMachineId-linux-GYKYU2VS.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-linux-HL4T6PK6.js")).getMachineId;
             break;
           case "freebsd":
-            getMachineIdImpl = (await import("./getMachineId-bsd-ZHXGNGPP.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-bsd-FLOEJRVI.js")).getMachineId;
             break;
           case "win32":
-            getMachineIdImpl = (await import("./getMachineId-win-BIGOASIM.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-win-2PYSOPWA.js")).getMachineId;
             break;
           default:
-            getMachineIdImpl = (await import("./getMachineId-unsupported-GCZD7ZNO.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-unsupported-F2DRQ7QH.js")).getMachineId;
             break;
         }
       }
@@ -197606,8 +197606,8 @@ var require_get_vercel_oidc_token = __commonJS({
       }
       try {
         const [{ getTokenPayload, isExpired }, { refreshToken }] = await Promise.all([
-          await import("./token-util-CL2OLF7I.js"),
-          await import("./token-VF4NE2R7.js")
+          await import("./token-util-POAWM4EX.js"),
+          await import("./token-VXC2MKCH.js")
         ]);
         if (!token2 || isExpired(getTokenPayload(token2))) {
           await refreshToken();
@@ -452998,7 +452998,7 @@ var require_config_loader = __commonJS({
        * @returns {Promise<{createJiti: Function|undefined, version: string;}>} A promise that fulfills with an object containing the jiti module's createJiti function and version.
        */
       static async loadJiti() {
-        const { createJiti } = await import("./jiti-WLQLO77Q.js");
+        const { createJiti } = await import("./jiti-PKH2TSAU.js");
         const version4 = require_package5().version;
         return { createJiti, version: version4 };
       }
@@ -453327,7 +453327,7 @@ var require_eslint_helpers = __commonJS({
     }
     async function globMatch({ basePath, pattern }) {
       let found = false;
-      const { hfs } = await import("./src-M4SCGEDI.js");
+      const { hfs } = await import("./src-VSJSPJHE.js");
       const patternToUse = normalizeToPosix(path78.relative(basePath, pattern));
       const matcher = new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       const walkSettings = {
@@ -453367,7 +453367,7 @@ var require_eslint_helpers = __commonJS({
         return new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       });
       const unmatchedPatterns = /* @__PURE__ */ new Set([...relativeToPatterns.keys()]);
-      const { hfs } = await import("./src-M4SCGEDI.js");
+      const { hfs } = await import("./src-VSJSPJHE.js");
       const walk2 = hfs.walk(basePath, {
         async directoryFilter(entry) {
           if (!matchers.some((matcher) => matcher.match(entry.path, true))) {
@@ -509972,7 +509972,7 @@ init_cjs_shims();
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.130-next.2",
+  version: "2.0.130-next.3",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
   license: "Superblocks Community Software License",
@@ -510350,7 +510350,7 @@ var config = void 0;
 var configured = false;
 var ddTracePromise = void 0;
 async function getDdTrace() {
-  ddTracePromise ??= import("./dd-trace-HJUEFCMR.js").then((module) => module.default);
+  ddTracePromise ??= import("./dd-trace-PISMQOM4.js").then((module) => module.default);
   return await ddTracePromise;
 }
 var deploymentType = (() => {
@@ -514455,7 +514455,7 @@ init_cjs_shims();
 
 // ../../../vite-plugin-file-sync/dist/ai-service/index.js
 init_cjs_shims();
-var import_ai17 = __toESM(require_dist9(), 1);
+var import_ai17 = __toESM(require_dist9());
 import { createHash as createHash5, randomUUID as randomUUID4 } from "node:crypto";
 import os6 from "node:os";
 import path50 from "node:path";
@@ -518893,7 +518893,7 @@ init_cjs_shims();
 init_cjs_shims();
 
 // ../../../vite-plugin-file-sync/dist/ai-service/index.js
-var import_shared52 = __toESM(require_dist2(), 1);
+var import_shared52 = __toESM(require_dist2());
 
 // ../../../vite-plugin-file-sync/dist/migration/translation-prompt.js
 init_cjs_shims();
@@ -536121,7 +536121,7 @@ var MAX_ATTRIBUTE_LENGTH = 64e3;
 var LLMObsSpanWriter = null;
 async function loadLLMObsSpanWriter() {
   if (!LLMObsSpanWriter) {
-    const module = await import("./spans-XFMNVHJD.js");
+    const module = await import("./spans-GFS66UKZ.js");
     LLMObsSpanWriter = module.default;
   }
   return LLMObsSpanWriter;
@@ -566103,20 +566103,26 @@ function formatIntegrationForPlanPrompt(integration) {
   type: ${type}`;
 }
 var exitPlanModeToolFactory = createToolFactory("exitPlanMode", ({ clark, services }) => {
+  const managedNativeDbEnabled = services.features.managedNativeDbEnabled === true;
+  const baseInputSchema = external_exports.object({
+    complexity: external_exports.enum(PlanComplexityLevels).describe("Your best estimate of the plan complexity"),
+    title: external_exports.string().min(1, "Plan title is required").max(160, "Plan title must be 160 characters or fewer").describe("Title to display for the plan. Should be the name of the feature or fix, eg 'Executive orders dashboard', 'User login page', 'Fix data sync bug'"),
+    integrationIds: external_exports.array(external_exports.string()).describe("List of integration IDs that may be referenced in the plan."),
+    attachmentIds: external_exports.array(external_exports.number()).min(0).max(MAX_PLAN_ATTACHMENTS).describe(`List of up to ${MAX_PLAN_ATTACHMENTS} attachment IDs that are relevant to the plan. Call listAttachments first to see available attachments with their IDs, types, and labels.`),
+    entityIds: external_exports.array(external_exports.string()).min(0).describe(`List of targeted entity IDs (components) from the user's selection that are relevant to implementing this plan. Include entities that the plan will modify or depend on.`)
+  });
+  const inputSchema2 = managedNativeDbEnabled ? baseInputSchema.extend({
+    includesFreshDatabase: external_exports.boolean().optional().describe("Set to true only when the plan explicitly calls provisionDatabase to create a new dev database. Do not set it for plans that query, migrate, or modify an existing database.")
+  }) : baseInputSchema;
+  const description = buildExitPlanModeDescription(managedNativeDbEnabled);
   return {
-    description: EXIT_PLAN_MODE_DESCRIPTION,
+    description,
     category: ToolCategory.PLAN,
     defaultPermission: PermissionLevel.ALLOW,
     readOnly: true,
-    inputSchema: external_exports.object({
-      complexity: external_exports.enum(PlanComplexityLevels).describe("Your best estimate of the plan complexity"),
-      title: external_exports.string().min(1, "Plan title is required").max(160, "Plan title must be 160 characters or fewer").describe("Title to display for the plan. Should be the name of the feature or fix, eg 'Executive orders dashboard', 'User login page', 'Fix data sync bug'"),
-      integrationIds: external_exports.array(external_exports.string()).describe("List of integration IDs that may be referenced in the plan."),
-      attachmentIds: external_exports.array(external_exports.number()).min(0).max(MAX_PLAN_ATTACHMENTS).describe(`List of up to ${MAX_PLAN_ATTACHMENTS} attachment IDs that are relevant to the plan. Call listAttachments first to see available attachments with their IDs, types, and labels.`),
-      entityIds: external_exports.array(external_exports.string()).min(0).describe(`List of targeted entity IDs (components) from the user's selection that are relevant to implementing this plan. Include entities that the plan will modify or depend on.`),
-      includesFreshDatabase: external_exports.boolean().optional().describe("Set to true only when the plan explicitly calls provisionDatabase to create a new dev database. Do not set it for plans that query, migrate, or modify an existing database.")
-    }),
-    execute: async ({ complexity, title, integrationIds, attachmentIds, entityIds, includesFreshDatabase }, { messages: messages3 }) => {
+    inputSchema: inputSchema2,
+    execute: async (input, { messages: messages3 }) => {
+      const { complexity, title, integrationIds, attachmentIds, entityIds, includesFreshDatabase } = input;
       const { chatSessionStore } = services;
       const sendUserMessage = sendUserMessageChannel(clark, chatSessionStore);
       const sendInteractiveMessage = sendInteractiveMessageChannel(clark, chatSessionStore);
@@ -566474,7 +566480,7 @@ Navigation & Behavior
 - Match dashboard styling and layout
 </plan>
 `;
-var EXIT_PLAN_MODE_DESCRIPTION = `
+var EXIT_PLAN_MODE_DESCRIPTION_INTRO = `
 Use this tool to delegate to a planning expert who will generate a plan and present it to the user.
 This tool presents a plan with a "Build It" button that allows the user to switch to Build mode.
 NEVER output a plan directly as text - ALWAYS use this tool to present plans properly.
@@ -566490,12 +566496,14 @@ ENTITIES:
 - If there are focused_entities in the context (components selected by the user), extract the "id" field from each entity
 - Pass these IDs to the entityIds parameter - they will be displayed in the plan and preserved for build mode
 - Include the relevant focused entity IDs unless they are clearly irrelevant to the plan
-
+`;
+var EXIT_PLAN_MODE_DATABASE_SECTION = `
 DATABASE:
 - Set includesFreshDatabase to true ONLY when the plan explicitly calls the provisionDatabase tool to create a new dev database
 - Do NOT set includesFreshDatabase for plans that merely query, migrate, or modify an existing database
 - This shows a "Fresh Database" indicator on the plan card so the user knows a new database will be created
-
+`;
+var EXIT_PLAN_MODE_DESCRIPTION_OUTRO = `
 Before presenting a plan:
 - If the user's request is ambiguous or has multiple interpretations, use askMultiChoice to clarify
 - If there are unknowns about requirements, preferences, or approach, use askMultiChoice first
@@ -566541,6 +566549,12 @@ After calling this tool, the user will either:
 Remember: Always use this tool to present plans - never output plans directly as text.
 IF THE TOOL CALL FAILS, DO NOT ATTEMPT TO GENERATE THE PLAN YOURSELF. Call the tool again.
 `;
+function buildExitPlanModeDescription(managedNativeDbEnabled) {
+  if (managedNativeDbEnabled) {
+    return EXIT_PLAN_MODE_DESCRIPTION_INTRO + EXIT_PLAN_MODE_DATABASE_SECTION + EXIT_PLAN_MODE_DESCRIPTION_OUTRO;
+  }
+  return EXIT_PLAN_MODE_DESCRIPTION_INTRO + EXIT_PLAN_MODE_DESCRIPTION_OUTRO;
+}
 
 // ../../../vite-plugin-file-sync/dist/ai-service/agent/tools2/tools/ask-multi-choice.js
 init_cjs_shims();
@@ -613463,8 +613477,8 @@ var ChatSessionStore = (() => {
 // ../../../vite-plugin-file-sync/dist/ai-service/context-download.js
 init_cjs_shims();
 var import_util18 = __toESM(require_dist3());
-import { mkdir as mkdir12, rm as rm10, writeFile as writeFile11 } from "node:fs/promises";
-import * as path43 from "node:path";
+import { mkdir as mkdir13, rm as rm11, writeFile as writeFile11 } from "node:fs/promises";
+import * as path44 from "node:path";
 
 // ../../../vite-plugin-file-sync/dist/ai-service/context-archive-paths.js
 init_cjs_shims();
@@ -613493,10 +613507,151 @@ function safeJoinUnderRoot(root3, ...segments) {
   return target;
 }
 
-// ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/storage/local.js
+// ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/storage/jsonl-event-store.js
 init_cjs_shims();
-import { readFile as readFile11, writeFile as writeFile10, mkdir as mkdir11, unlink as unlink2, rm as rm9 } from "node:fs/promises";
+import { readFile as readFile11, appendFile, mkdir as mkdir11, rm as rm9 } from "node:fs/promises";
 import * as path42 from "node:path";
+var logger3 = getPrefixedLogger("[jsonl-event-store]");
+var JsonlEventStore = class _JsonlEventStore {
+  rootDir;
+  static SUPERBLOCKS_SYSTEM_DIR = ".superblocks";
+  static EVENTS_SUBDIR = "events";
+  constructor(rootDir) {
+    this.rootDir = rootDir;
+  }
+  /**
+   * Append a single event to the log for the given context.
+   *
+   * Creates parent directories if they do not exist. Each call
+   * writes exactly one JSON line terminated by `\n`.
+   */
+  async appendEvent(id2, event) {
+    const filePath = this.getFilePath(id2);
+    await mkdir11(path42.dirname(filePath), { recursive: true });
+    await appendFile(filePath, JSON.stringify(event) + "\n");
+  }
+  /**
+   * Check whether any events exist for the given context.
+   */
+  async hasEvents(id2) {
+    try {
+      const content18 = await readFile11(this.getFilePath(id2), "utf-8");
+      return content18.trimEnd().length > 0;
+    } catch (err) {
+      if (err.code === "ENOENT") {
+        return false;
+      }
+      throw err;
+    }
+  }
+  /**
+   * Remove the event log for a single context. Missing files are
+   * treated as success so callers can use this as a fire-and-forget
+   * cleanup step.
+   */
+  async deleteEvents(id2) {
+    await rm9(this.getFilePath(id2), { force: true });
+  }
+  /**
+   * Remove the entire `.superblocks/events/` tree under `rootDir`.
+   *
+   * Used by clear-all flows so a subsequent `getOrCreateContext` does
+   * not silently restore a "deleted" conversation from disk.
+   */
+  async deleteAllEvents() {
+    await rm9(this.getEventsRoot(), { recursive: true, force: true });
+  }
+  /**
+   * Load conversation messages by scanning backward for the last
+   * compaction anchor, then reading forward from that point.
+   *
+   * A compaction anchor is either:
+   * - An event with `type === "compaction_received"`
+   * - An event with `_superblocks.isSummary === true` (migration seed)
+   *
+   * Each `EventLogEntry` is mapped to a `StoredMessage` so that
+   * consumers receive the AI SDK `ModelMessage` shape.
+   */
+  async loadMessages(id2) {
+    const filePath = this.getFilePath(id2);
+    let raw;
+    try {
+      raw = await readFile11(filePath, "utf-8");
+    } catch (err) {
+      if (err.code === "ENOENT") {
+        return [];
+      }
+      throw err;
+    }
+    const lines = raw.split("\n").filter((line3) => line3.length > 0);
+    if (lines.length === 0) {
+      return [];
+    }
+    const contextLabel = `${id2.appId}/${id2.userId}/${id2.name}`;
+    const events = [];
+    let corruptedCount = 0;
+    for (let i2 = 0; i2 < lines.length; i2++) {
+      const line3 = lines[i2];
+      try {
+        events.push(JSON.parse(line3));
+      } catch {
+        corruptedCount++;
+        logger3.warn(`Skipping corrupted JSONL line ${i2} for context '${contextLabel}' (length=${line3.length})`);
+      }
+    }
+    if (corruptedCount > 0) {
+      logger3.warn(`Encountered ${corruptedCount} corrupted line(s) in event log for context '${contextLabel}'; if any held a compaction anchor the loaded window may extend further back than expected.`);
+    }
+    let anchorIndex = -1;
+    for (let i2 = events.length - 1; i2 >= 0; i2--) {
+      const event = events[i2];
+      if (event.type === "compaction_received" || event._superblocks?.isSummary === true) {
+        anchorIndex = i2;
+        break;
+      }
+    }
+    if (anchorIndex < 0 && corruptedCount > 0) {
+      logger3.error(`No compaction anchor found for context '${contextLabel}' but ${corruptedCount} corrupted line(s) were skipped; the loaded conversation window may be unbounded.`);
+    }
+    const window2 = anchorIndex >= 0 ? events.slice(anchorIndex) : events;
+    return window2.map((event) => this.toStoredMessage(event));
+  }
+  /**
+   * Map an EventLogEntry to a StoredMessage (AI SDK ModelMessage shape).
+   *
+   * The cast is required at this JSON deserialization boundary: `content`
+   * is stored as `unknown` because AI SDK content shapes are polymorphic
+   * (string, content part arrays, tool results). The role is type-safe
+   * via `MessageRole`, but TypeScript cannot narrow the discriminated
+   * union without runtime content validation — which would be fragile
+   * against SDK version changes.
+   */
+  toStoredMessage(event) {
+    return {
+      role: event.role,
+      content: event.content,
+      ...event.providerMetadata && {
+        providerMetadata: event.providerMetadata
+      },
+      _superblocks: {
+        timestamp: event.timestamp,
+        ...event._superblocks
+      }
+    };
+  }
+  getEventsRoot() {
+    return path42.join(this.rootDir, _JsonlEventStore.SUPERBLOCKS_SYSTEM_DIR, _JsonlEventStore.EVENTS_SUBDIR);
+  }
+  getFilePath(id2) {
+    const root3 = this.getEventsRoot();
+    return safeJoinUnderRoot(root3, encodeContextPathSegment(id2.userId, "userId"), `${encodeContextPathSegment(id2.name, "name")}.jsonl`);
+  }
+};
+
+// ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/storage/local.js
+init_cjs_shims();
+import { readFile as readFile12, writeFile as writeFile10, mkdir as mkdir12, unlink as unlink2, rm as rm10 } from "node:fs/promises";
+import * as path43 from "node:path";
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/context-metrics.js
 init_cjs_shims();
@@ -613582,7 +613737,7 @@ function recordContextFileBytes(input) {
 }
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/storage/local.js
-var logger3 = getPrefixedLogger("[context-storage]");
+var logger4 = getPrefixedLogger("[context-storage]");
 var LARGE_CONTEXT_BYTES = 5 * 1024 * 1024;
 var LARGE_CONTEXT_MESSAGES = 1e3;
 var toMb = (bytes) => (bytes / 1024 / 1024).toFixed(1);
@@ -613595,11 +613750,11 @@ var LocalContextStorageV2 = class {
   async loadContext(id2) {
     const filePath = this.getFilePath(id2);
     try {
-      const content18 = await readFile11(filePath, "utf-8");
+      const content18 = await readFile12(filePath, "utf-8");
       const contentBytes = Buffer.byteLength(content18);
       recordContextFileBytes({ operation: "load", bytes: contentBytes });
       if (contentBytes > LARGE_CONTEXT_BYTES) {
-        logger3.info(`Parsing large context file '${id2.name}' (${toMb(contentBytes)}MB)...`);
+        logger4.info(`Parsing large context file '${id2.name}' (${toMb(contentBytes)}MB)...`);
       }
       return JSON.parse(content18);
     } catch (err) {
@@ -613613,13 +613768,13 @@ var LocalContextStorageV2 = class {
     const filePath = this.getFilePath(id2);
     await this.ensureBaseDirExists(filePath);
     if (record2.messages.length >= LARGE_CONTEXT_MESSAGES) {
-      logger3.info(`Serializing large context '${id2.name}' (${record2.messages.length} messages)...`);
+      logger4.info(`Serializing large context '${id2.name}' (${record2.messages.length} messages)...`);
     }
     const serialized = JSON.stringify(record2);
     const serializedBytes = Buffer.byteLength(serialized);
     recordContextFileBytes({ operation: "persist", bytes: serializedBytes });
     if (serializedBytes > LARGE_CONTEXT_BYTES) {
-      logger3.warn(`Context file '${id2.name}' is ${toMb(serializedBytes)}MB (${record2.messages.length} messages); save and reload costs scale with this size`);
+      logger4.warn(`Context file '${id2.name}' is ${toMb(serializedBytes)}MB (${record2.messages.length} messages); save and reload costs scale with this size`);
     }
     await writeFile10(filePath, serialized);
   }
@@ -613637,7 +613792,7 @@ var LocalContextStorageV2 = class {
   async deleteAllContexts() {
     const contextDir = this.getContextDir();
     try {
-      await rm9(contextDir, { recursive: true, force: true });
+      await rm10(contextDir, { recursive: true, force: true });
     } catch (err) {
       if (err.code === "ENOENT") {
         return;
@@ -613646,20 +613801,21 @@ var LocalContextStorageV2 = class {
     }
   }
   getContextDir() {
-    return path42.join(this.rootDir, this.SUPERBLOCKS_SYSTEM_DIR, "context");
+    return path43.join(this.rootDir, this.SUPERBLOCKS_SYSTEM_DIR, "context");
   }
   async ensureBaseDirExists(filePath) {
-    await mkdir11(path42.dirname(filePath), { recursive: true });
+    await mkdir12(path43.dirname(filePath), { recursive: true });
   }
   getFilePath(id2) {
-    return path42.join(this.rootDir, this.SUPERBLOCKS_SYSTEM_DIR, "context", id2.userId, `${id2.name}.json`);
+    return path43.join(this.rootDir, this.SUPERBLOCKS_SYSTEM_DIR, "context", id2.userId, `${id2.name}.json`);
   }
 };
 
 // ../../../vite-plugin-file-sync/dist/ai-service/context-download.js
 var EVENT_LOG_ARCHIVE_PREFIX = "events__";
+var CONTEXT_RECORD_VERSION = 2;
 function isContextRecordV2(record2) {
-  return typeof record2 === "object" && record2 !== null && "version" in record2 && record2.version === 2;
+  return typeof record2 === "object" && record2 !== null && "version" in record2 && record2.version === CONTEXT_RECORD_VERSION;
 }
 async function downloadContextFromBucketeer({ applicationId, commitId, branchName, superblocksBaseUrl, logger: logger22, jwt: jwt2, contextId, appRootDirPath }) {
   const bucketeerUrl = (0, import_util18.getBucketeerUrlFromSuperblocksUrl)(superblocksBaseUrl);
@@ -613742,10 +613898,13 @@ async function downloadAndParseContext({ url: url4, applicationId, superblocksBa
     const formData = await response.formData();
     const contextFiles = formData.getAll("context");
     let contextRecord = null;
+    const restoredEventLogFiles = [];
+    const allFileNames = [];
     for (const file2 of contextFiles) {
       if (!(file2 instanceof File)) {
         continue;
       }
+      allFileNames.push(file2.name);
       const eventLogFileName = file2.name.startsWith(EVENT_LOG_ARCHIVE_PREFIX) ? safeArchiveFileName(file2.name.slice(EVENT_LOG_ARCHIVE_PREFIX.length)) : void 0;
       if (file2.name === "main.json") {
         const fileContent = await file2.text();
@@ -613762,6 +613921,25 @@ async function downloadAndParseContext({ url: url4, applicationId, superblocksBa
           contextId,
           appRootDirPath
         });
+        restoredEventLogFiles.push(eventLogFileName);
+      }
+    }
+    if (!contextRecord && allFileNames.length > 0) {
+      logger22.warn(`[${logLabel}] 200 multipart response contained no main.json (applicationId=${applicationId}, contextId=${contextId?.name ?? "unknown"}, files=${allFileNames.join(", ")}). The archive may have been flushed mid-generation before the context record was persisted.`);
+    }
+    if (!contextRecord && restoredEventLogFiles.length > 0 && contextId && appRootDirPath) {
+      try {
+        const eventStore = new JsonlEventStore(appRootDirPath);
+        const messages3 = await eventStore.loadMessages(contextId);
+        if (messages3.length > 0) {
+          await eventStore.deleteEvents(contextId);
+          contextRecord = { version: CONTEXT_RECORD_VERSION, messages: messages3 };
+          logger22.info(`[${logLabel}] Rebuilt context record from event log (applicationId=${applicationId}, contextId=${contextId.name}, ${messages3.length} messages, files=${restoredEventLogFiles.join(", ")})`);
+        } else {
+          logger22.warn(`[${logLabel}] Event log restored but contained no loadable messages`);
+        }
+      } catch (err) {
+        logger22.error(`[${logLabel}] Failed to rebuild context from event log`, getErrorMeta2(err));
       }
     }
     return contextRecord;
@@ -613771,17 +613949,17 @@ async function downloadAndParseContext({ url: url4, applicationId, superblocksBa
   return null;
 }
 async function restoreEventLogFile({ file: file2, fileName, contextId, appRootDirPath }) {
-  const eventRoot = path43.join(appRootDirPath, ".superblocks", "events");
+  const eventRoot = path44.join(appRootDirPath, ".superblocks", "events");
   const eventDir = safeJoinUnderRoot(eventRoot, encodeContextPathSegment(contextId.userId, "userId"));
-  await mkdir12(eventDir, { recursive: true });
+  await mkdir13(eventDir, { recursive: true });
   const filePath = safeJoinUnderRoot(eventDir, fileName);
   const fileContent = await file2.arrayBuffer();
   await writeFile11(filePath, Buffer.from(fileContent));
 }
 async function clearLocalEventLog({ contextId, appRootDirPath }) {
-  const eventRoot = path43.join(appRootDirPath, ".superblocks", "events");
+  const eventRoot = path44.join(appRootDirPath, ".superblocks", "events");
   const eventDir = safeJoinUnderRoot(eventRoot, encodeContextPathSegment(contextId.userId, "userId"));
-  await rm10(eventDir, { recursive: true, force: true });
+  await rm11(eventDir, { recursive: true, force: true });
 }
 async function restoreContextFromCheckpoint({ applicationId, commitId, branchName, contextId, appRootDirPath, superblocksBaseUrl, logger: logger22, jwt: jwt2, contextManagerV2 }) {
   const contextStorageV2 = new LocalContextStorageV2(appRootDirPath);
@@ -613877,9 +614055,9 @@ async function restoreContextFromCheckpoint({ applicationId, commitId, branchNam
         });
         savedFiles.push(fileName);
       } else {
-        const contextRoot = path43.join(appRootDirPath, ".superblocks", "context");
+        const contextRoot = path44.join(appRootDirPath, ".superblocks", "context");
         const contextDir = safeJoinUnderRoot(contextRoot, contextId.userId);
-        await mkdir12(contextDir, { recursive: true });
+        await mkdir13(contextDir, { recursive: true });
         const filePath = safeJoinUnderRoot(contextDir, safeArchiveFileName(fileName));
         const fileContent = await file2.arrayBuffer();
         await writeFile11(filePath, Buffer.from(fileContent));
@@ -613914,15 +614092,15 @@ async function restoreContextFromCheckpoint({ applicationId, commitId, branchNam
 // ../../../vite-plugin-file-sync/dist/ai-service/context-upload.js
 init_cjs_shims();
 var import_util19 = __toESM(require_dist3());
-import { readdir as readdir9, readFile as readFile12 } from "node:fs/promises";
-import * as path44 from "node:path";
+import { readdir as readdir9, readFile as readFile13 } from "node:fs/promises";
+import * as path45 from "node:path";
 var EVENT_LOG_ARCHIVE_PREFIX2 = "events__";
 async function readDirectoryFiles({ dir, archiveName, onMissing }) {
   try {
     const entries = await readdir9(dir, { withFileTypes: true });
     return entries.filter((entry) => entry.isFile()).map((entry) => ({
       archiveName: archiveName(entry.name),
-      filePath: path44.join(dir, entry.name)
+      filePath: path45.join(dir, entry.name)
     }));
   } catch (err) {
     if (err.code === "ENOENT") {
@@ -613933,8 +614111,8 @@ async function readDirectoryFiles({ dir, archiveName, onMissing }) {
   }
 }
 async function uploadContextToBucketeer({ applicationId, commitId, branchName, appRootDirPath, userId, useServerUpload = false, superblocksBaseUrl, logger: logger22, jwt: jwt2 }) {
-  const contextRoot = path44.join(appRootDirPath, ".superblocks", "context");
-  const eventsRoot = path44.join(appRootDirPath, ".superblocks", "events");
+  const contextRoot = path45.join(appRootDirPath, ".superblocks", "context");
+  const eventsRoot = path45.join(appRootDirPath, ".superblocks", "events");
   const contextDir = safeJoinUnderRoot(contextRoot, userId);
   const eventDir = safeJoinUnderRoot(eventsRoot, encodeContextPathSegment(userId, "userId"));
   const filesToUpload = [
@@ -613957,7 +614135,7 @@ async function uploadContextToBucketeer({ applicationId, commitId, branchName, a
   const uploadedFiles = [];
   for (const file2 of filesToUpload) {
     try {
-      const fileBuffer = await readFile12(file2.filePath);
+      const fileBuffer = await readFile13(file2.filePath);
       contextFileData.push({ data: fileBuffer, archiveName: file2.archiveName });
       uploadedFiles.push(file2.archiveName);
     } catch (err) {
@@ -613968,6 +614146,10 @@ async function uploadContextToBucketeer({ applicationId, commitId, branchName, a
     logger22.warn(`[uploadContextToBucketeer] No files were successfully read for upload`);
     return { rawContextBytes: 0, fileCount: 0 };
   }
+  if (!uploadedFiles.includes("main.json")) {
+    logger22.warn(`[uploadContextToBucketeer] Skipping upload: archive has no main.json (applicationId=${applicationId}, userId=${userId}, files=${uploadedFiles.join(", ")}). This flush was likely triggered mid-generation before the context record was persisted.`);
+    return { rawContextBytes: 0, fileCount: 0 };
+  }
   const rawContextBytes = contextFileData.reduce((total, file2) => total + file2.data.length, 0);
   const buildFormData = () => {
     const formData = new FormData();
@@ -615517,7 +615699,7 @@ var JudgeService = class {
 // ../../../vite-plugin-file-sync/dist/ai-service/judge/storage/csv-storage.js
 init_cjs_shims();
 import { promises as fs19 } from "fs";
-import path45 from "path";
+import path46 from "path";
 var DEFAULT_STORAGE_DIR = ".superblocks/judge-evaluations";
 var CSV_HEADER = "timestamp,promptId,branchName,commitSha,appId,prompt,passed,score,feedback\n";
 var CsvJudgeStorage = class {
@@ -615529,7 +615711,7 @@ var CsvJudgeStorage = class {
    * @param filename - CSV filename (default: evaluations.csv)
    */
   constructor(storageDir = DEFAULT_STORAGE_DIR, filename = "evaluations.csv") {
-    this.filePath = path45.join(storageDir, filename);
+    this.filePath = path46.join(storageDir, filename);
   }
   /**
    * Ensures the storage directory and file exist.
@@ -615537,7 +615719,7 @@ var CsvJudgeStorage = class {
    * Creates directory if needed and initializes CSV with header row.
    */
   async ensureStorageExists() {
-    const dir = path45.dirname(this.filePath);
+    const dir = path46.dirname(this.filePath);
     await fs19.mkdir(dir, { recursive: true });
     try {
       await fs19.access(this.filePath);
@@ -616355,7 +616537,7 @@ init_cjs_shims();
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/compaction/server-side.js
 init_cjs_shims();
-var logger4 = getPrefixedLogger("[compaction:server-side]");
+var logger5 = getPrefixedLogger("[compaction:server-side]");
 var SERVER_COMPACTION_SUMMARY = "Server-side compaction applied";
 var SERVER_COMPACTION_INTERRUPTED_SUMMARY = "Server-side compaction interrupted before completion";
 var ServerSideCompactionStrategy = class {
@@ -616398,7 +616580,7 @@ var ServerSideCompactionStrategy = class {
       }
     }
     if (lastUserIndex < 0) {
-      logger4.warn("Server-side compaction detected but no user message present; skipping in-memory trim");
+      logger5.warn("Server-side compaction detected but no user message present; skipping in-memory trim");
       return { skillsNeedReload: true };
     }
     let lastSummaryIndex = -1;
@@ -616419,7 +616601,7 @@ var ServerSideCompactionStrategy = class {
       ...retainedPrefix,
       ...messages3.slice(lastUserIndex)
     ];
-    logger4.info(`Server-side compaction detected; trimmed in-memory history ${messages3.length} \u2192 ${trimmed2.length} messages`);
+    logger5.info(`Server-side compaction detected; trimmed in-memory history ${messages3.length} \u2192 ${trimmed2.length} messages`);
     return { messages: trimmed2, skillsNeedReload: true };
   }
   getProtectedToolNames(messages3) {
@@ -616477,7 +616659,7 @@ var CACHE_BREAKPOINT_PROVIDER_OPTIONS = {
   bedrock: { cachePoint: { type: "default" } },
   anthropic: { cacheControl: { type: "ephemeral" } }
 };
-var logger5 = getPrefixedLogger("[context-v2:types]");
+var logger6 = getPrefixedLogger("[context-v2:types]");
 function toJsonValue2(value2) {
   if (value2 === void 0) {
     return null;
@@ -616535,7 +616717,7 @@ function normalizeToolResultOutput(output) {
   ];
   const type = outputObj.type;
   if (!validTypes.includes(type)) {
-    logger5.warn(`Invalid tool result output type: ${type}. Normalizing to json type.`);
+    logger6.warn(`Invalid tool result output type: ${type}. Normalizing to json type.`);
     return toJsonOutput(output);
   }
   const valueRequiredTypes = /* @__PURE__ */ new Set([
@@ -616546,7 +616728,7 @@ function normalizeToolResultOutput(output) {
     "content"
   ]);
   if (valueRequiredTypes.has(type) && !("value" in outputObj)) {
-    logger5.warn(`Tool result output missing required value for type=${outputObj.type}. Normalizing to json type.`);
+    logger6.warn(`Tool result output missing required value for type=${outputObj.type}. Normalizing to json type.`);
     return toJsonOutput(output);
   }
   return toJsonOutput(output);
@@ -616560,7 +616742,7 @@ function normalizeToolMessage(msg) {
       const toolResult = part;
       const normalizedOutput = normalizeToolResultOutput(toolResult.output);
       if (normalizedOutput !== toolResult.output) {
-        logger5.debug(`Normalized tool result output for ${toolResult.toolName} (callId: ${toolResult.toolCallId})`);
+        logger6.debug(`Normalized tool result output for ${toolResult.toolName} (callId: ${toolResult.toolCallId})`);
       }
       return { ...toolResult, output: normalizedOutput };
     }
@@ -616659,7 +616841,7 @@ function repairBrokenToolCalls(msg, index2, messages3) {
     return part;
   });
   if (inputsFixed > 0) {
-    logger5.debug(`Fixed ${inputsFixed} tool call(s) with non-object input at index ${index2}`);
+    logger6.debug(`Fixed ${inputsFixed} tool call(s) with non-object input at index ${index2}`);
   }
   const toolResultIds = collectToolResultIds(messages3[index2 + 1]);
   const hasToolCalls = content18.some((part) => typeof part === "object" && part !== null && "type" in part && part.type === "tool-call");
@@ -616678,7 +616860,7 @@ function repairBrokenToolCalls(msg, index2, messages3) {
   });
   const removed = before2 - content18.length;
   if (removed > 0) {
-    logger5.debug(`Removed ${removed} orphaned tool call(s) from assistant message at index ${index2}`);
+    logger6.debug(`Removed ${removed} orphaned tool call(s) from assistant message at index ${index2}`);
   }
   return { ...msg, content: content18 };
 }
@@ -616704,7 +616886,7 @@ function repairOrphanedToolResults(msg, index2, messages3) {
   });
   const removed = before2 - content18.length;
   if (removed > 0) {
-    logger5.debug(`Removed ${removed} orphaned tool result(s) from tool message at index ${index2}`);
+    logger6.debug(`Removed ${removed} orphaned tool result(s) from tool message at index ${index2}`);
   }
   return { ...msg, content: content18 };
 }
@@ -616730,7 +616912,7 @@ function enforceToolUsePairing(messages3) {
     });
     if (strippedToolUses.length === 0)
       return msg;
-    logger5.warn(`enforceToolUsePairing: stripped ${strippedToolUses.length} orphan tool_use part(s) [${strippedToolUses.join(", ")}] from assistant message at input index ${i2}`);
+    logger6.warn(`enforceToolUsePairing: stripped ${strippedToolUses.length} orphan tool_use part(s) [${strippedToolUses.join(", ")}] from assistant message at input index ${i2}`);
     return { ...msg, content: content18 };
   });
   return stripped.filter((msg) => {
@@ -616740,7 +616922,7 @@ function enforceToolUsePairing(messages3) {
       return true;
     if (Array.isArray(msg.content) && msg.content.length > 0)
       return true;
-    logger5.debug(`enforceToolUsePairing: dropped empty ${msg.role} message after stripping`);
+    logger6.debug(`enforceToolUsePairing: dropped empty ${msg.role} message after stripping`);
     return false;
   });
 }
@@ -616935,7 +617117,7 @@ function uniquifyFilePartFilenames(messages3) {
 }
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/context.js
-var logger6 = getPrefixedLogger("[context-v2]");
+var logger7 = getPrefixedLogger("[context-v2]");
 var SLOW_PERSIST_WARN_MS = 500;
 var REPLAY_YIELD_INTERVAL = 100;
 var ZERO_USAGE = {
@@ -616988,7 +617170,7 @@ function stripScreenshotMediaFromToolMessage(msg) {
   if (!modified) {
     return msg;
   }
-  logger6.info("Stripped screenshot media from tool message before storage");
+  logger7.info("Stripped screenshot media from tool message before storage");
   return { ...msg, content: strippedContent };
 }
 var ContextV2 = class _ContextV2 {
@@ -617031,6 +617213,27 @@ var ContextV2 = class _ContextV2 {
     this.contextId = options8.contextId;
     this.compaction = options8.compaction ?? new ServerSideCompactionStrategy();
   }
+  // Cached result of getMessages() normalization. Avoids recomputing
+  // 10+ repair/normalization passes when messages haven't changed.
+  // Invalidated by any operation that modifies this.messages or systemPrompt.
+  // NOTE: Returns a shallow copy of the cached array. Element references are
+  // shared — callers must treat returned message objects as read-only.
+  _cachedMessages = null;
+  /**
+   * Call this before AND after every operation that modifies `this.messages`
+   * or `this.systemPrompt`. Pre-enqueue call prevents fast-path cache hits
+   * while the mutation is queued; post-mutation call handles the scenario where
+   * a `getMessages()` queue op ran and cached a result between enqueue and
+   * execution.
+   *
+   * CHECKLIST for new mutation methods:
+   * - Synchronous mutations: call once after the mutation.
+   * - Async queue mutations: call once before enqueue, once after the mutation
+   *   inside the queue op.
+   */
+  invalidateMessageCache() {
+    this._cachedMessages = null;
+  }
   updateConfig(config4) {
     this.config = { ...this.config, ...config4 };
     this.compaction.updateConfig(config4);
@@ -617108,11 +617311,13 @@ var ContextV2 = class _ContextV2 {
     return this.attachments;
   }
   truncateAfterTimestamp(timestamp) {
+    this.invalidateMessageCache();
     void this.queue.enqueue(async () => {
       const initialCount = this.messages.length;
       this.messages = this.messages.filter((msg) => !msg._superblocks?.timestamp || msg._superblocks.timestamp <= timestamp);
+      this.invalidateMessageCache();
       const removed = initialCount - this.messages.length;
-      logger6.info(`Truncated context after timestamp ${timestamp}. Removed ${removed} messages, ${this.messages.length} remaining.`);
+      logger7.info(`Truncated context after timestamp ${timestamp}. Removed ${removed} messages, ${this.messages.length} remaining.`);
       await this.persist("truncate");
     });
   }
@@ -617132,12 +617337,15 @@ var ContextV2 = class _ContextV2 {
   }
   setSystemPrompt(prompt) {
     this.systemPrompt = toStoredMessage(prompt);
+    this.invalidateMessageCache();
   }
   async addUserMessage(message) {
     this.serverCompactionCompletedBeforeStart = false;
+    this.invalidateMessageCache();
     return this.queue.enqueue(async () => {
       const storedMessage = toStoredMessage(message);
       this.messages.push(storedMessage);
+      this.invalidateMessageCache();
       await this.appendEvent("prompt_sent", storedMessage);
     });
   }
@@ -617153,6 +617361,7 @@ var ContextV2 = class _ContextV2 {
    * persistent contexts, re-append every message to the event log).
    */
   async initializeWith(messages3) {
+    this.invalidateMessageCache();
     const tracer4 = this.tracer ?? LLMObsTracer.instance;
     return tracer4.trace({ kind: "task", name: "context.replay" }, (span) => this.replayMessages(messages3, tracer4, span));
   }
@@ -617162,7 +617371,7 @@ var ContextV2 = class _ContextV2 {
     await this.queue.enqueue(async () => {
       const replayStartedAt = performance.now();
       if (this.messages.length > 0) {
-        logger6.warn(`initializeWith called on a non-empty context (${this.messages.length} existing messages); appending \u2014 this likely duplicates history`);
+        logger7.warn(`initializeWith called on a non-empty context (${this.messages.length} existing messages); appending \u2014 this likely duplicates history`);
       }
       for (let i2 = 0; i2 < messages3.length; i2++) {
         if (i2 > 0 && i2 % REPLAY_YIELD_INTERVAL === 0) {
@@ -617189,6 +617398,7 @@ var ContextV2 = class _ContextV2 {
         await this.appendEvent("response_received", storedResponse, eventUsage);
       }
       this.stripAllButLatestScreenshot();
+      this.invalidateMessageCache();
       await this.persist("replay");
       replayMs = Math.round(performance.now() - replayStartedAt);
     });
@@ -617196,13 +617406,15 @@ var ContextV2 = class _ContextV2 {
     tracer4.annotate(span, {
       metadata: { messageCount: messages3.length, queueWaitMs, replayMs }
     });
-    logger6.info(`initializeWith: replayed ${messages3.length} messages in ${replayMs}ms (queueWaitMs=${queueWaitMs})`);
+    logger7.info(`initializeWith: replayed ${messages3.length} messages in ${replayMs}ms (queueWaitMs=${queueWaitMs})`);
   }
   async addResponse(response, usage) {
+    this.invalidateMessageCache();
     await this.queue.enqueue(async () => {
       const storedResponse = this.ingestResponse(response, usage, {
         stripOlderScreenshots: true
       });
+      this.invalidateMessageCache();
       if (response.role === "assistant" || response.role === "tool") {
         const eventUsage = response.role === "assistant" ? extractTokenUsage(usage) : void 0;
         await this.appendEvent("response_received", storedResponse, eventUsage);
@@ -617232,6 +617444,7 @@ var ContextV2 = class _ContextV2 {
     if (responses.length === 0) {
       return;
     }
+    this.invalidateMessageCache();
     await this.queue.enqueue(async () => {
       for (const response of responses) {
         const storedResponse = this.ingestResponse(response, usage, {
@@ -617243,6 +617456,7 @@ var ContextV2 = class _ContextV2 {
         }
       }
       this.stripAllButLatestScreenshot();
+      this.invalidateMessageCache();
     });
     const lastResponse = responses[responses.length - 1];
     if (lastResponse) {
@@ -617292,7 +617506,7 @@ var ContextV2 = class _ContextV2 {
             }
           }
           if (strippedCount > 0) {
-            logger6.info(`Stripped media from ${strippedCount} older screenshot(s)`);
+            logger7.info(`Stripped media from ${strippedCount} older screenshot(s)`);
           }
         }
         const extraMeta = this.compaction.collectToolMetadata(normalized) ?? {};
@@ -617324,7 +617538,7 @@ var ContextV2 = class _ContextV2 {
       strippedCount++;
     }
     if (strippedCount > 0) {
-      logger6.info(`Stripped media from ${strippedCount} older screenshot(s)`);
+      logger7.info(`Stripped media from ${strippedCount} older screenshot(s)`);
     }
   }
   /**
@@ -617364,6 +617578,7 @@ var ContextV2 = class _ContextV2 {
       });
       if (result.messages) {
         this.messages = result.messages;
+        this.invalidateMessageCache();
       }
       if (result.skillsNeedReload) {
         this.skillsNeedReload = true;
@@ -617377,14 +617592,21 @@ var ContextV2 = class _ContextV2 {
     });
   }
   async getMessages() {
+    if (this._cachedMessages) {
+      logger7.debug(`getMessages: cache hit (${this._cachedMessages.length} messages)`);
+      return [...this._cachedMessages];
+    }
     return this.queue.enqueue(async () => {
+      if (this._cachedMessages) {
+        return [...this._cachedMessages];
+      }
       const conversationMessages = this.messages.filter((msg) => msg.role !== "system");
       const allMessages = this.systemPrompt ? [this.systemPrompt, ...conversationMessages] : [...conversationMessages];
       const sanitized = toSdkMessages(allMessages);
       const normalized = sanitized.map((msg) => normalizeToolMessage(stripUndefinedFromToolOutputs(msg)));
       const repaired = normalized.map(repairBrokenToolCalls).map(repairOrphanedToolResults).filter((msg) => {
         if (msg.role !== "user" && Array.isArray(msg.content) && msg.content.length === 0) {
-          logger6.debug(`Filtered out empty ${msg.role} message after repair`);
+          logger7.debug(`Filtered out empty ${msg.role} message after repair`);
           return false;
         }
         return true;
@@ -617396,11 +617618,11 @@ var ContextV2 = class _ContextV2 {
       }
       const signatureSafe = stripUnsignedReasoning(repaired);
       if (signatureSafe.length < repaired.length) {
-        logger6.debug(`Stripped ${repaired.length - signatureSafe.length} message(s) with unsigned reasoning`);
+        logger7.debug(`Stripped ${repaired.length - signatureSafe.length} message(s) with unsigned reasoning`);
       }
       const prefillSafe = stripTrailingAssistantPrefill(signatureSafe);
       if (prefillSafe.length < signatureSafe.length) {
-        logger6.debug(`Stripped ${signatureSafe.length - prefillSafe.length} trailing assistant prefill message(s)`);
+        logger7.debug(`Stripped ${signatureSafe.length - prefillSafe.length} trailing assistant prefill message(s)`);
       }
       const deduped = uniquifyFilePartFilenames(prefillSafe);
       const enforced = enforceToolUsePairing(deduped);
@@ -617414,15 +617636,18 @@ var ContextV2 = class _ContextV2 {
           enforced[idx].providerOptions = CACHE_BREAKPOINT_PROVIDER_OPTIONS;
         }
       }
-      return enforced;
+      this._cachedMessages = enforced;
+      return [...enforced];
     });
   }
   async onCompactionDetected() {
     const detectedGeneration = this.activeServerCompactionGeneration;
+    this.invalidateMessageCache();
     await this.queue.enqueue(async () => {
       const result = this.compaction.onCompactionDetected(this.messages);
       if (result.messages) {
         this.messages = result.messages;
+        this.invalidateMessageCache();
       }
       if (result.skillsNeedReload) {
         this.skillsNeedReload = true;
@@ -617431,7 +617656,7 @@ var ContextV2 = class _ContextV2 {
       const summary = typeof marker17?.content === "string" ? marker17.content : SERVER_COMPACTION_SUMMARY;
       this.completeServerCompactionMessage(summary, detectedGeneration);
       if (!this.eventStore || !this.contextId) {
-        logger6.info("Server-side compaction detected (no event store configured)");
+        logger7.info("Server-side compaction detected (no event store configured)");
         return;
       }
       const entry = {
@@ -617447,9 +617672,9 @@ var ContextV2 = class _ContextV2 {
           await this.eventStore.appendEvent(this.contextId, this.toEventLogEntry(message));
         }
       } catch (err) {
-        logger6.error(`Failed to append compaction_received event: ${err}`);
+        logger7.error(`Failed to append compaction_received event: ${err}`);
       }
-      logger6.info(`Server-side compaction detected, wrote compaction_received event and replayed ${retainedMessages.length} retained message(s)`);
+      logger7.info(`Server-side compaction detected, wrote compaction_received event and replayed ${retainedMessages.length} retained message(s)`);
     });
   }
   ensureServerCompactionMessageStarted() {
@@ -617499,7 +617724,7 @@ var ContextV2 = class _ContextV2 {
     try {
       await this.eventStore.appendEvent(this.contextId, entry);
     } catch (err) {
-      logger6.error(`Failed to append ${type} event: ${err}`);
+      logger7.error(`Failed to append ${type} event: ${err}`);
     }
   }
   async appendCompactionWindow(messages3) {
@@ -617508,7 +617733,7 @@ var ContextV2 = class _ContextV2 {
     }
     const windowMessages = messages3.filter((msg) => msg.role !== "system");
     if (windowMessages.length === 0) {
-      logger6.warn("Compaction window is empty after system-role filtering; skipping event log write");
+      logger7.warn("Compaction window is empty after system-role filtering; skipping event log write");
       return;
     }
     const needsMarker = windowMessages[0]?._superblocks?.isSummary !== true;
@@ -617524,9 +617749,9 @@ var ContextV2 = class _ContextV2 {
       for (const message of windowMessages) {
         await this.eventStore.appendEvent(this.contextId, this.toEventLogEntry(message));
       }
-      logger6.info(`Wrote ${windowMessages.length} client-side compaction message(s) to event log (anchor: ${needsMarker ? "phase-1 marker" : "isSummary message"})`);
+      logger7.info(`Wrote ${windowMessages.length} client-side compaction message(s) to event log (anchor: ${needsMarker ? "phase-1 marker" : "isSummary message"})`);
     } catch (err) {
-      logger6.error(`Failed to append client-side compaction window: ${err}`);
+      logger7.error(`Failed to append client-side compaction window: ${err}`);
     }
   }
   toEventLogEntry(message) {
@@ -617571,7 +617796,7 @@ var ContextV2 = class _ContextV2 {
         await onPersist(this.toRecord());
       } catch (err) {
         persistError = err;
-        logger6.error(`Failed to persist context: ${err}`);
+        logger7.error(`Failed to persist context: ${err}`);
       }
       const elapsedMs = performance.now() - startedAt;
       tracer4.annotate(span, {
@@ -617584,7 +617809,7 @@ var ContextV2 = class _ContextV2 {
       });
       recordContextPersist({ trigger, durationMs: elapsedMs });
       if (elapsedMs > SLOW_PERSIST_WARN_MS) {
-        logger6.warn(`slow persist: ${Math.round(elapsedMs)}ms (messages=${this.messages.length})`);
+        logger7.warn(`slow persist: ${Math.round(elapsedMs)}ms (messages=${this.messages.length})`);
       }
     });
   }
@@ -617592,7 +617817,7 @@ var ContextV2 = class _ContextV2 {
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/adapter.js
 init_cjs_shims();
-var logger7 = getPrefixedLogger("[context-v2-adapter]");
+var logger8 = getPrefixedLogger("[context-v2-adapter]");
 var createUsage = (inputTokens = 0, outputTokens = 0) => ({
   inputTokens,
   outputTokens,
@@ -617633,7 +617858,7 @@ var ContextV2Adapter = class _ContextV2Adapter {
     const newResponses = responses.slice(this.responseCount);
     this.responseCount = responses.length;
     if (!usage) {
-      logger7.warn("endStep called without usage data - compaction may not trigger");
+      logger8.warn("endStep called without usage data - compaction may not trigger");
     }
     this.lastUsage = usage ?? this.lastUsage;
     const effectiveUsage = usage ?? this.lastUsage ?? createUsage();
@@ -618066,7 +618291,7 @@ function getProviderId(model) {
     return "string-model";
   return model.provider ?? "unknown";
 }
-var logger8 = getPrefixedLogger("[phase2-session-summarizer]");
+var logger9 = getPrefixedLogger("[phase2-session-summarizer]");
 function getMediaType(value2) {
   if (value2.mediaType) {
     return value2.mediaType;
@@ -618203,7 +618428,7 @@ async function summarizeSession(options8) {
               headers: response?.headers
             }
           };
-          logger8.warn("Summarization produced empty summary - debug info:", debugInfo);
+          logger9.warn("Summarization produced empty summary - debug info:", debugInfo);
           throw new Error(`Summarization produced empty summary. finishReason=${finishReason}, model=${getModelId(model)}, inputTokens=${usage?.inputTokens}, outputTokens=${usage?.outputTokens}`);
         }
         tracer4.annotate(llmSpan, {
@@ -618228,7 +618453,7 @@ async function summarizeSession(options8) {
     const MAX_SPLIT_DEPTH = 10;
     async function summarizeWithSplitting(msgs, depth = 0) {
       if (depth >= MAX_SPLIT_DEPTH) {
-        logger8.warn(`Summarization split depth limit reached (${MAX_SPLIT_DEPTH}). Falling back to truncation.`);
+        logger9.warn(`Summarization split depth limit reached (${MAX_SPLIT_DEPTH}). Falling back to truncation.`);
         return createTruncationFallback(messages3, tracer4);
       }
       if (msgs.length < 2) {
@@ -618236,10 +618461,10 @@ async function summarizeSession(options8) {
           return await callLLM(msgs);
         } catch (error40) {
           if (isTokenLimitError(error40)) {
-            logger8.warn(`Token limit exceeded even with ${msgs.length} message(s). Falling back to truncation.`);
+            logger9.warn(`Token limit exceeded even with ${msgs.length} message(s). Falling back to truncation.`);
             return createTruncationFallback(messages3, tracer4);
           }
-          logger8.error(`LLM summarization failed. Falling back to truncation. Error: ${JSON.stringify(error40)}`, error40);
+          logger9.error(`LLM summarization failed. Falling back to truncation. Error: ${JSON.stringify(error40)}`, error40);
           return createTruncationFallback(messages3, tracer4);
         }
       }
@@ -618248,13 +618473,13 @@ async function summarizeSession(options8) {
         return result2;
       } catch (error40) {
         if (!isTokenLimitError(error40)) {
-          logger8.error(`LLM summarization failed. Falling back to truncation. Error: ${JSON.stringify(error40)}`, error40);
+          logger9.error(`LLM summarization failed. Falling back to truncation. Error: ${JSON.stringify(error40)}`, error40);
           return createTruncationFallback(messages3, tracer4);
         }
         const midpoint = Math.floor(msgs.length / 2);
         const firstHalf = msgs.slice(0, midpoint);
         const secondHalf = msgs.slice(midpoint);
-        logger8.warn(`Token limit exceeded with ${msgs.length} messages (depth=${depth}). Splitting: first half (${firstHalf.length}), second half (${secondHalf.length})`);
+        logger9.warn(`Token limit exceeded with ${msgs.length} messages (depth=${depth}). Splitting: first half (${firstHalf.length}), second half (${secondHalf.length})`);
         const firstResult = await tracer4.trace({ name: "session.summarize.split", kind: "task" }, async (splitSpan) => {
           tracer4.annotate(splitSpan, {
             metadata: {
@@ -618304,8 +618529,8 @@ async function summarizeSession(options8) {
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/session-capture.js
 init_cjs_shims();
 import { writeFileSync as writeFileSync2, mkdirSync, existsSync as existsSync3 } from "node:fs";
-import { join as join18 } from "node:path";
-var logger9 = getPrefixedLogger("[session-capture]");
+import { join as join19 } from "node:path";
+var logger10 = getPrefixedLogger("[session-capture]");
 var CAPTURE_ENABLED = false;
 function isTestEnvironment() {
   return process.env.VITEST === "true" || process.env.NODE_ENV === "test";
@@ -618317,7 +618542,7 @@ function isEnabled() {
   return CAPTURE_ENABLED;
 }
 function getCaptureDir(rootDir) {
-  return join18(rootDir, ".superblocks", "captured-sessions");
+  return join19(rootDir, ".superblocks", "captured-sessions");
 }
 function ensureDir(captureDir) {
   if (!existsSync3(captureDir)) {
@@ -618340,18 +618565,18 @@ function captureSession(data3, rootDir) {
       usage: data3.usage
     };
     const filename = generateFilename();
-    const filepath = join18(captureDir, filename);
+    const filepath = join19(captureDir, filename);
     writeFileSync2(filepath, JSON.stringify(session, null, 2));
-    logger9.info(`Captured session to ${filepath}`);
+    logger10.info(`Captured session to ${filepath}`);
     return filepath;
   } catch (err) {
-    logger9.error(`Failed to capture session: ${err}`);
+    logger10.error(`Failed to capture session: ${err}`);
     return null;
   }
 }
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/compactor.js
-var logger10 = getPrefixedLogger("[context-v2:compactor]");
+var logger11 = getPrefixedLogger("[context-v2:compactor]");
 async function compact(options8) {
   const { messages: messages3, usage, model, config: config4 = {}, callbacks, tracer: tracer4 = LLMObsTracer.instance, rootDir } = options8;
   return tracer4.trace({ name: "context.compaction", kind: "task" }, async (compactionSpan) => {
@@ -618373,7 +618598,7 @@ async function compact(options8) {
     }, rootDir);
     const pruneableTokens = calculatePruneableTokens(messages3, phase1ProtectedTokens);
     if (phase1Enabled && pruneableTokens >= phase1MinPruneable) {
-      logger10.info(`Phase 1: summarizing tool outputs (${pruneableTokens} pruneable tokens)`);
+      logger11.info(`Phase 1: summarizing tool outputs (${pruneableTokens} pruneable tokens)`);
       const phase1MessageId = crypto.randomUUID();
       callbacks?.onCompactionStart?.("phase1", phase1MessageId);
       const result = tracer4.trace({ name: "context.compaction.phase1", kind: "task" }, (phase1Span) => {
@@ -618402,7 +618627,7 @@ async function compact(options8) {
       });
       currentMessages = result.messages;
       phase1Applied = true;
-      logger10.info(`Phase 1 complete: summarized ${result.summarizedCount} tool outputs`);
+      logger11.info(`Phase 1 complete: summarized ${result.summarizedCount} tool outputs`);
       callbacks?.onCompactionComplete?.("phase1", phase1MessageId);
       const estimatedNewTokens = initialTokens - pruneableTokens;
       if (estimatedNewTokens < targetTokens) {
@@ -618439,7 +618664,7 @@ async function compact(options8) {
         };
       }
     }
-    logger10.info("Phase 2: generating session summary");
+    logger11.info("Phase 2: generating session summary");
     const phase2MessageId = crypto.randomUUID();
     callbacks?.onCompactionStart?.("phase2", phase2MessageId);
     const summaryResult = await tracer4.trace({ name: "context.compaction.phase2", kind: "task" }, async (phase2Span) => {
@@ -618467,7 +618692,7 @@ async function compact(options8) {
     currentMessages = summaryResult.messages;
     const summaryTokens = summaryResult.messages.reduce((sum, msg) => sum + (msg._superblocks?.tokenCount ?? 100), 0);
     tokensSaved = initialTokens - summaryTokens;
-    logger10.info(`Phase 2 complete: ${initialTokens}\u2192${summaryTokens} tokens (saved ${tokensSaved})`);
+    logger11.info(`Phase 2 complete: ${initialTokens}\u2192${summaryTokens} tokens (saved ${tokensSaved})`);
     callbacks?.onCompactionComplete?.("phase2", phase2MessageId, summaryResult.summary);
     tracer4.annotate(compactionSpan, {
       metadata: {
@@ -618503,7 +618728,7 @@ async function compact(options8) {
 }
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/compaction/client-side.js
-var logger11 = getPrefixedLogger("[compaction:client-side]");
+var logger12 = getPrefixedLogger("[compaction:client-side]");
 var ClientSideCompactionStrategy = class {
   summarizationModel;
   config;
@@ -618583,15 +618808,15 @@ var ClientSideCompactionStrategy = class {
     const inputContextUsed = computeContextUsed(params.usage);
     const threshold = this.config.contextLimit - this.config.maxOutputTokens - this.config.contextBufferTokens;
     if (inputContextUsed === 0) {
-      logger11.warn("Compaction threshold check skipped because provider usage reported 0 input context tokens");
+      logger12.warn("Compaction threshold check skipped because provider usage reported 0 input context tokens");
       return {};
     }
     if (inputContextUsed <= threshold) {
       return {};
     }
-    logger11.info(`Compaction triggered: ${inputContextUsed} tokens > ${threshold} threshold (${params.messages.length} messages)`);
+    logger12.info(`Compaction triggered: ${inputContextUsed} tokens > ${threshold} threshold (${params.messages.length} messages)`);
     if (!this.summarizationModel) {
-      logger11.warn("Client-side compaction is selected but no summarization model is configured; skipping compaction");
+      logger12.warn("Client-side compaction is selected but no summarization model is configured; skipping compaction");
       return {};
     }
     const result = await compact({
@@ -618609,7 +618834,7 @@ var ClientSideCompactionStrategy = class {
     } else if (result.phase1Applied) {
       phase = "phase1";
     }
-    logger11.info(`Compaction complete (${phase}): saved ${result.tokensSaved} tokens, ${params.messages.length}\u2192${result.messages.length} messages`);
+    logger12.info(`Compaction complete (${phase}): saved ${result.tokensSaved} tokens, ${params.messages.length}\u2192${result.messages.length} messages`);
     const messages3 = result.messages.map((msg) => ({
       ...msg,
       _superblocks: {
@@ -618627,12 +618852,12 @@ var ClientSideCompactionStrategy = class {
             role: "user",
             content: buildModeMessage(modeState.mode, modeState.planApproved)
           }));
-          logger11.info(`Re-injected mode context after phase 2 compaction (mode=${modeState.mode})`);
+          logger12.info(`Re-injected mode context after phase 2 compaction (mode=${modeState.mode})`);
         } else if (this.getModeState) {
-          logger11.warn("Phase 2 compaction completed but getModeState() returned undefined; mode context will NOT be re-injected");
+          logger12.warn("Phase 2 compaction completed but getModeState() returned undefined; mode context will NOT be re-injected");
         }
       } catch (err) {
-        logger11.error(`Failed to re-inject mode state after phase 2 compaction: ${err}`);
+        logger12.error(`Failed to re-inject mode state after phase 2 compaction: ${err}`);
       }
     }
     return {
@@ -618763,11 +618988,11 @@ function hasMigrationPath(fromVersion, toVersion) {
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/migrations/runner.js
 init_cjs_shims();
-var logger12 = getPrefixedLogger("[context-migration]");
+var logger13 = getPrefixedLogger("[context-migration]");
 function migrateContext(record2, targetVersion) {
   const currentVersion = detectVersion(record2);
   if (currentVersion === 0) {
-    logger12.error(`Unrecognized context format, cannot determine version. Deleting context.`);
+    logger13.error(`Unrecognized context format, cannot determine version. Deleting context.`);
     return {
       success: false,
       deleted: true,
@@ -618775,14 +619000,14 @@ function migrateContext(record2, targetVersion) {
     };
   }
   if (currentVersion === targetVersion) {
-    logger12.debug(`Context already at version ${targetVersion}, no migration needed`);
+    logger13.debug(`Context already at version ${targetVersion}, no migration needed`);
     return {
       success: true,
       record: record2
     };
   }
   if (currentVersion > targetVersion) {
-    logger12.error(`Context version ${currentVersion} is newer than expected version ${targetVersion}. Downgrade is not supported. Deleting context.`);
+    logger13.error(`Context version ${currentVersion} is newer than expected version ${targetVersion}. Downgrade is not supported. Deleting context.`);
     return {
       success: false,
       deleted: true,
@@ -618790,21 +619015,21 @@ function migrateContext(record2, targetVersion) {
     };
   }
   if (!hasMigrationPath(currentVersion, targetVersion)) {
-    logger12.error(`No migration path from version ${currentVersion} to ${targetVersion}. Deleting context.`);
+    logger13.error(`No migration path from version ${currentVersion} to ${targetVersion}. Deleting context.`);
     return {
       success: false,
       deleted: true,
       reason: `No migration path from ${currentVersion} to ${targetVersion}`
     };
   }
-  logger12.debug(`Migrating context from version ${currentVersion} to ${targetVersion}`);
+  logger13.debug(`Migrating context from version ${currentVersion} to ${targetVersion}`);
   let migrated = record2;
   for (let v2 = currentVersion; v2 < targetVersion; v2++) {
     const migration = getMigration(v2, v2 + 1);
     try {
       migrated = migration.migrate(migrated);
     } catch (err) {
-      logger12.error(`Migration v${v2} \u2192 v${v2 + 1} failed: ${err}. Deleting context.`);
+      logger13.error(`Migration v${v2} \u2192 v${v2 + 1} failed: ${err}. Deleting context.`);
       return {
         success: false,
         deleted: true,
@@ -618820,7 +619045,7 @@ function migrateContext(record2, targetVersion) {
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/storage/migration.js
 init_cjs_shims();
-var logger13 = getPrefixedLogger("[context-v2-migrator]");
+var logger14 = getPrefixedLogger("[context-v2-migrator]");
 var ContextV2Migrator = class {
   legacyStorage;
   eventStore;
@@ -618848,7 +619073,7 @@ var ContextV2Migrator = class {
     }
     const result = migrateContext(rawRecord, 2);
     if (!result.success) {
-      logger13.warn(`Cannot migrate context '${contextId.name}': ${result.reason}`);
+      logger14.warn(`Cannot migrate context '${contextId.name}': ${result.reason}`);
       return false;
     }
     const { messages: messages3 } = result.record;
@@ -618870,15 +619095,15 @@ var ContextV2Migrator = class {
         written++;
       }
     } catch (err) {
-      logger13.error(`Migration failed after writing ${written}/${slice2.length} events for context '${contextId.name}': ${err}`);
+      logger14.error(`Migration failed after writing ${written}/${slice2.length} events for context '${contextId.name}': ${err}`);
       try {
         await this.eventStore.deleteEvents(contextId);
       } catch (cleanupErr) {
-        logger13.error(`Failed to clean up partial event log for context '${contextId.name}': ${cleanupErr}`);
+        logger14.error(`Failed to clean up partial event log for context '${contextId.name}': ${cleanupErr}`);
       }
       throw err;
     }
-    logger13.info(`Migrated ${slice2.length} messages from ContextV2 to event log for context '${contextId.name}'`);
+    logger14.info(`Migrated ${slice2.length} messages from ContextV2 to event log for context '${contextId.name}'`);
     return true;
   }
   /**
@@ -618917,7 +619142,7 @@ var ContextV2Migrator = class {
 };
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/manager.js
-var logger14 = getPrefixedLogger("[context-manager-v2]");
+var logger15 = getPrefixedLogger("[context-manager-v2]");
 var ContextManagerV2 = class {
   storage;
   contexts = /* @__PURE__ */ new Map();
@@ -618982,10 +619207,10 @@ var ContextManagerV2 = class {
     };
     let context2;
     if (record2) {
-      logger14.info(`Restored context '${id2?.name}' from storage in ${loadMs}ms (messages=${record2.messages.length})`);
+      logger15.info(`Restored context '${id2?.name}' from storage in ${loadMs}ms (messages=${record2.messages.length})`);
       context2 = ContextV2.fromRecord(record2, options8);
     } else {
-      logger14.info(`Creating new context '${id2?.name ?? "ephemeral"}' (load took ${loadMs}ms)`);
+      logger15.info(`Creating new context '${id2?.name ?? "ephemeral"}' (load took ${loadMs}ms)`);
       context2 = new ContextV2(options8);
     }
     if (key2) {
@@ -619002,7 +619227,7 @@ var ContextManagerV2 = class {
    */
   async loadRecordTraced(id2, tracer4) {
     return tracer4.trace({ kind: "task", name: "context.load" }, async (span) => {
-      logger14.info(`Loading context '${id2.name}' from storage...`);
+      logger15.info(`Loading context '${id2.name}' from storage...`);
       const loadStartedAt = performance.now();
       try {
         const { record: record2, source: source2, migrationRan, migrationFailed } = await this.loadRecord(id2);
@@ -619036,10 +619261,10 @@ var ContextManagerV2 = class {
       try {
         migrationRan = await this.migrator.migrateIfNeeded(id2);
         if (migrationRan) {
-          logger14.info(`Migrated context '${id2.name}' from ContextV2 to event log`);
+          logger15.info(`Migrated context '${id2.name}' from ContextV2 to event log`);
         }
       } catch (err) {
-        logger14.error(`Failed to migrate context '${id2.name}', falling back to legacy storage: ${err}`);
+        logger15.error(`Failed to migrate context '${id2.name}', falling back to legacy storage: ${err}`);
         migrationFailed = true;
       }
     }
@@ -619049,11 +619274,11 @@ var ContextManagerV2 = class {
         if (messages3.length > 0) {
           const legacyRecord2 = await this.loadContext(id2);
           const record2 = await this.reconcileEventAndLegacyRecord(id2, messages3, legacyRecord2);
-          logger14.info(`Loaded ${record2.messages.length} messages from event log for '${id2.name}'`);
+          logger15.info(`Loaded ${record2.messages.length} messages from event log for '${id2.name}'`);
           return { record: record2, source: "event_log", migrationRan, migrationFailed };
         }
       } catch (err) {
-        logger14.error(`Failed to load from event log for '${id2.name}': ${err}`);
+        logger15.error(`Failed to load from event log for '${id2.name}': ${err}`);
       }
     }
     const legacyRecord = await this.loadContext(id2);
@@ -619069,7 +619294,7 @@ var ContextManagerV2 = class {
       try {
         const remoteRecord = await this.remoteRestoreFallback(id2);
         if (remoteRecord) {
-          logger14.info(`Restored context '${id2.name}' from remote fallback`);
+          logger15.info(`Restored context '${id2.name}' from remote fallback`);
           await this.saveContext(id2, remoteRecord);
           await this.seedEventLogFromRecord(id2, remoteRecord);
           return {
@@ -619080,7 +619305,7 @@ var ContextManagerV2 = class {
           };
         }
       } catch (err) {
-        logger14.warn(`Remote restore fallback failed for '${id2.name}': ${err}`);
+        logger15.warn(`Remote restore fallback failed for '${id2.name}': ${err}`);
       }
     }
     return { record: void 0, source: "new", migrationRan, migrationFailed };
@@ -619123,7 +619348,7 @@ var ContextManagerV2 = class {
       try {
         await this.eventStore.deleteAllEvents();
       } catch (err) {
-        logger14.error(`Failed to delete event logs: ${err}`);
+        logger15.error(`Failed to delete event logs: ${err}`);
       }
     }
   }
@@ -619143,7 +619368,7 @@ var ContextManagerV2 = class {
     if (legacyRecord && this.hasNewerSummary(legacyRecord.messages, eventMessages)) {
       await this.migrator?.appendRecordWindow(id2, legacyRecord);
       const messages3 = this.messagesFromSummaryAnchor(legacyRecord.messages);
-      logger14.info(`Reconciled context '${id2.name}' from newer legacy summary into event log`);
+      logger15.info(`Reconciled context '${id2.name}' from newer legacy summary into event log`);
       return {
         version: 2,
         messages: messages3,
@@ -619162,7 +619387,7 @@ var ContextManagerV2 = class {
     try {
       await this.migrator.appendRecordWindow(id2, record2);
     } catch (err) {
-      logger14.error(`Failed to seed event log after remote restore for '${id2.name}': ${err}`);
+      logger15.error(`Failed to seed event log after remote restore for '${id2.name}': ${err}`);
     }
   }
   hasNewerSummary(candidate, current2) {
@@ -619211,17 +619436,17 @@ var ContextManagerV2 = class {
       }
       const result = migrateContext(rawRecord, 2);
       if (!result.success) {
-        logger14.warn(`Context '${id2.name}' migration failed: ${result.reason}. Context will be deleted and a fresh conversation will start.`);
+        logger15.warn(`Context '${id2.name}' migration failed: ${result.reason}. Context will be deleted and a fresh conversation will start.`);
         try {
           await this.storage.deleteContext(id2);
         } catch (deleteErr) {
-          logger14.error(`Failed to delete context '${id2.name}' after migration failure: ${deleteErr}`);
+          logger15.error(`Failed to delete context '${id2.name}' after migration failure: ${deleteErr}`);
         }
         return null;
       }
       return result.record;
     } catch (err) {
-      logger14.error(`Failed to load context for '${id2.name}': ${err}`);
+      logger15.error(`Failed to load context for '${id2.name}': ${err}`);
       return null;
     }
   }
@@ -619235,7 +619460,7 @@ var ContextManagerV2 = class {
       await this.storage.saveContext(id2, record2);
       return true;
     } catch (err) {
-      logger14.error(`Failed to save context for '${id2.name}': ${err}`);
+      logger15.error(`Failed to save context for '${id2.name}': ${err}`);
       return false;
     }
   }
@@ -619676,11 +619901,16 @@ var IdleMonitor = class {
   firstChunkTimeoutMs;
   onStallCallback;
   onServerCompactionStart;
+  shouldPause;
+  onPauseCallback;
   timer = null;
   stallError = null;
   stallCallbacks = [];
   subscribed = false;
   hasReceivedChunk = false;
+  // True once a local-wait suppression stretch has fired its onPause event;
+  // reset by real activity (chunk/step/retry) so each stretch logs exactly once.
+  pausedThisStretch = false;
   compactionTextBlockIds = /* @__PURE__ */ new Set();
   // The budget snapshot used when the live timer was armed. fireStall() reports
   // this rather than re-resolving, so the logged budget always matches the timer
@@ -619695,6 +619925,8 @@ var IdleMonitor = class {
     this.firstChunkTimeoutMs = options8.firstChunkTimeoutMs ?? options8.maxIdleTimeMs;
     this.onStallCallback = options8.onStall;
     this.onServerCompactionStart = options8.onServerCompactionStart;
+    this.shouldPause = options8.shouldPause;
+    this.onPauseCallback = options8.onPause;
   }
   resolveBudget(budget) {
     return typeof budget === "function" ? budget() : budget;
@@ -619718,6 +619950,7 @@ var IdleMonitor = class {
   start() {
     this.stallError = null;
     this.hasReceivedChunk = false;
+    this.pausedThisStretch = false;
     this.compactionTextBlockIds.clear();
     this.session.resetActivityTimer();
     this.subscribeToEvents();
@@ -619773,12 +620006,14 @@ var IdleMonitor = class {
     }
     this.stallError = null;
     this.stallCallbacks = [];
+    this.pausedThisStretch = false;
     this.armTimer();
   };
   handleStepStart = () => {
     this.hasReceivedChunk = false;
     this.compactionTextBlockIds.clear();
     this.stallError = null;
+    this.pausedThisStretch = false;
     this.session.resetActivityTimer();
     this.armTimer();
   };
@@ -619787,6 +620022,7 @@ var IdleMonitor = class {
     this.compactionTextBlockIds.clear();
     this.stallError = null;
     this.stallCallbacks = [];
+    this.pausedThisStretch = false;
     this.session.resetActivityTimer();
     this.armTimer();
   };
@@ -619826,6 +620062,22 @@ var IdleMonitor = class {
     if (!this.session.isPending()) {
       return;
     }
+    let shouldPause = false;
+    try {
+      shouldPause = this.shouldPause?.() ?? false;
+    } catch {
+    }
+    if (shouldPause) {
+      if (!this.pausedThisStretch) {
+        this.pausedThisStretch = true;
+        try {
+          this.onPauseCallback?.();
+        } catch {
+        }
+      }
+      this.armTimer();
+      return;
+    }
     const idleTime = this.session.getTimeSinceLastActivity();
     this.stallError = new StallTimeoutError(idleTime, this.armedBudget.timeoutMs, this.armedBudget.budgetKind);
     try {
@@ -619851,10 +620103,12 @@ function createManagedStream(source2, session, idleMonitor) {
         controller.close();
         return;
       }
-      session.recordPull();
       while (true) {
         try {
+          session.recordPull();
+          session.setAwaitingUpstream(true);
           const result = await raceWithStallDetection(iterator2.next(), idleMonitor);
+          session.setAwaitingUpstream(false);
           if (result.done) {
             closed = true;
             session.finalize("complete");
@@ -619894,6 +620148,7 @@ function createManagedStream(source2, session, idleMonitor) {
           controller.enqueue(result.value);
           return;
         } catch (error40) {
+          session.setAwaitingUpstream(false);
           closed = true;
           controller.error(error40);
           return;
@@ -619945,7 +620200,7 @@ var RetryEngine = class {
     }
     return attemptsForProvider[provider.model] ?? 2;
   }
-  getRetryDecision(error40, session, abortSignal) {
+  getRetryDecision(error40, session, abortSignal, currentWaitState) {
     if (abortSignal?.aborted) {
       return { shouldRetry: false, delayMs: 0, reason: "aborted" };
     }
@@ -619974,6 +620229,13 @@ var RetryEngine = class {
       return { shouldRetry: false, delayMs: 0, reason: "max-attempts" };
     }
     if (this.isStallTimeout(error40)) {
+      if (currentWaitState?.state === "tool" || currentWaitState?.state === "step-boundary") {
+        return {
+          shouldRetry: true,
+          delayMs: this.config.retry.initialDelayMs,
+          reason: "local-wait"
+        };
+      }
       const next2 = this.peekNextProvider();
       if (next2 && next2.name !== session.provider.name) {
         const newProvider = this.advanceFallback(error40);
@@ -620239,9 +620501,15 @@ var StreamSession = class {
   // tracks when we last received a content chunk (NOT reset by keep-alives or retries).
   lastContentTime;
   // tracks when the downstream consumer last pulled from the managed stream.
-  // Discriminates "network dark" (recent pull, no chunks) from "consumer
-  // blocked" (stale pull) on stall logs (APPS-4729).
+  // Emitted as ms_since_last_pull on stall logs for triage (APPS-4729).
   lastPullTime;
+  // true while the managed stream is suspended in `await iterator.next()`,
+  // false once control returns to the downstream consumer. Discriminates a
+  // "network dark" stall (timer fires while we're blocked on upstream) from a
+  // "consumer blocked" stall (timer fires while the consumer holds the stream
+  // and isn't pulling, e.g. awaiting a downstream RPC). A boolean, not a timing
+  // comparison, so it doesn't degrade near the idle-budget boundary (APPS-4729).
+  awaitingUpstream = false;
   constructor(options8) {
     this.id = crypto.randomUUID();
     this.startTime = Date.now();
@@ -620337,6 +620605,15 @@ var StreamSession = class {
   getTimeSinceLastPull() {
     return this.lastPullTime === void 0 ? void 0 : Date.now() - this.lastPullTime;
   }
+  // Should only be called by createManagedStream's pull loop, symmetrically
+  // around its `await raceWithStallDetection(iterator.next(), ...)`. Setting it
+  // from anywhere else corrupts stall_reason classification for a live stream.
+  setAwaitingUpstream(awaiting) {
+    this.awaitingUpstream = awaiting;
+  }
+  isAwaitingUpstream() {
+    return this.awaitingUpstream;
+  }
   // Advances both the liveness clock and the retry-budget content clock without
   // touching content metrics (chunkCount / timeToFirstTokenMs). For upstream
   // chunks that are real model output — proof of progress — but are filtered
@@ -620543,10 +620820,62 @@ var StreamOrchestrator = class {
           firstChunkTimeoutMs: this.config.retry.budgetForModel(session.provider.model).firstChunkTimeoutMs
         });
       },
+      shouldPause: () => {
+        try {
+          const waitState = waitStateTracker.getWaitState();
+          if (waitState.state === "tool" || waitState.state === "step-boundary") {
+            return true;
+          }
+          return !session.isAwaitingUpstream() && session.metrics.chunkCount > 0;
+        } catch (err) {
+          this.logger.error("[orchestrator] shouldPause check failed", {
+            error: {
+              kind: err instanceof Error ? err.name : "unknown",
+              message: err instanceof Error ? err.message : String(err),
+              stack: err instanceof Error ? err.stack : void 0
+            }
+          });
+          return false;
+        }
+      },
+      onPause: () => {
+        const waitState = waitStateTracker.getWaitState();
+        const message = `[orchestrator] Local wait suppressed idle stall`;
+        const attributes2 = {
+          event: "stream_local_wait",
+          session_id: session.id,
+          provider: session.provider.name,
+          model: session.provider.model,
+          attempt: session.attempt,
+          elapsed_ms: session.getElapsedMs(),
+          chunks_received: session.metrics.chunkCount,
+          // "tool"/"step-boundary" come from the wait tracker; "consumer" is the
+          // remaining case (consumer holding the stream), which the tracker
+          // reports as "provider" since it does not track consumer-pull state.
+          wait_state: waitState.state === "provider" ? "consumer" : waitState.state
+        };
+        if (waitState.state === "tool") {
+          attributes2.tool_name = waitState.toolName;
+          attributes2.tool_call_id = waitState.toolCallId;
+          attributes2.pending_tool_count = waitState.pendingToolCount;
+        }
+        if (session.organizationId) {
+          attributes2.organization_id = session.organizationId;
+        }
+        if (session.applicationId) {
+          attributes2.application_id = session.applicationId;
+        }
+        if (this.logger.warnStructured) {
+          this.logger.warnStructured(message, attributes2);
+        } else {
+          this.logger.warn(message, attributes2);
+        }
+      },
       onStall: (error40) => {
         const budgetKind = error40.budgetKind;
-        const message = `[orchestrator] Idle timeout exceeded, triggering retry`;
         const msSinceLastPull = session.getTimeSinceLastPull();
+        const stallReason = budgetKind === "first-chunk" || session.isAwaitingUpstream() ? "network-dark" : "consumer-blocked";
+        const message = `[orchestrator] Idle timeout exceeded, triggering retry`;
         const waitState = waitStateTracker.getWaitState();
         const attributes2 = {
           event: "stream_stall",
@@ -620559,6 +620888,7 @@ var StreamOrchestrator = class {
           budget_ms: error40.maxIdleTimeMs,
           elapsed_ms: session.getElapsedMs(),
           chunks_received: session.metrics.chunkCount,
+          stall_reason: stallReason,
           wait_state: waitState.state,
           raw_reset_count: waitStateTracker.getRawResetCount()
         };
@@ -620583,10 +620913,10 @@ var StreamOrchestrator = class {
         }
       }
     });
-    const result = await this.startStreamWithRetry(optionsWithAbort, session, retryEngine, attempts);
+    const result = await this.startStreamWithRetry(optionsWithAbort, session, retryEngine, attempts, waitStateTracker);
     idleMonitor.start();
     const managedStream = createManagedStream(result.fullStream, session, idleMonitor);
-    const retryableFullStream = this.wrapWithRetry(managedStream, (r3) => createManagedStream(r3.fullStream, session, idleMonitor), optionsWithAbort, session, retryEngine, internalAbortController, attempts);
+    const retryableFullStream = this.wrapWithRetry(managedStream, (r3) => createManagedStream(r3.fullStream, session, idleMonitor), optionsWithAbort, session, retryEngine, internalAbortController, attempts, waitStateTracker);
     const [fullStream, textSourceStream] = retryableFullStream.tee();
     return {
       ...result,
@@ -620646,7 +620976,7 @@ var StreamOrchestrator = class {
    * retries will silently fail (the new stream will close immediately because
    * session.isPending() returns false).
    */
-  wrapWithRetry(initialStream, getNewStream, options8, session, retryEngine, abortController, attempts) {
+  wrapWithRetry(initialStream, getNewStream, options8, session, retryEngine, abortController, attempts, waitStateTracker) {
     const handleRetry = this.handleRetryDecision.bind(this);
     let currentStream = initialStream;
     async function* createRetryIterator() {
@@ -620660,7 +620990,7 @@ var StreamOrchestrator = class {
           }
           return;
         } catch (error40) {
-          const retryResult = await handleRetry(error40, options8, session, retryEngine, attempts);
+          const retryResult = await handleRetry(error40, options8, session, retryEngine, attempts, waitStateTracker);
           if (!retryResult.shouldRetry) {
             abortController.abort();
             throw retryResult.error;
@@ -620693,8 +621023,8 @@ var StreamOrchestrator = class {
    * Handle an error by making a retry decision. Returns either a new result to continue
    * with, or the final error to throw.
    */
-  async handleRetryDecision(error40, options8, session, retryEngine, attempts) {
-    const decision = retryEngine.getRetryDecision(error40, session, options8.abortSignal);
+  async handleRetryDecision(error40, options8, session, retryEngine, attempts, waitStateTracker) {
+    const decision = retryEngine.getRetryDecision(error40, session, options8.abortSignal, waitStateTracker.getWaitState());
     if (!decision.shouldRetry) {
       this.logger.warn(`[orchestrator] Not retrying: reason=${decision.reason}`, getErrorMeta2(error40));
       session.finalize("error", error40);
@@ -620709,17 +621039,17 @@ var StreamOrchestrator = class {
       await this.switchProvider(session, decision.newProvider, decision.fastFallback === true, error40);
     }
     session.recordRetry(decision.delayMs);
-    this.logger.warn(`[orchestrator] Retrying in ${decision.delayMs}ms (attempt ${session.attempt})`, getErrorMeta2(error40));
+    this.logger.warn(`[orchestrator] Retrying in ${decision.delayMs}ms (attempt ${session.attempt}) reason=${decision.reason ?? "retry"}`, getErrorMeta2(error40));
     await this.delay(decision.delayMs, options8.abortSignal);
-    const newResult = await this.startStreamWithRetry(options8, session, retryEngine, attempts);
+    const newResult = await this.startStreamWithRetry(options8, session, retryEngine, attempts, waitStateTracker);
     return { shouldRetry: true, newResult };
   }
-  async startStreamWithRetry(options8, session, retryEngine, attempts) {
+  async startStreamWithRetry(options8, session, retryEngine, attempts, waitStateTracker) {
     while (true) {
       try {
         return await this.startStream(options8, session, attempts);
       } catch (error40) {
-        const decision = retryEngine.getRetryDecision(error40, session, options8.abortSignal);
+        const decision = retryEngine.getRetryDecision(error40, session, options8.abortSignal, waitStateTracker.getWaitState());
         if (!decision.shouldRetry) {
           this.logger.error(`[orchestrator] Startup error, not retrying: reason=${decision.reason}`, {
             error: {
@@ -620737,7 +621067,7 @@ var StreamOrchestrator = class {
           await this.switchProvider(session, decision.newProvider, decision.fastFallback === true, error40);
         }
         session.recordRetry(decision.delayMs);
-        this.logger.info(`[orchestrator] Startup retry in ${decision.delayMs}ms (attempt ${session.attempt})`);
+        this.logger.info(`[orchestrator] Startup retry in ${decision.delayMs}ms (attempt ${session.attempt}) reason=${decision.reason ?? "retry"}`);
         await this.delay(decision.delayMs, options8.abortSignal);
       }
     }
@@ -622140,7 +622470,7 @@ function wrapToolsForObservability(tools, tracer4) {
 
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/stream/observers/context.js
 init_cjs_shims();
-var logger15 = getPrefixedLogger("[context-observer]");
+var logger16 = getPrefixedLogger("[context-observer]");
 var ContextObserver = class {
   contextHandle;
   released = false;
@@ -622182,7 +622512,7 @@ var ContextObserver = class {
       const normalizedMessages = step.response.messages.map((msg) => normalizeToolMessage(stripUndefinedFromToolOutputs(msg)));
       const hasReasoning = normalizedMessages.some((msg) => msg.role === "assistant" && typeof msg.content !== "string" && msg.content.some((p3) => p3.type === "reasoning"));
       if (hasReasoning && !step.content?.length) {
-        logger15.warn("Step has reasoning in response.messages but no step.content for signature backfill");
+        logger16.warn("Step has reasoning in response.messages but no step.content for signature backfill");
       }
       backfillReasoningSignatures(normalizedMessages, step.content ?? []);
       await this.contextHandle.context.endStep(normalizedMessages, step.usage);
@@ -622191,7 +622521,7 @@ var ContextObserver = class {
     try {
       await this.detectCompaction(step);
     } catch (err) {
-      logger15.error(`detectCompaction threw, ignoring: ${err instanceof Error ? err.message : String(err)}`);
+      logger16.error(`detectCompaction threw, ignoring: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   async onChunk(chunk) {
@@ -622201,7 +622531,7 @@ var ContextObserver = class {
         this.contextHandle.context.onServerCompactionStarted();
       }
     } catch (err) {
-      logger15.error(`detectCompactionStart threw, ignoring: ${err instanceof Error ? err.message : String(err)}`);
+      logger16.error(`detectCompactionStart threw, ignoring: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   async onStreamFinish(result, _session) {
@@ -622238,7 +622568,7 @@ var ContextObserver = class {
     const compactedViaIterations = iterations?.some((iter) => iter.type === "compaction");
     const compactedViaEdits = appliedEdits?.some((edit) => edit.type === "compact_20260112");
     if (compactedViaIterations || compactedViaEdits) {
-      logger15.info("Server-side compaction detected in response", {
+      logger16.info("Server-side compaction detected in response", {
         iterations: iterations?.map((i2) => i2.type),
         edits: appliedEdits?.map((e) => e.type)
       });
@@ -622250,7 +622580,7 @@ var ContextObserver = class {
     }
     const clearEdit = appliedEdits?.find((edit) => edit.type === "clear_tool_uses_20250919");
     if (clearEdit) {
-      logger15.info("Server-side clear_tool_uses applied", {
+      logger16.info("Server-side clear_tool_uses applied", {
         clearedToolUses: clearEdit.clearedToolUses,
         clearedInputTokens: clearEdit.clearedInputTokens
       });
@@ -622873,147 +623203,6 @@ var LLMClient = class {
   }
 };
 
-// ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/storage/jsonl-event-store.js
-init_cjs_shims();
-import { readFile as readFile13, appendFile, mkdir as mkdir13, rm as rm11 } from "node:fs/promises";
-import * as path46 from "node:path";
-var logger16 = getPrefixedLogger("[jsonl-event-store]");
-var JsonlEventStore = class _JsonlEventStore {
-  rootDir;
-  static SUPERBLOCKS_SYSTEM_DIR = ".superblocks";
-  static EVENTS_SUBDIR = "events";
-  constructor(rootDir) {
-    this.rootDir = rootDir;
-  }
-  /**
-   * Append a single event to the log for the given context.
-   *
-   * Creates parent directories if they do not exist. Each call
-   * writes exactly one JSON line terminated by `\n`.
-   */
-  async appendEvent(id2, event) {
-    const filePath = this.getFilePath(id2);
-    await mkdir13(path46.dirname(filePath), { recursive: true });
-    await appendFile(filePath, JSON.stringify(event) + "\n");
-  }
-  /**
-   * Check whether any events exist for the given context.
-   */
-  async hasEvents(id2) {
-    try {
-      const content18 = await readFile13(this.getFilePath(id2), "utf-8");
-      return content18.trimEnd().length > 0;
-    } catch (err) {
-      if (err.code === "ENOENT") {
-        return false;
-      }
-      throw err;
-    }
-  }
-  /**
-   * Remove the event log for a single context. Missing files are
-   * treated as success so callers can use this as a fire-and-forget
-   * cleanup step.
-   */
-  async deleteEvents(id2) {
-    await rm11(this.getFilePath(id2), { force: true });
-  }
-  /**
-   * Remove the entire `.superblocks/events/` tree under `rootDir`.
-   *
-   * Used by clear-all flows so a subsequent `getOrCreateContext` does
-   * not silently restore a "deleted" conversation from disk.
-   */
-  async deleteAllEvents() {
-    await rm11(this.getEventsRoot(), { recursive: true, force: true });
-  }
-  /**
-   * Load conversation messages by scanning backward for the last
-   * compaction anchor, then reading forward from that point.
-   *
-   * A compaction anchor is either:
-   * - An event with `type === "compaction_received"`
-   * - An event with `_superblocks.isSummary === true` (migration seed)
-   *
-   * Each `EventLogEntry` is mapped to a `StoredMessage` so that
-   * consumers receive the AI SDK `ModelMessage` shape.
-   */
-  async loadMessages(id2) {
-    const filePath = this.getFilePath(id2);
-    let raw;
-    try {
-      raw = await readFile13(filePath, "utf-8");
-    } catch (err) {
-      if (err.code === "ENOENT") {
-        return [];
-      }
-      throw err;
-    }
-    const lines = raw.split("\n").filter((line3) => line3.length > 0);
-    if (lines.length === 0) {
-      return [];
-    }
-    const contextLabel = `${id2.appId}/${id2.userId}/${id2.name}`;
-    const events = [];
-    let corruptedCount = 0;
-    for (let i2 = 0; i2 < lines.length; i2++) {
-      const line3 = lines[i2];
-      try {
-        events.push(JSON.parse(line3));
-      } catch {
-        corruptedCount++;
-        logger16.warn(`Skipping corrupted JSONL line ${i2} for context '${contextLabel}' (length=${line3.length})`);
-      }
-    }
-    if (corruptedCount > 0) {
-      logger16.warn(`Encountered ${corruptedCount} corrupted line(s) in event log for context '${contextLabel}'; if any held a compaction anchor the loaded window may extend further back than expected.`);
-    }
-    let anchorIndex = -1;
-    for (let i2 = events.length - 1; i2 >= 0; i2--) {
-      const event = events[i2];
-      if (event.type === "compaction_received" || event._superblocks?.isSummary === true) {
-        anchorIndex = i2;
-        break;
-      }
-    }
-    if (anchorIndex < 0 && corruptedCount > 0) {
-      logger16.error(`No compaction anchor found for context '${contextLabel}' but ${corruptedCount} corrupted line(s) were skipped; the loaded conversation window may be unbounded.`);
-    }
-    const window2 = anchorIndex >= 0 ? events.slice(anchorIndex) : events;
-    return window2.map((event) => this.toStoredMessage(event));
-  }
-  /**
-   * Map an EventLogEntry to a StoredMessage (AI SDK ModelMessage shape).
-   *
-   * The cast is required at this JSON deserialization boundary: `content`
-   * is stored as `unknown` because AI SDK content shapes are polymorphic
-   * (string, content part arrays, tool results). The role is type-safe
-   * via `MessageRole`, but TypeScript cannot narrow the discriminated
-   * union without runtime content validation — which would be fragile
-   * against SDK version changes.
-   */
-  toStoredMessage(event) {
-    return {
-      role: event.role,
-      content: event.content,
-      ...event.providerMetadata && {
-        providerMetadata: event.providerMetadata
-      },
-      _superblocks: {
-        timestamp: event.timestamp,
-        ...event._superblocks
-      }
-    };
-  }
-  getEventsRoot() {
-    return path46.join(this.rootDir, _JsonlEventStore.SUPERBLOCKS_SYSTEM_DIR, _JsonlEventStore.EVENTS_SUBDIR);
-  }
-  getFilePath(id2) {
-    const root3 = this.getEventsRoot();
-    return safeJoinUnderRoot(root3, encodeContextPathSegment(id2.userId, "userId"), `${encodeContextPathSegment(id2.name, "name")}.jsonl`);
-  }
-};
-
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/provider.js
 init_cjs_shims();
 
@@ -628249,7 +628438,7 @@ var PlaywrightMcpServerManager = class {
       this.logger.info(`Starting embedded Playwright MCP server: browser=${options8?.browser || "chromium"}, headless=${options8?.headless !== false}`);
     }
     try {
-      const { startEmbeddedPlaywrightMcpServer } = await import("./embedded-playwright-mcp-server-SWU2GROW.js");
+      const { startEmbeddedPlaywrightMcpServer } = await import("./embedded-playwright-mcp-server-46UEH2AX.js");
       this.server = await startEmbeddedPlaywrightMcpServer({
         storageStatePath: options8?.storageStatePath,
         jwt: options8?.jwt,
@@ -631555,7 +631744,7 @@ The current mode and plan approval status will be given to you in the <current_m
 In 'Plan' mode, your goal is to help the user understand and interact with their application, and the data and integrations available to them.
 
 **Plan Mode Behavior:**
-- **Without approved plan**: You can use read-only tools freely, plus a small set of product-scoped tools \u2014 notably ${config4.features.clarkAttachmentDownloadEnabled ? "`listAttachments` and `downloadAttachments` (which materialize uploaded attachments into a private scratch directory), " : ""}\`exitPlanMode\` (to propose a plan for approval)${config4.features.managedNativeDbEnabled ? ", and the read-only Native DB background-task companions `checkTask` and `waitForTask` (so you can observe progress of any tasks the user started before entering Plan mode)" : ""}, and debug/interactive tools the UI may expose. You cannot otherwise make changes to the user's application files or production data \u2014 including provisioning a dev database or applying SQL migrations, which require an approved plan. Answer questions, provide suggestions, inspect attachments, and when appropriate, present plans using the exitPlanMode tool.
+- **Without approved plan**: You can use read-only tools freely, plus a small set of product-scoped tools \u2014 notably ${config4.features.clarkAttachmentDownloadEnabled ? "`listAttachments` and `downloadAttachments` (which materialize uploaded attachments into a private scratch directory), " : ""}\`exitPlanMode\` (to propose a plan for approval)${config4.features.managedNativeDbEnabled ? ", and the read-only Native DB background-task companions `checkTask` and `waitForTask` (so you can observe progress of any tasks the user started before entering Plan mode)" : ""}, and debug/interactive tools the UI may expose. You cannot otherwise make changes to the user's application files or production data${config4.features.managedNativeDbEnabled ? " \u2014 including provisioning a dev database or applying SQL migrations, which require an approved plan" : ""}. Answer questions, provide suggestions, inspect attachments, and when appropriate, present plans using the exitPlanMode tool.
 - **With approved plan**: When the user accepts one of your plans, you gain access to all tools and can execute the plan by making the necessary changes. You remain in Plan mode throughout execution.
 
 **Integrations:**
@@ -638506,9 +638695,9 @@ ${request.prompt}`;
 // ../../../vite-plugin-file-sync/dist/sync-service/index.js
 init_cjs_shims();
 import { normalizePath as normalizePath8 } from "vite";
-var import_shared58 = __toESM(require_dist2(), 1);
-var import_shared59 = __toESM(require_dist2(), 1);
-var import_shared60 = __toESM(require_dist2(), 1);
+var import_shared58 = __toESM(require_dist2());
+var import_shared59 = __toESM(require_dist2());
+var import_shared60 = __toESM(require_dist2());
 
 // ../../../vite-plugin-file-sync/dist/errors/make-server-error.js
 init_cjs_shims();
@@ -640102,8 +640291,8 @@ var SyncService = class extends import_shared58.TracedEventEmitter {
 
 // ../../../vite-plugin-file-sync/dist/lock-service/index.js
 init_cjs_shims();
-var import_shared61 = __toESM(require_dist2(), 1);
-var import_shared62 = __toESM(require_dist2(), 1);
+var import_shared61 = __toESM(require_dist2());
+var import_shared62 = __toESM(require_dist2());
 
 // ../../../vite-plugin-file-sync/dist/lock-service/activity-tracker.js
 init_cjs_shims();
@@ -664831,7 +665020,7 @@ var parseYaml3;
 async function loadYaml(file2) {
   const content18 = await read_file_default(file2);
   if (!parseYaml3) {
-    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-HVUWODPN.js"));
+    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-RNXURET6.js"));
   }
   try {
     return parseYaml3(content18);
@@ -670225,7 +670414,7 @@ function createParsersAndPrinters(modules) {
 }
 var estreePlugin = createParsersAndPrinters([
   {
-    importPlugin: () => import("./estree-CVEVNMEY.js"),
+    importPlugin: () => import("./estree-3ELOGBVO.js"),
     printers: ["estree", "estree-json"]
   }
 ]);
@@ -670249,11 +670438,11 @@ var languages = [
 ];
 var { parsers: parsers12, printers } = createParsersAndPrinters([
   {
-    importPlugin: () => import("./acorn-PNDQIP6Z.js"),
+    importPlugin: () => import("./acorn-OS63BTIP.js"),
     parsers: ["acorn", "espree"]
   },
   {
-    importPlugin: () => import("./angular-46FTABOP.js"),
+    importPlugin: () => import("./angular-XRJMPAT5.js"),
     parsers: [
       "__ng_action",
       "__ng_binding",
@@ -670262,7 +670451,7 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./babel-ZHCYURNT.js"),
+    importPlugin: () => import("./babel-KABIYOLI.js"),
     parsers: [
       "babel",
       "babel-flow",
@@ -670281,44 +670470,44 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./flow-IE3M4PY6.js"),
+    importPlugin: () => import("./flow-WZSRVHZW.js"),
     parsers: ["flow"]
   },
   {
-    importPlugin: () => import("./glimmer-AL4JQT4P.js"),
+    importPlugin: () => import("./glimmer-IMKJRXNH.js"),
     parsers: ["glimmer"],
     printers: ["glimmer"]
   },
   {
-    importPlugin: () => import("./graphql-OYPRAJ2F.js"),
+    importPlugin: () => import("./graphql-NXAASEI3.js"),
     parsers: ["graphql"],
     printers: ["graphql"]
   },
   {
-    importPlugin: () => import("./html-Z2OPZK7Y.js"),
+    importPlugin: () => import("./html-73R3X3I4.js"),
     parsers: ["html", "angular", "vue", "lwc", "mjml"],
     printers: ["html"]
   },
   {
-    importPlugin: () => import("./markdown-MXQ2FGWR.js"),
+    importPlugin: () => import("./markdown-5NVT32YM.js"),
     parsers: ["markdown", "mdx", "remark"],
     printers: ["mdast"]
   },
   {
-    importPlugin: () => import("./meriyah-D5WHB4VG.js"),
+    importPlugin: () => import("./meriyah-5HLBX7QE.js"),
     parsers: ["meriyah"]
   },
   {
-    importPlugin: () => import("./postcss-C56PS4TK.js"),
+    importPlugin: () => import("./postcss-RGXOH323.js"),
     parsers: ["css", "less", "scss"],
     printers: ["postcss"]
   },
   {
-    importPlugin: () => import("./typescript-R4PX3DN5.js"),
+    importPlugin: () => import("./typescript-HJJCNM6Y.js"),
     parsers: ["typescript"]
   },
   {
-    importPlugin: () => import("./yaml-HVUWODPN.js"),
+    importPlugin: () => import("./yaml-RNXURET6.js"),
     parsers: ["yaml"],
     printers: ["yaml"]
   }
@@ -676965,6 +677154,7 @@ var vite_plugin_optimize_lucide_imports_default = createLucideReactImportOptimiz
 // ../sdk/dist/vite-plugin-sdk-api-entry-point.mjs
 init_cjs_shims();
 import path66 from "node:path";
+var SERVER_APIS_DIR = "server/apis";
 function buildPrependMappings(prependLineCount, originalLineCount) {
   const empty3 = ";".repeat(prependLineCount);
   if (originalLineCount === 0)
@@ -676972,16 +677162,57 @@ function buildPrependMappings(prependLineCount, originalLineCount) {
   const original = ["AAAA"].concat(Array(Math.max(0, originalLineCount - 1)).fill("AACA")).join(";");
   return empty3 + original;
 }
-function sdkApiEntryPointPlugin(root3) {
+function qualifyAnchoredServerApisRelative(relative15) {
+  if (relative15 === `${SERVER_APIS_DIR}/index.ts`) {
+    return null;
+  }
+  const baseName = path66.posix.basename(relative15);
+  if (baseName === "index.ts") {
+    return null;
+  }
+  if (!relative15.endsWith(".ts") && !relative15.endsWith(".tsx")) {
+    return null;
+  }
+  return relative15;
+}
+function qualifySegmentFallbackRelative(relative15) {
+  if (!relative15.startsWith(`${SERVER_APIS_DIR}/`)) {
+    return null;
+  }
+  if (relative15.includes("/client/")) {
+    return null;
+  }
+  const baseName = path66.posix.basename(relative15);
+  if (baseName !== "api.ts" && baseName !== "api.tsx") {
+    return null;
+  }
+  return relative15;
+}
+function resolveSdkApiEntryPointRelativePath(appRootDir, moduleId) {
+  const normalizedId = path66.normalize(moduleId);
+  const normalizedRoot = path66.normalize(appRootDir);
+  const relative15 = path66.relative(normalizedRoot, normalizedId).replace(/\\/g, "/");
+  if (relative15.startsWith(`${SERVER_APIS_DIR}/`)) {
+    return qualifyAnchoredServerApisRelative(relative15);
+  }
+  if (relative15.startsWith(`../${SERVER_APIS_DIR}/`)) {
+    return qualifyAnchoredServerApisRelative(relative15.slice("../".length));
+  }
+  const posixId = normalizedId.replace(/\\/g, "/");
+  const segment2 = `/${SERVER_APIS_DIR}/`;
+  const segmentIndex = posixId.lastIndexOf(segment2);
+  if (segmentIndex !== -1) {
+    return qualifySegmentFallbackRelative(posixId.slice(segmentIndex + 1));
+  }
+  return null;
+}
+function sdkApiEntryPointPlugin(appRootDir) {
   return {
     name: "sb-sdk-api-entry-point",
     enforce: "pre",
     transform(code, id2) {
-      const relative15 = path66.relative(root3, id2).replace(/\\/g, "/");
-      if (!relative15.startsWith("server/apis/") || relative15 === "server/apis/index.ts") {
-        return null;
-      }
-      if (!relative15.endsWith(".ts") && !relative15.endsWith(".tsx")) {
+      const relative15 = resolveSdkApiEntryPointRelativePath(appRootDir, id2);
+      if (!relative15) {
         return null;
       }
       const prependLines = [
@@ -688060,7 +688291,7 @@ async function handleLockConflict(error40, lockSvc, span, logger22) {
 }
 async function readPkgJson(cwd) {
   try {
-    const { readPackage } = await import("./read-pkg-LA7GFWSK.js");
+    const { readPackage } = await import("./read-pkg-BUJFLEXQ.js");
     return await readPackage({ cwd });
   } catch {
     return null;
@@ -689751,4 +689982,4 @@ serve-static/index.js:
 chokidar/esm/index.js:
   (*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-MRVVM4MF.js.map
+//# sourceMappingURL=chunk-TOZ7A6XG.js.map