@vellumai/assistant 0.8.4 → 0.8.6

package/src/__tests__/config-loader-backfill.test.ts

@@ -82,7 +82,7 @@ import { migrateProviderConnectionStatusLabel } from "../memory/migrations/244-p
 import { migrateProviderConnectionBaseUrlAndModels } from "../memory/migrations/250-provider-connection-base-url-and-models.js";
 import * as schema from "../memory/schema.js";
 import { getConnection } from "../providers/inference/connections.js";
-import { _setStorePath } from "../security/encrypted-store.js";
+import { setStorePathForTesting } from "./encrypted-store-test-helpers.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -328,14 +328,14 @@ describe("loadConfig startup behavior", () => {
     const updatesPath = join(WORKSPACE_DIR, "UPDATES.md");
     if (existsSync(updatesPath)) rmSync(updatesPath, { force: true });
     ensureTestDir();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     delete process.env.VELLUM_DEFAULT_WORKSPACE_CONFIG_PATH;
     delete process.env.IS_PLATFORM;
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     delete process.env.VELLUM_DEFAULT_WORKSPACE_CONFIG_PATH;
     delete process.env.IS_PLATFORM;
     invalidateConfigCache();
@@ -943,14 +943,14 @@ describe("seedInferenceProfiles BYOK-mode managed profile labels", () => {
       }
     }
     ensureTestDir();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     delete process.env.VELLUM_DEFAULT_WORKSPACE_CONFIG_PATH;
     delete process.env.IS_PLATFORM;
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     delete process.env.VELLUM_DEFAULT_WORKSPACE_CONFIG_PATH;
     delete process.env.IS_PLATFORM;
     invalidateConfigCache();
@@ -1037,9 +1037,10 @@ describe("seedInferenceProfiles BYOK-mode managed profile labels", () => {
       "anthropic-managed",
     );
     expect("status" in raw.llm.profiles.balanced).toBe(false);
-    expect(getConnection(db, "anthropic-managed")?.status).toBe("active");
-    expect(getConnection(db, "openai-managed")?.status).toBe("disabled");
-    expect(getConnection(db, "gemini-managed")?.status).toBe("disabled");
+    // Connections exist (status is no longer a connection-level concept).
+    expect(getConnection(db, "anthropic-managed")).not.toBeNull();
+    expect(getConnection(db, "openai-managed")).not.toBeNull();
+    expect(getConnection(db, "gemini-managed")).not.toBeNull();
   });
 
   test("off-platform managed-inference hatch respects explicit non-managed active connection", () => {
@@ -1075,26 +1076,10 @@ describe("seedInferenceProfiles BYOK-mode managed profile labels", () => {
     expect(raw.llm.profiles.balanced.provider_connection).toBe(
       "anthropic-personal",
     );
-    expect(getConnection(db, "anthropic-managed")?.status).toBe("disabled");
-    expect(getConnection(db, "openai-managed")?.status).toBe("disabled");
-    expect(getConnection(db, "gemini-managed")?.status).toBe("disabled");
-  });
-
-  test("off-platform BYOK hatch still disables managed connections", () => {
-    const overlayPath = join(WORKSPACE_DIR, "hatch-overlay.json");
-    writeFileSync(
-      overlayPath,
-      JSON.stringify({ llm: { default: { provider: "anthropic" } } }, null, 2) +
-        "\n",
-    );
-    process.env.VELLUM_DEFAULT_WORKSPACE_CONFIG_PATH = overlayPath;
-    const db = createProviderConnectionsDb();
-
-    mergeDefaultConfigAndSeedInferenceProfiles(db);
-
-    expect(getConnection(db, "anthropic-managed")?.status).toBe("disabled");
-    expect(getConnection(db, "openai-managed")?.status).toBe("disabled");
-    expect(getConnection(db, "gemini-managed")?.status).toBe("disabled");
+    // Connections exist (status is no longer a connection-level concept).
+    expect(getConnection(db, "anthropic-managed")).not.toBeNull();
+    expect(getConnection(db, "openai-managed")).not.toBeNull();
+    expect(getConnection(db, "gemini-managed")).not.toBeNull();
   });
 
   test("non-hatch off-platform boot does NOT auto-disable freshly-materialized managed profiles", () => {

package/src/__tests__/config-loader-corrupt.test.ts

@@ -23,7 +23,7 @@ import {
   loadConfig,
   loadRawConfig,
 } from "../config/loader.js";
-import { _setStorePath } from "../security/encrypted-store.js";
+import { setStorePathForTesting } from "./encrypted-store-test-helpers.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -65,12 +65,12 @@ function listQuarantinedFiles(): string[] {
 describe("loadConfig corrupt-file recovery", () => {
   beforeEach(() => {
     resetWorkspace();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     invalidateConfigCache();
   });
 
@@ -187,12 +187,12 @@ describe("loadConfig corrupt-file recovery", () => {
 describe("loadRawConfig corrupt-file recovery", () => {
   beforeEach(() => {
     resetWorkspace();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     invalidateConfigCache();
   });
 

package/src/__tests__/config-loader-platform-defaults.test.ts

@@ -1,9 +1,11 @@
 /**
  * When IS_PLATFORM=true and no config.json exists yet, loadConfig() must
- * write all eight managed-capable service modes as "managed" instead of the
- * schema default "your-own". When IS_PLATFORM is absent/false, or when
- * config.json already exists, the schema defaults and existing values are
- * preserved unchanged.
+ * write all managed-capable service modes as "managed" instead of the
+ * per-service schema default. When IS_PLATFORM is absent/false, or when
+ * config.json already exists, the Zod schema defaults and existing values
+ * are preserved unchanged — note that `google-oauth` and `notion-oauth`
+ * default to "managed" at the schema level (per JARVIS-966), while every
+ * other managed-capable service defaults to "your-own".
  */
 
 import {
@@ -59,7 +61,7 @@ afterAll(() => {
 
 import { invalidateConfigCache, loadConfig } from "../config/loader.js";
 import { applyContextDefaultsToRawConfig } from "../runtime/routes/conversation-query-routes.js";
-import { _setStorePath } from "../security/encrypted-store.js";
+import { setStorePathForTesting } from "./encrypted-store-test-helpers.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -91,6 +93,9 @@ function readConfig(): Record<string, unknown> {
   return JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
 }
 
+// When IS_PLATFORM=true, every managed-capable service defaults to "managed".
+// Without IS_PLATFORM, services split by Zod schema default: google/notion-oauth
+// resolve to "managed" (per JARVIS-966), the rest resolve to "your-own".
 const MANAGED_SERVICES = [
   "image-generation",
   "web-search",
@@ -101,6 +106,28 @@ const MANAGED_SERVICES = [
   "notion-oauth",
 ] as const;
 
+/**
+ * Services whose Zod schema default is `"managed"` rather than `"your-own"`.
+ * For these, the fresh-write and in-memory paths produce `"managed"` even
+ * when IS_PLATFORM is false/unset — the schema default applies regardless of
+ * deployment context. See `assistant/src/config/schemas/services.ts` and
+ * JARVIS-966: managed mode is the optimization target for new users on
+ * managed-capable infra, since the BYO flow requires a Google Cloud /
+ * Notion integration setup that most users never complete.
+ */
+const SCHEMA_MANAGED_DEFAULT_SERVICES = [
+  "google-oauth",
+  "notion-oauth",
+] as const;
+
+const SCHEMA_YOUR_OWN_DEFAULT_SERVICES = [
+  "image-generation",
+  "web-search",
+  "outlook-oauth",
+  "linear-oauth",
+  "github-oauth",
+] as const;
+
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------
@@ -110,12 +137,12 @@ describe("platform-managed config defaults", () => {
 
   beforeEach(() => {
     resetWorkspace();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     invalidateConfigCache();
     // Restore env to its original value
     if (originalIsPlatform === undefined) {
@@ -137,9 +164,12 @@ describe("platform-managed config defaults", () => {
     for (const svc of MANAGED_SERVICES) {
       expect((services[svc] as { mode?: string })?.mode).toBe("managed");
     }
+    expect((services["web-search"] as { provider?: string })?.provider).toBe(
+      "inference-provider-native",
+    );
   });
 
-  test("IS_PLATFORM=false, no config file → managed service modes default to 'your-own'", () => {
+  test("IS_PLATFORM=false, no config file → service modes follow schema defaults (your-own except google/notion-oauth which are managed)", () => {
     process.env.IS_PLATFORM = "false";
 
     loadConfig();
@@ -148,12 +178,15 @@ describe("platform-managed config defaults", () => {
     const written = readConfig() as { services?: Record<string, unknown> };
     expect(written.services).toBeDefined();
     const services = written.services!;
-    for (const svc of MANAGED_SERVICES) {
+    for (const svc of SCHEMA_YOUR_OWN_DEFAULT_SERVICES) {
       expect((services[svc] as { mode?: string })?.mode).toBe("your-own");
     }
+    for (const svc of SCHEMA_MANAGED_DEFAULT_SERVICES) {
+      expect((services[svc] as { mode?: string })?.mode).toBe("managed");
+    }
   });
 
-  test("IS_PLATFORM unset, no config file → managed service modes default to 'your-own'", () => {
+  test("IS_PLATFORM unset, no config file → service modes follow schema defaults (your-own except google/notion-oauth which are managed)", () => {
     delete process.env.IS_PLATFORM;
 
     loadConfig();
@@ -162,9 +195,12 @@ describe("platform-managed config defaults", () => {
     const written = readConfig() as { services?: Record<string, unknown> };
     expect(written.services).toBeDefined();
     const services = written.services!;
-    for (const svc of MANAGED_SERVICES) {
+    for (const svc of SCHEMA_YOUR_OWN_DEFAULT_SERVICES) {
       expect((services[svc] as { mode?: string })?.mode).toBe("your-own");
     }
+    for (const svc of SCHEMA_MANAGED_DEFAULT_SERVICES) {
+      expect((services[svc] as { mode?: string })?.mode).toBe("managed");
+    }
   });
 
   test("IS_PLATFORM=true, config file already exists → existing service mode values are preserved", () => {
@@ -197,6 +233,37 @@ describe("platform-managed config defaults", () => {
     expect(config.services["image-generation"].mode).toBe("your-own");
   });
 
+  test("IS_PLATFORM=true, config file with explicit notion-oauth mode='your-own' → preserved (schema default is 'managed')", () => {
+    process.env.IS_PLATFORM = "true";
+
+    // notion-oauth's schema default is "managed" (per JARVIS-966), but an
+    // explicit user choice of "your-own" must win — the fill-defaults pass
+    // must never override an explicit value, even one that contradicts the
+    // schema default. Mirror of the image-generation "your-own preserved"
+    // test above, but for a service whose schema default is "managed".
+    writeFileSync(
+      CONFIG_PATH,
+      JSON.stringify(
+        {
+          services: {
+            "notion-oauth": { mode: "your-own" },
+          },
+        },
+        null,
+        2,
+      ) + "\n",
+    );
+
+    const config = loadConfig();
+
+    const written = readConfig() as { services?: Record<string, unknown> };
+    expect(written.services).toBeDefined();
+    expect((written.services!["notion-oauth"] as { mode?: string })?.mode).toBe(
+      "your-own",
+    );
+    expect(config.services["notion-oauth"].mode).toBe("your-own");
+  });
+
   test("IS_PLATFORM=true, config file exists without a services key → in-memory config has all managed modes", () => {
     // Regression guard for the platform-managed boot order: by the time
     // `loadConfig()` runs, lifecycle steps such as `seedInferenceProfiles`
@@ -228,12 +295,8 @@ describe("platform-managed config defaults", () => {
     // missing service-mode fields.
     for (const svc of MANAGED_SERVICES) {
       expect(
-        (
-          config.services as unknown as Record<
-            string,
-            { mode: string }
-          >
-        )[svc]!.mode,
+        (config.services as unknown as Record<string, { mode: string }>)[svc]!
+          .mode,
       ).toBe("managed");
     }
 
@@ -277,9 +340,11 @@ describe("platform-managed config defaults", () => {
     expect(imageGen.provider).toBe("openai");
   });
 
-  test("IS_PLATFORM=false, config file exists without services key → in-memory config keeps schema your-own defaults", () => {
+  test("IS_PLATFORM=false, config file exists without services key → in-memory config keeps schema defaults (your-own except google/notion-oauth which are managed)", () => {
     // Sanity guard: deployment-context defaults are a no-op when IS_PLATFORM
-    // is not enabled, regardless of whether config.json existed.
+    // is not enabled, regardless of whether config.json existed. The Zod
+    // schema defaults still apply, so google-oauth and notion-oauth resolve
+    // to "managed" while the remaining services resolve to "your-own".
     process.env.IS_PLATFORM = "false";
 
     writeFileSync(
@@ -300,16 +365,18 @@ describe("platform-managed config defaults", () => {
 
     const config = loadConfig();
 
-    for (const svc of MANAGED_SERVICES) {
+    for (const svc of SCHEMA_YOUR_OWN_DEFAULT_SERVICES) {
       expect(
-        (
-          config.services as unknown as Record<
-            string,
-            { mode: string }
-          >
-        )[svc]!.mode,
+        (config.services as unknown as Record<string, { mode: string }>)[svc]!
+          .mode,
       ).toBe("your-own");
     }
+    for (const svc of SCHEMA_MANAGED_DEFAULT_SERVICES) {
+      expect(
+        (config.services as unknown as Record<string, { mode: string }>)[svc]!
+          .mode,
+      ).toBe("managed");
+    }
   });
 });
 

package/src/__tests__/config-loader-quarantine-bulletin.test.ts

@@ -28,7 +28,7 @@ import {
   invalidateConfigCache,
   loadConfig,
 } from "../config/loader.js";
-import { _setStorePath } from "../security/encrypted-store.js";
+import { setStorePathForTesting } from "./encrypted-store-test-helpers.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -71,12 +71,12 @@ function listQuarantinedFiles(): string[] {
 describe("config-quarantine UPDATES.md bulletin", () => {
   beforeEach(() => {
     resetWorkspace();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     invalidateConfigCache();
   });
 

package/src/__tests__/config-managed-gemini-defaults.test.ts

@@ -68,7 +68,6 @@ mock.module("../config/assistant-feature-flags.js", () => ({
     if (key === "managed-gemini-embeddings-enabled") return featureFlagEnabled;
     return true;
   },
-  _setOverridesForTesting: () => {},
   clearFeatureFlagOverridesCache: () => {},
   initFeatureFlagOverrides: async () => {},
   getAssistantFeatureFlagDefaults: () => ({}),
@@ -81,7 +80,7 @@ afterAll(() => {
 });
 
 import { invalidateConfigCache, loadConfig } from "../config/loader.js";
-import { _setStorePath } from "../security/encrypted-store.js";
+import { setStorePathForTesting } from "./encrypted-store-test-helpers.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -117,7 +116,7 @@ describe("managed Gemini embedding defaults (via loadConfig)", () => {
       }
     }
     ensureTestDir();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     invalidateConfigCache();
 
     // Reset mock state
@@ -127,7 +126,7 @@ describe("managed Gemini embedding defaults (via loadConfig)", () => {
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     invalidateConfigCache();
 
     // Restore IS_PLATFORM

package/src/__tests__/config-schema.test.ts

@@ -64,9 +64,9 @@ import {
   VALID_TTS_PROVIDERS as VALID_TTS_SERVICE_PROVIDERS,
 } from "../config/schemas/tts.js";
 import type { AssistantConfig } from "../config/types.js";
-import { _setStorePath } from "../security/encrypted-store.js";
 import { listCatalogProviderIds } from "../tts/provider-catalog.js";
 import { resolveTtsConfig } from "../tts/tts-config-resolver.js";
+import { setStorePathForTesting } from "./encrypted-store-test-helpers.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -87,7 +87,7 @@ describe("AssistantConfigSchema", () => {
     // llm.default.{provider,model}, auth routing via provider_connections.
     expect(result.services.inference).toEqual({});
     expect(result.llm.default.provider).toBe("anthropic");
-    expect(result.llm.default.model).toBe("claude-opus-4-7");
+    expect(result.llm.default.model).toBe("claude-opus-4-8");
     expect(result.services["image-generation"].provider).toBe("gemini");
     expect(result.services["image-generation"].model).toBe(
       "gemini-3.1-flash-image-preview",
@@ -179,7 +179,7 @@ describe("AssistantConfigSchema", () => {
     expect(result.llm).toBeDefined();
     expect(result.llm.default).toEqual({
       provider: "anthropic",
-      model: "claude-opus-4-7",
+      model: "claude-opus-4-8",
       maxTokens: 64000,
       effort: "max",
       speed: "standard",
@@ -318,7 +318,7 @@ describe("AssistantConfigSchema", () => {
       (result.services.inference as Record<string, unknown>).model,
     ).toBeUndefined();
     expect(result.llm.default.provider).toBe("anthropic");
-    expect(result.llm.default.model).toBe("claude-opus-4-7");
+    expect(result.llm.default.model).toBe("claude-opus-4-8");
   });
 
   test("partial llm config (empty `llm: {}`) doesn't trigger full config reset", () => {
@@ -333,7 +333,7 @@ describe("AssistantConfigSchema", () => {
     });
     expect(result.llm.default.maxTokens).toBe(32000);
     expect(result.llm.default.provider).toBe("anthropic");
-    expect(result.llm.default.model).toBe("claude-opus-4-7");
+    expect(result.llm.default.model).toBe("claude-opus-4-8");
   });
 
   test("llm.default with one missing field still parses (defaults applied)", () => {
@@ -2068,12 +2068,12 @@ describe("loadConfig with schema validation", () => {
       }
     }
     ensureTestDir();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     invalidateConfigCache();
   });
 
@@ -2096,7 +2096,7 @@ describe("loadConfig with schema validation", () => {
     writeConfig({});
     const config = loadConfig();
     expect(config.llm.default.provider).toBe("anthropic");
-    expect(config.llm.default.model).toBe("claude-opus-4-7");
+    expect(config.llm.default.model).toBe("claude-opus-4-8");
     expect(config.llm.default.maxTokens).toBe(64000);
     expect(config.llm.default.thinking).toEqual({
       enabled: true,
@@ -2350,12 +2350,12 @@ describe("Call entrypoint gating", () => {
       }
     }
     ensureTestDir();
-    _setStorePath(join(WORKSPACE_DIR, "keys.enc"));
+    setStorePathForTesting(join(WORKSPACE_DIR, "keys.enc"));
     invalidateConfigCache();
   });
 
   afterEach(() => {
-    _setStorePath(null);
+    setStorePathForTesting(null);
     invalidateConfigCache();
   });
 

package/src/__tests__/confirmation-request-guardian-bridge.test.ts

@@ -50,7 +50,6 @@ mock.module("../notifications/emit-signal.js", () => ({
       ],
     };
   },
-  registerBroadcastFn: () => {},
 }));
 
 // Mock channel guardian service — provide a guardian binding for 'self' + 'telegram'

package/src/__tests__/connection-model-compat.test.ts

@@ -0,0 +1,83 @@
+import { describe, expect, test } from "bun:test";
+
+import {
+  describeSubscriptionModelIncompatibility,
+  isConnectionCompatibleWithModel,
+} from "../providers/connection-model-compat.js";
+
+describe("isConnectionCompatibleWithModel", () => {
+  test("non-oauth_subscription connections are always compatible", () => {
+    expect(
+      isConnectionCompatibleWithModel(
+        { auth: { type: "api_key" } as never },
+        "o3",
+      ),
+    ).toBe(true);
+  });
+
+  test("oauth_subscription is compatible with Codex models", () => {
+    expect(
+      isConnectionCompatibleWithModel(
+        { auth: { type: "oauth_subscription" } as never },
+        "gpt-5.4",
+      ),
+    ).toBe(true);
+  });
+
+  test("oauth_subscription is incompatible with non-Codex models", () => {
+    expect(
+      isConnectionCompatibleWithModel(
+        { auth: { type: "oauth_subscription" } as never },
+        "o3",
+      ),
+    ).toBe(false);
+  });
+
+  test("undefined model is always compatible", () => {
+    expect(
+      isConnectionCompatibleWithModel(
+        { auth: { type: "oauth_subscription" } as never },
+        undefined,
+      ),
+    ).toBe(true);
+  });
+});
+
+describe("describeSubscriptionModelIncompatibility", () => {
+  const subscriptionConn = { auth: { type: "oauth_subscription" as const } as never };
+  const apiKeyConn = { auth: { type: "api_key" as const } as never };
+
+  test("returns message when all candidates are oauth_subscription and model is incompatible", () => {
+    const msg = describeSubscriptionModelIncompatibility(
+      [subscriptionConn],
+      "o3",
+    );
+    expect(msg).toContain("o3");
+    expect(msg).toContain("ChatGPT subscription");
+  });
+
+  test("returns null when no candidates", () => {
+    expect(describeSubscriptionModelIncompatibility([], "o3")).toBeNull();
+  });
+
+  test("returns null when model is undefined", () => {
+    expect(
+      describeSubscriptionModelIncompatibility([subscriptionConn], undefined),
+    ).toBeNull();
+  });
+
+  test("returns null when some candidates are compatible", () => {
+    expect(
+      describeSubscriptionModelIncompatibility(
+        [subscriptionConn, apiKeyConn],
+        "o3",
+      ),
+    ).toBeNull();
+  });
+
+  test("returns null when model is Codex-compatible", () => {
+    expect(
+      describeSubscriptionModelIncompatibility([subscriptionConn], "gpt-5.4"),
+    ).toBeNull();
+  });
+});

package/src/__tests__/contacts-tools.test.ts

@@ -65,11 +65,12 @@ import { executeContactMerge } from "../config/bundled-skills/contacts/tools/con
 import { executeContactSearch } from "../config/bundled-skills/contacts/tools/contact-search.js";
 import { upsertContact } from "../contacts/contact-store.js";
 import type { ContactWithChannels } from "../contacts/types.js";
-import { getDb, resetDb } from "../memory/db-connection.js";
+import { getDb } from "../memory/db-connection.js";
 import { initializeDb } from "../memory/db-init.js";
 import { ROUTES } from "../runtime/routes/contact-routes.js";
 import { RouteError } from "../runtime/routes/errors.js";
 import type { ToolContext } from "../tools/types.js";
+import { resetDbForTesting } from "./db-test-helpers.js";
 
 initializeDb();
 
@@ -127,7 +128,7 @@ beforeAll(() => {
 
 afterAll(() => {
   testServer?.stop(true);
-  resetDb();
+  resetDbForTesting();
 });
 
 function getRawDb(): Database {

package/src/__tests__/context-token-estimator.test.ts

@@ -367,6 +367,28 @@ describe("token estimator", () => {
     expect(tokens).toBeLessThan(4_200);
   });
 
+  test("Gemini preserves aspect ratio when resizing to the 3072px cap", () => {
+    // Gemini rescales BOTH dimensions by a single factor so the longest side
+    // becomes 3072px. A 10000x1000 image → 3072x307, i.e. ceil(3072/768)=4
+    // tiles wide * ceil(307/768)=1 tile high = 4 tiles (~1,032 tokens).
+    // Clamping each side independently would yield 4*2=8 tiles, over-counting
+    // by 2x and risking spurious compaction.
+    const tokens = estimateContentBlockTokens(
+      {
+        type: "image",
+        source: {
+          type: "base64",
+          media_type: "image/png",
+          data: makePngBase64(10000, 1000),
+        },
+      },
+      { providerName: "gemini" },
+    );
+    // 4 tiles * 258 = 1,032 image tokens + 16 block overhead + 3 media type.
+    expect(tokens).toBeGreaterThanOrEqual(1_032);
+    expect(tokens).toBeLessThan(1_100);
+  });
+
   test("Gemini images ≤384px on both sides count as a single 258-token tile", () => {
     const tokens = estimateContentBlockTokens(
       {

package/src/__tests__/conversation-abort-tool-results.test.ts

@@ -138,6 +138,8 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationTitle: () => {},
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
+  updateMessageContent: mock(() => {}),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({
@@ -192,6 +194,9 @@ mock.module("../agent/loop.js", () => ({
       onEvent: (event: AgentEvent) => void,
       _signal?: AbortSignal,
     ): Promise<Message[]> {
+      // Prime the assistant row anchor — production code emits this from
+      // `AgentLoop.run` just before `provider.sendMessage`.
+      await onEvent({ type: "llm_call_started" });
       const history = [...messages];
 
       // Simulate provider response with 2 tool_use blocks

package/src/__tests__/conversation-agent-loop-disk-pressure.test.ts

@@ -86,7 +86,6 @@ mock.module("../daemon/disk-pressure-guard.js", () => ({
 }));
 
 mock.module("../memory/conversation-crud.js", () => ({
-  clearStrippedInjectionMetadataForConversation: () => {},
   getConversation: () => ({
     id: "conv-123",
     conversationType: "background",
@@ -98,8 +97,10 @@ mock.module("../memory/conversation-crud.js", () => ({
   getConversationOriginInterface: () => null,
   getConversationOverrideProfileFromRow: () => null,
   provenanceFromTrustContext: () => ({}),
+  setConversationHistoryStrippedAt: () => {},
   updateConversationContextWindow: () => {},
   updateConversationSlackContextWatermark: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 import { runAgentLoopImpl } from "../daemon/conversation-agent-loop.js";