@hasna/mementos 0.14.86 → 0.14.88

package/dist/cli/index.js

@@ -2200,11 +2200,119 @@ var init_retired_storage_mode = __esm(() => {
   ];
 });
 
-// src/storage.ts
-import { Database } from "bun:sqlite";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+// ../../node_modules/.bun/@hasna+paths@0.1.0/node_modules/@hasna/paths/dist/index.js
 import { homedir } from "os";
 import { join } from "path";
+function assertApp(app) {
+  if (typeof app !== "string" || app.length === 0) {
+    throw new TypeError("paths: app must be a non-empty string");
+  }
+  if (!APP_SLUG_RE.test(app)) {
+    throw new TypeError(`paths: invalid app slug "${app}" \u2014 expected lowercase kebab-case ([a-z0-9]+(-[a-z0-9]+)*)`);
+  }
+}
+function envOf(options) {
+  return options.env ?? process.env;
+}
+function envValue(options, kind) {
+  const value = envOf(options)[KIND_ENV[kind]];
+  return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+function isMacOS(platform) {
+  return platform === "darwin";
+}
+function baseDir(kind, options) {
+  const override = envValue(options, kind);
+  if (override)
+    return override;
+  const home = options.home ?? homedir();
+  const platform = options.platform ?? process.platform;
+  if (isMacOS(platform)) {
+    switch (kind) {
+      case "config":
+      case "data":
+        return join(home, "Library", "Application Support", "Hasna");
+      case "cache":
+        return join(home, "Library", "Caches", "Hasna");
+      case "state":
+        return join(home, "Library", "Logs", "Hasna");
+    }
+  }
+  switch (kind) {
+    case "config":
+      return join(home, ".config", "hasna");
+    case "data":
+      return join(home, ".local", "share", "hasna");
+    case "state":
+      return join(home, ".local", "state", "hasna");
+    case "cache":
+      return join(home, ".cache", "hasna");
+  }
+}
+function resolvePath(kind, options) {
+  assertApp(options.app);
+  const appSegment = options.internal === true ? join("internal", options.app) : options.app;
+  return join(baseDir(kind, options), appSegment);
+}
+function dataDir(options) {
+  return resolvePath("data", options);
+}
+var KIND_ENV, APP_SLUG_RE;
+var init_dist = __esm(() => {
+  KIND_ENV = {
+    config: "HASNA_CONFIG_HOME",
+    data: "HASNA_DATA_HOME",
+    state: "HASNA_STATE_HOME",
+    cache: "HASNA_CACHE_HOME"
+  };
+  APP_SLUG_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+});
+
+// src/lib/paths.ts
+import { existsSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join2, resolve } from "path";
+function effectiveHome() {
+  return process.env["HOME"] || process.env["USERPROFILE"] || homedir2() || "/tmp";
+}
+function legacyDataRoot() {
+  return join2(effectiveHome(), ".hasna", "mementos");
+}
+function resolverDataRoot() {
+  return dataDir({
+    app: "mementos",
+    home: process.env["HOME"] || process.env["USERPROFILE"] || undefined
+  });
+}
+function adoptResolverDataRoot(resolved, env = process.env) {
+  const dataOverride = env.HASNA_DATA_HOME;
+  if (typeof dataOverride === "string" && dataOverride.trim().length > 0)
+    return true;
+  return existsSync(join2(resolved, "mementos.db"));
+}
+function exactDataRoot() {
+  for (const key of ["HASNA_MEMENTOS_HOME", "MEMENTOS_HOME"]) {
+    const dir = process.env[key]?.trim();
+    if (dir)
+      return resolve(dir);
+  }
+  return;
+}
+function getDataRoot() {
+  const exact = exactDataRoot();
+  if (exact)
+    return exact;
+  const resolved = resolverDataRoot();
+  return adoptResolverDataRoot(resolved) ? resolve(resolved) : resolve(legacyDataRoot());
+}
+var init_paths = __esm(() => {
+  init_dist();
+});
+
+// src/storage.ts
+import { Database } from "bun:sqlite";
+import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { join as join3 } from "path";
 import { fileURLToPath } from "url";
 import { Worker } from "worker_threads";
 import pg from "pg";
@@ -2454,7 +2562,7 @@ function readEnv(name) {
   return value ? value : null;
 }
 function readConfigFile() {
-  if (!existsSync(STORAGE_CONFIG_PATH)) {
+  if (!existsSync2(STORAGE_CONFIG_PATH)) {
     return {};
   }
   try {
@@ -2463,6 +2571,9 @@ function readConfigFile() {
     return {};
   }
 }
+function getConfigPath() {
+  return STORAGE_CONFIG_PATH;
+}
 function getStorageDatabaseEnv() {
   for (const env of DATABASE_ENV_NAMES) {
     if (readEnv(env.name))
@@ -2699,11 +2810,7 @@ function getStorageStatus() {
 function getConfiguredConnectionString() {
   return getStorageDatabaseUrl() ?? undefined;
 }
-function getStorageConnectionString(dbName = "mementos") {
-  assertNoLegacyStorageMode2();
-  if (!isServerContext()) {
-    throw new Error("Refusing to construct an RDS Postgres DSN outside the mementos-serve server. " + "The raw database DSN is NEVER distributed to client machines. " + "Clients must use the HTTP API: set HASNA_MEMENTOS_API_URL and " + "HASNA_MEMENTOS_API_KEY (and unset HASNA_MEMENTOS_DATABASE_URL).");
-  }
+function resolveConfiguredConnectionString(dbName) {
   const envConnectionString = getConfiguredConnectionString();
   if (envConnectionString) {
     const validation = validatePostgresConnectionString(envConnectionString);
@@ -2722,7 +2829,7 @@ function getStorageConnectionString(dbName = "mementos") {
     missing.push("storage.rds.username");
   }
   if (missing.length > 0) {
-    throw new Error(`Remote storage database is not configured. Missing ${missing.join(", ")}. Set HASNA_MEMENTOS_DATABASE_URL or configure ~/.hasna/mementos/storage/config.json.`);
+    throw new Error(`Remote storage database is not configured. Missing ${missing.join(", ")}. Set HASNA_MEMENTOS_DATABASE_URL or configure ${STORAGE_CONFIG_PATH}.`);
   }
   const password = process.env[password_env];
   if (!password) {
@@ -2731,6 +2838,17 @@ function getStorageConnectionString(dbName = "mementos") {
   const sslParam = ssl ? "?sslmode=require" : "";
   return `postgres://${username}:${encodeURIComponent(password)}@${host}:${port}/${dbName}${sslParam}`;
 }
+function getStorageConnectionString(dbName = "mementos") {
+  assertNoLegacyStorageMode2();
+  if (!isServerContext()) {
+    throw new Error("Refusing to construct an RDS Postgres DSN outside the mementos-serve server. " + "The raw database DSN is NEVER distributed to client machines. " + "Clients must use the HTTP API: set HASNA_MEMENTOS_API_URL and " + "HASNA_MEMENTOS_API_KEY (and unset HASNA_MEMENTOS_DATABASE_URL).");
+  }
+  return resolveConfiguredConnectionString(dbName);
+}
+function getStorageConnectionStringForOperator(dbName = "mementos") {
+  assertNoLegacyStorageMode2();
+  return resolveConfiguredConnectionString(dbName);
+}
 function isSyncExcludedTable(table) {
   return SYNC_EXCLUDED_TABLE_PATTERNS.some((pattern) => pattern.test(table));
 }
@@ -2889,6 +3007,7 @@ CREATE TABLE IF NOT EXISTS _sync_meta (
 var init_storage = __esm(() => {
   init_backend();
   init_retired_storage_mode();
+  init_paths();
   PgSyncPool = class PgSyncPool {
     worker;
     status;
@@ -2906,12 +3025,12 @@ var init_storage = __esm(() => {
       const ext = import.meta.url.endsWith(".ts") ? ".ts" : ".js";
       const here = fileURLToPath(new URL(".", import.meta.url));
       const candidates = [
-        join(here, `pg-sync-worker${ext}`),
-        join(here, "..", `pg-sync-worker${ext}`),
-        join(here, "..", "..", `pg-sync-worker${ext}`)
+        join3(here, `pg-sync-worker${ext}`),
+        join3(here, "..", `pg-sync-worker${ext}`),
+        join3(here, "..", "..", `pg-sync-worker${ext}`)
       ];
       for (const candidate of candidates) {
-        if (existsSync(candidate))
+        if (existsSync2(candidate))
           return candidate;
       }
       return candidates[0];
@@ -2998,7 +3117,7 @@ var init_storage = __esm(() => {
   MEMENTOS_STORAGE_FALLBACK_ENV = {
     databaseUrl: "MEMENTOS_DATABASE_URL"
   };
-  LOCAL_DATA_DIR = join(homedir(), ".hasna", "mementos");
+  LOCAL_DATA_DIR = getDataRoot();
   DEFAULT_STORAGE_CONFIG = {
     rds: {
       host: "",
@@ -3013,8 +3132,8 @@ var init_storage = __esm(() => {
       schedule_minutes: 0
     }
   };
-  STORAGE_CONFIG_DIR = join(LOCAL_DATA_DIR, "storage");
-  STORAGE_CONFIG_PATH = join(STORAGE_CONFIG_DIR, "config.json");
+  STORAGE_CONFIG_DIR = join3(LOCAL_DATA_DIR, "storage");
+  STORAGE_CONFIG_PATH = join3(STORAGE_CONFIG_DIR, "config.json");
   DATABASE_ENV_NAMES = [
     { name: MEMENTOS_STORAGE_ENV.databaseUrl, deprecated: false },
     { name: MEMENTOS_STORAGE_FALLBACK_ENV.databaseUrl, deprecated: false }
@@ -3039,7 +3158,7 @@ var init_storage = __esm(() => {
 
 // src/db/api-mode.ts
 import { tmpdir } from "os";
-import { join as join2 } from "path";
+import { join as join4 } from "path";
 import { writeFileSync as writeFileSync2, unlinkSync } from "fs";
 import { randomUUID } from "crypto";
 function firstEnv2(keys) {
@@ -3164,7 +3283,7 @@ x-api-key: ${cfg.apiKey}
   ];
   let bodyFile;
   if (hasBody) {
-    bodyFile = join2(tmpdir(), `mem-req-${process.pid}-${randomUUID()}.json`);
+    bodyFile = join4(tmpdir(), `mem-req-${process.pid}-${randomUUID()}.json`);
     writeFileSync2(bodyFile, JSON.stringify(body), { mode: 384 });
     args.push("--data-binary", `@${bodyFile}`);
   }
@@ -4650,18 +4769,18 @@ __export(exports_database, {
   escapeLikePrefix: () => escapeLikePrefix,
   closeDatabase: () => closeDatabase
 });
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, cpSync } from "fs";
-import { dirname, join as join3, resolve } from "path";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, cpSync } from "fs";
+import { dirname, join as join5, resolve as resolve2 } from "path";
 function isInMemoryDb(path) {
   return path === ":memory:" || path.startsWith("file::memory:");
 }
 function findNearestMementosDb(startDir) {
-  let dir = resolve(startDir);
+  let dir = resolve2(startDir);
   const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-  const legacyHomeDb = resolve(home, ".mementos", "mementos.db");
+  const legacyHomeDb = resolve2(home, ".mementos", "mementos.db");
   while (true) {
-    const candidate = join3(dir, ".mementos", "mementos.db");
-    if (existsSync2(candidate) && resolve(candidate) !== legacyHomeDb)
+    const candidate = join5(dir, ".mementos", "mementos.db");
+    if (existsSync3(candidate) && resolve2(candidate) !== legacyHomeDb)
       return candidate;
     const parent = dirname(dir);
     if (parent === dir)
@@ -4671,9 +4790,9 @@ function findNearestMementosDb(startDir) {
   return null;
 }
 function findGitRoot(startDir) {
-  let dir = resolve(startDir);
+  let dir = resolve2(startDir);
   while (true) {
-    if (existsSync2(join3(dir, ".git")))
+    if (existsSync3(join5(dir, ".git")))
       return dir;
     const parent = dirname(dir);
     if (parent === dir)
@@ -4684,10 +4803,10 @@ function findGitRoot(startDir) {
 }
 function migrateGlobalDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-  const newDir = join3(home, ".hasna", "mementos");
-  const oldDir = join3(home, ".mementos");
-  if (!existsSync2(newDir) && existsSync2(oldDir)) {
-    mkdirSync2(join3(home, ".hasna"), { recursive: true });
+  const newDir = getDataRoot();
+  const oldDir = join5(home, ".mementos");
+  if (!existsSync3(newDir) && existsSync3(oldDir)) {
+    mkdirSync2(dirname(newDir), { recursive: true });
     cpSync(oldDir, newDir, { recursive: true });
   }
 }
@@ -4704,18 +4823,17 @@ function getDbPath() {
   if (process.env["MEMENTOS_DB_SCOPE"] === "project") {
     const gitRoot = findGitRoot(cwd);
     if (gitRoot) {
-      return join3(gitRoot, ".mementos", "mementos.db");
+      return join5(gitRoot, ".mementos", "mementos.db");
     }
   }
   migrateGlobalDir();
-  const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-  return join3(home, ".hasna", "mementos", "mementos.db");
+  return join5(getDataRoot(), "mementos.db");
 }
 function ensureDir(filePath) {
   if (isInMemoryDb(filePath))
     return;
-  const dir = dirname(resolve(filePath));
-  if (!existsSync2(dir)) {
+  const dir = dirname(resolve2(filePath));
+  if (!existsSync3(dir)) {
     mkdirSync2(dir, { recursive: true });
   }
 }
@@ -4853,6 +4971,7 @@ var init_database = __esm(() => {
   init_storage();
   init_api_mode();
   init_migrations();
+  init_paths();
   ALLOWED_TABLES = new Set([
     "memories",
     "agents",
@@ -5019,6 +5138,30 @@ function redactSecrets(text) {
   }
   return result;
 }
+function redactValueTree(value) {
+  if (typeof value === "string")
+    return redactSecrets(value);
+  if (Array.isArray(value))
+    return value.map(redactValueTree);
+  if (value !== null && typeof value === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = redactValueTree(v);
+    }
+    return out;
+  }
+  return value;
+}
+function redactMemoryForOutput(memory) {
+  return {
+    ...memory,
+    key: redactSecrets(memory.key),
+    value: redactSecrets(memory.value),
+    summary: memory.summary ? redactSecrets(memory.summary) : null,
+    when_to_use: memory.when_to_use ? redactSecrets(memory.when_to_use) : null,
+    metadata: redactValueTree(memory.metadata)
+  };
+}
 var REDACTED = "[REDACTED]", SECRET_PATTERNS;
 var init_redact = __esm(() => {
   SECRET_PATTERNS = [
@@ -5421,12 +5564,22 @@ function createMemory(input, dedupeMode = "merge", db) {
   const effectiveMode = dedupeMode === "overwrite" ? "merge" : dedupeMode === "version-fork" ? "create" : dedupeMode;
   if (effectiveMode === "error") {
     const existing = d.query(`SELECT id, agent_id, updated_at FROM memories
-       WHERE key = ? AND scope = ? AND COALESCE(project_id, '') = ? AND status = 'active'
+       WHERE key = ? AND scope = ? AND COALESCE(project_id, '') = ?
        LIMIT 1`).get(input.key, input.scope || "private", input.project_id || "");
     if (existing) {
       throw new MemoryConflictError(input.key, existing);
     }
   }
+  if (effectiveMode === "create") {
+    const existing = d.query(`SELECT id, agent_id, updated_at FROM memories
+       WHERE key = ? AND scope = ?
+         AND COALESCE(agent_id, '') = ?
+         AND COALESCE(project_id, '') = ?
+         AND COALESCE(session_id, '') = ?`).get(input.key, input.scope || "private", input.agent_id || "", input.project_id || "", input.session_id || "");
+    if (existing) {
+      throw new MemoryConflictError(input.key, existing);
+    }
+  }
   if (effectiveMode === "merge") {
     const existing = d.query(`SELECT id, version FROM memories
          WHERE key = ? AND scope = ?
@@ -6078,6 +6231,17 @@ function updateMemory(id, input, db) {
   if (existing.version !== input.version) {
     throw new VersionConflictError(id, input.version, existing.version);
   }
+  if (input.scope !== undefined && input.scope !== existing.scope) {
+    const conflict = d.query(`SELECT id, agent_id, updated_at FROM memories
+         WHERE key = ? AND scope = ?
+           AND COALESCE(agent_id, '') = ?
+           AND COALESCE(project_id, '') = ?
+           AND COALESCE(session_id, '') = ?
+           AND id != ?`).get(existing.key, input.scope, existing.agent_id || "", existing.project_id || "", existing.session_id || "", memoryId);
+    if (conflict) {
+      throw new MemoryConflictError(existing.key, conflict);
+    }
+  }
   const sets = ["version = version + 1", "updated_at = ?"];
   const params = [now()];
   if (input.value !== undefined) {
@@ -6336,16 +6500,16 @@ var init_memories = __esm(() => {
 });
 
 // src/db/agents.ts
-import { homedir as homedir3 } from "os";
-import { join as join5 } from "path";
-import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join7 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync2 } from "fs";
 function resolveWritingAgentName() {
   const envName = process.env["MEMENTOS_AGENT"]?.trim();
   if (envName)
     return envName;
   try {
-    const path = join5(homedir3(), ".hasna", "conversations", "agent-id");
-    if (existsSync4(path)) {
+    const path = join7(homedir4(), ".hasna", "conversations", "agent-id");
+    if (existsSync5(path)) {
       const fileAgent = readFileSync2(path, "utf8").trim();
       if (fileAgent)
         return fileAgent;
@@ -6556,13 +6720,13 @@ var init_agents = __esm(() => {
 
 // src/lib/package-version.ts
 import { readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname2, join as join6 } from "path";
+import { dirname as dirname2, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function getMementosPackageVersion() {
   const here = dirname2(fileURLToPath2(import.meta.url));
   for (const candidate of [
-    join6(here, "..", "..", "package.json"),
-    join6(here, "..", "package.json")
+    join8(here, "..", "..", "package.json"),
+    join8(here, "..", "package.json")
   ]) {
     try {
       const parsed = JSON.parse(readFileSync3(candidate, "utf8"));
@@ -7548,7 +7712,7 @@ __export(exports_helpers, {
   getPackageVersion: () => getPackageVersion,
   getOutputFormat: () => getOutputFormat,
   getNestedValue: () => getNestedValue,
-  getConfigPath: () => getConfigPath,
+  getConfigPath: () => getConfigPath2,
   formatWatchLine: () => formatWatchLine,
   formatMemoryLine: () => formatMemoryLine,
   formatMemoryDetail: () => formatMemoryDetail,
@@ -7569,11 +7733,11 @@ __export(exports_helpers, {
 });
 import chalk from "chalk";
 import { readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname3, join as join7, resolve as resolve2 } from "path";
+import { dirname as dirname3, join as join9, resolve as resolve3 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function getPackageVersion() {
   try {
-    const pkgPath = join7(dirname3(fileURLToPath3(import.meta.url)), "..", "..", "package.json");
+    const pkgPath = join9(dirname3(fileURLToPath3(import.meta.url)), "..", "..", "package.json");
     const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
     return pkg.version || "0.0.0";
   } catch {
@@ -7853,7 +8017,7 @@ function resolveKeyOrId(keyOrId, opts, globalOpts) {
   const projectPath = opts.project || globalOpts.project;
   let projectId;
   if (projectPath) {
-    const project = getProject(resolve2(projectPath));
+    const project = getProject(resolve3(projectPath));
     if (project)
       projectId = project.id;
   }
@@ -8132,14 +8296,13 @@ function validateConfigKeyValue(key, value, DEFAULT_CONFIG) {
   }
   return null;
 }
-function getConfigPath() {
-  const { homedir: homedir4 } = __require("os");
-  return join7(homedir4(), ".hasna", "mementos", "config.json");
+function getConfigPath2() {
+  return join9(getDataRoot(), "config.json");
 }
 function readFileConfig() {
-  const { existsSync: existsSync5 } = __require("fs");
-  const configPath = getConfigPath();
-  if (!existsSync5(configPath))
+  const { existsSync: existsSync6 } = __require("fs");
+  const configPath = getConfigPath2();
+  if (!existsSync6(configPath))
     return {};
   try {
     const data = JSON.parse(readFileSync4(configPath, "utf-8"));
@@ -8153,10 +8316,10 @@ function readFileConfig() {
   }
 }
 function writeFileConfig(data) {
-  const { existsSync: existsSync5, writeFileSync: writeFileSync3, mkdirSync: mkdirSync3 } = __require("fs");
-  const configPath = getConfigPath();
+  const { existsSync: existsSync6, writeFileSync: writeFileSync3, mkdirSync: mkdirSync3 } = __require("fs");
+  const configPath = getConfigPath2();
   const dir = dirname3(configPath);
-  if (!existsSync5(dir))
+  if (!existsSync6(dir))
     mkdirSync3(dir, { recursive: true });
   writeFileSync3(configPath, JSON.stringify(data, null, 2) + `
 `, "utf-8");
@@ -8169,6 +8332,7 @@ var init_helpers = __esm(() => {
   init_agents();
   init_projects();
   init_entities();
+  init_paths();
   scopeColor = {
     global: chalk.cyan,
     shared: chalk.yellow,
@@ -8787,7 +8951,9 @@ function scoreResults(rows, queryLower, graphBoostedIds) {
   scored.sort((a, b) => {
     if (b.score !== a.score)
       return b.score - a.score;
-    return b.memory.importance - a.memory.importance;
+    if (b.memory.importance !== a.memory.importance)
+      return b.memory.importance - a.memory.importance;
+    return a.memory.id.localeCompare(b.memory.id);
   });
   return scored;
 }
@@ -9952,6 +10118,7 @@ var init_auto_memory = __esm(() => {
 // src/db/webhook_hooks.ts
 var exports_webhook_hooks = {};
 __export(exports_webhook_hooks, {
+  validateWebhookHandlerUrl: () => validateWebhookHandlerUrl,
   updateWebhookHook: () => updateWebhookHook,
   recordWebhookInvocation: () => recordWebhookInvocation,
   listWebhookHooks: () => listWebhookHooks,
@@ -9959,6 +10126,8 @@ __export(exports_webhook_hooks, {
   deleteWebhookHook: () => deleteWebhookHook,
   createWebhookHook: () => createWebhookHook
 });
+import { isIP } from "net";
+import { lookup as dnsLookup } from "dns/promises";
 function parseRow(row) {
   return {
     id: row["id"],
@@ -9975,7 +10144,153 @@ function parseRow(row) {
     failureCount: row["failure_count"]
   };
 }
-function createWebhookHook(input, db) {
+function isBlockedIpv4(parts) {
+  const a = parts[0];
+  const b = parts[1];
+  if (a === 0)
+    return true;
+  if (a === 127)
+    return true;
+  if (a === 169 && b === 254)
+    return true;
+  if (a === 10)
+    return true;
+  if (a === 172 && b >= 16 && b <= 31)
+    return true;
+  if (a === 192 && b === 168)
+    return true;
+  return false;
+}
+function isBlockedIpv6(bytes) {
+  const mapped = bytes.slice(0, 10).every((b) => b === 0) && bytes[10] === 255 && bytes[11] === 255;
+  if (mapped)
+    return isBlockedIpv4(bytes.slice(12, 16));
+  if (bytes.every((b) => b === 0))
+    return true;
+  if (bytes.slice(0, 15).every((b) => b === 0) && bytes[15] === 1)
+    return true;
+  if ((bytes[0] & 254) === 252)
+    return true;
+  if (bytes[0] === 254 && (bytes[1] & 192) === 128)
+    return true;
+  return false;
+}
+function quadToGroups(quad) {
+  const nums = quad.split(".").map((p) => Number(p));
+  const [a, b, c, d] = nums;
+  const valid = [a, b, c, d].every((n) => n !== undefined && Number.isInteger(n) && n >= 0 && n <= 255);
+  if (!valid)
+    return null;
+  return [a << 8 | b, c << 8 | d];
+}
+function parseIpv6Bytes(host) {
+  const groups = host.split("::");
+  if (groups.length > 2)
+    return null;
+  const headRaw = groups[0] ?? "";
+  const tailRaw = groups[1] ?? "";
+  const head = headRaw === "" ? [] : headRaw.split(":");
+  const tail = tailRaw === "" ? [] : tailRaw.split(":");
+  const headNums = [];
+  for (const g of head) {
+    if (!/^[0-9a-f]{1,4}$/i.test(g))
+      return null;
+    headNums.push(parseInt(g, 16));
+  }
+  const tailNums = [];
+  for (const g of tail) {
+    if (/^\d+\.\d+\.\d+\.\d+$/.test(g)) {
+      const quads = quadToGroups(g);
+      if (!quads)
+        return null;
+      tailNums.push(...quads);
+    } else if (/^[0-9a-f]{1,4}$/i.test(g)) {
+      tailNums.push(parseInt(g, 16));
+    } else {
+      return null;
+    }
+  }
+  const hasCompression = groups.length === 2;
+  if (!hasCompression && headNums.length !== 8)
+    return null;
+  if (hasCompression && headNums.length + tailNums.length >= 8)
+    return null;
+  const zeros = 8 - headNums.length - tailNums.length;
+  const all = [...headNums, ...new Array(zeros).fill(0), ...tailNums];
+  const bytes = [];
+  for (const n of all) {
+    bytes.push(n >> 8 & 255, n & 255);
+  }
+  return bytes;
+}
+function defaultResolveHost(hostname2) {
+  return dnsLookup(hostname2, { all: true, verbatim: true });
+}
+function assertResolvedAddressPublic(address, url) {
+  const version = isIP(address);
+  if (version === 4) {
+    if (isBlockedIpv4(address.split(".").map((p) => Number(p)))) {
+      throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+    }
+  } else if (version === 6) {
+    const bytes = parseIpv6Bytes(address);
+    if (!bytes || isBlockedIpv6(bytes)) {
+      throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+    }
+  } else {
+    throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+  }
+}
+async function validateWebhookHandlerUrl(url, opts) {
+  const resolveHost = opts?.lookup ?? defaultResolveHost;
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    throw new Error(`Invalid webhook handler URL "${url}" \u2014 must be a valid http(s) URL`);
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    throw new Error(`Invalid webhook handler URL "${url}" \u2014 only http and https are allowed`);
+  }
+  if (parsed.username || parsed.password) {
+    throw new Error(`Invalid webhook handler URL "${url}" \u2014 embedded credentials are not allowed`);
+  }
+  const host = parsed.hostname.replace(/^\[|\]$/g, "").toLowerCase();
+  if (host === "localhost" || host.endsWith(".localhost")) {
+    throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+  }
+  const version = isIP(host);
+  if (version === 4 || version === 6) {
+    if (version === 4) {
+      if (isBlockedIpv4(host.split(".").map((p) => Number(p)))) {
+        throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+      }
+    } else {
+      const bytes = parseIpv6Bytes(host);
+      if (!bytes || isBlockedIpv6(bytes)) {
+        throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+      }
+    }
+    return;
+  }
+  if (/^[0-9]+(\.[0-9]+)*$/.test(host) || /^0x[0-9a-f]+$/i.test(host) || host.includes("%")) {
+    throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+  }
+  let addrs;
+  try {
+    addrs = await resolveHost(host);
+  } catch {
+    throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+  }
+  if (addrs.length === 0) {
+    throw new Error(`${BLOCKED_TARGET_MESSAGE}: "${url}"`);
+  }
+  for (const { address } of addrs) {
+    assertResolvedAddressPublic(address, url);
+  }
+}
+async function createWebhookHook(input, db, opts) {
+  await validateWebhookHandlerUrl(input.handlerUrl, opts);
   if (!db && isApiMode()) {
     const { data } = apiJson("POST", "/webhooks", {
       type: input.type,
@@ -10093,6 +10408,7 @@ function recordWebhookInvocation(id, success, db) {
     d.run("UPDATE webhook_hooks SET invocation_count = invocation_count + 1, failure_count = failure_count + 1 WHERE id = ?", [id]);
   }
 }
+var BLOCKED_TARGET_MESSAGE = "Invalid webhook handler URL \u2014 loopback, link-local, and private network targets are not allowed";
 var init_webhook_hooks = __esm(() => {
   init_database();
   init_api_mode();
@@ -10711,6 +11027,7 @@ var init_contradiction = __esm(() => {
 var exports_built_in_hooks = {};
 __export(exports_built_in_hooks, {
   reloadWebhooks: () => reloadWebhooks,
+  makeWebhookHandler: () => makeWebhookHandler,
   loadWebhooksFromDb: () => loadWebhooksFromDb
 });
 async function getAutoMemory() {
@@ -10720,13 +11037,19 @@ async function getAutoMemory() {
   }
   return _processConversationTurn;
 }
-function loadWebhooksFromDb() {
+async function loadWebhooksFromDb() {
   if (_webhooksLoaded)
     return;
   _webhooksLoaded = true;
   try {
     const webhooks = listWebhookHooks({ enabled: true });
     for (const wh of webhooks) {
+      try {
+        await validateWebhookHandlerUrl(wh.handlerUrl);
+      } catch (err) {
+        console.error(`[hooks] Skipping webhook ${wh.id} (${wh.type}): ${err instanceof Error ? err.message : String(err)}`);
+        continue;
+      }
       hookRegistry.register({
         type: wh.type,
         blocking: wh.blocking,
@@ -10744,9 +11067,10 @@ function loadWebhooksFromDb() {
     console.error("[hooks] Failed to load webhooks from DB:", err);
   }
 }
-function makeWebhookHandler(webhookId, url) {
+function makeWebhookHandler(webhookId, url, opts) {
   return async (context) => {
     try {
+      await validateWebhookHandlerUrl(url, opts);
       const res = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -10759,9 +11083,9 @@ function makeWebhookHandler(webhookId, url) {
     }
   };
 }
-function reloadWebhooks() {
+async function reloadWebhooks() {
   _webhooksLoaded = false;
-  loadWebhooksFromDb();
+  await loadWebhooksFromDb();
 }
 var _processConversationTurn = null, _webhooksLoaded = false;
 var init_built_in_hooks = __esm(() => {
@@ -12726,13 +13050,13 @@ __export(exports_session_registry, {
   closeRegistry: () => closeRegistry,
   cleanStaleSessions: () => cleanStaleSessions
 });
-import { existsSync as existsSync9, mkdirSync as mkdirSync5 } from "fs";
-import { dirname as dirname6, join as join10 } from "path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync5 } from "fs";
+import { dirname as dirname6, join as join15 } from "path";
 function getDb() {
   if (_db2)
     return _db2;
   const dir = dirname6(DB_PATH);
-  if (!existsSync9(dir))
+  if (!existsSync10(dir))
     mkdirSync5(dir, { recursive: true });
   _db2 = new SqliteAdapter(DB_PATH);
   _db2.run("PRAGMA journal_mode = WAL");
@@ -12907,7 +13231,7 @@ function closeRegistry() {
 var DB_PATH, _db2 = null;
 var init_session_registry = __esm(() => {
   init_storage();
-  DB_PATH = join10(process.env["HOME"] || process.env["USERPROFILE"] || "~", ".open-sessions-registry.db");
+  DB_PATH = join15(process.env["HOME"] || process.env["USERPROFILE"] || "~", ".open-sessions-registry.db");
 });
 
 // src/db/pg-migrations.ts
@@ -13702,7 +14026,7 @@ function getPgMigrationDiagnostics(connectionString) {
   const issues = [];
   if (!resolvedConnectionString) {
     try {
-      resolvedConnectionString = getStorageConnectionString("mementos");
+      resolvedConnectionString = getStorageConnectionStringForOperator("mementos");
     } catch (error) {
       issues.push(error instanceof Error ? error.message : String(error));
     }
@@ -17767,7 +18091,7 @@ var init_zod = __esm(() => {
   init_external();
 });
 
-// ../../node_modules/.bun/@ai-sdk+provider@3.0.14/node_modules/@ai-sdk/provider/dist/index.mjs
+// ../../node_modules/.bun/@ai-sdk+provider@3.0.15/node_modules/@ai-sdk/provider/dist/index.mjs
 function getErrorMessage(error) {
   if (error == null) {
     return "unknown error";
@@ -17799,7 +18123,7 @@ function isJSONObject(value) {
   return value != null && typeof value === "object" && Object.entries(value).every(([key, val]) => typeof key === "string" && (val === undefined || isJSONValue(val)));
 }
 var marker = "vercel.ai.error", symbol, _a, _b, AISDKError, name = "AI_APICallError", marker2, symbol2, _a2, _b2, APICallError, name2 = "AI_EmptyResponseBodyError", marker3, symbol3, _a3, _b3, EmptyResponseBodyError, name3 = "AI_InvalidArgumentError", marker4, symbol4, _a4, _b4, InvalidArgumentError2, name4 = "AI_InvalidPromptError", marker5, symbol5, _a5, _b5, InvalidPromptError, name5 = "AI_InvalidResponseDataError", marker6, symbol6, _a6, _b6, InvalidResponseDataError, name6 = "AI_JSONParseError", marker7, symbol7, _a7, _b7, JSONParseError, name7 = "AI_LoadAPIKeyError", marker8, symbol8, _a8, _b8, LoadAPIKeyError, name8 = "AI_LoadSettingError", marker9, symbol9, _a9, _b9, LoadSettingError, name9 = "AI_NoContentGeneratedError", marker10, symbol10, _a10, _b10, NoContentGeneratedError, name10 = "AI_NoSuchModelError", marker11, symbol11, _a11, _b11, NoSuchModelError, name11 = "AI_TooManyEmbeddingValuesForCallError", marker12, symbol12, _a12, _b12, TooManyEmbeddingValuesForCallError, name12 = "AI_TypeValidationError", marker13, symbol13, _a13, _b13, TypeValidationError, name13 = "AI_UnsupportedFunctionalityError", marker14, symbol14, _a14, _b14, UnsupportedFunctionalityError;
-var init_dist = __esm(() => {
+var init_dist2 = __esm(() => {
   symbol = Symbol.for(marker);
   AISDKError = class _AISDKError extends (_b = Error, _a = symbol, _b) {
     constructor({
@@ -29432,7 +29756,7 @@ var init_v3 = __esm(() => {
   init_external();
 });
 
-// ../../node_modules/.bun/eventsource-parser@3.1.0/node_modules/eventsource-parser/dist/index.js
+// ../../node_modules/.bun/eventsource-parser@3.1.1/node_modules/eventsource-parser/dist/index.js
 function noop(_arg) {}
 function createParser(config2) {
   if (typeof config2 == "function")
@@ -29519,7 +29843,7 @@ ${value2}`, dataLines++;
     }
     if (firstCharCode === 105 && chunk.charCodeAt(start + 1) === 100 && chunk.charCodeAt(start + 2) === 58) {
       const value2 = chunk.slice(chunk.charCodeAt(start + 3) === SPACE ? start + 4 : start + 3, end);
-      id = value2.includes("\x00") ? undefined : value2;
+      value2.includes("\x00") || (id = value2);
       return;
     }
     if (firstCharCode === 58) {
@@ -29547,7 +29871,7 @@ ${value2}`, dataLines++;
 ${value}`, dataLines++;
         break;
       case "id":
-        id = value.includes("\x00") ? undefined : value;
+        value.includes("\x00") || (id = value);
         break;
       case "retry":
         /^\d+$/.test(value) ? onRetry(parseInt(value, 10)) : onError(new ParseError(`Invalid \`retry\` value: "${value}"`, {
@@ -29584,7 +29908,7 @@ function isEventPrefix(chunk, i, firstCharCode) {
   return firstCharCode === 101 && chunk.charCodeAt(i + 1) === 118 && chunk.charCodeAt(i + 2) === 101 && chunk.charCodeAt(i + 3) === 110 && chunk.charCodeAt(i + 4) === 116 && chunk.charCodeAt(i + 5) === 58;
 }
 var ParseError, LF = 10, CR = 13, SPACE = 32;
-var init_dist2 = __esm(() => {
+var init_dist3 = __esm(() => {
   ParseError = class ParseError extends Error {
     constructor(message, options) {
       super(message), this.name = "ParseError", this.type = options.type, this.field = options.field, this.value = options.value, this.line = options.line;
@@ -29592,10 +29916,10 @@ var init_dist2 = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/eventsource-parser@3.1.0/node_modules/eventsource-parser/dist/stream.js
+// ../../node_modules/.bun/eventsource-parser@3.1.1/node_modules/eventsource-parser/dist/stream.js
 var EventSourceParserStream;
 var init_stream = __esm(() => {
-  init_dist2();
+  init_dist3();
   EventSourceParserStream = class EventSourceParserStream extends TransformStream {
     constructor({ onError, onRetry, onComment, maxBufferSize } = {}) {
       let parser;
@@ -29621,7 +29945,7 @@ var init_stream = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/@ai-sdk+provider-utils@4.0.42+27912429049419a2/node_modules/@ai-sdk/provider-utils/dist/index.mjs
+// ../../node_modules/.bun/@ai-sdk+provider-utils@4.0.46+27912429049419a2/node_modules/@ai-sdk/provider-utils/dist/index.mjs
 function combineHeaders(...headers) {
   return headers.reduce((combinedHeaders, currentHeaders) => ({
     ...combinedHeaders,
@@ -29962,11 +30286,10 @@ async function loadNodeModule(id) {
   var _a22;
   const processWithBuiltins = globalThis.process;
   const builtinModule = (_a22 = processWithBuiltins == null ? undefined : processWithBuiltins.getBuiltinModule) == null ? undefined : _a22.call(processWithBuiltins, id);
-  return builtinModule == null ? await importNodeModule(id) : builtinModule;
-}
-function importNodeModule(id) {
-  dynamicImport != null || (dynamicImport = Function("specifier", "return import(specifier)"));
-  return dynamicImport(id);
+  if (builtinModule == null) {
+    throw new Error(`Node.js built-in module ${id} is unavailable`);
+  }
+  return builtinModule;
 }
 function getCurrentModulePath() {
   const originalPrepareStackTrace = Error.prepareStackTrace;
@@ -30065,7 +30388,7 @@ async function readResponseWithSizeLimit({
   } finally {
     try {
       await reader.cancel();
-    } finally {
+    } catch (e) {} finally {
       reader.releaseLock();
     }
   }
@@ -31330,7 +31653,7 @@ function createProviderToolFactoryWithOutputSchema({
     supportsDeferredResults
   });
 }
-async function resolve20(value) {
+async function resolve21(value) {
   if (typeof value === "function") {
     value = value();
   }
@@ -31465,7 +31788,7 @@ var DelayedPromise = class {
   isPending() {
     return this.status.type === "pending";
   }
-}, btoa, atob2, name14 = "AI_DownloadError", marker15, symbol17, _a15, _b15, DownloadError, safeNodeFetchPromise, initialGlobalFetch, initialGlobalFetchIsNodeDefault, dynamicImport, MAX_DOWNLOAD_REDIRECTS = 10, DEFAULT_MAX_DOWNLOAD_SIZE, createIdGenerator = ({
+}, btoa, atob2, name14 = "AI_DownloadError", marker15, symbol17, _a15, _b15, DownloadError, safeNodeFetchPromise, initialGlobalFetch, initialGlobalFetchIsNodeDefault, MAX_DOWNLOAD_REDIRECTS = 10, DEFAULT_MAX_DOWNLOAD_SIZE, createIdGenerator = ({
   prefix,
   size = 16,
   alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
@@ -31489,7 +31812,7 @@ var DelayedPromise = class {
     });
   }
   return () => `${prefix}${separator}${generator()}`;
-}, generateId2, FETCH_FAILED_ERROR_MESSAGES, BUN_ERROR_CODES, VERSION = "4.0.42", getOriginalFetch = () => globalThis.fetch, getFromApi = async ({
+}, generateId2, FETCH_FAILED_ERROR_MESSAGES, BUN_ERROR_CODES, VERSION = "4.0.46", getOriginalFetch = () => globalThis.fetch, getFromApi = async ({
   url: url2,
   headers = {},
   successfulResponseHandler,
@@ -32009,23 +32332,23 @@ var DelayedPromise = class {
     });
   }
 };
-var init_dist3 = __esm(() => {
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
+var init_dist4 = __esm(() => {
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
   init_v4();
   init_v3();
   init_v3();
   init_v3();
   init_stream();
-  init_dist();
-  init_dist();
-  init_dist();
+  init_dist2();
+  init_dist2();
+  init_dist2();
   ({ btoa, atob: atob2 } = globalThis);
   marker15 = `vercel.ai.error.${name14}`;
   symbol17 = Symbol.for(marker15);
@@ -32118,7 +32441,7 @@ var init_dist3 = __esm(() => {
   textDecoder = new TextDecoder;
 });
 
-// ../../node_modules/.bun/@ai-sdk+anthropic@3.0.107+27912429049419a2/node_modules/@ai-sdk/anthropic/dist/index.mjs
+// ../../node_modules/.bun/@ai-sdk+anthropic@3.0.111+27912429049419a2/node_modules/@ai-sdk/anthropic/dist/index.mjs
 var exports_dist = {};
 __export(exports_dist, {
   forwardAnthropicContainerIdFromLastStep: () => forwardAnthropicContainerIdFromLastStep,
@@ -32576,7 +32899,7 @@ async function convertToAnthropicMessagesPrompt({
   cacheControlValidator,
   toolNameMapping
 }) {
-  var _a16, _b16, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
+  var _a16, _b16, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
   const betas = /* @__PURE__ */ new Set;
   const blocks = groupIntoBlocks(prompt);
   const validator = cacheControlValidator || new CacheControlValidator;
@@ -32964,6 +33287,7 @@ async function convertToAnthropicMessagesPrompt({
                 break;
               }
               case "tool-call": {
+                const caller = getAnthropicCaller(part.providerOptions);
                 if (part.providerExecuted) {
                   const providerToolName = toolNameMapping.toProviderToolName(part.toolName);
                   const isMcpToolUse = ((_l = (_k = part.providerOptions) == null ? undefined : _k.anthropic) == null ? undefined : _l.type) === "mcp-tool-use";
@@ -32992,6 +33316,7 @@ async function convertToAnthropicMessagesPrompt({
                       id: part.toolCallId,
                       name: subtoolName,
                       input,
+                      ...caller && { caller },
                       cache_control: cacheControl
                     });
                   } else if (providerToolName === "code_execution" && part.input != null && typeof part.input === "object" && "type" in part.input && part.input.type === "programmatic-tool-call") {
@@ -33001,6 +33326,7 @@ async function convertToAnthropicMessagesPrompt({
                       id: part.toolCallId,
                       name: "code_execution",
                       input: inputWithoutType,
+                      ...caller && { caller },
                       cache_control: cacheControl
                     });
                   } else {
@@ -33010,6 +33336,7 @@ async function convertToAnthropicMessagesPrompt({
                         id: part.toolCallId,
                         name: providerToolName,
                         input: part.input,
+                        ...caller && { caller },
                         cache_control: cacheControl
                       });
                     } else if (providerToolName === "tool_search_tool_regex" || providerToolName === "tool_search_tool_bm25") {
@@ -33018,6 +33345,7 @@ async function convertToAnthropicMessagesPrompt({
                         id: part.toolCallId,
                         name: providerToolName,
                         input: part.input,
+                        ...caller && { caller },
                         cache_control: cacheControl
                       });
                     } else if (providerToolName === "advisor") {
@@ -33026,6 +33354,7 @@ async function convertToAnthropicMessagesPrompt({
                         id: part.toolCallId,
                         name: "advisor",
                         input: {},
+                        ...caller && { caller },
                         cache_control: cacheControl
                       });
                     } else {
@@ -33037,11 +33366,6 @@ async function convertToAnthropicMessagesPrompt({
                   }
                   break;
                 }
-                const callerOptions = (_o = part.providerOptions) == null ? undefined : _o.anthropic;
-                const caller = (callerOptions == null ? undefined : callerOptions.caller) ? (callerOptions.caller.type === "code_execution_20250825" || callerOptions.caller.type === "code_execution_20260120") && callerOptions.caller.toolId ? {
-                  type: callerOptions.caller.type,
-                  tool_id: callerOptions.caller.toolId
-                } : callerOptions.caller.type === "direct" ? { type: "direct" } : undefined : undefined;
                 anthropicContent.push({
                   type: "tool_use",
                   id: part.toolCallId,
@@ -33054,6 +33378,7 @@ async function convertToAnthropicMessagesPrompt({
               }
               case "tool-result": {
                 const providerToolName = toolNameMapping.toProviderToolName(part.toolName);
+                const caller = getAnthropicCaller(part.providerOptions);
                 if (mcpToolUseIds.has(part.toolCallId)) {
                   const output = part.output;
                   if (output.type !== "json" && output.type !== "error-json") {
@@ -33087,7 +33412,7 @@ async function convertToAnthropicMessagesPrompt({
                         tool_use_id: part.toolCallId,
                         content: {
                           type: "code_execution_tool_result_error",
-                          error_code: (_p = errorInfo.errorCode) != null ? _p : "unknown"
+                          error_code: (_o = errorInfo.errorCode) != null ? _o : "unknown"
                         },
                         cache_control: cacheControl
                       });
@@ -33098,7 +33423,7 @@ async function convertToAnthropicMessagesPrompt({
                         cache_control: cacheControl,
                         content: {
                           type: "bash_code_execution_tool_result_error",
-                          error_code: (_q = errorInfo.errorCode) != null ? _q : "unknown"
+                          error_code: (_p = errorInfo.errorCode) != null ? _p : "unknown"
                         }
                       });
                     }
@@ -33131,7 +33456,7 @@ async function convertToAnthropicMessagesPrompt({
                         stdout: codeExecutionOutput.stdout,
                         stderr: codeExecutionOutput.stderr,
                         return_code: codeExecutionOutput.return_code,
-                        content: (_r = codeExecutionOutput.content) != null ? _r : []
+                        content: (_q = codeExecutionOutput.content) != null ? _q : []
                       },
                       cache_control: cacheControl
                     });
@@ -33149,7 +33474,7 @@ async function convertToAnthropicMessagesPrompt({
                           encrypted_stdout: codeExecutionOutput.encrypted_stdout,
                           stderr: codeExecutionOutput.stderr,
                           return_code: codeExecutionOutput.return_code,
-                          content: (_s = codeExecutionOutput.content) != null ? _s : []
+                          content: (_r = codeExecutionOutput.content) != null ? _r : []
                         },
                         cache_control: cacheControl
                       });
@@ -33168,7 +33493,7 @@ async function convertToAnthropicMessagesPrompt({
                           stdout: codeExecutionOutput.stdout,
                           stderr: codeExecutionOutput.stderr,
                           return_code: codeExecutionOutput.return_code,
-                          content: (_t = codeExecutionOutput.content) != null ? _t : []
+                          content: (_s = codeExecutionOutput.content) != null ? _s : []
                         },
                         cache_control: cacheControl
                       });
@@ -33204,8 +33529,9 @@ async function convertToAnthropicMessagesPrompt({
                       tool_use_id: part.toolCallId,
                       content: {
                         type: "web_fetch_tool_result_error",
-                        error_code: (_u = (await extractErrorValue(output.value)).errorCode) != null ? _u : "unavailable"
+                        error_code: (_t = (await extractErrorValue(output.value)).errorCode) != null ? _t : "unavailable"
                       },
+                      ...caller && { caller },
                       cache_control: cacheControl
                     });
                     break;
@@ -33239,6 +33565,7 @@ async function convertToAnthropicMessagesPrompt({
                         }
                       }
                     },
+                    ...caller && { caller },
                     cache_control: cacheControl
                   });
                   break;
@@ -33251,8 +33578,9 @@ async function convertToAnthropicMessagesPrompt({
                       tool_use_id: part.toolCallId,
                       content: {
                         type: "web_search_tool_result_error",
-                        error_code: (_v = (await extractErrorValue(output.value)).errorCode) != null ? _v : "unavailable"
+                        error_code: (_u = (await extractErrorValue(output.value)).errorCode) != null ? _u : "unavailable"
                       },
+                      ...caller && { caller },
                       cache_control: cacheControl
                     });
                     break;
@@ -33278,6 +33606,7 @@ async function convertToAnthropicMessagesPrompt({
                       encrypted_content: result.encryptedContent,
                       type: result.type
                     })),
+                    ...caller && { caller },
                     cache_control: cacheControl
                   });
                   break;
@@ -33446,6 +33775,17 @@ function moveToolUseBlocksToEnd(content) {
   flushSegment();
   return result;
 }
+function getAnthropicCaller(providerOptions) {
+  var _a16;
+  const caller = (_a16 = providerOptions == null ? undefined : providerOptions.anthropic) == null ? undefined : _a16.caller;
+  if (((caller == null ? undefined : caller.type) === "code_execution_20250825" || (caller == null ? undefined : caller.type) === "code_execution_20260120") && caller.toolId) {
+    return {
+      type: caller.type,
+      tool_id: caller.toolId
+    };
+  }
+  return (caller == null ? undefined : caller.type) === "direct" ? { type: "direct" } : undefined;
+}
 function mapAnthropicStopReason({
   finishReason,
   isJsonResponseFromTool
@@ -33622,6 +33962,16 @@ function createCitationSource(citation, citationDocuments, generateId3) {
     }
   };
 }
+function getAnthropicCallerInfo(caller) {
+  return caller == null ? undefined : {
+    type: caller.type,
+    toolId: "tool_id" in caller ? caller.tool_id : undefined
+  };
+}
+function getAnthropicCallerMetadata(caller) {
+  const callerInfo = getAnthropicCallerInfo(caller);
+  return callerInfo == null ? {} : { providerMetadata: { anthropic: { caller: callerInfo } } };
+}
 function getModelCapabilities(modelId) {
   if (modelId.includes("claude-opus-5")) {
     return {
@@ -33850,7 +34200,7 @@ function forwardAnthropicContainerIdFromLastStep({
   }
   return;
 }
-var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandler, anthropicStopDetailsSchema, anthropicMessagesResponseSchema, anthropicMessagesChunkSchema, anthropicReasoningMetadataSchema, anthropicFilePartProviderOptions, anthropicSystemMessageProviderOptions, anthropicLanguageModelOptions, MAX_CACHE_BREAKPOINTS = 4, CacheControlValidator = class {
+var VERSION2 = "3.0.111", anthropicErrorDataSchema, anthropicFailedResponseHandler, anthropicStopDetailsSchema, anthropicToolCallCallerSchema, anthropicMessagesResponseSchema, anthropicMessagesChunkSchema, anthropicReasoningMetadataSchema, anthropicFilePartProviderOptions, anthropicSystemMessageProviderOptions, anthropicLanguageModelOptions, MAX_CACHE_BREAKPOINTS = 4, CacheControlValidator = class {
   constructor() {
     this.breakpointCount = 0;
     this.warnings = [];
@@ -34358,11 +34708,11 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
     betas,
     headers
   }) {
-    return combineHeaders(await resolve20(this.config.headers), headers, betas.size > 0 ? { "anthropic-beta": Array.from(betas).join(",") } : {});
+    return combineHeaders(await resolve21(this.config.headers), headers, betas.size > 0 ? { "anthropic-beta": Array.from(betas).join(",") } : {});
   }
   async getBetasFromHeaders(requestHeaders) {
     var _a16, _b16;
-    const configHeaders = await resolve20(this.config.headers);
+    const configHeaders = await resolve21(this.config.headers);
     const configBetaHeader = (_a16 = configHeaders["anthropic-beta"]) != null ? _a16 : "";
     const requestBetaHeader = (_b16 = requestHeaders == null ? undefined : requestHeaders["anthropic-beta"]) != null ? _b16 : "";
     return new Set([
@@ -34509,23 +34859,12 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               text: JSON.stringify(part.input)
             });
           } else {
-            const caller = part.caller;
-            const callerInfo = caller ? {
-              type: caller.type,
-              toolId: "tool_id" in caller ? caller.tool_id : undefined
-            } : undefined;
             content.push({
               type: "tool-call",
               toolCallId: part.id,
               toolName: part.name,
               input: JSON.stringify(part.input),
-              ...callerInfo && {
-                providerMetadata: {
-                  anthropic: {
-                    caller: callerInfo
-                  }
-                }
-              }
+              ...getAnthropicCallerMetadata(part.caller)
             });
           }
           break;
@@ -34539,7 +34878,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               toolName: toolNameMapping.toCustomToolName("code_execution"),
               input: JSON.stringify({ type: part.name, ...part.input }),
               providerExecuted: true,
-              ...markCodeExecutionDynamic && providerToolName === "code_execution" ? { dynamic: true } : {}
+              ...markCodeExecutionDynamic && providerToolName === "code_execution" ? { dynamic: true } : {},
+              ...getAnthropicCallerMetadata(part.caller)
             });
           } else if (part.name === "web_search" || part.name === "code_execution" || part.name === "web_fetch") {
             const inputToSerialize = part.name === "code_execution" && part.input != null && typeof part.input === "object" && "code" in part.input && !("type" in part.input) ? { type: "programmatic-tool-call", ...part.input } : part.input;
@@ -34549,7 +34889,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               toolName: toolNameMapping.toCustomToolName(part.name),
               input: JSON.stringify(inputToSerialize),
               providerExecuted: true,
-              ...markCodeExecutionDynamic && part.name === "code_execution" ? { dynamic: true } : {}
+              ...markCodeExecutionDynamic && part.name === "code_execution" ? { dynamic: true } : {},
+              ...getAnthropicCallerMetadata(part.caller)
             });
           } else if (part.name === "tool_search_tool_regex" || part.name === "tool_search_tool_bm25") {
             serverToolCalls[part.id] = part.name;
@@ -34558,7 +34899,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               toolCallId: part.id,
               toolName: toolNameMapping.toCustomToolName(part.name),
               input: JSON.stringify(part.input),
-              providerExecuted: true
+              providerExecuted: true,
+              ...getAnthropicCallerMetadata(part.caller)
             });
           } else if (part.name === "advisor") {
             content.push({
@@ -34566,7 +34908,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               toolCallId: part.id,
               toolName: toolNameMapping.toCustomToolName("advisor"),
               input: JSON.stringify(part.input),
-              providerExecuted: true
+              providerExecuted: true,
+              ...getAnthropicCallerMetadata(part.caller)
             });
           }
           break;
@@ -34625,7 +34968,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                     data: part.content.content.source.data
                   }
                 }
-              }
+              },
+              ...getAnthropicCallerMetadata(part.caller)
             });
           } else if (part.content.type === "web_fetch_tool_result_error") {
             content.push({
@@ -34636,7 +34980,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               result: {
                 type: "web_fetch_tool_result_error",
                 errorCode: part.content.error_code
-              }
+              },
+              ...getAnthropicCallerMetadata(part.caller)
             });
           }
           break;
@@ -34656,7 +35001,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                   encryptedContent: result.encrypted_content,
                   type: result.type
                 };
-              })
+              }),
+              ...getAnthropicCallerMetadata(part.caller)
             });
             for (const result of part.content) {
               content.push({
@@ -34681,7 +35027,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               result: {
                 type: "web_search_tool_result_error",
                 errorCode: part.content.error_code
-              }
+              },
+              ...getAnthropicCallerMetadata(part.caller)
             });
           }
           break;
@@ -35022,11 +35369,7 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                     id: String(value.index)
                   });
                 } else {
-                  const caller = part.caller;
-                  const callerInfo = caller ? {
-                    type: caller.type,
-                    toolId: "tool_id" in caller ? caller.tool_id : undefined
-                  } : undefined;
+                  const callerInfo = getAnthropicCallerInfo(part.caller);
                   const hasNonEmptyInput = part.input && Object.keys(part.input).length > 0;
                   const initialInput = hasNonEmptyInput ? JSON.stringify(part.input) : "";
                   contentBlocks[value.index] = {
@@ -35046,6 +35389,7 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                 return;
               }
               case "server_tool_use": {
+                const callerInfo = getAnthropicCallerInfo(part.caller);
                 if ([
                   "web_fetch",
                   "web_search",
@@ -35066,7 +35410,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                     ...markCodeExecutionDynamic && providerToolName === "code_execution" ? { dynamic: true } : {},
                     firstDelta: finalInput.length === 0,
                     providerToolName,
-                    providerToolInputType
+                    providerToolInputType,
+                    ...callerInfo && { caller: callerInfo }
                   };
                   controller.enqueue({
                     type: "tool-input-start",
@@ -35085,7 +35430,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                     input: "",
                     providerExecuted: true,
                     firstDelta: true,
-                    providerToolName: part.name
+                    providerToolName: part.name,
+                    ...callerInfo && { caller: callerInfo }
                   };
                   controller.enqueue({
                     type: "tool-input-start",
@@ -35102,7 +35448,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                     input: "{}",
                     providerExecuted: true,
                     firstDelta: true,
-                    providerToolName: part.name
+                    providerToolName: part.name,
+                    ...callerInfo && { caller: callerInfo }
                   };
                   controller.enqueue({
                     type: "tool-input-start",
@@ -35137,7 +35484,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                           data: part.content.content.source.data
                         }
                       }
-                    }
+                    },
+                    ...getAnthropicCallerMetadata(part.caller)
                   });
                 } else if (part.content.type === "web_fetch_tool_result_error") {
                   controller.enqueue({
@@ -35148,7 +35496,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                     result: {
                       type: "web_fetch_tool_result_error",
                       errorCode: part.content.error_code
-                    }
+                    },
+                    ...getAnthropicCallerMetadata(part.caller)
                   });
                 }
                 return;
@@ -35168,7 +35517,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                         encryptedContent: result.encrypted_content,
                         type: result.type
                       };
-                    })
+                    }),
+                    ...getAnthropicCallerMetadata(part.caller)
                   });
                   for (const result of part.content) {
                     controller.enqueue({
@@ -35193,7 +35543,8 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
                     result: {
                       type: "web_search_tool_result_error",
                       errorCode: part.content.error_code
-                    }
+                    },
+                    ...getAnthropicCallerMetadata(part.caller)
                   });
                 }
                 return;
@@ -35571,11 +35922,7 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
               for (let contentIndex = 0;contentIndex < value.message.content.length; contentIndex++) {
                 const part = value.message.content[contentIndex];
                 if (part.type === "tool_use") {
-                  const caller = part.caller;
-                  const callerInfo = caller ? {
-                    type: caller.type,
-                    toolId: "tool_id" in caller ? caller.tool_id : undefined
-                  } : undefined;
+                  const callerInfo = getAnthropicCallerInfo(part.caller);
                   controller.enqueue({
                     type: "tool-input-start",
                     id: part.id,
@@ -35735,59 +36082,59 @@ var VERSION2 = "3.0.107", anthropicErrorDataSchema, anthropicFailedResponseHandl
 }, bash_20241022InputSchema, bash_20241022, bash_20250124InputSchema, bash_20250124, computer_20241022InputSchema, computer_20241022, computer_20250124InputSchema, computer_20250124, computer_20251124InputSchema, computer_20251124, memory_20250818InputSchema, memory_20250818, textEditor_20241022InputSchema, textEditor_20241022, textEditor_20250124InputSchema, textEditor_20250124, textEditor_20250429InputSchema, textEditor_20250429, toolSearchBm25_20251119OutputSchema, toolSearchBm25_20251119InputSchema, factory11, toolSearchBm25_20251119 = (args = {}) => {
   return factory11(args);
 }, anthropicTools, ANTHROPIC_API_URL = "https://api.anthropic.com", ANTHROPIC_API_VERSIONED_URL, anthropic;
-var init_dist4 = __esm(() => {
-  init_dist();
-  init_dist3();
-  init_dist();
-  init_dist3();
-  init_dist3();
+var init_dist5 = __esm(() => {
+  init_dist2();
+  init_dist4();
+  init_dist2();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
   init_v4();
-  init_dist();
-  init_dist3();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist2();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
   anthropicErrorDataSchema = lazySchema(() => zodSchema(exports_external2.object({
     type: exports_external2.literal("error"),
@@ -35806,6 +36153,19 @@ var init_dist4 = __esm(() => {
     explanation: exports_external2.string().nullish(),
     recommended_model: exports_external2.string().nullish()
   });
+  anthropicToolCallCallerSchema = exports_external2.union([
+    exports_external2.object({
+      type: exports_external2.literal("code_execution_20250825"),
+      tool_id: exports_external2.string()
+    }),
+    exports_external2.object({
+      type: exports_external2.literal("code_execution_20260120"),
+      tool_id: exports_external2.string()
+    }),
+    exports_external2.object({
+      type: exports_external2.literal("direct")
+    })
+  ]);
   anthropicMessagesResponseSchema = lazySchema(() => zodSchema(exports_external2.object({
     type: exports_external2.literal("message"),
     id: exports_external2.string().nullish(),
@@ -35858,34 +36218,14 @@ var init_dist4 = __esm(() => {
         id: exports_external2.string(),
         name: exports_external2.string(),
         input: exports_external2.unknown(),
-        caller: exports_external2.union([
-          exports_external2.object({
-            type: exports_external2.literal("code_execution_20250825"),
-            tool_id: exports_external2.string()
-          }),
-          exports_external2.object({
-            type: exports_external2.literal("code_execution_20260120"),
-            tool_id: exports_external2.string()
-          }),
-          exports_external2.object({
-            type: exports_external2.literal("direct")
-          })
-        ]).optional()
+        caller: anthropicToolCallCallerSchema.optional()
       }),
       exports_external2.object({
         type: exports_external2.literal("server_tool_use"),
         id: exports_external2.string(),
         name: exports_external2.string(),
         input: exports_external2.record(exports_external2.string(), exports_external2.unknown()).nullish(),
-        caller: exports_external2.union([
-          exports_external2.object({
-            type: exports_external2.literal("code_execution_20260120"),
-            tool_id: exports_external2.string()
-          }),
-          exports_external2.object({
-            type: exports_external2.literal("direct")
-          })
-        ]).optional()
+        caller: anthropicToolCallCallerSchema.optional()
       }),
       exports_external2.object({
         type: exports_external2.literal("mcp_tool_use"),
@@ -35906,6 +36246,7 @@ var init_dist4 = __esm(() => {
       exports_external2.object({
         type: exports_external2.literal("web_fetch_tool_result"),
         tool_use_id: exports_external2.string(),
+        caller: anthropicToolCallCallerSchema.optional(),
         content: exports_external2.union([
           exports_external2.object({
             type: exports_external2.literal("web_fetch_result"),
@@ -35938,6 +36279,7 @@ var init_dist4 = __esm(() => {
       exports_external2.object({
         type: exports_external2.literal("web_search_tool_result"),
         tool_use_id: exports_external2.string(),
+        caller: anthropicToolCallCallerSchema.optional(),
         content: exports_external2.union([
           exports_external2.array(exports_external2.object({
             type: exports_external2.literal("web_search_result"),
@@ -36141,19 +36483,7 @@ var init_dist4 = __esm(() => {
             id: exports_external2.string(),
             name: exports_external2.string(),
             input: exports_external2.unknown(),
-            caller: exports_external2.union([
-              exports_external2.object({
-                type: exports_external2.literal("code_execution_20250825"),
-                tool_id: exports_external2.string()
-              }),
-              exports_external2.object({
-                type: exports_external2.literal("code_execution_20260120"),
-                tool_id: exports_external2.string()
-              }),
-              exports_external2.object({
-                type: exports_external2.literal("direct")
-              })
-            ]).optional()
+            caller: anthropicToolCallCallerSchema.optional()
           })
         ])).nullish(),
         stop_reason: exports_external2.string().nullish(),
@@ -36180,19 +36510,7 @@ var init_dist4 = __esm(() => {
           id: exports_external2.string(),
           name: exports_external2.string(),
           input: exports_external2.record(exports_external2.string(), exports_external2.unknown()).optional(),
-          caller: exports_external2.union([
-            exports_external2.object({
-              type: exports_external2.literal("code_execution_20250825"),
-              tool_id: exports_external2.string()
-            }),
-            exports_external2.object({
-              type: exports_external2.literal("code_execution_20260120"),
-              tool_id: exports_external2.string()
-            }),
-            exports_external2.object({
-              type: exports_external2.literal("direct")
-            })
-          ]).optional()
+          caller: anthropicToolCallCallerSchema.optional()
         }),
         exports_external2.object({
           type: exports_external2.literal("redacted_thinking"),
@@ -36207,15 +36525,7 @@ var init_dist4 = __esm(() => {
           id: exports_external2.string(),
           name: exports_external2.string(),
           input: exports_external2.record(exports_external2.string(), exports_external2.unknown()).nullish(),
-          caller: exports_external2.union([
-            exports_external2.object({
-              type: exports_external2.literal("code_execution_20260120"),
-              tool_id: exports_external2.string()
-            }),
-            exports_external2.object({
-              type: exports_external2.literal("direct")
-            })
-          ]).optional()
+          caller: anthropicToolCallCallerSchema.optional()
         }),
         exports_external2.object({
           type: exports_external2.literal("mcp_tool_use"),
@@ -36236,6 +36546,7 @@ var init_dist4 = __esm(() => {
         exports_external2.object({
           type: exports_external2.literal("web_fetch_tool_result"),
           tool_use_id: exports_external2.string(),
+          caller: anthropicToolCallCallerSchema.optional(),
           content: exports_external2.union([
             exports_external2.object({
               type: exports_external2.literal("web_fetch_result"),
@@ -36268,6 +36579,7 @@ var init_dist4 = __esm(() => {
         exports_external2.object({
           type: exports_external2.literal("web_search_tool_result"),
           tool_use_id: exports_external2.string(),
+          caller: anthropicToolCallCallerSchema.optional(),
           content: exports_external2.union([
             exports_external2.array(exports_external2.object({
               type: exports_external2.literal("web_search_result"),
@@ -37307,7 +37619,7 @@ var init_dist4 = __esm(() => {
   anthropic = createAnthropic();
 });
 
-// ../../node_modules/.bun/@ai-sdk+openai@3.0.91+27912429049419a2/node_modules/@ai-sdk/openai/dist/index.mjs
+// ../../node_modules/.bun/@ai-sdk+openai@3.0.97+27912429049419a2/node_modules/@ai-sdk/openai/dist/index.mjs
 var exports_dist2 = {};
 __export(exports_dist2, {
   openai: () => openai,
@@ -38244,12 +38556,14 @@ async function convertToOpenAIResponsesInput({
                 if (store && id != null) {
                   input.push({ type: "item_reference", id });
                 }
-                break;
+                if (store || !hasShellTool || resolvedToolName !== "shell") {
+                  break;
+                }
               }
-              if (hasPreviousResponseId && store && id != null) {
+              const isProviderDefinedToolCall = hasLocalShellTool && resolvedToolName === "local_shell" || hasShellTool && resolvedToolName === "shell" || hasApplyPatchTool && resolvedToolName === "apply_patch" || ((_m = customProviderToolNames == null ? undefined : customProviderToolNames.has(resolvedToolName)) != null ? _m : false);
+              if (hasPreviousResponseId && store && id != null && isProviderDefinedToolCall) {
                 break;
               }
-              const isProviderDefinedToolCall = hasLocalShellTool && resolvedToolName === "local_shell" || hasShellTool && resolvedToolName === "shell" || hasApplyPatchTool && resolvedToolName === "apply_patch" || ((_m = customProviderToolNames == null ? undefined : customProviderToolNames.has(resolvedToolName)) != null ? _m : false);
               if (store && id != null && isProviderDefinedToolCall) {
                 input.push({ type: "item_reference", id });
                 break;
@@ -38470,7 +38784,7 @@ async function convertToOpenAIResponsesInput({
               continue;
             }
             processedApprovalIds.add(approvalResponse.approvalId);
-            if (store) {
+            if (store && !hasConversation && !hasPreviousResponseId) {
               input.push({
                 type: "item_reference",
                 id: approvalResponse.approvalId
@@ -39434,7 +39748,7 @@ var openaiErrorDataSchema, openaiFailedResponseHandler, openaiChatResponseSchema
       });
       baseArgs.service_tier = undefined;
     }
-    if (openaiOptions.serviceTier === "priority" && !modelCapabilities.supportsPriorityProcessing) {
+    if ((openaiOptions.serviceTier === "priority" || openaiOptions.serviceTier === "fast") && !modelCapabilities.supportsPriorityProcessing) {
       warnings.push({
         type: "unsupported",
         feature: "serviceTier",
@@ -40444,7 +40758,7 @@ var openaiErrorDataSchema, openaiFailedResponseHandler, openaiChatResponseSchema
       });
       delete baseArgs.service_tier;
     }
-    if ((openaiOptions == null ? undefined : openaiOptions.serviceTier) === "priority" && !modelCapabilities.supportsPriorityProcessing) {
+    if (((openaiOptions == null ? undefined : openaiOptions.serviceTier) === "priority" || (openaiOptions == null ? undefined : openaiOptions.serviceTier) === "fast") && !modelCapabilities.supportsPriorityProcessing) {
       warnings.push({
         type: "unsupported",
         feature: "serviceTier",
@@ -42024,78 +42338,78 @@ var openaiErrorDataSchema, openaiFailedResponseHandler, openaiChatResponseSchema
       }
     };
   }
-}, VERSION3 = "3.0.91", openai;
-var init_dist5 = __esm(() => {
-  init_dist3();
-  init_dist();
-  init_dist3();
+}, VERSION3 = "3.0.97", openai;
+var init_dist6 = __esm(() => {
+  init_dist4();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist();
-  init_dist();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist2();
+  init_dist2();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist();
-  init_dist3();
-  init_dist();
+  init_dist2();
+  init_dist4();
+  init_dist2();
   init_v4();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist();
-  init_dist3();
-  init_dist3();
+  init_dist2();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist();
-  init_dist3();
-  init_dist();
-  init_dist3();
+  init_dist2();
+  init_dist4();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist();
-  init_dist3();
-  init_dist3();
-  init_dist3();
+  init_dist2();
+  init_dist4();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
   openaiErrorDataSchema = exports_external2.object({
     error: exports_external2.object({
@@ -42231,7 +42545,7 @@ var init_dist5 = __esm(() => {
     store: exports_external2.boolean().optional(),
     metadata: exports_external2.record(exports_external2.string().max(64), exports_external2.string().max(512)).optional(),
     prediction: exports_external2.record(exports_external2.string(), exports_external2.any()).optional(),
-    serviceTier: exports_external2.enum(["auto", "flex", "priority", "default"]).optional(),
+    serviceTier: exports_external2.enum(["auto", "flex", "priority", "fast", "default"]).optional(),
     strictJsonSchema: exports_external2.boolean().optional(),
     textVerbosity: exports_external2.enum(["low", "medium", "high"]).optional(),
     promptCacheKey: exports_external2.string().optional(),
@@ -43643,7 +43957,7 @@ var init_dist5 = __esm(() => {
     reasoningContext: exports_external2.enum(["auto", "current_turn", "all_turns"]).optional(),
     reasoningSummary: exports_external2.string().nullish(),
     safetyIdentifier: exports_external2.string().nullish(),
-    serviceTier: exports_external2.enum(["auto", "flex", "priority", "default"]).nullish(),
+    serviceTier: exports_external2.enum(["auto", "flex", "priority", "fast", "default"]).nullish(),
     store: exports_external2.boolean().nullish(),
     passThroughUnsupportedFiles: exports_external2.boolean().optional(),
     strictJsonSchema: exports_external2.boolean().nullish(),
@@ -43752,7 +44066,7 @@ var init_dist5 = __esm(() => {
   openai = createOpenAI();
 });
 
-// ../../node_modules/.bun/@ai-sdk+openai-compatible@2.0.64+27912429049419a2/node_modules/@ai-sdk/openai-compatible/dist/index.mjs
+// ../../node_modules/.bun/@ai-sdk+openai-compatible@2.0.69+27912429049419a2/node_modules/@ai-sdk/openai-compatible/dist/index.mjs
 var exports_dist3 = {};
 __export(exports_dist3, {
   createOpenAICompatible: () => createOpenAICompatible,
@@ -43803,7 +44117,7 @@ function convertOpenAICompatibleChatUsage(usage) {
     },
     outputTokens: {
       total: completionTokens,
-      text: completionTokens - reasoningTokens,
+      text: Math.max(0, completionTokens - reasoningTokens),
       reasoning: reasoningTokens
     },
     raw: usage
@@ -45177,27 +45491,27 @@ var openaiCompatibleErrorDataSchema, defaultOpenAICompatibleErrorStructure, open
       }
     };
   }
-}, openaiCompatibleImageResponseSchema, VERSION4 = "2.0.64";
-var init_dist6 = __esm(() => {
-  init_dist();
-  init_dist3();
+}, openaiCompatibleImageResponseSchema, VERSION4 = "2.0.69";
+var init_dist7 = __esm(() => {
+  init_dist2();
+  init_dist4();
   init_v4();
   init_v4();
-  init_dist();
-  init_dist3();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist();
-  init_dist3();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist();
+  init_dist2();
   init_v4();
-  init_dist();
-  init_dist3();
+  init_dist2();
+  init_dist4();
   init_v4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   openaiCompatibleErrorDataSchema = exports_external2.object({
     error: exports_external2.object({
       message: exports_external2.string(),
@@ -45220,10 +45534,10 @@ var init_dist6 = __esm(() => {
     prompt_tokens: exports_external2.number().nullish(),
     completion_tokens: exports_external2.number().nullish(),
     total_tokens: exports_external2.number().nullish(),
-    prompt_tokens_details: exports_external2.object({
+    prompt_tokens_details: exports_external2.looseObject({
       cached_tokens: exports_external2.number().nullish()
     }).nullish(),
-    completion_tokens_details: exports_external2.object({
+    completion_tokens_details: exports_external2.looseObject({
       reasoning_tokens: exports_external2.number().nullish(),
       accepted_prediction_tokens: exports_external2.number().nullish(),
       rejected_prediction_tokens: exports_external2.number().nullish()
@@ -45290,7 +45604,7 @@ var init_dist6 = __esm(() => {
     suffix: exports_external2.string().optional(),
     user: exports_external2.string().optional()
   });
-  usageSchema = exports_external2.object({
+  usageSchema = exports_external2.looseObject({
     prompt_tokens: exports_external2.number(),
     completion_tokens: exports_external2.number(),
     total_tokens: exports_external2.number()
@@ -45419,19 +45733,19 @@ var require_token_io = __commonJS((exports, module) => {
     getUserDataDir: () => getUserDataDir
   });
   module.exports = __toCommonJS2(token_io_exports);
-  var import_path2 = __toESM2(__require("path"));
+  var import_path3 = __toESM2(__require("path"));
   var import_fs2 = __toESM2(__require("fs"));
-  var import_os3 = __toESM2(__require("os"));
+  var import_os4 = __toESM2(__require("os"));
   var import_token_error = require_token_error();
   function findRootDir() {
     try {
       let dir = process.cwd();
-      while (dir !== import_path2.default.dirname(dir)) {
-        const pkgPath = import_path2.default.join(dir, ".vercel");
+      while (dir !== import_path3.default.dirname(dir)) {
+        const pkgPath = import_path3.default.join(dir, ".vercel");
         if (import_fs2.default.existsSync(pkgPath)) {
           return dir;
         }
-        dir = import_path2.default.dirname(dir);
+        dir = import_path3.default.dirname(dir);
       }
     } catch (e) {
       throw new import_token_error.VercelOidcTokenError("Token refresh only supported in node server environments");
@@ -45442,11 +45756,11 @@ var require_token_io = __commonJS((exports, module) => {
     if (process.env.XDG_DATA_HOME) {
       return process.env.XDG_DATA_HOME;
     }
-    switch (import_os3.default.platform()) {
+    switch (import_os4.default.platform()) {
       case "darwin":
-        return import_path2.default.join(import_os3.default.homedir(), "Library/Application Support");
+        return import_path3.default.join(import_os4.default.homedir(), "Library/Application Support");
       case "linux":
-        return import_path2.default.join(import_os3.default.homedir(), ".local/share");
+        return import_path3.default.join(import_os4.default.homedir(), ".local/share");
       case "win32":
         if (process.env.LOCALAPPDATA) {
           return process.env.LOCALAPPDATA;
@@ -45491,11 +45805,11 @@ var require_auth_config = __commonJS((exports, module) => {
   var path = __toESM2(__require("path"));
   var import_token_util = require_token_util();
   function getAuthConfigPath() {
-    const dataDir = (0, import_token_util.getVercelDataDir)();
-    if (!dataDir) {
+    const dataDir2 = (0, import_token_util.getVercelDataDir)();
+    if (!dataDir2) {
       throw new Error(`Unable to find Vercel CLI data directory. Your platform: ${process.platform}. Supported: darwin, linux, win32.`);
     }
-    return path.join(dataDir, "auth.json");
+    return path.join(dataDir2, "auth.json");
   }
   function readAuthConfig() {
     try {
@@ -45556,10 +45870,10 @@ var require_oauth = __commonJS((exports, module) => {
     refreshTokenRequest: () => refreshTokenRequest
   });
   module.exports = __toCommonJS2(oauth_exports);
-  var import_os3 = __require("os");
+  var import_os4 = __require("os");
   var VERCEL_ISSUER = "https://vercel.com";
   var VERCEL_CLI_CLIENT_ID = "cl_HYyOPBNtFMfHhaUn9L4QPfTZz6TP47bp";
-  var userAgent = `@vercel/oidc node-${process.version} ${(0, import_os3.platform)()} (${(0, import_os3.arch)()}) ${(0, import_os3.hostname)()}`;
+  var userAgent = `@vercel/oidc node-${process.version} ${(0, import_os4.platform)()} (${(0, import_os4.arch)()}) ${(0, import_os4.hostname)()}`;
   var _tokenEndpoint = null;
   async function getTokenEndpoint() {
     if (_tokenEndpoint) {
@@ -45702,11 +46016,11 @@ var require_token_util = __commonJS((exports, module) => {
   var import_auth_errors = require_auth_errors();
   function getVercelDataDir() {
     const vercelFolder = "com.vercel.cli";
-    const dataDir = (0, import_token_io.getUserDataDir)();
-    if (!dataDir) {
+    const dataDir2 = (0, import_token_io.getUserDataDir)();
+    if (!dataDir2) {
       return null;
     }
-    return path.join(dataDir, vercelFolder);
+    return path.join(dataDir2, vercelFolder);
   }
   async function getVercelToken2(options) {
     const authConfig = (0, import_auth_config.readAuthConfig)();
@@ -45981,7 +46295,7 @@ var require_dist = __commonJS((exports, module) => {
   var import_token_util = require_token_util();
 });
 
-// ../../node_modules/.bun/@ai-sdk+gateway@3.0.166+27912429049419a2/node_modules/@ai-sdk/gateway/dist/index.mjs
+// ../../node_modules/.bun/@ai-sdk+gateway@3.0.175+27912429049419a2/node_modules/@ai-sdk/gateway/dist/index.mjs
 async function createGatewayErrorFromResponse({
   response,
   statusCode,
@@ -46388,11 +46702,14 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
     try {
       const { value } = await getFromApi({
         url: `${this.config.baseURL}/config`,
-        headers: await resolve20(this.config.headers()),
+        headers: await resolve21(this.config.headers()),
         successfulResponseHandler: createJsonResponseHandler(gatewayAvailableModelsResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         fetch: this.config.fetch
       });
@@ -46406,11 +46723,14 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
       const baseUrl = new URL(this.config.baseURL);
       const { value } = await getFromApi({
         url: `${baseUrl.origin}/v1/credits`,
-        headers: await resolve20(this.config.headers()),
+        headers: await resolve21(this.config.headers()),
         successfulResponseHandler: createJsonResponseHandler(gatewayCreditsResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         fetch: this.config.fetch
       });
@@ -46452,11 +46772,14 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
       }
       const { value } = await getFromApi({
         url: `${baseUrl.origin}/v1/report?${searchParams.toString()}`,
-        headers: await resolve20(this.config.headers()),
+        headers: await resolve21(this.config.headers()),
         successfulResponseHandler: createJsonResponseHandler(gatewaySpendReportResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         fetch: this.config.fetch
       });
@@ -46474,11 +46797,14 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
       const baseUrl = new URL(this.config.baseURL);
       const { value } = await getFromApi({
         url: `${baseUrl.origin}/v1/generation?id=${encodeURIComponent(params.id)}`,
-        headers: await resolve20(this.config.headers()),
+        headers: await resolve21(this.config.headers()),
         successfulResponseHandler: createJsonResponseHandler(gatewayGenerationInfoResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         fetch: this.config.fetch
       });
@@ -46507,7 +46833,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
   async doGenerate(options) {
     const { args, warnings } = await this.getArgs(options);
     const { abortSignal } = options;
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const {
         responseHeaders,
@@ -46515,12 +46841,15 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         rawValue: rawResponse
       } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, options.headers, this.getModelConfigHeaders(this.modelId, false), await resolve20(this.config.o11yHeaders)),
+        headers: combineHeaders(resolvedHeaders, options.headers, this.getModelConfigHeaders(this.modelId, false), await resolve21(this.config.o11yHeaders)),
         body: args,
         successfulResponseHandler: createJsonResponseHandler(exports_external2.any()),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -46538,16 +46867,19 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
   async doStream(options) {
     const { args, warnings } = await this.getArgs(options);
     const { abortSignal } = options;
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const { value: response, responseHeaders } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, options.headers, this.getModelConfigHeaders(this.modelId, true), await resolve20(this.config.o11yHeaders)),
+        headers: combineHeaders(resolvedHeaders, options.headers, this.getModelConfigHeaders(this.modelId, true), await resolve21(this.config.o11yHeaders)),
         body: args,
         successfulResponseHandler: createEventSourceResponseHandler(exports_external2.any()),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -46627,7 +46959,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
     providerOptions
   }) {
     var _a112, _b112;
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const {
         responseHeaders,
@@ -46635,7 +46967,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         rawValue
       } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve20(this.config.o11yHeaders)),
+        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve21(this.config.o11yHeaders)),
         body: {
           values,
           ...providerOptions ? { providerOptions } : {}
@@ -46643,7 +46975,10 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         successfulResponseHandler: createJsonResponseHandler(gatewayEmbeddingResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a122;
+            return (_a122 = getErrorMessage2(data)) != null ? _a122 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -46691,7 +47026,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
     abortSignal
   }) {
     var _a112, _b112, _c;
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const {
         responseHeaders,
@@ -46699,7 +47034,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         rawValue
       } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve20(this.config.o11yHeaders)),
+        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve21(this.config.o11yHeaders)),
         body: {
           prompt,
           n,
@@ -46715,7 +47050,10 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         successfulResponseHandler: createJsonResponseHandler(gatewayImageResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a122;
+            return (_a122 = getErrorMessage2(data)) != null ? _a122 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -46776,11 +47114,11 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
     headers,
     abortSignal
   }) {
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const { responseHeaders, value: responseBody } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve20(this.config.o11yHeaders), { accept: "text/event-stream" }),
+        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve21(this.config.o11yHeaders), { accept: "text/event-stream" }),
         body: {
           prompt,
           n,
@@ -46868,7 +47206,10 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         },
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -46914,7 +47255,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
     providerOptions
   }) {
     var _a112;
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const {
         responseHeaders,
@@ -46922,7 +47263,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         rawValue
       } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve20(this.config.o11yHeaders)),
+        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve21(this.config.o11yHeaders)),
         body: {
           documents,
           query,
@@ -46932,7 +47273,10 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         successfulResponseHandler: createJsonResponseHandler(gatewayRerankingResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a122;
+            return (_a122 = getErrorMessage2(data)) != null ? _a122 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -46976,7 +47320,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
     headers,
     abortSignal
   }) {
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const {
         responseHeaders,
@@ -46984,7 +47328,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         rawValue
       } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve20(this.config.o11yHeaders)),
+        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve21(this.config.o11yHeaders)),
         body: {
           text,
           ...voice && { voice },
@@ -46997,7 +47341,10 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         successfulResponseHandler: createJsonResponseHandler(gatewaySpeechResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a112;
+            return (_a112 = getErrorMessage2(data)) != null ? _a112 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -47043,7 +47390,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
     abortSignal
   }) {
     var _a112, _b112, _c;
-    const resolvedHeaders = await resolve20(this.config.headers());
+    const resolvedHeaders = await resolve21(this.config.headers());
     try {
       const {
         responseHeaders,
@@ -47051,7 +47398,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         rawValue
       } = await postJsonToApi({
         url: this.getUrl(),
-        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve20(this.config.o11yHeaders)),
+        headers: combineHeaders(resolvedHeaders, headers != null ? headers : {}, this.getModelConfigHeaders(), await resolve21(this.config.o11yHeaders)),
         body: {
           audio: audio instanceof Uint8Array ? convertUint8ArrayToBase64(audio) : audio,
           mediaType,
@@ -47060,7 +47407,10 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
         successfulResponseHandler: createJsonResponseHandler(gatewayTranscriptionResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
           errorSchema: exports_external2.any(),
-          errorToMessage: (data) => data
+          errorToMessage: (data) => {
+            var _a122;
+            return (_a122 = getErrorMessage2(data)) != null ? _a122 : "unknown error";
+          }
         }),
         ...abortSignal && { abortSignal },
         fetch: this.config.fetch
@@ -47092,45 +47442,45 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
       "ai-model-id": this.modelId
     };
   }
-}, providerMetadataEntrySchema4, gatewayTranscriptionWarningSchema, gatewayTranscriptionResponseSchema, exaSearchInputSchema, exaSearchOutputSchema, exaSearchToolFactory, exaSearch = (config2 = {}) => exaSearchToolFactory(config2), parallelSearchInputSchema, parallelSearchOutputSchema, parallelSearchToolFactory, parallelSearch = (config2 = {}) => parallelSearchToolFactory(config2), perplexitySearchInputSchema, perplexitySearchOutputSchema, perplexitySearchToolFactory, perplexitySearch = (config2 = {}) => perplexitySearchToolFactory(config2), gatewayTools, VERSION5 = "3.0.166", AI_GATEWAY_PROTOCOL_VERSION = "0.0.1", gateway;
-var init_dist7 = __esm(() => {
-  init_dist3();
-  init_dist();
+}, providerMetadataEntrySchema4, gatewayTranscriptionWarningSchema, gatewayTranscriptionResponseSchema, exaSearchInputSchema, exaSearchOutputSchema, exaSearchToolFactory, exaSearch = (config2 = {}) => exaSearchToolFactory(config2), parallelSearchInputSchema, parallelSearchOutputSchema, parallelSearchToolFactory, parallelSearch = (config2 = {}) => parallelSearchToolFactory(config2), perplexitySearchInputSchema, perplexitySearchOutputSchema, perplexitySearchToolFactory, perplexitySearch = (config2 = {}) => perplexitySearchToolFactory(config2), gatewayTools, VERSION5 = "3.0.175", AI_GATEWAY_PROTOCOL_VERSION = "0.0.1", gateway;
+var init_dist8 = __esm(() => {
+  init_dist4();
+  init_dist2();
   init_v4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist();
-  init_dist3();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_v4();
-  init_dist3();
+  init_dist4();
   init_zod();
-  init_dist3();
+  init_dist4();
   init_zod();
-  init_dist3();
+  init_dist4();
   init_zod();
   import_oidc = __toESM(require_dist(), 1);
   import_oidc2 = __toESM(require_dist(), 1);
@@ -49408,7 +49758,7 @@ var require_src = __commonJS((exports) => {
   };
 });
 
-// ../../node_modules/.bun/ai@6.0.246+27912429049419a2/node_modules/ai/dist/index.mjs
+// ../../node_modules/.bun/ai@6.0.257+27912429049419a2/node_modules/ai/dist/index.mjs
 var exports_dist4 = {};
 __export(exports_dist4, {
   zodSchema: () => zodSchema,
@@ -50693,7 +51043,8 @@ async function recordSpan({
   tracer,
   attributes,
   fn,
-  endWhenDone = true
+  endWhenDone = true,
+  endOnError = endWhenDone
 }) {
   return tracer.startActiveSpan(name222, { attributes: await attributes }, async (span) => {
     const ctx = import_api3.context.active();
@@ -50707,7 +51058,9 @@ async function recordSpan({
       try {
         recordErrorOnSpan(span, error40);
       } finally {
-        span.end();
+        if (endOnError) {
+          span.end();
+        }
       }
       throw error40;
     }
@@ -53177,6 +53530,7 @@ function processUIMessageStream({
           case "reasoning-start": {
             const reasoningPart = {
               type: "reasoning",
+              id: chunk.id,
               text: "",
               providerMetadata: chunk.providerMetadata,
               state: "streaming"
@@ -53473,7 +53827,7 @@ function processUIMessageStream({
             }
             await updateMessageMetadata(chunk.messageMetadata);
             if (chunk.messageId != null || chunk.messageMetadata != null) {
-              write();
+              write({ updateStatus: false });
             }
             break;
           }
@@ -53696,9 +54050,18 @@ function createAsyncIterableStream(source) {
 }
 async function consumeStream({
   stream,
-  onError
+  onError,
+  abortSignal
 }) {
   const reader = stream.getReader();
+  const cancelOnAbort = () => {
+    reader.cancel().catch(() => {});
+  };
+  if (abortSignal == null ? undefined : abortSignal.aborted) {
+    cancelOnAbort();
+  } else {
+    abortSignal == null || abortSignal.addEventListener("abort", cancelOnAbort, { once: true });
+  }
   try {
     while (true) {
       const { done } = await reader.read();
@@ -53708,6 +54071,7 @@ async function consumeStream({
   } catch (error40) {
     onError == null || onError(error40);
   } finally {
+    abortSignal == null || abortSignal.removeEventListener("abort", cancelOnAbort);
     reader.releaseLock();
   }
 }
@@ -54308,6 +54672,27 @@ function createUIMessageStream({
     onError
   });
 }
+function createUIMessageSnapshot(message) {
+  const textByPartIndex = /* @__PURE__ */ new Map;
+  const messageWithoutText = {
+    ...message,
+    parts: message.parts.map((part, index) => {
+      if (part.type === "text" || part.type === "reasoning") {
+        textByPartIndex.set(index, part.text);
+        return { ...part, text: "" };
+      }
+      return part;
+    })
+  };
+  const snapshot2 = structuredClone(messageWithoutText);
+  for (const [index, text2] of textByPartIndex) {
+    const part = snapshot2.parts[index];
+    if (part.type === "text" || part.type === "reasoning") {
+      part.text = text2;
+    }
+  }
+  return snapshot2;
+}
 function readUIMessageStream({
   message,
   stream,
@@ -54340,7 +54725,7 @@ function readUIMessageStream({
         return job({
           state,
           write: () => {
-            controller == null || controller.enqueue(structuredClone(state.message));
+            controller == null || controller.enqueue(createUIMessageSnapshot(state.message));
           }
         });
       },
@@ -57223,7 +57608,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
 }, imageMediaTypeSignatures, audioMediaTypeSignatures, videoMediaTypeSignatures, DEFAULT_SNIFF_BYTES = 18, MAX_SIGNATURE_BYTES = 12, MAX_ID3_TAG_BYTES, ID3_SCAN_BYTES, stripID3 = (bytes) => {
   const id3Size = (bytes[6] & 127) << 21 | (bytes[7] & 127) << 14 | (bytes[8] & 127) << 7 | bytes[9] & 127;
   return bytes.subarray(id3Size + 10);
-}, VERSION6 = "6.0.246", download = async ({
+}, VERSION6 = "6.0.257", download = async ({
   url: url2,
   maxBytes,
   abortSignal
@@ -57318,7 +57703,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
   const schema = asSchema(inputSchema);
   return {
     name: "object",
-    responseFormat: resolve20(schema.jsonSchema).then((jsonSchema2) => ({
+    responseFormat: resolve21(schema.jsonSchema).then((jsonSchema2) => ({
       type: "json",
       schema: jsonSchema2,
       ...name222 != null && { name: name222 },
@@ -57379,7 +57764,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
   const elementSchema = asSchema(inputElementSchema);
   return {
     name: "array",
-    responseFormat: resolve20(elementSchema.jsonSchema).then((jsonSchema2) => {
+    responseFormat: resolve21(elementSchema.jsonSchema).then((jsonSchema2) => {
       const { $schema, ...itemSchema } = jsonSchema2;
       return {
         type: "json",
@@ -58422,6 +58807,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
               }),
               tracer,
               endWhenDone: false,
+              endOnError: true,
               fn: async (doStreamSpan2) => ({
                 startTimestampMs: now22(),
                 doStreamSpan: doStreamSpan2,
@@ -59341,10 +59727,11 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     onStepFinish,
     ...options
   }) {
+    const preparedCall = await this.prepareCall(options);
     return generateText({
-      ...await this.prepareCall(options),
+      ...preparedCall,
       abortSignal,
-      timeout,
+      timeout: timeout != null ? timeout : preparedCall.timeout,
       onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish)
     });
   }
@@ -59355,10 +59742,11 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     onStepFinish,
     ...options
   }) {
+    const preparedCall = await this.prepareCall(options);
     return streamText({
-      ...await this.prepareCall(options),
+      ...preparedCall,
       abortSignal,
-      timeout,
+      timeout: timeout != null ? timeout : preparedCall.timeout,
       experimental_transform,
       onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish)
     });
@@ -59715,6 +60103,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
       }),
       tracer,
       endWhenDone: false,
+      endOnError: true,
       fn: async (rootSpan) => {
         const standardizedPrompt = await standardizePrompt({
           system,
@@ -59784,6 +60173,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
           }),
           tracer,
           endWhenDone: false,
+          endOnError: true,
           fn: async (doStreamSpan2) => ({
             startTimestampMs: now22(),
             doStreamSpan: doStreamSpan2,
@@ -60370,9 +60760,9 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     ...options
   }) {
     var _a222, _b16, _c, _d, _e;
-    const resolvedBody = await resolve20(this.body);
-    const resolvedHeaders = await resolve20(this.headers);
-    const resolvedCredentials = await resolve20(this.credentials);
+    const resolvedBody = await resolve21(this.body);
+    const resolvedHeaders = await resolve21(this.headers);
+    const resolvedCredentials = await resolve21(this.credentials);
     const baseHeaders = {
       ...normalizeHeaders(resolvedHeaders),
       ...normalizeHeaders(options.headers)
@@ -60420,9 +60810,9 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
   }
   async reconnectToStream(options) {
     var _a222, _b16, _c, _d, _e;
-    const resolvedBody = await resolve20(this.body);
-    const resolvedHeaders = await resolve20(this.headers);
-    const resolvedCredentials = await resolve20(this.credentials);
+    const resolvedBody = await resolve21(this.body);
+    const resolvedHeaders = await resolve21(this.headers);
+    const resolvedCredentials = await resolve21(this.credentials);
     const baseHeaders = {
       ...normalizeHeaders(resolvedHeaders),
       ...normalizeHeaders(options.headers)
@@ -60442,7 +60832,8 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     const response = await fetch2(api2, {
       method: "GET",
       headers,
-      credentials
+      credentials,
+      signal: options.abortSignal
     });
     if (response.status === 204) {
       return null;
@@ -60470,6 +60861,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     sendAutomaticallyWhen
   }) {
     this.activeResponse = undefined;
+    this.activeResumeRequest = undefined;
     this.jobExecutor = new SerialJobExecutor;
     this.sendMessage = async (message, options) => {
       var _a222, _b16, _c, _d;
@@ -60611,12 +61003,9 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     });
     this.addToolResult = this.addToolOutput;
     this.stop = async () => {
-      var _a222;
-      if (this.status !== "streaming" && this.status !== "submitted")
-        return;
-      if ((_a222 = this.activeResponse) == null ? undefined : _a222.abortController) {
-        this.activeResponse.abortController.abort();
-      }
+      var _a222, _b16;
+      (_a222 = this.activeResumeRequest) == null || _a222.abortController.abort();
+      (_b16 = this.activeResponse) == null || _b16.abortController.abort();
     };
     this.id = id;
     this.transport = transport;
@@ -60672,25 +61061,59 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     body,
     messageId
   }) {
-    var _a222, _b16;
+    var _a222, _b16, _c;
+    const abortController = new AbortController;
+    const activeResumeRequest = trigger === "resume-stream" ? { abortController } : undefined;
+    if (activeResumeRequest) {
+      (_a222 = this.activeResumeRequest) == null || _a222.abortController.abort();
+      this.activeResumeRequest = activeResumeRequest;
+    }
+    const isCurrentRequest = () => activeResumeRequest == null || this.activeResumeRequest === activeResumeRequest;
+    const clearActiveResumeRequest = () => {
+      if (this.activeResumeRequest === activeResumeRequest) {
+        this.activeResumeRequest = undefined;
+      }
+    };
     let resumeStream;
     if (trigger === "resume-stream") {
       try {
         const reconnect = await this.transport.reconnectToStream({
           chatId: this.id,
+          abortSignal: abortController.signal,
           metadata,
           headers,
           body
         });
+        if (abortController.signal.aborted || !isCurrentRequest()) {
+          await (reconnect == null ? undefined : reconnect.cancel().catch(() => {}));
+          if (isCurrentRequest()) {
+            this.setStatus({ status: "ready" });
+          }
+          clearActiveResumeRequest();
+          return;
+        }
         if (reconnect == null) {
+          this.setStatus({ status: "ready" });
+          clearActiveResumeRequest();
           return;
         }
         resumeStream = reconnect;
       } catch (err) {
+        if (abortController.signal.aborted || err.name === "AbortError") {
+          if (isCurrentRequest()) {
+            this.setStatus({ status: "ready" });
+          }
+          clearActiveResumeRequest();
+          return;
+        }
+        if (!isCurrentRequest()) {
+          return;
+        }
         if (this.onError && err instanceof Error) {
           this.onError(err);
         }
         this.setStatus({ status: "error", error: err });
+        clearActiveResumeRequest();
         return;
       }
     }
@@ -60703,10 +61126,10 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     try {
       const response = {
         state: createStreamingUIMessageState({
-          lastMessage: trigger === "regenerate-message" ? undefined : this.state.snapshot(lastMessage),
+          lastMessage: trigger === "resume-stream" || trigger === "regenerate-message" ? undefined : this.state.snapshot(lastMessage),
           messageId: this.generateId()
         }),
-        abortController: new AbortController
+        abortController
       };
       activeResponse = response;
       response.abortController.signal.addEventListener("abort", () => {
@@ -60728,19 +61151,29 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
           messageId
         });
       }
-      const runUpdateMessageJob = (job) => this.jobExecutor.run(() => job({
-        state: response.state,
-        write: () => {
-          var _a232;
-          this.setStatus({ status: "streaming" });
-          const replaceLastMessage = response.state.message.id === ((_a232 = this.lastMessage) == null ? undefined : _a232.id);
-          if (replaceLastMessage) {
-            this.state.replaceMessage(this.state.messages.length - 1, response.state.message);
-          } else {
-            this.state.pushMessage(response.state.message);
-          }
+      const runUpdateMessageJob = (job) => this.jobExecutor.run(() => {
+        if (response.abortController.signal.aborted) {
+          return Promise.resolve();
         }
-      }));
+        return job({
+          state: response.state,
+          write: ({ updateStatus = true } = {}) => {
+            var _a232;
+            if (response.abortController.signal.aborted) {
+              return;
+            }
+            if (updateStatus) {
+              this.setStatus({ status: "streaming" });
+            }
+            const replaceLastMessage = response.state.message.id === ((_a232 = this.lastMessage) == null ? undefined : _a232.id);
+            if (replaceLastMessage) {
+              this.state.replaceMessage(this.state.messages.length - 1, response.state.message);
+            } else {
+              this.state.pushMessage(response.state.message);
+            }
+          }
+        });
+      });
       await consumeStream({
         stream: processUIMessageStream({
           stream,
@@ -60753,15 +61186,29 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
             throw error40;
           }
         }),
+        abortSignal: response.abortController.signal,
         onError: (error40) => {
           throw error40;
         }
       });
-      this.setStatus({ status: "ready" });
+      if (isAbort) {
+        if (isCurrentRequest()) {
+          this.setStatus({ status: "ready" });
+        }
+        return null;
+      }
+      if (isCurrentRequest()) {
+        this.setStatus({ status: "ready" });
+      }
     } catch (err) {
       if (isAbort || err.name === "AbortError") {
         isAbort = true;
-        this.setStatus({ status: "ready" });
+        if (isCurrentRequest()) {
+          this.setStatus({ status: "ready" });
+        }
+        return null;
+      }
+      if (!isCurrentRequest()) {
         return null;
       }
       isError = true;
@@ -60775,7 +61222,7 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     } finally {
       try {
         if (activeResponse) {
-          (_a222 = this.onFinish) == null || _a222.call(this, {
+          (_b16 = this.onFinish) == null || _b16.call(this, {
             message: activeResponse.state.message,
             messages: this.state.messages,
             isAbort,
@@ -60784,17 +61231,17 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
             finishReason: activeResponse.state.finishReason
           });
         }
-      } catch (err) {
-        console.error(err);
-      }
-      if (this.activeResponse === activeResponse) {
-        this.activeResponse = undefined;
+      } finally {
+        if (this.activeResponse === activeResponse) {
+          this.activeResponse = undefined;
+        }
+        clearActiveResumeRequest();
       }
     }
     if (!isError && await this.shouldSendAutomatically()) {
       await this.makeRequest({
         trigger: "submit-message",
-        messageId: (_b16 = this.lastMessage) == null ? undefined : _b16.id,
+        messageId: (_c = this.lastMessage) == null ? undefined : _c.id,
         metadata,
         headers,
         body
@@ -60833,96 +61280,96 @@ var import_api2, import_api3, __defProp2, __export2 = (target, all) => {
     return null;
   }
 }, TextStreamChatTransport;
-var init_dist8 = __esm(() => {
-  init_dist7();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist3();
-  init_dist();
-  init_dist7();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist();
-  init_dist3();
+var init_dist9 = __esm(() => {
+  init_dist8();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist4();
+  init_dist2();
+  init_dist8();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist();
-  init_dist3();
-  init_dist();
-  init_dist3();
+  init_dist2();
+  init_dist4();
+  init_dist2();
+  init_dist4();
   init_v4();
   init_v4();
   init_v4();
   init_v4();
   init_v4();
-  init_dist7();
-  init_dist();
-  init_dist();
-  init_dist7();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist();
-  init_dist3();
-  init_dist3();
+  init_dist8();
+  init_dist2();
+  init_dist2();
+  init_dist8();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist2();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist2();
+  init_dist4();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist();
-  init_dist3();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist2();
+  init_dist4();
   init_v4();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist();
-  init_dist3();
-  init_dist();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist();
-  init_dist3();
-  init_dist();
-  init_dist();
-  init_dist();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
-  init_dist3();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist2();
+  init_dist4();
+  init_dist2();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist2();
+  init_dist4();
+  init_dist2();
+  init_dist2();
+  init_dist2();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
+  init_dist4();
   import_api2 = __toESM(require_src(), 1);
   import_api3 = __toESM(require_src(), 1);
   __defProp2 = Object.defineProperty;
@@ -61981,6 +62428,7 @@ var init_dist8 = __esm(() => {
       }),
       exports_external2.object({
         type: exports_external2.literal("reasoning"),
+        id: exports_external2.string().optional(),
         text: exports_external2.string(),
         state: exports_external2.enum(["streaming", "done"]).optional(),
         providerMetadata: providerMetadataSchema.optional()
@@ -62389,7 +62837,7 @@ var {
 // src/cli/index.tsx
 init_database();
 import { readFileSync as readFileSync10 } from "fs";
-import { dirname as dirname8, join as join14 } from "path";
+import { dirname as dirname8, join as join19 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 
 // src/db/machines.ts
@@ -62501,9 +62949,9 @@ function resolveExitCode(err) {
 
 // ../../node_modules/.bun/@hasna+events@0.1.6/node_modules/@hasna/events/dist/commander.js
 import { chmod, mkdir, readFile, rename, writeFile } from "fs/promises";
-import { existsSync as existsSync3 } from "fs";
-import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
+import { existsSync as existsSync4 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join6 } from "path";
 import { createHmac, timingSafeEqual } from "crypto";
 import { randomUUID as randomUUID2 } from "crypto";
 import { spawn } from "child_process";
@@ -62552,7 +63000,7 @@ function channelMatchesEvent(channel, event) {
 var HASNA_EVENTS_DIR_ENV = "HASNA_EVENTS_DIR";
 var HASNA_EVENTS_HOME_ENV = "HASNA_EVENTS_HOME";
 function getEventsDataDir(override) {
-  return override || process.env[HASNA_EVENTS_DIR_ENV] || process.env[HASNA_EVENTS_HOME_ENV] || join4(homedir2(), ".hasna", "events");
+  return override || process.env[HASNA_EVENTS_DIR_ENV] || process.env[HASNA_EVENTS_HOME_ENV] || join6(homedir3(), ".hasna", "events");
 }
 
 class JsonEventsStore {
@@ -62560,11 +63008,11 @@ class JsonEventsStore {
   channelsPath;
   eventsPath;
   deliveriesPath;
-  constructor(dataDir = getEventsDataDir()) {
-    this.dataDir = dataDir;
-    this.channelsPath = join4(dataDir, "channels.json");
-    this.eventsPath = join4(dataDir, "events.json");
-    this.deliveriesPath = join4(dataDir, "deliveries.json");
+  constructor(dataDir2 = getEventsDataDir()) {
+    this.dataDir = dataDir2;
+    this.channelsPath = join6(dataDir2, "channels.json");
+    this.eventsPath = join6(dataDir2, "events.json");
+    this.deliveriesPath = join6(dataDir2, "deliveries.json");
   }
   async init() {
     await mkdir(this.dataDir, { recursive: true, mode: 448 });
@@ -62636,7 +63084,7 @@ class JsonEventsStore {
     };
   }
   async ensureArrayFile(path) {
-    if (!existsSync3(path)) {
+    if (!existsSync4(path)) {
       await writeFile(path, `[]
 `, { encoding: "utf-8", mode: 384 });
     }
@@ -62753,7 +63201,7 @@ async function dispatchCommand(event, channel) {
     HASNA_EVENT_SCHEMA_VERSION: event.schemaVersion,
     HASNA_EVENT_JSON: eventJson
   };
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     const child = spawn(channel.command.command, channel.command.args ?? [], {
       cwd: channel.command.cwd,
       env,
@@ -62771,7 +63219,7 @@ async function dispatchCommand(event, channel) {
     });
     child.on("error", (error) => {
       clearTimeout(timeout);
-      resolve2({
+      resolve3({
         attempt: 1,
         status: "failed",
         startedAt,
@@ -62784,7 +63232,7 @@ async function dispatchCommand(event, channel) {
     child.on("close", (code, signal) => {
       clearTimeout(timeout);
       const success = code === 0;
-      resolve2({
+      resolve3({
         attempt: 1,
         status: success ? "success" : "failed",
         startedAt,
@@ -63191,7 +63639,7 @@ init_database();
 init_api_mode();
 init_memories();
 import chalk2 from "chalk";
-import { resolve as resolve3 } from "path";
+import { resolve as resolve4 } from "path";
 
 // src/db/memory-project-link.ts
 init_storage();
@@ -64414,7 +64862,7 @@ function registerCrudCommands(program2) {
         session_id: globalOpts.session
       };
       if (globalOpts.project) {
-        const projectPath = resolve3(globalOpts.project);
+        const projectPath = resolve4(globalOpts.project);
         const project = getProject(projectPath);
         if (!project) {
           throw new Error(`Unknown project "${projectPath}": no registered project matches that path.
@@ -64729,7 +65177,7 @@ init_helpers();
 init_projects();
 init_helpers();
 import chalk4 from "chalk";
-import { resolve as resolve4 } from "path";
+import { resolve as resolve5 } from "path";
 function registerTailCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("tail").description("Watch for new/updated memories in real-time (like tail -f)").option("--scope <scope>", "Scope filter: global, shared, private, working").option("-c, --category <cat>", "Category filter: preference, fact, knowledge, history, procedural, resource").option("--agent <name>", "Agent filter").option("--project <path>", "Project filter").option("--interval <ms>", "Poll interval in milliseconds (default: 2000)", parseInt).option("--notify", "Send macOS notifications for each change").action((opts) => {
@@ -64740,7 +65188,7 @@ function registerTailCommand(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve4(projectPath));
+        const project = getProject(resolve5(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -64843,7 +65291,7 @@ init_projects();
 init_search();
 init_helpers();
 import chalk6 from "chalk";
-import { resolve as resolve5 } from "path";
+import { resolve as resolve6 } from "path";
 function registerSearchCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("search <query>").description("Full-text search across memories").option("--scope <scope>", "Scope filter").option("-c, --category <cat>", "Category filter").option("--tags <tags>", "Comma-separated tags filter").option("--project <path>", "Project filter (path or name)").option("--agent <name>", "Agent filter").option("--session <id>", "Session ID filter").option("--limit <n>", "Max results", parseInt).option("--offset <n>", "Offset for pagination", parseInt).option("--cursor <n>", "Cursor offset for the next page", parseInt).option("--format <fmt>", "Output format: compact (default), json, csv, yaml").option("--verbose", "Show match highlights and wider snippets").option("--history", "Show recent search queries instead of searching").option("--popular", "Show most popular search queries").action((query, opts) => {
@@ -64888,7 +65336,7 @@ function registerSearchCommand(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve5(projectPath));
+        const project = getProject(resolve6(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -65154,7 +65602,7 @@ init_memories();
 init_search();
 init_helpers();
 import chalk11 from "chalk";
-import { resolve as resolve6 } from "path";
+import { resolve as resolve7 } from "path";
 
 // src/cli/commands/memory-cmd-recall-exit.ts
 var RECALL_EXIT_NOT_FOUND = 1;
@@ -65170,7 +65618,7 @@ function registerRecallCommand(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve6(projectPath));
+        const project = getProject(resolve7(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -65226,9 +65674,10 @@ function registerRecallCommand(program2) {
 // src/cli/commands/memory-cmd-list.ts
 init_projects();
 init_memories();
+init_redact();
 init_helpers();
 import chalk12 from "chalk";
-import { resolve as resolve7 } from "path";
+import { resolve as resolve8 } from "path";
 function registerListCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("list").description("List memories with optional filters").option("--scope <scope>", "Scope filter").option("-c, --category <cat>", "Category filter").option("--tags <tags>", "Comma-separated tags filter").option("--importance-min <n>", "Minimum importance", parseInt).option("--pinned", "Show only pinned").option("--agent <name>", "Agent filter").option("--project <path>", "Project filter").option("--session <id>", "Session ID filter").option("--limit <n>", "Max results", parseInt).option("--offset <n>", "Offset for pagination", parseInt).option("--cursor <n>", "Cursor offset for the next page", parseInt).option("--status <status>", "Status filter: active, archived, expired").option("--format <fmt>", "Output format: compact (default), json, csv, yaml").option("--verbose", "Show wider memory snippets in human output").action((opts) => {
@@ -65243,7 +65692,7 @@ function registerListCommand(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve7(projectPath));
+        const project = getProject(resolve8(projectPath));
         if (!project) {
           throw new Error(`Project not found: ${projectPath}`);
         }
@@ -65273,36 +65722,37 @@ function registerListCommand(program2) {
         };
       }, limit, offset);
       const memories = hasMore && limit !== undefined ? collected.slice(0, limit) : collected;
+      const sanitized = memories.map(redactMemoryForOutput);
       if (fmt === "json") {
-        outputJson(memories);
+        outputJson(sanitized);
         return;
       }
       if (fmt === "csv") {
         console.log("key,value,scope,category,importance,id");
-        for (const m of memories) {
+        for (const m of sanitized) {
           const v = m.value.replace(/"/g, '""');
           console.log(`"${m.key}","${v}",${m.scope},${m.category},${m.importance},${m.id.slice(0, 8)}`);
         }
         return;
       }
       if (fmt === "yaml") {
-        outputYaml(memories);
+        outputYaml(sanitized);
         return;
       }
-      if (memories.length === 0) {
+      if (sanitized.length === 0) {
         console.log(chalk12.yellow("No memories found."));
         return;
       }
-      console.log(chalk12.bold(`${memories.length}${hasMore ? "+" : ""} memor${memories.length === 1 ? "y" : "ies"}:`));
-      for (const m of memories) {
+      console.log(chalk12.bold(`${sanitized.length}${hasMore ? "+" : ""} memor${sanitized.length === 1 ? "y" : "ies"}:`));
+      for (const m of sanitized) {
         console.log(formatMemoryLine(m, {
           valueLength: opts.verbose ? 120 : 64,
           preferSummary: !opts.verbose
         }));
       }
       printPageHint({
-        shown: memories.length,
-        limit: limit ?? memories.length,
+        shown: sanitized.length,
+        limit: limit ?? sanitized.length,
         offset,
         hasMore,
         command: "mementos list",
@@ -65556,7 +66006,7 @@ function registerStatsCommand(program2) {
 
 // src/cli/commands/info-report.ts
 import chalk14 from "chalk";
-import { resolve as resolve8 } from "path";
+import { resolve as resolve9 } from "path";
 init_projects();
 function registerReportCommand(program2) {
   program2.command("report").description("Rich summary of memory activity and top memories").option("--days <n>", "Activity window in days (default: 7)", "7").option("--project <path>", "Filter by project path").option("--markdown", "Output as Markdown (for PRs, docs, etc.)").option("--json", "Output as JSON").action((opts) => {
@@ -65568,7 +66018,7 @@ function registerReportCommand(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve8(projectPath));
+        const project = getProject(resolve9(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -65640,7 +66090,7 @@ mementos report \u2014 last ${days} days
 
 // src/cli/commands/info-stale.ts
 import chalk15 from "chalk";
-import { resolve as resolve9 } from "path";
+import { resolve as resolve10 } from "path";
 init_projects();
 init_helpers();
 function registerStaleCommand(program2) {
@@ -65656,7 +66106,7 @@ function registerStaleCommand(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve9(projectPath));
+        const project = getProject(resolve10(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -65777,7 +66227,7 @@ function registerHistoryCommand(program2) {
 init_projects();
 init_memories();
 import chalk17 from "chalk";
-import { resolve as resolve10 } from "path";
+import { resolve as resolve11 } from "path";
 
 // src/lib/machine-visibility.ts
 function resolveVisibleMachineId(machineId, db) {
@@ -65821,7 +66271,7 @@ function registerContextCommand(program2) {
       const visibleMachineId = resolveVisibleMachineId(opts.machine);
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve10(projectPath));
+        const project = getProject(resolve11(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -65935,7 +66385,7 @@ function registerInfoCommands(program2) {
 init_projects();
 init_memories();
 init_helpers();
-import { resolve as resolve11 } from "path";
+import { resolve as resolve12 } from "path";
 function registerExportCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("export").description("Export memories as JSON").option("--scope <scope>", "Scope filter").option("-c, --category <cat>", "Category filter").option("--agent <name>", "Agent filter").option("--project <path>", "Project filter").action((opts) => {
@@ -65945,7 +66395,7 @@ function registerExportCommand(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve11(projectPath));
+        const project = getProject(resolve12(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -65967,7 +66417,7 @@ function registerExportCommand(program2) {
 init_memories();
 init_helpers();
 import chalk18 from "chalk";
-import { resolve as resolve12 } from "path";
+import { resolve as resolve13 } from "path";
 import { readFileSync as readFileSync5 } from "fs";
 function registerImportCommand(program2) {
   const handleError = makeHandleError(program2);
@@ -65978,7 +66428,7 @@ function registerImportCommand(program2) {
       if (file === "-" || !file && !process.stdin.isTTY) {
         raw = await Bun.stdin.text();
       } else if (file) {
-        raw = readFileSync5(resolve12(file), "utf-8");
+        raw = readFileSync5(resolve13(file), "utf-8");
       } else {
         console.error(chalk18.red("No input: provide a file path, use '-' for stdin, or pipe data."));
         process.exit(1);
@@ -66008,14 +66458,15 @@ function registerImportCommand(program2) {
 import chalk19 from "chalk";
 
 // src/lib/config.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync6, readdirSync, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, cpSync as cpSync2 } from "fs";
-import { homedir as homedir4 } from "os";
-import { basename, dirname as dirname4, join as join8, resolve as resolve13 } from "path";
+init_paths();
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync6, readdirSync, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, cpSync as cpSync2 } from "fs";
+import { homedir as homedir5 } from "os";
+import { basename, dirname as dirname4, join as join10, resolve as resolve14 } from "path";
 function isInMemoryDb2(path) {
   return path === ":memory:" || path.startsWith("file::memory:");
 }
 function homeDir() {
-  return process.env["HOME"] || process.env["USERPROFILE"] || homedir4();
+  return process.env["HOME"] || process.env["USERPROFILE"] || homedir5();
 }
 var DEFAULT_CONFIG = {
   default_scope: "private",
@@ -66073,9 +66524,9 @@ function isValidCategory(value) {
   return VALID_CATEGORIES2.includes(value);
 }
 function loadConfig() {
-  const configPath = join8(homeDir(), ".hasna", "mementos", "config.json");
+  const configPath = join10(getDataRoot(), "config.json");
   let fileConfig = {};
-  if (existsSync5(configPath)) {
+  if (existsSync6(configPath)) {
     try {
       const raw = readFileSync6(configPath, "utf-8");
       fileConfig = JSON.parse(raw);
@@ -66101,10 +66552,10 @@ function loadConfig() {
 }
 function findFileWalkingUp(filename) {
   let dir = process.cwd();
-  const legacyHomeMementosDb = resolve13(homeDir(), ".mementos", "mementos.db");
+  const legacyHomeMementosDb = resolve14(homeDir(), ".mementos", "mementos.db");
   while (true) {
-    const candidate = join8(dir, filename);
-    if (existsSync5(candidate) && resolve13(candidate) !== legacyHomeMementosDb) {
+    const candidate = join10(dir, filename);
+    if (existsSync6(candidate) && resolve14(candidate) !== legacyHomeMementosDb) {
       return candidate;
     }
     const parent = dirname4(dir);
@@ -66117,7 +66568,7 @@ function findFileWalkingUp(filename) {
 function findGitRoot2() {
   let dir = process.cwd();
   while (true) {
-    if (existsSync5(join8(dir, ".git"))) {
+    if (existsSync6(join10(dir, ".git"))) {
       return dir;
     }
     const parent = dirname4(dir);
@@ -66128,14 +66579,14 @@ function findGitRoot2() {
   }
 }
 function profilesDir() {
-  return join8(homeDir(), ".hasna", "mementos", "profiles");
+  return join10(getDataRoot(), "profiles");
 }
 function globalConfigPath() {
-  return join8(homeDir(), ".hasna", "mementos", "config.json");
+  return join10(getDataRoot(), "config.json");
 }
 function readGlobalConfig() {
   const p = globalConfigPath();
-  if (!existsSync5(p))
+  if (!existsSync6(p))
     return {};
   try {
     return JSON.parse(readFileSync6(p, "utf-8"));
@@ -66145,7 +66596,7 @@ function readGlobalConfig() {
 }
 function readGlobalConfigForWrite() {
   const p = globalConfigPath();
-  if (!existsSync5(p))
+  if (!existsSync6(p))
     return {};
   try {
     const data = JSON.parse(readFileSync6(p, "utf-8"));
@@ -66181,13 +66632,13 @@ function setActiveProfile(name) {
 }
 function listProfiles() {
   const dir = profilesDir();
-  if (!existsSync5(dir))
+  if (!existsSync6(dir))
     return [];
   return readdirSync(dir).filter((f) => f.endsWith(".db")).map((f) => basename(f, ".db")).sort();
 }
 function deleteProfile(name) {
-  const dbPath = join8(profilesDir(), `${name}.db`);
-  if (!existsSync5(dbPath))
+  const dbPath = join10(profilesDir(), `${name}.db`);
+  if (!existsSync6(dbPath))
     return false;
   unlinkSync2(dbPath);
   if (getActiveProfile() === name)
@@ -66196,10 +66647,10 @@ function deleteProfile(name) {
 }
 function getDbPath2() {
   const _home = homeDir();
-  const _newDir = join8(_home, ".hasna", "mementos");
-  const _oldDir = join8(_home, ".mementos");
-  if (!existsSync5(_newDir) && existsSync5(_oldDir)) {
-    mkdirSync3(join8(_home, ".hasna"), { recursive: true });
+  const _newDir = getDataRoot();
+  const _oldDir = join10(_home, ".mementos");
+  if (!existsSync6(_newDir) && existsSync6(_oldDir)) {
+    mkdirSync3(join10(_home, ".hasna"), { recursive: true });
     cpSync2(_oldDir, _newDir, { recursive: true });
   }
   const envDbPath = process.env["HASNA_MEMENTOS_DB_PATH"] ?? process.env["MEMENTOS_DB_PATH"];
@@ -66207,13 +66658,13 @@ function getDbPath2() {
     if (isInMemoryDb2(envDbPath)) {
       return envDbPath;
     }
-    const resolved = resolve13(envDbPath);
+    const resolved = resolve14(envDbPath);
     ensureDir2(dirname4(resolved));
     return resolved;
   }
   const profile = getActiveProfile();
   if (profile) {
-    const profilePath = join8(profilesDir(), `${profile}.db`);
+    const profilePath = join10(profilesDir(), `${profile}.db`);
     ensureDir2(dirname4(profilePath));
     return profilePath;
   }
@@ -66221,21 +66672,21 @@ function getDbPath2() {
   if (dbScope === "project") {
     const gitRoot = findGitRoot2();
     if (gitRoot) {
-      const dbPath = join8(gitRoot, ".mementos", "mementos.db");
+      const dbPath = join10(gitRoot, ".mementos", "mementos.db");
       ensureDir2(dirname4(dbPath));
       return dbPath;
     }
   }
-  const found = findFileWalkingUp(join8(".mementos", "mementos.db"));
+  const found = findFileWalkingUp(join10(".mementos", "mementos.db"));
   if (found) {
     return found;
   }
-  const fallback = join8(homeDir(), ".hasna", "mementos", "mementos.db");
+  const fallback = join10(getDataRoot(), "mementos.db");
   ensureDir2(dirname4(fallback));
   return fallback;
 }
 function ensureDir2(dir) {
-  if (!existsSync5(dir)) {
+  if (!existsSync6(dir)) {
     mkdirSync3(dir, { recursive: true });
   }
 }
@@ -66350,19 +66801,19 @@ function registerCleanCommand(program2) {
 
 // src/cli/commands/io-backup.ts
 init_database();
+init_paths();
 init_helpers();
 import chalk20 from "chalk";
-import { resolve as resolve14, dirname as dirname5 } from "path";
-import { existsSync as existsSync6, statSync, copyFileSync, mkdirSync as mkdirSync4, readdirSync as readdirSync2 } from "fs";
+import { join as join11, resolve as resolve15, dirname as dirname5 } from "path";
+import { existsSync as existsSync7, statSync, copyFileSync, mkdirSync as mkdirSync4, readdirSync as readdirSync2 } from "fs";
 function registerBackupCommand(program2) {
   const handleError = makeHandleError(program2);
-  program2.command("backup [path]").description("Backup the SQLite database to a file").option("--list", "List available backups in ~/.hasna/mementos/backups/").action((targetPath, opts) => {
+  program2.command("backup [path]").description("Backup the SQLite database to a file").option("--list", "List available backups in the mementos backups dir").action((targetPath, opts) => {
     try {
       const globalOpts = program2.opts();
-      const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-      const backupsDir = resolve14(home, ".hasna", "mementos", "backups");
+      const backupsDir = join11(getDataRoot(), "backups");
       if (opts.list) {
-        if (!existsSync6(backupsDir)) {
+        if (!existsSync7(backupsDir)) {
           if (globalOpts.json) {
             outputJson({ backups: [] });
             return;
@@ -66371,7 +66822,7 @@ function registerBackupCommand(program2) {
           return;
         }
         const files = readdirSync2(backupsDir).filter((f) => f.endsWith(".db")).map((f) => {
-          const filePath = resolve14(backupsDir, f);
+          const filePath = resolve15(backupsDir, f);
           const st2 = statSync(filePath);
           return { name: f, path: filePath, size: st2.size, mtime: st2.mtime };
         }).sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
@@ -66404,23 +66855,23 @@ function registerBackupCommand(program2) {
         return;
       }
       const dbPath = getDbPath();
-      if (!existsSync6(dbPath)) {
+      if (!existsSync7(dbPath)) {
         console.error(chalk20.red(`Database not found at ${dbPath}`));
         process.exit(1);
       }
       let dest;
       if (targetPath) {
-        dest = resolve14(targetPath);
+        dest = resolve15(targetPath);
       } else {
-        if (!existsSync6(backupsDir)) {
+        if (!existsSync7(backupsDir)) {
           mkdirSync4(backupsDir, { recursive: true });
         }
         const now3 = new Date;
         const ts = now3.toISOString().replace(/[-:T]/g, "").replace(/\..+/, "").slice(0, 15);
-        dest = resolve14(backupsDir, `mementos-${ts}.db`);
+        dest = resolve15(backupsDir, `mementos-${ts}.db`);
       }
       const destDir = dirname5(dest);
-      if (!existsSync6(destDir)) {
+      if (!existsSync7(destDir)) {
         mkdirSync4(destDir, { recursive: true });
       }
       copyFileSync(dbPath, dest);
@@ -66442,10 +66893,11 @@ function registerBackupCommand(program2) {
 init_database();
 init_api_mode();
 init_memories();
+init_paths();
 init_helpers();
 import chalk21 from "chalk";
-import { resolve as resolve15 } from "path";
-import { existsSync as existsSync7, statSync as statSync2, copyFileSync as copyFileSync2, readdirSync as readdirSync3 } from "fs";
+import { join as join12, resolve as resolve16 } from "path";
+import { existsSync as existsSync8, statSync as statSync2, copyFileSync as copyFileSync2, readdirSync as readdirSync3 } from "fs";
 function readMemoriesFromBackup(source) {
   const { Database: Database3 } = __require("bun:sqlite");
   const backupDb = new Database3(source, { readonly: true });
@@ -66458,19 +66910,18 @@ function readMemoriesFromBackup(source) {
 }
 function registerRestoreCommand(program2) {
   const handleError = makeHandleError(program2);
-  program2.command("restore [file]").description("Restore the database from a backup file").option("--latest", "Restore the most recent backup from ~/.hasna/mementos/backups/").option("--force", "Skip confirmation and perform the restore").action((filePath, opts) => {
+  program2.command("restore [file]").description("Restore the database from a backup file").option("--latest", "Restore the most recent backup from the mementos backups dir").option("--force", "Skip confirmation and perform the restore").action((filePath, opts) => {
     try {
       const globalOpts = program2.opts();
-      const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-      const backupsDir = resolve15(home, ".hasna", "mementos", "backups");
+      const backupsDir = join12(getDataRoot(), "backups");
       let source;
       if (opts.latest) {
-        if (!existsSync7(backupsDir)) {
+        if (!existsSync8(backupsDir)) {
           console.error(chalk21.red("No backups directory found."));
           process.exit(1);
         }
         const files = readdirSync3(backupsDir).filter((f) => f.endsWith(".db")).map((f) => {
-          const fp = resolve15(backupsDir, f);
+          const fp = resolve16(backupsDir, f);
           const st = statSync2(fp);
           return { path: fp, mtime: st.mtime };
         }).sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
@@ -66480,12 +66931,12 @@ function registerRestoreCommand(program2) {
         }
         source = files[0].path;
       } else if (filePath) {
-        source = resolve15(filePath);
+        source = resolve16(filePath);
       } else {
         console.error(chalk21.red("Provide a backup file path or use --latest"));
         process.exit(1);
       }
-      if (!existsSync7(source)) {
+      if (!existsSync8(source)) {
         console.error(chalk21.red(`Backup file not found: ${source}`));
         process.exit(1);
       }
@@ -66560,7 +67011,7 @@ function registerRestoreCommand(program2) {
       }
       const dbPath = getDbPath();
       let currentCount = 0;
-      if (existsSync7(dbPath)) {
+      if (existsSync8(dbPath)) {
         try {
           const db = getDatabase();
           const row = db.query("SELECT COUNT(*) as count FROM memories").get();
@@ -66842,7 +67293,7 @@ function registerAgentCommands(program2) {
 init_projects();
 init_memories();
 import chalk23 from "chalk";
-import { resolve as resolve16 } from "path";
+import { resolve as resolve17 } from "path";
 init_helpers();
 function registerProjectCommands(program2) {
   const handleError = makeHandleError(program2);
@@ -66860,7 +67311,7 @@ function registerProjectCommands(program2) {
           console.error(chalk23.red("--name and --path are required when adding a project"));
           process.exit(1);
         }
-        const project = registerProject(name, resolve16(path), opts.description);
+        const project = registerProject(name, resolve17(path), opts.description);
         if (globalOpts.json) {
           outputJson(project);
         } else {
@@ -66876,7 +67327,7 @@ function registerProjectCommands(program2) {
         if (opts.name !== undefined)
           updates.name = opts.name;
         if (opts.path !== undefined)
-          updates.path = resolve16(opts.path);
+          updates.path = resolve17(opts.path);
         if (opts.description !== undefined) {
           updates.description = opts.description;
         }
@@ -67020,7 +67471,7 @@ function registerProjectCommands(program2) {
       const visibleMachineId = resolveVisibleMachineId(opts.machine);
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve16(projectPath));
+        const project = getProject(resolve17(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -67373,7 +67824,7 @@ init_relations();
 init_entity_memories();
 init_helpers();
 import chalk24 from "chalk";
-import { resolve as resolve17 } from "path";
+import { resolve as resolve18 } from "path";
 function registerEntityCommands(program2) {
   const handleError = makeHandleError(program2);
   const entityCmd = program2.command("entity").description("Knowledge graph entity commands");
@@ -67383,7 +67834,7 @@ function registerEntityCommands(program2) {
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve17(projectPath));
+        const project = getProject(resolve18(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -67456,7 +67907,7 @@ ${chalk24.bold(`Linked memories (${visibleMemories.length}${memories.length > vi
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
-        const project = getProject(resolve17(projectPath));
+        const project = getProject(resolve18(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -67814,11 +68265,11 @@ init_memories();
 init_agents();
 init_projects();
 import chalk27 from "chalk";
-import { join as join9 } from "path";
-import { homedir as homedir5 } from "os";
+import { join as join13 } from "path";
+import { homedir as homedir6 } from "os";
 import {
   readFileSync as readFileSync7,
-  existsSync as existsSync8,
+  existsSync as existsSync9,
   accessSync,
   statSync as statSync3,
   constants as fsConstants
@@ -67832,10 +68283,10 @@ async function runCommandWithTimeout(args, timeoutMs) {
   let timedOut = false;
   const exitCode = await Promise.race([
     proc.exited,
-    new Promise((resolve18) => setTimeout(() => {
+    new Promise((resolve19) => setTimeout(() => {
       timedOut = true;
       proc.kill();
-      resolve18(null);
+      resolve19(null);
     }, timeoutMs))
   ]);
   const [stdout, stderr] = await Promise.all([stdoutPromise, stderrPromise]);
@@ -67853,7 +68304,7 @@ function registerDoctorCommand(program2) {
     checks.push({ name: "Version", status: "ok", detail: version });
     const dbPath = getDbPath();
     let db = null;
-    if (dbPath !== ":memory:" && existsSync8(dbPath)) {
+    if (dbPath !== ":memory:" && existsSync9(dbPath)) {
       try {
         accessSync(dbPath, fsConstants.R_OK | fsConstants.W_OK);
         checks.push({ name: "Database file", status: "ok", detail: dbPath });
@@ -67872,7 +68323,7 @@ function registerDoctorCommand(program2) {
       checks.push({ name: "Database connection", status: "fail", detail: e instanceof Error ? e.message : String(e) });
     }
     try {
-      if (dbPath !== ":memory:" && existsSync8(dbPath)) {
+      if (dbPath !== ":memory:" && existsSync9(dbPath)) {
         const stats = statSync3(dbPath);
         const sizeKb = (stats.size / 1024).toFixed(1);
         const sizeMb = (stats.size / (1024 * 1024)).toFixed(2);
@@ -68005,8 +68456,8 @@ function registerDoctorCommand(program2) {
       checks.push({ name: "MCP server", status: "warn", detail: "could not check (is claude CLI installed?)" });
     }
     try {
-      const settingsFilePath = join9(homedir5(), ".claude", "settings.json");
-      if (existsSync8(settingsFilePath)) {
+      const settingsFilePath = join13(homedir6(), ".claude", "settings.json");
+      if (existsSync9(settingsFilePath)) {
         const settings = JSON.parse(readFileSync7(settingsFilePath, "utf-8"));
         const hooksObj = settings["hooks"] || {};
         const stopHooks = hooksObj["Stop"] || [];
@@ -68023,11 +68474,11 @@ function registerDoctorCommand(program2) {
       checks.push({ name: "Stop hook", status: "warn", detail: "could not check stop hook" });
     }
     if (process.platform === "darwin") {
-      const plistFilePath = join9(homedir5(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
+      const plistFilePath = join13(homedir6(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
       checks.push({
         name: "Auto-start",
-        status: existsSync8(plistFilePath) ? "ok" : "warn",
-        detail: existsSync8(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
+        status: existsSync9(plistFilePath) ? "ok" : "warn",
+        detail: existsSync9(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
       });
     } else {
       checks.push({ name: "Auto-start", status: "ok", detail: `n/a on ${process.platform}` });
@@ -68106,8 +68557,8 @@ async function runCloudDoctor(globalOpts, checks) {
     checks.push({ name: "MCP server", status: "warn", detail: "could not check (is claude CLI installed?)" });
   }
   try {
-    const settingsFilePath = join9(homedir5(), ".claude", "settings.json");
-    if (existsSync8(settingsFilePath)) {
+    const settingsFilePath = join13(homedir6(), ".claude", "settings.json");
+    if (existsSync9(settingsFilePath)) {
       const settings = JSON.parse(readFileSync7(settingsFilePath, "utf-8"));
       const hooksObj = settings["hooks"] || {};
       const stopHooks = hooksObj["Stop"] || [];
@@ -68124,11 +68575,11 @@ async function runCloudDoctor(globalOpts, checks) {
     checks.push({ name: "Stop hook", status: "warn", detail: "could not check stop hook" });
   }
   if (process.platform === "darwin") {
-    const plistFilePath = join9(homedir5(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
+    const plistFilePath = join13(homedir6(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
     checks.push({
       name: "Auto-start",
-      status: existsSync8(plistFilePath) ? "ok" : "warn",
-      detail: existsSync8(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
+      status: existsSync9(plistFilePath) ? "ok" : "warn",
+      detail: existsSync9(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
     });
   } else {
     checks.push({ name: "Auto-start", status: "ok", detail: `n/a on ${process.platform}` });
@@ -68183,7 +68634,7 @@ function registerConfigCommand(program2) {
         return;
       }
       if (subcommand === "path") {
-        const p = getConfigPath();
+        const p = getConfigPath2();
         if (useJson) {
           outputJson({ path: p });
         } else {
@@ -68252,7 +68703,7 @@ function registerConfigCommand(program2) {
             console.log(chalk28.green(`Reset ${key} to default (${JSON.stringify(defaultVal)})`));
           }
         } else {
-          const configPath = getConfigPath();
+          const configPath = getConfigPath2();
           const { unlinkSync: unlinkSync3, existsSync: _existsSync } = __require("fs");
           if (_existsSync(configPath)) {
             unlinkSync3(configPath);
@@ -68276,6 +68727,8 @@ function registerConfigCommand(program2) {
 
 // src/cli/commands/system-profile.ts
 import chalk29 from "chalk";
+import { join as join14 } from "path";
+init_paths();
 init_helpers();
 function registerProfileCommand(program2) {
   const profileCmd = program2.command("profile").description("Manage named profile files and active-profile metadata");
@@ -68306,7 +68759,7 @@ function registerProfileCommand(program2) {
     if (active) {
       console.log(chalk29.green(`Active profile: ${active}`));
       if (!process.env["MEMENTOS_PROFILE"]) {
-        console.log(chalk29.dim("(persisted in ~/.hasna/mementos/config.json)"));
+        console.log(chalk29.dim(`(persisted in ${join14(getDataRoot(), "config.json")})`));
       } else {
         console.log(chalk29.dim("(from MEMENTOS_PROFILE env var)"));
       }
@@ -68322,7 +68775,7 @@ function registerProfileCommand(program2) {
     }
     setActiveProfile(clean);
     console.log(chalk29.green(`\u2713 Active-profile metadata set: ${clean}`));
-    console.log(chalk29.dim(`  Profile file: ~/.hasna/mementos/profiles/${clean}.db`));
+    console.log(chalk29.dim(`  Profile file: ${join14(getDataRoot(), "profiles", `${clean}.db`)}`));
     console.log(chalk29.dim("  Run `mementos storage mode` to verify the live runtime database."));
   });
   profileCmd.command("unset").description("Clear the active-profile metadata").action(() => {
@@ -68343,8 +68796,8 @@ function registerProfileCommand(program2) {
         process.exit(1);
       }
       process.stdout.write(chalk29.yellow(`Delete profile "${name}" and its DB? This cannot be undone. [y/N] `));
-      const answer = await new Promise((resolve18) => {
-        process.stdin.once("data", (d) => resolve18(d.toString().trim().toLowerCase()));
+      const answer = await new Promise((resolve19) => {
+        process.stdin.once("data", (d) => resolve19(d.toString().trim().toLowerCase()));
       });
       if (answer !== "y" && answer !== "yes") {
         console.log(chalk29.dim("Cancelled."));
@@ -68572,7 +69025,7 @@ By type:`));
   webhooksCmd.command("create <type> <url>").description("Create a persistent webhook hook").option("--blocking", "Block the operation until the webhook responds").option("--priority <n>", "Hook priority (default 50)", "50").option("--agent <id>", "Scope to specific agent").option("--project <id>", "Scope to specific project").option("--description <text>", "Human-readable description").action(async (type, url, opts) => {
     const { createWebhookHook: createWebhookHook2 } = await Promise.resolve().then(() => (init_webhook_hooks(), exports_webhook_hooks));
     const { reloadWebhooks: reloadWebhooks2 } = await Promise.resolve().then(() => (init_built_in_hooks(), exports_built_in_hooks));
-    const wh = createWebhookHook2({
+    const wh = await createWebhookHook2({
       type,
       handlerUrl: url,
       blocking: opts.blocking ?? false,
@@ -68581,7 +69034,7 @@ By type:`));
       projectId: opts.project,
       description: opts.description
     });
-    reloadWebhooks2();
+    await reloadWebhooks2();
     console.log(chalk31.green("\u2713 Webhook created"));
     console.log(`  ID:   ${chalk31.cyan(wh.id)}`);
     console.log(`  Type: ${wh.type}`);
@@ -68602,7 +69055,7 @@ By type:`));
     const { reloadWebhooks: reloadWebhooks2 } = await Promise.resolve().then(() => (init_built_in_hooks(), exports_built_in_hooks));
     const updated = updateWebhookHook2(id, { enabled: true });
     if (updated) {
-      reloadWebhooks2();
+      await reloadWebhooks2();
       console.log(chalk31.green(`\u2713 Webhook ${id} enabled`));
     } else {
       console.error(chalk31.red(`Webhook not found: ${id}`));
@@ -68614,7 +69067,7 @@ By type:`));
     const { reloadWebhooks: reloadWebhooks2 } = await Promise.resolve().then(() => (init_built_in_hooks(), exports_built_in_hooks));
     const updated = updateWebhookHook2(id, { enabled: false });
     if (updated) {
-      reloadWebhooks2();
+      await reloadWebhooks2();
       console.log(chalk31.yellow(`\u2298 Webhook ${id} disabled`));
     } else {
       console.error(chalk31.red(`Webhook not found: ${id}`));
@@ -68865,7 +69318,7 @@ function registerToolsCommand(program2) {
 // src/cli/commands/system-synthesized-profile.ts
 init_helpers();
 import chalk35 from "chalk";
-import { resolve as resolve18 } from "path";
+import { resolve as resolve19 } from "path";
 function registerSynthesizedProfileCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("synthesized-profile").description("Show or refresh the synthesized agent/project profile").option("--project-id <id>", "Project ID").option("--refresh", "Force refresh the profile (re-synthesize from memories)").action(async (opts) => {
@@ -68875,7 +69328,7 @@ function registerSynthesizedProfileCommand(program2) {
       let projectId = opts.projectId;
       if (!projectId && globalOpts.project) {
         const { getProject: getProject2 } = (init_projects(), __toCommonJS(exports_projects));
-        const project = getProject2(resolve18(globalOpts.project));
+        const project = getProject2(resolve19(globalOpts.project));
         if (project)
           projectId = project.id;
       }
@@ -69060,7 +69513,7 @@ function registerMiscCommands(program2) {
       connStr = opts.connectionString;
     } else {
       try {
-        connStr = getStorageConnectionString("mementos");
+        connStr = getStorageConnectionStringForOperator("mementos");
       } catch {
         const msg = "Remote storage database is not configured. Use --connection-string or set HASNA_MEMENTOS_DATABASE_URL.";
         if (useJson) {
@@ -69235,7 +69688,7 @@ args = []
 init_memories();
 init_helpers();
 import chalk39 from "chalk";
-import { resolve as resolve19 } from "path";
+import { resolve as resolve20 } from "path";
 function registerWatchCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("watch").description("Watch for new and changed memories in real-time").option("--scope <scope>", "Scope filter: global, shared, private, working").option("-c, --category <cat>", "Category filter: preference, fact, knowledge, history, procedural, resource").option("--agent <name>", "Agent filter").option("--project <path>", "Project filter").option("--interval <ms>", "Poll interval in milliseconds", parseInt).action((opts) => {
@@ -69246,7 +69699,7 @@ function registerWatchCommand(program2) {
       let projectId;
       if (projectPath) {
         const { getProject: getProject2 } = (init_projects(), __toCommonJS(exports_projects));
-        const project = getProject2(resolve19(projectPath));
+        const project = getProject2(resolve20(projectPath));
         if (project)
           projectId = project.id;
       }
@@ -69802,7 +70255,7 @@ function resolveCurrentMachineId(local, requested) {
 function runStorageSync(direction, options = {}) {
   const backend = getStorageBackend();
   if (backend === "sqlite" && !options.remote) {
-    throw new Error("Remote storage is not configured. Set HASNA_MEMENTOS_DATABASE_URL or configure ~/.hasna/mementos/storage/config.json.");
+    throw new Error(`Remote storage is not configured. Set HASNA_MEMENTOS_DATABASE_URL or configure ${getConfigPath()}.`);
   }
   return withManagedAdapters(options, (local, remote, currentMachineId) => {
     const tables = resolveTables(local, options.tables);
@@ -70066,7 +70519,7 @@ function installStorageSubcommands(storage, program2) {
         }
         return;
       }
-      const connectionString = opts.connectionString || getStorageConnectionString("mementos");
+      const connectionString = opts.connectionString || getStorageConnectionStringForOperator("mementos");
       const result = await applyPgMigrations2(connectionString);
       if (useJson) {
         outputJson2(true, result);
@@ -70132,17 +70585,17 @@ import chalk41 from "chalk";
 import {
   readFileSync as readFileSync8,
   writeFileSync as writeFileSync4,
-  existsSync as existsSync10,
+  existsSync as existsSync11,
   copyFileSync as copyFileSync3,
   mkdirSync as mkdirSync6
 } from "fs";
-import { dirname as dirname7, join as join11 } from "path";
-import { homedir as homedir6 } from "os";
+import { dirname as dirname7, join as join16 } from "path";
+import { homedir as homedir7 } from "os";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function registerInitCommand(program2) {
   program2.command("init").description("One-command setup: register MCP, install stop hook, configure auto-start").action(async () => {
     const { platform: platform2 } = process;
-    const home = homedir6();
+    const home = homedir7();
     const isMac = platform2 === "darwin";
     console.log("");
     console.log(chalk41.bold("  mementos \u2014 setting up your memory layer"));
@@ -70197,15 +70650,15 @@ function registerInitCommand(program2) {
     } else {
       console.log(chalk41.green("  \u2713 MCP server registered with Claude Code"));
     }
-    const hooksDir = join11(home, ".claude", "hooks");
-    const hookDest = join11(hooksDir, "mementos-stop-hook.ts");
-    const settingsPath = join11(home, ".claude", "settings.json");
+    const hooksDir = join16(home, ".claude", "hooks");
+    const hookDest = join16(hooksDir, "mementos-stop-hook.ts");
+    const settingsPath = join16(home, ".claude", "settings.json");
     const hookCommand = `bun ${hookDest}`;
     let hookAlreadyInstalled = false;
     let hookError = null;
     try {
       let settings = {};
-      if (existsSync10(settingsPath)) {
+      if (existsSync11(settingsPath)) {
         try {
           settings = JSON.parse(readFileSync8(settingsPath, "utf-8"));
         } catch {
@@ -70218,19 +70671,19 @@ function registerInitCommand(program2) {
       if (alreadyHasMementos) {
         hookAlreadyInstalled = true;
       } else {
-        if (!existsSync10(hooksDir)) {
+        if (!existsSync11(hooksDir)) {
           mkdirSync6(hooksDir, { recursive: true });
         }
-        if (!existsSync10(hookDest)) {
+        if (!existsSync11(hookDest)) {
           const packageDir = dirname7(dirname7(fileURLToPath4(import.meta.url)));
           const candidatePaths = [
-            join11(packageDir, "scripts", "hooks", "claude-stop-hook.ts"),
-            join11(packageDir, "..", "scripts", "hooks", "claude-stop-hook.ts"),
-            join11(home, ".bun", "install", "global", "node_modules", "@hasna", "mementos", "scripts", "hooks", "claude-stop-hook.ts")
+            join16(packageDir, "scripts", "hooks", "claude-stop-hook.ts"),
+            join16(packageDir, "..", "scripts", "hooks", "claude-stop-hook.ts"),
+            join16(home, ".bun", "install", "global", "node_modules", "@hasna", "mementos", "scripts", "hooks", "claude-stop-hook.ts")
           ];
           let hookSourceFound = false;
           for (const src of candidatePaths) {
-            if (existsSync10(src)) {
+            if (existsSync11(src)) {
               copyFileSync3(src, hookDest);
               hookSourceFound = true;
               break;
@@ -70296,7 +70749,7 @@ main().catch(() => {});
     if (!isMac) {
       console.log(chalk41.dim(`  \xB7 Auto-start skipped (not macOS \u2014 platform: ${platform2})`));
     } else {
-      const plistPath = join11(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
+      const plistPath = join16(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
       const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -70321,11 +70774,11 @@ main().catch(() => {});
 </plist>
 `;
       try {
-        if (existsSync10(plistPath)) {
+        if (existsSync11(plistPath)) {
           autoStartAlreadyInstalled = true;
         } else {
-          const launchAgentsDir = join11(home, "Library", "LaunchAgents");
-          if (!existsSync10(launchAgentsDir)) {
+          const launchAgentsDir = join16(home, "Library", "LaunchAgents");
+          if (!existsSync11(launchAgentsDir)) {
             mkdirSync6(launchAgentsDir, { recursive: true });
           }
           writeFileSync4(plistPath, plistContent, "utf-8");
@@ -70341,7 +70794,7 @@ main().catch(() => {});
         console.log(chalk41.green("  \u2713 Auto-start configured (starts on login)"));
       }
       if (!autoStartAlreadyInstalled && !autoStartError) {
-        const plistPath2 = join11(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
+        const plistPath2 = join16(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
         const loadResult = await run(["launchctl", "load", plistPath2]);
         if (!loadResult.ok) {
           console.log(chalk41.dim(`  \xB7 launchctl load: ${loadResult.output || "already loaded"}`));
@@ -70376,7 +70829,7 @@ main().catch(() => {});
 init_agents();
 init_projects();
 import chalk42 from "chalk";
-import { resolve as resolve21 } from "path";
+import { resolve as resolve22 } from "path";
 
 // src/lib/consolidation.ts
 init_database();
@@ -71219,7 +71672,7 @@ async function resolveAISDKModel(provider, model) {
     const key = process.env["ANTHROPIC_API_KEY"];
     if (!key)
       return null;
-    const mod = await Promise.resolve().then(() => (init_dist4(), exports_dist));
+    const mod = await Promise.resolve().then(() => (init_dist5(), exports_dist));
     const anthropic2 = mod["anthropic"];
     return anthropic2 ? anthropic2(model) : null;
   }
@@ -71227,7 +71680,7 @@ async function resolveAISDKModel(provider, model) {
     const key = process.env["OPENAI_API_KEY"];
     if (!key)
       return null;
-    const mod = await Promise.resolve().then(() => (init_dist5(), exports_dist2));
+    const mod = await Promise.resolve().then(() => (init_dist6(), exports_dist2));
     const openai2 = mod["openai"];
     return openai2 ? openai2(model) : null;
   }
@@ -71236,7 +71689,7 @@ async function resolveAISDKModel(provider, model) {
     if (!apiKey)
       return null;
     const baseURL = provider === "cerebras" ? "https://api.cerebras.ai/v1" : "https://api.x.ai/v1";
-    const mod = await Promise.resolve().then(() => (init_dist6(), exports_dist3));
+    const mod = await Promise.resolve().then(() => (init_dist7(), exports_dist3));
     const createOpenAICompatible2 = mod["createOpenAICompatible"];
     if (!createOpenAICompatible2)
       return null;
@@ -71252,7 +71705,7 @@ function createAISDKReflectionCritic(options = {}) {
     if (!resolvedModel)
       return heuristicReflectionCritic(trajectory);
     try {
-      const ai = await Promise.resolve().then(() => (init_dist8(), exports_dist4));
+      const ai = await Promise.resolve().then(() => (init_dist9(), exports_dist4));
       const generateObject2 = ai["generateObject"];
       if (!generateObject2)
         return heuristicReflectionCritic(trajectory);
@@ -71364,7 +71817,7 @@ function resolveAgentId(nameOrId) {
 function resolveProjectId(pathOrId) {
   if (!pathOrId)
     return;
-  return getProject(resolve21(pathOrId))?.id ?? getProject(pathOrId)?.id ?? pathOrId;
+  return getProject(resolve22(pathOrId))?.id ?? getProject(pathOrId)?.id ?? pathOrId;
 }
 function registerConsolidationCommands(program2) {
   program2.command("consolidate").description("Consolidate memories: dedup, promote, summarize, and soft-delete stale low-value entries").option("--dry-run", "Plan actions without mutating memories").option("--scope <scope>", "Scope to consolidate: global, shared, private").option("--project <idOrPath>", "Project ID, name, or path").option("--agent <nameOrId>", "Agent name or ID").option("--duplicate-threshold <n>", "Near-duplicate similarity threshold 0-1", parseNumber2).option("--stale-days <n>", "Minimum age for decay/forget candidates", parseNumber2).option("--decay-threshold <n>", "Maximum decay score for soft-delete candidates", parseNumber2).option("--limit <n>", "Maximum memories to analyze", parseNumber2).option("--format <fmt>", "Output format: compact, json").action(async (opts) => {
@@ -71455,13 +71908,12 @@ function lessonTagForCli(kind) {
 
 // src/cli/brains.ts
 import {
-  existsSync as existsSync12,
+  existsSync as existsSync13,
   mkdirSync as mkdirSync8,
   writeFileSync as writeFileSync6,
   readdirSync as readdirSync4
 } from "fs";
-import { homedir as homedir8 } from "os";
-import { join as join13 } from "path";
+import { join as join18 } from "path";
 import chalk43 from "chalk";
 
 // src/lib/gatherer.ts
@@ -71537,15 +71989,18 @@ var gatherTrainingData = async (options = {}) => {
   };
 };
 
+// src/cli/brains.ts
+init_paths();
+
 // src/lib/model-config.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join12 } from "path";
+init_paths();
+import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "fs";
+import { join as join17 } from "path";
 var DEFAULT_MODEL = "gpt-4o-mini";
-var CONFIG_DIR = join12(homedir7(), ".hasna", "mementos");
-var CONFIG_PATH = join12(CONFIG_DIR, "config.json");
+var CONFIG_DIR = getDataRoot();
+var CONFIG_PATH = join17(CONFIG_DIR, "config.json");
 function readConfig() {
-  if (!existsSync11(CONFIG_PATH))
+  if (!existsSync12(CONFIG_PATH))
     return {};
   try {
     const raw = readFileSync9(CONFIG_PATH, "utf-8");
@@ -71555,7 +72010,7 @@ function readConfig() {
   }
 }
 function writeConfig(config2) {
-  if (!existsSync11(CONFIG_DIR)) {
+  if (!existsSync12(CONFIG_DIR)) {
     mkdirSync7(CONFIG_DIR, { recursive: true });
   }
   writeFileSync5(CONFIG_PATH, JSON.stringify(config2, null, 2) + `
@@ -71589,7 +72044,7 @@ function printInfo(msg) {
 function makeBrainsCommand() {
   const brains = new Command("brains");
   brains.description("Fine-tuned model training and management (via @hasna/brains)");
-  brains.command("gather").description("Gather training data from memories and write to JSONL").option("--limit <n>", "Maximum number of examples to gather", parseInt).option("--since <date>", "Only include memories created since this date (ISO 8601)").option("--output <dir>", "Output directory (default: ~/.hasna/mementos/training/)").option("--json", "Output result summary as JSON").action(async (opts) => {
+  brains.command("gather").description("Gather training data from memories and write to JSONL").option("--limit <n>", "Maximum number of examples to gather", parseInt).option("--since <date>", "Only include memories created since this date (ISO 8601)").option("--output <dir>", "Output directory (default: the mementos training data dir)").option("--json", "Output result summary as JSON").action(async (opts) => {
     try {
       const since = opts.since ? new Date(opts.since) : undefined;
       if (since && isNaN(since.getTime())) {
@@ -71603,12 +72058,12 @@ function makeBrainsCommand() {
         limit: opts.limit,
         since
       });
-      const outputDir = opts.output ?? join13(homedir8(), ".hasna", "mementos", "training");
-      if (!existsSync12(outputDir)) {
+      const outputDir = opts.output ?? join18(getDataRoot(), "training");
+      if (!existsSync13(outputDir)) {
         mkdirSync8(outputDir, { recursive: true });
       }
       const timestamp2 = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
-      const outputPath = join13(outputDir, `mementos-training-${timestamp2}.jsonl`);
+      const outputPath = join18(outputDir, `mementos-training-${timestamp2}.jsonl`);
       const jsonl = result.examples.map((ex) => JSON.stringify(ex)).join(`
 `);
       writeFileSync6(outputPath, jsonl + `
@@ -71632,8 +72087,8 @@ function makeBrainsCommand() {
     try {
       let datasetPath = opts.dataset;
       if (!datasetPath) {
-        const trainingDir = join13(homedir8(), ".hasna", "mementos", "training");
-        if (!existsSync12(trainingDir)) {
+        const trainingDir = join18(getDataRoot(), "training");
+        if (!existsSync13(trainingDir)) {
           printError("No training data found. Run `mementos brains gather` first.");
           process.exit(1);
         }
@@ -71643,9 +72098,9 @@ function makeBrainsCommand() {
           printError("No JSONL training files found. Run `mementos brains gather` first.");
           process.exit(1);
         }
-        datasetPath = join13(trainingDir, latestFile);
+        datasetPath = join18(trainingDir, latestFile);
       }
-      if (!datasetPath || !existsSync12(datasetPath)) {
+      if (!datasetPath || !existsSync13(datasetPath)) {
         printError(`Dataset file not found: ${datasetPath ?? "(unresolved)"}`);
         process.exit(1);
       }
@@ -71771,7 +72226,7 @@ function registerAllCommands(program2) {
 // src/cli/index.tsx
 function getPackageVersion2() {
   try {
-    const pkgPath = join14(dirname8(fileURLToPath5(import.meta.url)), "..", "..", "package.json");
+    const pkgPath = join19(dirname8(fileURLToPath5(import.meta.url)), "..", "..", "package.json");
     const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
     return pkg.version || "0.0.0";
   } catch {