@vibedeckx/linux-x64 0.3.23 → 0.3.24

package/dist/bin.js

@@ -4594,7 +4594,7 @@ var require_W3CTraceContextPropagator = __commonJS({
     var TraceState_1 = require_TraceState();
     exports.TRACE_PARENT_HEADER = "traceparent";
     exports.TRACE_STATE_HEADER = "tracestate";
-    var VERSION8 = "00";
+    var VERSION9 = "00";
     var VERSION_PART = "(?!ff)[\\da-f]{2}";
     var TRACE_ID_PART = "(?![0]{32})[\\da-f]{32}";
     var PARENT_ID_PART = "(?![0]{16})[\\da-f]{16}";
@@ -4618,7 +4618,7 @@ var require_W3CTraceContextPropagator = __commonJS({
         const spanContext = api_1.trace.getSpanContext(context2);
         if (!spanContext || (0, suppress_tracing_1.isTracingSuppressed)(context2) || !(0, api_1.isSpanContextValid)(spanContext))
           return;
-        const traceParent = `${VERSION8}-${spanContext.traceId}-${spanContext.spanId}-0${Number(spanContext.traceFlags || api_1.TraceFlags.NONE).toString(16)}`;
+        const traceParent = `${VERSION9}-${spanContext.traceId}-${spanContext.spanId}-0${Number(spanContext.traceFlags || api_1.TraceFlags.NONE).toString(16)}`;
         setter.set(carrier, exports.TRACE_PARENT_HEADER, traceParent);
         if (spanContext.traceState) {
           setter.set(carrier, exports.TRACE_STATE_HEADER, spanContext.traceState.serialize());
@@ -9571,32 +9571,32 @@ var require_Meter = __commonJS({
        */
       createGauge(name25, options) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name25, MetricData_1.InstrumentType.GAUGE, options);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.GaugeInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.GaugeInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link Histogram} instrument.
        */
       createHistogram(name25, options) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name25, MetricData_1.InstrumentType.HISTOGRAM, options);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.HistogramInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.HistogramInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link Counter} instrument.
        */
       createCounter(name25, options) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name25, MetricData_1.InstrumentType.COUNTER, options);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.CounterInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.CounterInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link UpDownCounter} instrument.
        */
       createUpDownCounter(name25, options) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name25, MetricData_1.InstrumentType.UP_DOWN_COUNTER, options);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.UpDownCounterInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.UpDownCounterInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link ObservableGauge} instrument.
@@ -10084,16 +10084,16 @@ var require_MetricStorageRegistry = __commonJS({
         }
         return storages;
       }
-      register(storage) {
-        this._registerStorage(storage, this._sharedRegistry);
+      register(storage2) {
+        this._registerStorage(storage2, this._sharedRegistry);
       }
-      registerForCollector(collector, storage) {
+      registerForCollector(collector, storage2) {
         let storageMap = this._perCollectorRegistry.get(collector);
         if (storageMap == null) {
           storageMap = /* @__PURE__ */ new Map();
           this._perCollectorRegistry.set(collector, storageMap);
         }
-        this._registerStorage(storage, storageMap);
+        this._registerStorage(storage2, storageMap);
       }
       findOrUpdateCompatibleStorage(expectedDescriptor) {
         const storages = this._sharedRegistry.get(expectedDescriptor.name);
@@ -10113,14 +10113,14 @@ var require_MetricStorageRegistry = __commonJS({
         }
         return this._findOrUpdateCompatibleStorage(expectedDescriptor, storages);
       }
-      _registerStorage(storage, storageMap) {
-        const descriptor = storage.getInstrumentDescriptor();
+      _registerStorage(storage2, storageMap) {
+        const descriptor = storage2.getInstrumentDescriptor();
         const storages = storageMap.get(descriptor.name);
         if (storages === void 0) {
-          storageMap.set(descriptor.name, [storage]);
+          storageMap.set(descriptor.name, [storage2]);
           return;
         }
-        storages.push(storage);
+        storages.push(storage2);
       }
       _findOrUpdateCompatibleStorage(expectedDescriptor, existingStorages) {
         let compatibleStorage = null;
@@ -10550,9 +10550,9 @@ var require_MeterSharedState = __commonJS({
             }
             const aggregator = aggregation.createAggregator(descriptor);
             const cardinalityLimit = collector.selectCardinalityLimit(descriptor.type);
-            const storage = new MetricStorageType(descriptor, aggregator, (0, AttributesProcessor_1.createNoopAttributesProcessor)(), [collector], cardinalityLimit);
-            this.metricStorageRegistry.registerForCollector(collector, storage);
-            return storage;
+            const storage2 = new MetricStorageType(descriptor, aggregator, (0, AttributesProcessor_1.createNoopAttributesProcessor)(), [collector], cardinalityLimit);
+            this.metricStorageRegistry.registerForCollector(collector, storage2);
+            return storage2;
           });
           storages = storages.concat(collectorStorages);
         }
@@ -95415,7 +95415,7 @@ var require_light_my_request = __commonJS({
 var require_fastify = __commonJS({
   "../../node_modules/.pnpm/fastify@5.7.2/node_modules/fastify/fastify.js"(exports, module) {
     "use strict";
-    var VERSION8 = "5.7.2";
+    var VERSION9 = "5.7.2";
     var Avvio = require_boot();
     var http = __require("node:http");
     var diagnostics = __require("node:diagnostics_channel");
@@ -95716,7 +95716,7 @@ var require_fastify = __commonJS({
         version: {
           configurable: true,
           get() {
-            return VERSION8;
+            return VERSION9;
           }
         },
         errorHandler: {
@@ -107959,7 +107959,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net2 = __require("net");
     var tls = __require("tls");
-    var { randomBytes: randomBytes4, createHash: createHash9 } = __require("crypto");
+    var { randomBytes: randomBytes5, createHash: createHash9 } = __require("crypto");
     var { Duplex, Readable: Readable4 } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -108489,7 +108489,7 @@ var require_websocket = __commonJS({
         }
       }
       const defaultPort = isSecure ? 443 : 80;
-      const key2 = randomBytes4(16).toString("base64");
+      const key2 = randomBytes5(16).toString("base64");
       const request = isSecure ? https.request : http.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
@@ -112389,7 +112389,7 @@ var require_websocket2 = __commonJS({
     "use strict";
     var { ServerResponse } = __require("node:http");
     var { PassThrough } = __require("node:stream");
-    var { randomBytes: randomBytes4 } = __require("node:crypto");
+    var { randomBytes: randomBytes5 } = __require("node:crypto");
     var fp36 = require_plugin2();
     var WebSocket2 = require_ws();
     var Duplexify = require_duplexify();
@@ -112460,7 +112460,7 @@ var require_websocket2 = __commonJS({
             connection: "upgrade",
             upgrade: "websocket",
             "sec-websocket-version": 13,
-            "sec-websocket-key": randomBytes4(16).toString("base64")
+            "sec-websocket-key": randomBytes5(16).toString("base64")
           },
           httpVersion: "1.1",
           url: path23,
@@ -132602,7 +132602,7 @@ var require_sqlite_cache_store = __commonJS({
     var { Writable: Writable2 } = __require("node:stream");
     var { assertCacheKey, assertCacheValue } = require_cache();
     var DatabaseSync;
-    var VERSION8 = 3;
+    var VERSION9 = 3;
     var MAX_ENTRY_SIZE = 2 * 1e3 * 1e3 * 1e3;
     module.exports = class SqliteCacheStore {
       #maxEntrySize = MAX_ENTRY_SIZE;
@@ -132673,7 +132673,7 @@ var require_sqlite_cache_store = __commonJS({
       PRAGMA temp_store = memory;
       PRAGMA optimize;
 
-      CREATE TABLE IF NOT EXISTS cacheInterceptorV${VERSION8} (
+      CREATE TABLE IF NOT EXISTS cacheInterceptorV${VERSION9} (
         -- Data specific to us
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         url TEXT NOT NULL,
@@ -132692,8 +132692,8 @@ var require_sqlite_cache_store = __commonJS({
         staleAt INTEGER NOT NULL
       );
 
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION8}_getValuesQuery ON cacheInterceptorV${VERSION8}(url, method, deleteAt);
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION8}_deleteByUrlQuery ON cacheInterceptorV${VERSION8}(deleteAt);
+      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION9}_getValuesQuery ON cacheInterceptorV${VERSION9}(url, method, deleteAt);
+      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION9}_deleteByUrlQuery ON cacheInterceptorV${VERSION9}(deleteAt);
     `);
         this.#getValuesQuery = this.#db.prepare(`
       SELECT
@@ -132708,7 +132708,7 @@ var require_sqlite_cache_store = __commonJS({
         vary,
         cachedAt,
         staleAt
-      FROM cacheInterceptorV${VERSION8}
+      FROM cacheInterceptorV${VERSION9}
       WHERE
         url = ?
         AND method = ?
@@ -132716,7 +132716,7 @@ var require_sqlite_cache_store = __commonJS({
         deleteAt ASC
     `);
         this.#updateValueQuery = this.#db.prepare(`
-      UPDATE cacheInterceptorV${VERSION8} SET
+      UPDATE cacheInterceptorV${VERSION9} SET
         body = ?,
         deleteAt = ?,
         statusCode = ?,
@@ -132730,7 +132730,7 @@ var require_sqlite_cache_store = __commonJS({
         id = ?
     `);
         this.#insertValueQuery = this.#db.prepare(`
-      INSERT INTO cacheInterceptorV${VERSION8} (
+      INSERT INTO cacheInterceptorV${VERSION9} (
         url,
         method,
         body,
@@ -132746,20 +132746,20 @@ var require_sqlite_cache_store = __commonJS({
       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
         this.#deleteByUrlQuery = this.#db.prepare(
-          `DELETE FROM cacheInterceptorV${VERSION8} WHERE url = ?`
+          `DELETE FROM cacheInterceptorV${VERSION9} WHERE url = ?`
         );
         this.#countEntriesQuery = this.#db.prepare(
-          `SELECT COUNT(*) AS total FROM cacheInterceptorV${VERSION8}`
+          `SELECT COUNT(*) AS total FROM cacheInterceptorV${VERSION9}`
         );
         this.#deleteExpiredValuesQuery = this.#db.prepare(
-          `DELETE FROM cacheInterceptorV${VERSION8} WHERE deleteAt <= ?`
+          `DELETE FROM cacheInterceptorV${VERSION9} WHERE deleteAt <= ?`
         );
         this.#deleteOldValuesQuery = this.#maxCount === Infinity ? null : this.#db.prepare(`
-        DELETE FROM cacheInterceptorV${VERSION8}
+        DELETE FROM cacheInterceptorV${VERSION9}
         WHERE id IN (
           SELECT
             id
-          FROM cacheInterceptorV${VERSION8}
+          FROM cacheInterceptorV${VERSION9}
           ORDER BY cachedAt DESC
           LIMIT ?
         )
@@ -136302,8 +136302,8 @@ var require_cache3 = __commonJS({
        */
       #queryCache(requestQuery, options, targetStorage) {
         const resultList = [];
-        const storage = targetStorage ?? this.#relevantRequestResponseList;
-        for (const requestResponse of storage) {
+        const storage2 = targetStorage ?? this.#relevantRequestResponseList;
+        for (const requestResponse of storage2) {
           const [cachedRequest, cachedResponse] = requestResponse;
           if (this.#requestMatchesCachedItem(requestQuery, cachedRequest, cachedResponse, options)) {
             resultList.push(requestResponse);
@@ -205475,8 +205475,8 @@ function verifySessionToolsToken(secret, token, nowMs) {
   if (typeof wire.exp !== "number" || nowMs >= wire.exp) return null;
   return { sessionId: wire.s };
 }
-async function getSessionToolsSecret(storage) {
-  return storage.settings.getOrCreate(
+async function getSessionToolsSecret(storage2) {
+  return storage2.settings.getOrCreate(
     SESSION_TOOLS_SECRET_SETTING,
     () => randomBytes(32).toString("hex")
   );
@@ -205940,8 +205940,8 @@ var ProcessManager = class _ProcessManager {
   storage;
   eventBus = null;
   terminalCounter = 0;
-  constructor(storage) {
-    this.storage = storage;
+  constructor(storage2) {
+    this.storage = storage2;
   }
   /** Payload size of one entry; `finished` carries an uncapped finalResult. */
   static logMessageBytes(msg) {
@@ -207966,22 +207966,22 @@ function reconcileWorktreeBranches(projectPath, entries, sessionBranches = [], r
   }
   return worktrees;
 }
-async function getRegisteredWorktreeBranches(storage, projectId, projectPath) {
+async function getRegisteredWorktreeBranches(storage2, projectId, projectPath) {
   const entries = readWorktreeListTolerant(projectPath);
-  const sessions = await storage.agentSessions.getProjectedByProjectId(projectId, "runtime");
+  const sessions = await storage2.agentSessions.getProjectedByProjectId(projectId, "runtime");
   const sessionBranches = sessions.map((session) => session.branch);
   const sessionBranchByPath = /* @__PURE__ */ new Map();
   for (const branch of sessionBranches) {
     if (branch) sessionBranchByPath.set(path7.resolve(conventionalWorktreePath(projectPath, branch)), branch);
   }
-  let registered = await storage.workspaceRegistry.listByProject(projectId, "local");
+  let registered = await storage2.workspaceRegistry.listByProject(projectId, "local");
   const livePaths = new Set(entries.map((entry) => path7.resolve(entry.path)));
   for (const row of registered) {
     if (livePaths.has(path7.resolve(row.checkout.worktree_path))) continue;
     if (row.checkout.status === "deleting") {
-      await storage.workspaceRegistry.markCheckoutDeleted(row.checkout.id);
+      await storage2.workspaceRegistry.markCheckoutDeleted(row.checkout.id);
     } else if (row.checkout.status !== "error" || row.checkout.error !== "Worktree is missing") {
-      await storage.workspaceRegistry.setCheckoutStatusIfCurrent(
+      await storage2.workspaceRegistry.setCheckoutStatusIfCurrent(
         row.checkout.id,
         { status: row.checkout.status, updatedAt: row.checkout.updated_at },
         "error",
@@ -207989,7 +207989,7 @@ async function getRegisteredWorktreeBranches(storage, projectId, projectPath) {
       );
     }
   }
-  registered = await storage.workspaceRegistry.listByProject(projectId, "local");
+  registered = await storage2.workspaceRegistry.listByProject(projectId, "local");
   const registeredPaths = new Set(registered.map((row) => path7.resolve(row.checkout.worktree_path)));
   for (let index = 0; index < entries.length; index++) {
     const entry = entries[index];
@@ -207997,10 +207997,10 @@ async function getRegisteredWorktreeBranches(storage, projectId, projectPath) {
     const existing = registered.find((row) => path7.resolve(row.checkout.worktree_path) === resolvedPath);
     if (existing) {
       if (existing.checkout.status === "creating" || existing.checkout.status === "error") {
-        await storage.workspaceRegistry.setCheckoutStatus(existing.checkout.id, "ready");
+        await storage2.workspaceRegistry.setCheckoutStatus(existing.checkout.id, "ready");
       }
       if (index === 0 && existing.checkout.expected_branch === "" && entry.branch) {
-        await storage.workspaceRegistry.registerReadyCheckout({
+        await storage2.workspaceRegistry.registerReadyCheckout({
           projectId,
           branch: existing.workspace.branch,
           targetId: "local",
@@ -208012,7 +208012,7 @@ async function getRegisteredWorktreeBranches(storage, projectId, projectPath) {
     }
     if (registeredPaths.has(resolvedPath) || entry.branch === null && index > 0) continue;
     const stableBranch = index === 0 ? "" : sessionBranchByPath.get(resolvedPath) ?? entry.branch;
-    await storage.workspaceRegistry.registerReadyCheckout({
+    await storage2.workspaceRegistry.registerReadyCheckout({
       projectId,
       branch: stableBranch,
       targetId: "local",
@@ -208021,7 +208021,7 @@ async function getRegisteredWorktreeBranches(storage, projectId, projectPath) {
     });
     registeredPaths.add(resolvedPath);
   }
-  registered = await storage.workspaceRegistry.listByProject(projectId, "local");
+  registered = await storage2.workspaceRegistry.listByProject(projectId, "local");
   const anchors = registered.map((row) => ({
     branch: row.workspace.branch,
     worktreePath: row.checkout.worktree_path,
@@ -208029,13 +208029,13 @@ async function getRegisteredWorktreeBranches(storage, projectId, projectPath) {
   }));
   return reconcileWorktreeBranches(projectPath, entries, sessionBranches, anchors);
 }
-async function anchorRootWorkspaceBranch(storage, projectId, projectPath, observedBranch) {
+async function anchorRootWorkspaceBranch(storage2, projectId, projectPath, observedBranch) {
   invalidateWorktreeListCache(projectPath);
   const rootEntry = readWorktreeListTolerant(projectPath)[0];
   if (!rootEntry || rootEntry.branch !== observedBranch) {
     return { anchored: false, currentBranch: rootEntry?.branch ?? null };
   }
-  await storage.workspaceRegistry.registerReadyCheckout({
+  await storage2.workspaceRegistry.registerReadyCheckout({
     projectId,
     branch: "",
     // The main-workspace identity sentinel; never the branch name.
@@ -208057,20 +208057,20 @@ function localBranchExists(projectPath, branch) {
     return false;
   }
 }
-async function setRootWorkspaceAnchor(storage, projectId, projectPath, branch) {
+async function setRootWorkspaceAnchor(storage2, projectId, projectPath, branch) {
   invalidateWorktreeListCache(projectPath);
   const entries = readWorktreeListTolerant(projectPath);
   const rootEntry = entries[0];
   if (!rootEntry || !localBranchExists(projectPath, branch)) {
     return { anchored: false, reason: rootEntry ? "unknown-branch" : "not-a-repository" };
   }
-  const registered = await storage.workspaceRegistry.listByProject(projectId, "local");
+  const registered = await storage2.workspaceRegistry.listByProject(projectId, "local");
   const takenByWorkspace = registered.some((row) => row.workspace.branch !== "" && row.workspace.branch === branch);
   const takenByWorktree = entries.slice(1).some((entry) => entry.branch === branch);
   if (takenByWorkspace || takenByWorktree) {
     return { anchored: false, reason: "branch-is-another-workspace" };
   }
-  await storage.workspaceRegistry.registerReadyCheckout({
+  await storage2.workspaceRegistry.registerReadyCheckout({
     projectId,
     branch: "",
     // The main-workspace identity sentinel; never the branch name.
@@ -228912,8 +228912,8 @@ function parseChatProviderConfig(raw) {
     return defaultConfig();
   }
 }
-async function getChatProviderConfig(storage, userId) {
-  const raw = await storage.userSettings.get(userId, "chat_provider");
+async function getChatProviderConfig(storage2, userId) {
+  const raw = await storage2.userSettings.get(userId, "chat_provider");
   return parseChatProviderConfig(raw);
 }
 function resolveModel(choice2, apiKeys) {
@@ -228925,12 +228925,12 @@ function isModelConfigured(config2, choice2) {
   const def = PROVIDERS[choice2.provider];
   return Boolean(config2.apiKeys[choice2.provider] || process.env[def.envKey]);
 }
-async function resolveChatModel(storage, userId) {
-  const config2 = await getChatProviderConfig(storage, userId);
+async function resolveChatModel(storage2, userId) {
+  const config2 = await getChatProviderConfig(storage2, userId);
   return resolveModel(config2.main, config2.apiKeys);
 }
-async function resolveFastChatModel(storage, userId) {
-  const config2 = await getChatProviderConfig(storage, userId);
+async function resolveFastChatModel(storage2, userId) {
+  const config2 = await getChatProviderConfig(storage2, userId);
   return resolveModel(config2.fast, config2.apiKeys);
 }
 
@@ -228946,8 +228946,8 @@ function buildPrompt(userMessage) {
 
 ${input}`;
 }
-async function isChatModelConfigured(storage, userId) {
-  const config2 = await getChatProviderConfig(storage, userId);
+async function isChatModelConfigured(storage2, userId) {
+  const config2 = await getChatProviderConfig(storage2, userId);
   return isModelConfigured(config2, config2.fast);
 }
 function extractUserText(content) {
@@ -228996,9 +228996,9 @@ async function generateSessionTitleWithModel(model, userMessage, options = {}) {
     return null;
   }
 }
-async function generateSessionTitle(storage, userMessage, userId) {
-  if (!await isChatModelConfigured(storage, userId)) return null;
-  return generateSessionTitleWithModel(await resolveFastChatModel(storage, userId), userMessage, { userId });
+async function generateSessionTitle(storage2, userMessage, userId) {
+  if (!await isChatModelConfigured(storage2, userId)) return null;
+  return generateSessionTitleWithModel(await resolveFastChatModel(storage2, userId), userMessage, { userId });
 }
 
 // src/utils/review-snapshot.ts
@@ -229149,11 +229149,11 @@ function computeScope(start, end, worktreePath) {
   changed.sort();
   return { changedFiles: changed, startHead: start.head };
 }
-async function recordTurnSnapshot(storage, sessionId, turnEndIndex, worktreePath, captured) {
+async function recordTurnSnapshot(storage2, sessionId, turnEndIndex, worktreePath, captured) {
   try {
     const snap = captured ?? captureSnapshot(worktreePath);
     if (!snap) return;
-    await storage.turnSnapshots.create({
+    await storage2.turnSnapshots.create({
       session_id: sessionId,
       turn_end_index: turnEndIndex,
       head: snap.head,
@@ -229163,8 +229163,8 @@ async function recordTurnSnapshot(storage, sessionId, turnEndIndex, worktreePath
     console.warn(`[ReviewSnapshot] failed to record snapshot for ${sessionId}@${turnEndIndex}:`, err.message);
   }
 }
-async function resolveStartSnapshot(storage, sessionId, span, turnEndIndex) {
-  return span === "session_start" ? storage.turnSnapshots.getSessionStart(sessionId) : storage.turnSnapshots.getStartBoundary(sessionId, turnEndIndex);
+async function resolveStartSnapshot(storage2, sessionId, span, turnEndIndex) {
+  return span === "session_start" ? storage2.turnSnapshots.getSessionStart(sessionId) : storage2.turnSnapshots.getStartBoundary(sessionId, turnEndIndex);
 }
 
 // src/branch-activity.ts
@@ -229516,8 +229516,8 @@ var AgentSessionManager = class {
   /** Grace window before committing a held completion (injectable for tests). */
   completionGraceMs;
   workflowSuppressionCheck = null;
-  constructor(storage, opts) {
-    this.storage = storage;
+  constructor(storage2, opts) {
+    this.storage = storage2;
     this.completionGraceMs = opts?.completionGraceMs ?? COMPLETION_GRACE_MS;
   }
   async resolveSessionWorktreePath(session, legacyProjectPath) {
@@ -231892,6 +231892,68 @@ var AgentSessionManager = class {
 // src/chat-session-manager.ts
 import { randomUUID as randomUUID3 } from "crypto";
 
+// src/trace-context.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+import { randomBytes as randomBytes2 } from "node:crypto";
+var VERSION8 = "00";
+var INVALID_VERSION = "ff";
+var ZERO_TRACE_ID = "0".repeat(32);
+var ZERO_SPAN_ID = "0".repeat(16);
+var HEX_2 = /^[0-9a-f]{2}$/;
+var HEX_16 = /^[0-9a-f]{16}$/;
+var HEX_32 = /^[0-9a-f]{32}$/;
+function parseTraceparent(value) {
+  const raw = Array.isArray(value) ? value[0] : value;
+  if (typeof raw !== "string") return null;
+  const parts = raw.split("-");
+  if (parts.length < 4) return null;
+  const [version2, traceId, spanId, flags] = parts;
+  if (!HEX_2.test(version2) || version2 === INVALID_VERSION) return null;
+  if (version2 === VERSION8 && parts.length !== 4) return null;
+  if (!HEX_32.test(traceId) || traceId === ZERO_TRACE_ID) return null;
+  if (!HEX_16.test(spanId) || spanId === ZERO_SPAN_ID) return null;
+  if (!HEX_2.test(flags)) return null;
+  return { traceId, spanId, flags };
+}
+function formatTraceparent(ctx) {
+  return `${VERSION8}-${ctx.traceId}-${ctx.spanId}-${ctx.sampled ? "01" : "00"}`;
+}
+function newTraceId() {
+  return randomBytes2(16).toString("hex");
+}
+function newSpanId() {
+  return randomBytes2(8).toString("hex");
+}
+function newTraceContext(incoming) {
+  const parsed = parseTraceparent(incoming);
+  if (parsed) {
+    return {
+      traceId: parsed.traceId,
+      spanId: newSpanId(),
+      parentSpanId: parsed.spanId,
+      sampled: (parseInt(parsed.flags, 16) & 1) === 1,
+      continued: true
+    };
+  }
+  return {
+    traceId: newTraceId(),
+    spanId: newSpanId(),
+    sampled: true,
+    continued: false
+  };
+}
+var storage = new AsyncLocalStorage();
+function runWithTraceContext(ctx, fn) {
+  return storage.run(ctx, fn);
+}
+function getTraceContext() {
+  return storage.getStore();
+}
+function outboundTraceparent() {
+  const ctx = storage.getStore();
+  return ctx ? formatTraceparent(ctx) : void 0;
+}
+
 // src/utils/remote-proxy.ts
 function proxyStatus(result, fallback = 502) {
   return result.status > 0 ? result.status : fallback;
@@ -231899,7 +231961,12 @@ function proxyStatus(result, fallback = 502) {
 async function proxyToRemoteAuto(remoteServerId, method, apiPath, body, options) {
   const rcm = options?.reverseConnectManager;
   if (rcm && rcm.isConnected(remoteServerId)) {
-    return rcm.sendHttpRequest(remoteServerId, method, apiPath, body, options?.timeoutMs);
+    const traceparent = outboundTraceparent();
+    const headers = {
+      ...traceparent ? { traceparent } : {},
+      ...options?.headers
+    };
+    return rcm.sendHttpRequest(remoteServerId, method, apiPath, body, options?.timeoutMs, headers);
   }
   return {
     ok: false,
@@ -232040,7 +232107,7 @@ function runUpdatedFrameForSubscribers(evt) {
 }
 
 // src/utils/cross-remote-token.ts
-import { createHmac as createHmac2, randomBytes as randomBytes2, timingSafeEqual as timingSafeEqual2 } from "crypto";
+import { createHmac as createHmac2, randomBytes as randomBytes3, timingSafeEqual as timingSafeEqual2 } from "crypto";
 var CROSS_REMOTE_SECRET_SETTING = "cross_remote_token_secret";
 var CROSS_REMOTE_TOKEN_TTL_MS = 864e5;
 var sign2 = (secret, body) => createHmac2("sha256", secret).update(body).digest("base64url");
@@ -232076,10 +232143,10 @@ function verifyCrossRemoteToken(secret, token, nowMs) {
   if (nowMs >= wire.exp) return null;
   return { userId: wire.u, sessionId: wire.s, sourceRemoteServerId: wire.src };
 }
-async function getCrossRemoteSecret(storage) {
-  return storage.settings.getOrCreate(
+async function getCrossRemoteSecret(storage2) {
+  return storage2.settings.getOrCreate(
     CROSS_REMOTE_SECRET_SETTING,
-    () => randomBytes2(32).toString("hex")
+    () => randomBytes3(32).toString("hex")
   );
 }
 
@@ -232633,8 +232700,8 @@ function groupByServer(mappings) {
 }
 
 // src/remote-agent-sessions.ts
-async function bindRemoteSessionMapping(storage, opts) {
-  const mappingRepo = opts.mappingRepo ?? storage.remoteSessionMappings;
+async function bindRemoteSessionMapping(storage2, opts) {
+  const mappingRepo = opts.mappingRepo ?? storage2.remoteSessionMappings;
   const existingMapping = await mappingRepo.getByLocal(opts.localSessionId);
   if (existingMapping?.workspace_checkout_id) {
     if (existingMapping.project_id !== opts.projectId || existingMapping.remote_server_id !== opts.remoteServerId || existingMapping.remote_session_id !== opts.remoteSessionId || (existingMapping.branch ?? "") !== (opts.branch ?? "")) {
@@ -232644,13 +232711,13 @@ async function bindRemoteSessionMapping(storage, opts) {
   }
   const branchKey = opts.branch ?? "";
   const fallbackPath = opts.branch ? conventionalWorktreePath(opts.remotePath, opts.branch) : opts.remotePath;
-  let registered = await storage.workspaceRegistry.getByProjectBranch(
+  let registered = await storage2.workspaceRegistry.getByProjectBranch(
     opts.projectId,
     branchKey,
     opts.remoteServerId
   );
   if (!registered || opts.reportedWorktreePath && (registered.checkout.path_source !== "reported" || registered.checkout.worktree_path !== opts.reportedWorktreePath)) {
-    registered = await storage.workspaceRegistry.registerReadyCheckout({
+    registered = await storage2.workspaceRegistry.registerReadyCheckout({
       projectId: opts.projectId,
       branch: branchKey,
       targetId: opts.remoteServerId,
@@ -233182,11 +233249,11 @@ function isSequencePrefix(cached2, replay) {
   }
   return true;
 }
-async function persistRemoteSessionActivityFrame(storage, sessionId, remoteInfo, parsed, activityAt = Date.now()) {
+async function persistRemoteSessionActivityFrame(storage2, sessionId, remoteInfo, parsed, activityAt = Date.now()) {
   const projectId = projectIdFromRemoteSessionId(sessionId, remoteInfo);
   const statusEvent = statusEventFromRemotePatch(parsed, sessionId, remoteInfo);
   if (statusEvent) {
-    return storage.searchCache.updateRemoteSessionActivity({
+    return storage2.searchCache.updateRemoteSessionActivity({
       localSessionId: sessionId,
       projectId,
       targetId: remoteInfo.remoteServerId,
@@ -233197,7 +233264,7 @@ async function persistRemoteSessionActivityFrame(storage, sessionId, remoteInfo,
     });
   }
   if ("taskCompleted" in parsed) {
-    return storage.searchCache.updateRemoteSessionActivity({
+    return storage2.searchCache.updateRemoteSessionActivity({
       localSessionId: sessionId,
       projectId,
       targetId: remoteInfo.remoteServerId,
@@ -233208,7 +233275,7 @@ async function persistRemoteSessionActivityFrame(storage, sessionId, remoteInfo,
     });
   }
   if ("error" in parsed) {
-    return storage.searchCache.updateRemoteSessionActivity({
+    return storage2.searchCache.updateRemoteSessionActivity({
       localSessionId: sessionId,
       projectId,
       targetId: remoteInfo.remoteServerId,
@@ -233219,7 +233286,7 @@ async function persistRemoteSessionActivityFrame(storage, sessionId, remoteInfo,
   }
   return false;
 }
-function connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage, requestedHistory) {
+function connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage2, requestedHistory) {
   const hasCachedData = cache2.hasData(sessionId);
   console.log(`[AgentWS] Opening persistent remote WS for ${sessionId} (cached=${hasCachedData})`);
   if (!reverseConnectManager || !reverseConnectManager.isConnected(remoteInfo.remoteServerId)) {
@@ -233274,8 +233341,8 @@ function connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnect
       if (statusEvent) {
         cache2.setSessionStatus(sessionId, statusEvent.status);
         let activityReady = true;
-        if (storage) {
-          activityReady = await persistRemoteSessionActivityFrame(storage, sessionId, remoteInfo, parsed).catch((error48) => {
+        if (storage2) {
+          activityReady = await persistRemoteSessionActivityFrame(storage2, sessionId, remoteInfo, parsed).catch((error48) => {
             console.error(`[AgentWS] activity write-through failed for ${sessionId}:`, error48);
             return false;
           });
@@ -233297,8 +233364,8 @@ function connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnect
       cache2.appendMessage(sessionId, raw, false);
       cache2.broadcast(sessionId, raw);
       let activityReady = true;
-      if (storage) {
-        activityReady = await persistRemoteSessionActivityFrame(storage, sessionId, remoteInfo, parsed).catch((error48) => {
+      if (storage2) {
+        activityReady = await persistRemoteSessionActivityFrame(storage2, sessionId, remoteInfo, parsed).catch((error48) => {
           console.error(`[AgentWS] completion write-through failed for ${sessionId}:`, error48);
           return false;
         });
@@ -233353,8 +233420,8 @@ function connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnect
       cache2.appendMessage(sessionId, raw, false);
       cache2.broadcast(sessionId, raw);
       let activityReady = true;
-      if (storage) {
-        activityReady = await persistRemoteSessionActivityFrame(storage, sessionId, remoteInfo, parsed).catch((error48) => {
+      if (storage2) {
+        activityReady = await persistRemoteSessionActivityFrame(storage2, sessionId, remoteInfo, parsed).catch((error48) => {
           console.error(`[AgentWS] error write-through failed for ${sessionId}:`, error48);
           return false;
         });
@@ -233472,10 +233539,10 @@ function connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnect
     cache2.setRemoteWs(sessionId, null);
     const entry = cache2.get(sessionId);
     if (!entry || entry.finished) return;
-    scheduleRemoteReconnect(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage);
+    scheduleRemoteReconnect(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage2);
   });
 }
-function scheduleRemoteReconnect(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage) {
+function scheduleRemoteReconnect(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage2) {
   const entry = cache2.get(sessionId);
   if (!entry || entry.finished) return;
   const attempt = cache2.getReconnectAttempt(sessionId);
@@ -233497,7 +233564,7 @@ function scheduleRemoteReconnect(sessionId, remoteInfo, cache2, reverseConnectMa
       cache2.setReconnecting(sessionId, false);
       return;
     }
-    connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage);
+    connectPersistentRemoteWs(sessionId, remoteInfo, cache2, reverseConnectManager, eventBus, agentSessionManager, storage2);
   }, totalDelay);
   cache2.setReconnectTimer(sessionId, timer);
 }
@@ -233642,8 +233709,8 @@ var ChatSessionManager = class {
   workflowEngine = null;
   /** Pending browser commands waiting for iframe response: commandId → resolve */
   pendingBrowserCommands = /* @__PURE__ */ new Map();
-  constructor(storage, processManager, agentSessionManager, remoteSessionMap, remoteExecutorMap, remotePatchCache, reverseConnectManager, browserManager) {
-    this.storage = storage;
+  constructor(storage2, processManager, agentSessionManager, remoteSessionMap, remoteExecutorMap, remotePatchCache, reverseConnectManager, browserManager) {
+    this.storage = storage2;
     this.processManager = processManager;
     this.agentSessionManager = agentSessionManager;
     this.remoteSessionMap = remoteSessionMap;
@@ -234558,7 +234625,7 @@ var ChatSessionManager = class {
     return sections.join("\n");
   }
   createTools(projectId, branch, sessionId) {
-    const storage = this.storage;
+    const storage2 = this.storage;
     const processManager = this.processManager;
     const turnStartedAt = (sessionId ? this.sessions.get(sessionId)?.turnStartedAt : null) ?? null;
     const wokenByEvent = (sessionId ? this.sessions.get(sessionId)?.wokenByEvent : false) ?? false;
@@ -234703,7 +234770,7 @@ var ChatSessionManager = class {
           if (!sessionId) {
             return { success: false, message: "No session context available." };
           }
-          const project = await storage.projects.getById(projectId);
+          const project = await storage2.projects.getById(projectId);
           const agentMode = project?.agent_mode;
           if (project && agentMode && agentMode !== "local") {
             return await this.spawnRemoteAgentSession({ projectId, branch, agentMode, prompt, agentType, chatSessionId: sessionId });
@@ -234756,12 +234823,12 @@ var ChatSessionManager = class {
           if (!sessionId) {
             return { success: false, message: "No session context available." };
           }
-          const sendProject = await storage.projects.getById(projectId);
+          const sendProject = await storage2.projects.getById(projectId);
           const sendAgentMode = sendProject?.agent_mode;
           if (sendProject && sendAgentMode && sendAgentMode !== "local") {
             return await this.sendToRemoteAgentSession({ projectId, branch, message, chatSessionId: sessionId });
           }
-          const project = await storage.projects.getById(projectId);
+          const project = await storage2.projects.getById(projectId);
           const target = agentSessionManager.getSessionByBranch(projectId, branch);
           if (!target) {
             return {
@@ -234794,14 +234861,14 @@ var ChatSessionManager = class {
           tailLines: external_exports.number().min(1).max(100).default(20).describe("Number of recent output lines to include per executor")
         }),
         execute: async ({ tailLines }) => {
-          const workspace = await storage.workspaceRegistry.getWorkspaceByProjectBranch(projectId, branch ?? "");
+          const workspace = await storage2.workspaceRegistry.getWorkspaceByProjectBranch(projectId, branch ?? "");
           if (!workspace) {
             return { executors: [], message: "No workspace found for this branch." };
           }
-          const executors = await storage.executors.getByWorkspaceId(workspace.id);
+          const executors = await storage2.executors.getByWorkspaceId(workspace.id);
           const now3 = Date.now();
           const results = await Promise.all(executors.map(async (executor) => {
-            const lastRow = await storage.executorProcesses.getLastByExecutorId(executor.id);
+            const lastRow = await storage2.executorProcesses.getLastByExecutorId(executor.id);
             const liveProcesses = processManager.getProcessesByExecutorId(executor.id);
             const latestLive = liveProcesses[liveProcesses.length - 1];
             if (!lastRow) {
@@ -234840,11 +234907,11 @@ var ChatSessionManager = class {
           remote: external_exports.string().optional().describe("Remote server name or ID to run the executor on. If omitted, uses project executor_mode or runs locally.")
         }),
         execute: async ({ executorName, remote }) => {
-          const workspace = await storage.workspaceRegistry.getWorkspaceByProjectBranch(projectId, branch ?? "");
+          const workspace = await storage2.workspaceRegistry.getWorkspaceByProjectBranch(projectId, branch ?? "");
           if (!workspace) {
             return { success: false, message: "No workspace found for this branch." };
           }
-          const executors = await storage.executors.getByWorkspaceId(workspace.id);
+          const executors = await storage2.executors.getByWorkspaceId(workspace.id);
           const executor = executors.find(
             (e) => e.name.toLowerCase() === executorName.toLowerCase()
           );
@@ -234857,26 +234924,26 @@ var ChatSessionManager = class {
           }
           let remoteServerId = remote;
           if (remote) {
-            const byId = await storage.remoteServers.getById(remote);
+            const byId = await storage2.remoteServers.getById(remote);
             if (!byId) {
-              const allServers = await storage.remoteServers.getAll();
+              const allServers = await storage2.remoteServers.getAll();
               const byName = allServers.find((s3) => s3.name.toLowerCase() === remote.toLowerCase());
               if (byName) {
                 remoteServerId = byName.id;
               }
             }
           }
-          const project = await storage.projects.getById(projectId);
+          const project = await storage2.projects.getById(projectId);
           let executorMode = remoteServerId || project?.executor_mode;
           let resolvedRemote = executorMode && executorMode !== "local" ? executorMode : void 0;
           if (!resolvedRemote && !project?.path) {
-            const remotes = await storage.projectRemotes.getByProject(projectId);
+            const remotes = await storage2.projectRemotes.getByProject(projectId);
             if (remotes.length > 0) {
               resolvedRemote = remotes[0].remote_server_id;
             }
           }
           if (resolvedRemote) {
-            const remoteConfig = await storage.projectRemotes.getByProjectAndServer(projectId, resolvedRemote);
+            const remoteConfig = await storage2.projectRemotes.getByProjectAndServer(projectId, resolvedRemote);
             if (!remoteConfig) {
               return { success: false, message: `Remote server "${resolvedRemote}" not configured for this project.` };
             }
@@ -234980,11 +235047,11 @@ var ChatSessionManager = class {
           remote: external_exports.string().optional().describe("Remote server name or ID where the executor is running. If omitted, auto-detects.")
         }),
         execute: async ({ executorName, remote }) => {
-          const workspace = await storage.workspaceRegistry.getWorkspaceByProjectBranch(projectId, branch ?? "");
+          const workspace = await storage2.workspaceRegistry.getWorkspaceByProjectBranch(projectId, branch ?? "");
           if (!workspace) {
             return { success: false, message: "No workspace found for this branch." };
           }
-          const executors = await storage.executors.getByWorkspaceId(workspace.id);
+          const executors = await storage2.executors.getByWorkspaceId(workspace.id);
           const executor = executors.find(
             (e) => e.name.toLowerCase() === executorName.toLowerCase()
           );
@@ -234997,9 +235064,9 @@ var ChatSessionManager = class {
           }
           let remoteServerId = remote;
           if (remote) {
-            const byId = await storage.remoteServers.getById(remote);
+            const byId = await storage2.remoteServers.getById(remote);
             if (!byId) {
-              const allServers = await storage.remoteServers.getAll();
+              const allServers = await storage2.remoteServers.getAll();
               const byName = allServers.find((s3) => s3.name.toLowerCase() === remote.toLowerCase());
               if (byName) {
                 remoteServerId = byName.id;
@@ -235018,7 +235085,7 @@ var ChatSessionManager = class {
               resolvedRemote = runningRemotes[0];
             } else if (runningRemotes.length > 1) {
               const remoteNames = await Promise.all(runningRemotes.map(async (id) => {
-                const server = await storage.remoteServers.getById(id);
+                const server = await storage2.remoteServers.getById(id);
                 return server?.name ?? id;
               }));
               return {
@@ -235801,14 +235868,14 @@ import { createHash as createHash2, randomUUID as randomUUID5 } from "crypto";
 
 // src/project-chat-context.ts
 var PROJECT_CHAT_CONTEXT_REF_LIMIT = 100;
-async function listProjectChatPublicContextRefs(storage, thread) {
-  const refs = await storage.projectChatContextRefs.listByThread(
+async function listProjectChatPublicContextRefs(storage2, thread) {
+  const refs = await storage2.projectChatContextRefs.listByThread(
     thread.id,
     thread.project_id,
     thread.user_id,
     PROJECT_CHAT_CONTEXT_REF_LIMIT
   );
-  const existing = new Map((await storage.projectChatContextRefs.resolveExisting(
+  const existing = new Map((await storage2.projectChatContextRefs.resolveExisting(
     thread.project_id,
     refs.map(({ entity_type, entity_id }) => ({ entity_type, entity_id }))
   )).map((resolved) => [`${resolved.entity_type}\0${resolved.entity_id}`, resolved.navigation]));
@@ -236178,19 +236245,19 @@ async function createProjectChatTools(options) {
     projectId,
     threadId,
     userId,
-    storage,
+    storage: storage2,
     agentSessionManager,
     remoteSessions,
     mutationServices,
     onOperationMessage
   } = options;
-  const project = await storage.projects.getById(projectId, userId);
+  const project = await storage2.projects.getById(projectId, userId);
   if (!project) throw new Error("Project not found");
-  const thread = await storage.projectChatThreads.getById(threadId, projectId, userId);
+  const thread = await storage2.projectChatThreads.getById(threadId, projectId, userId);
   if (!thread) throw new Error("Project Chat thread not found");
   const touchAll = async (entityType, ids) => {
     if (ids.length === 0) return;
-    const tracked = await storage.projectChatContextRefs.touchMany(
+    const tracked = await storage2.projectChatContextRefs.touchMany(
       threadId,
       projectId,
       userId,
@@ -236205,8 +236272,8 @@ async function createProjectChatTools(options) {
   };
   const revalidateScope = async () => {
     const [ownedProject, ownedThread] = await Promise.all([
-      storage.projects.getById(projectId, userId),
-      storage.projectChatThreads.getById(threadId, projectId, userId)
+      storage2.projects.getById(projectId, userId),
+      storage2.projectChatThreads.getById(threadId, projectId, userId)
     ]);
     if (!ownedProject || !ownedThread) throw new Error("Project Chat scope is no longer authorized");
   };
@@ -236221,7 +236288,7 @@ async function createProjectChatTools(options) {
   const beginOperation = async (kind, entityType, entityId, details, ids = {}) => {
     const operationId = ids.operationId ?? randomUUID4();
     const idempotencyKey = ids.idempotencyKey ?? operationId;
-    const row = await storage.projectChatOperations.create({
+    const row = await storage2.projectChatOperations.create({
       id: operationId,
       thread_id: threadId,
       project_id: projectId,
@@ -236238,7 +236305,7 @@ async function createProjectChatTools(options) {
     return row;
   };
   const finishOperation = async (operation, status, details, error48 = null) => {
-    const current = await storage.projectChatOperations.getById(
+    const current = await storage2.projectChatOperations.getById(
       operation.id,
       threadId,
       projectId,
@@ -236248,7 +236315,7 @@ async function createProjectChatTools(options) {
     const publicError = error48 === null ? null : sanitizeProjectChatPublicError(error48, "Operation failed");
     const payload = { ...current.payload, status, ...details };
     const content = projectChatPublicOperationContent(payload, publicError);
-    const result = await storage.projectChatOperations.transition({
+    const result = await storage2.projectChatOperations.transition({
       id: operation.id,
       thread_id: threadId,
       project_id: projectId,
@@ -236268,7 +236335,7 @@ async function createProjectChatTools(options) {
     return result.operation;
   };
   const markOperationRunning = async (operation, details) => {
-    const current = await storage.projectChatOperations.getById(
+    const current = await storage2.projectChatOperations.getById(
       operation.id,
       threadId,
       projectId,
@@ -236281,9 +236348,9 @@ async function createProjectChatTools(options) {
     return finishOperation(current, "running", details);
   };
   const workspaceCandidates = async () => {
-    const project2 = await storage.projects.getById(projectId, userId);
+    const project2 = await storage2.projects.getById(projectId, userId);
     if (!project2) throw new Error("Project is no longer authorized");
-    const rows = await storage.searchCache.listWorkspacesByProject(projectId, LIST_LIMIT + 1);
+    const rows = await storage2.searchCache.listWorkspacesByProject(projectId, LIST_LIMIT + 1);
     const candidates = rows.flatMap((row) => {
       if (typeof row.targetId !== "string" || !isNullableString(row.branch)) return [];
       if (row.targetId.length > TARGET_CHAR_LIMIT || (row.branch?.length ?? 0) > BRANCH_CHAR_LIMIT) return [];
@@ -236291,7 +236358,7 @@ async function createProjectChatTools(options) {
       if (!isToolSelectorId(id)) return [];
       return [{ id, target: row.targetId, branch: row.branch }];
     });
-    const authorized = await Promise.all(candidates.map(async (candidate) => candidate.target === "local" ? candidate : await storage.projectRemotes.getByProjectAndServer(projectId, candidate.target) ? candidate : void 0));
+    const authorized = await Promise.all(candidates.map(async (candidate) => candidate.target === "local" ? candidate : await storage2.projectRemotes.getByProjectAndServer(projectId, candidate.target) ? candidate : void 0));
     const available = authorized.filter((candidate) => Boolean(candidate));
     return { items: available.slice(0, LIST_LIMIT), truncated: available.length > LIST_LIMIT };
   };
@@ -236305,24 +236372,24 @@ async function createProjectChatTools(options) {
     const candidate = (await workspaceCandidates()).items.find(({ id }) => id === workspaceId);
     if (!candidate) throw new Error("Workspace is no longer available in this project");
     if (candidate.target !== "local") {
-      const association = await storage.projectRemotes.getByProjectAndServer(projectId, candidate.target);
+      const association = await storage2.projectRemotes.getByProjectAndServer(projectId, candidate.target);
       if (!association) throw new Error("Workspace is no longer available in this project");
     }
     return candidate;
   };
   const sessionExistsInScope = async (sessionId) => {
-    const local = await storage.agentSessions.getById(sessionId);
-    if (local) return (await storage.agentSessions.getActivityById(sessionId, "project-chat"))?.projectId === projectId;
+    const local = await storage2.agentSessions.getById(sessionId);
+    if (local) return (await storage2.agentSessions.getActivityById(sessionId, "project-chat"))?.projectId === projectId;
     const mapping = await remoteSessions?.getMapping(sessionId);
     if (!mapping || mapping.projectId !== projectId) return false;
-    return Boolean(await storage.projectRemotes.getByProjectAndServer(
+    return Boolean(await storage2.projectRemotes.getByProjectAndServer(
       projectId,
       mapping.remoteServerId
     ));
   };
   const rereadConfirmedSession = async (operation, sessionId) => {
-    const local = await storage.agentSessions.getById(sessionId);
-    const localProjection = local ? await storage.agentSessions.getActivityById(sessionId, "project-chat") : void 0;
+    const local = await storage2.agentSessions.getById(sessionId);
+    const localProjection = local ? await storage2.agentSessions.getActivityById(sessionId, "project-chat") : void 0;
     if (local && localProjection?.projectId === projectId && local.status !== "running") {
       const status = local.status === "stopped" && local.last_completed_at ? "completed" : "failed";
       return finishOperation(operation, status, { sessionId }, status === "failed" ? "Agent session failed" : null);
@@ -236362,7 +236429,7 @@ async function createProjectChatTools(options) {
         try {
           await revalidateScope();
           await validateAssignedBranch(assignedBranch);
-          const task = await storage.tasks.create({
+          const task = await storage2.tasks.create({
             id: taskId,
             project_id: projectId,
             title,
@@ -236376,7 +236443,7 @@ async function createProjectChatTools(options) {
           return { ok: true, operationId: operation.id, taskId: task.id, status: "completed" };
         } catch (error48) {
           const message = boundedError(error48);
-          const applied = await storage.tasks.getById(taskId);
+          const applied = await storage2.tasks.getById(taskId);
           if (applied?.project_id === projectId) {
             return {
               ok: false,
@@ -236398,7 +236465,7 @@ async function createProjectChatTools(options) {
       execute: async ({ taskId, assignedBranch, ...patch }) => {
         mutationService();
         await revalidateScope();
-        const target = await storage.tasks.getById(taskId);
+        const target = await storage2.tasks.getById(taskId);
         if (!target) throw new Error("Task not found");
         if (target.project_id !== projectId) throw new Error("Object is not part of this project");
         await validateAssignedBranch(assignedBranch);
@@ -236419,10 +236486,10 @@ async function createProjectChatTools(options) {
         });
         try {
           await revalidateScope();
-          const current = await storage.tasks.getById(taskId);
+          const current = await storage2.tasks.getById(taskId);
           if (!current || current.project_id !== projectId) throw new Error("Task is no longer authorized");
           await validateAssignedBranch(assignedBranch);
-          const updated = await storage.tasks.update(taskId, {
+          const updated = await storage2.tasks.update(taskId, {
             ...patch,
             ...assignedBranch !== void 0 ? { assigned_branch: assignedBranch } : {}
           });
@@ -236432,7 +236499,7 @@ async function createProjectChatTools(options) {
           return { ok: true, operationId: operation.id, taskId, status: "completed" };
         } catch (error48) {
           const message = boundedError(error48);
-          const applied = await storage.tasks.getById(taskId);
+          const applied = await storage2.tasks.getById(taskId);
           const current = applied && {
             title: applied.title,
             description: applied.description,
@@ -236483,7 +236550,7 @@ async function createProjectChatTools(options) {
             "pending",
             { requestId: operation2.id, candidates: candidates.map(({ id, target, branch }) => ({ id, target, branch })) }
           ));
-          const announced = await storage.projectChatOperations.announce({
+          const announced = await storage2.projectChatOperations.announce({
             id: operation2.id,
             thread_id: threadId,
             project_id: projectId,
@@ -236567,7 +236634,7 @@ async function createProjectChatTools(options) {
       execute: async ({ requestId, workspaceId }) => {
         const service = mutationService();
         await revalidateScope();
-        const operation = await storage.projectChatOperations.getById(
+        const operation = await storage2.projectChatOperations.getById(
           requestId,
           threadId,
           projectId,
@@ -236596,7 +236663,7 @@ async function createProjectChatTools(options) {
           let current = operation;
           for (let attempt = 0; attempt < 100 && current.status === "resolving"; attempt++) {
             await new Promise((resolve3) => setTimeout(resolve3, 5));
-            current = await storage.projectChatOperations.getById(
+            current = await storage2.projectChatOperations.getById(
               requestId,
               threadId,
               projectId,
@@ -236646,7 +236713,7 @@ async function createProjectChatTools(options) {
           branch: workspace.branch,
           initialInstructionDelivery: "pending"
         };
-        const claim = await storage.projectChatOperations.claimWorkspaceSelection({
+        const claim = await storage2.projectChatOperations.claimWorkspaceSelection({
           id: operation.id,
           thread_id: threadId,
           project_id: projectId,
@@ -236674,7 +236741,7 @@ async function createProjectChatTools(options) {
           }
           for (let attempt = 0; attempt < 100 && correlated.status === "resolving"; attempt++) {
             await new Promise((resolve3) => setTimeout(resolve3, 5));
-            correlated = await storage.projectChatOperations.getById(
+            correlated = await storage2.projectChatOperations.getById(
               requestId,
               threadId,
               projectId,
@@ -236750,10 +236817,10 @@ async function createProjectChatTools(options) {
       execute: async ({ sessionId, instruction }) => {
         const service = mutationService();
         await revalidateScope();
-        const local = await storage.agentSessions.getById(sessionId);
+        const local = await storage2.agentSessions.getById(sessionId);
         let target;
         if (local) {
-          const localProjectId = local.workspace_checkout_id ? (await storage.agentSessions.getActivityById(sessionId, "project-chat"))?.projectId : local.project_id;
+          const localProjectId = local.workspace_checkout_id ? (await storage2.agentSessions.getActivityById(sessionId, "project-chat"))?.projectId : local.project_id;
           if (localProjectId !== projectId) {
             throw new Error("Object is not part of this project");
           }
@@ -236762,7 +236829,7 @@ async function createProjectChatTools(options) {
           const mapping = await remoteSessions?.getMapping(sessionId);
           if (!mapping) throw new Error("Agent session not found");
           if (mapping.projectId !== projectId) throw new Error("Object is not part of this project");
-          const association = await storage.projectRemotes.getByProjectAndServer(projectId, mapping.remoteServerId);
+          const association = await storage2.projectRemotes.getByProjectAndServer(projectId, mapping.remoteServerId);
           if (!association) throw new Error("Agent session not found");
           target = { remoteServerId: mapping.remoteServerId, remoteSessionId: mapping.remoteSessionId };
         }
@@ -236776,8 +236843,8 @@ async function createProjectChatTools(options) {
         try {
           await revalidateScope();
           if (target === "local") {
-            const current = await storage.agentSessions.getById(sessionId);
-            const currentProjection = current && current.workspace_checkout_id ? await storage.agentSessions.getActivityById(sessionId, "project-chat") : void 0;
+            const current = await storage2.agentSessions.getById(sessionId);
+            const currentProjection = current && current.workspace_checkout_id ? await storage2.agentSessions.getActivityById(sessionId, "project-chat") : void 0;
             const currentProjectId = current?.workspace_checkout_id ? currentProjection?.projectId : current?.project_id;
             if (!current || currentProjectId !== projectId) {
               throw new Error("Agent session is no longer authorized");
@@ -236787,7 +236854,7 @@ async function createProjectChatTools(options) {
             if (!current || current.projectId !== projectId || current.remoteServerId !== target.remoteServerId || current.remoteSessionId !== target.remoteSessionId) {
               throw new Error("Agent session is no longer authorized");
             }
-            const association = await storage.projectRemotes.getByProjectAndServer(
+            const association = await storage2.projectRemotes.getByProjectAndServer(
               projectId,
               current.remoteServerId
             );
@@ -236823,7 +236890,7 @@ async function createProjectChatTools(options) {
       execute: async ({ scheduleId }) => {
         const service = mutationService();
         await revalidateScope();
-        const schedule = await storage.scheduledTasks.getById(scheduleId);
+        const schedule = await storage2.scheduledTasks.getById(scheduleId);
         if (!schedule) throw new Error("Schedule not found");
         if (schedule.project_id !== projectId) throw new Error("Object is not part of this project");
         const runId = randomUUID4();
@@ -236834,12 +236901,12 @@ async function createProjectChatTools(options) {
         });
         try {
           await revalidateScope();
-          const current = await storage.scheduledTasks.getById(scheduleId);
+          const current = await storage2.scheduledTasks.getById(scheduleId);
           if (!current || current.project_id !== projectId) throw new Error("Schedule is no longer authorized");
           const result = await service.runScheduleNow(scheduleId, runId);
           const [persisted, authorizedSchedule] = await Promise.all([
-            storage.scheduledTaskRuns.getById(runId),
-            storage.scheduledTasks.getById(scheduleId)
+            storage2.scheduledTaskRuns.getById(runId),
+            storage2.scheduledTasks.getById(scheduleId)
           ]);
           if (!authorizedSchedule || authorizedSchedule.project_id !== projectId) {
             throw new Error("Schedule is no longer authorized");
@@ -236851,7 +236918,7 @@ async function createProjectChatTools(options) {
             throw new Error("error" in result ? result.error : "Schedule run identity mismatch");
           }
           const skipped = "error" in result ? persisted.status === "skipped" : result.skipped;
-          const tracked = await storage.projectChatContextRefs.touchMany(
+          const tracked = await storage2.projectChatContextRefs.touchMany(
             threadId,
             projectId,
             userId,
@@ -236870,7 +236937,7 @@ async function createProjectChatTools(options) {
           );
           let final = transitioned;
           if (status === "running") {
-            const latest = await storage.scheduledTaskRuns.getById(runId);
+            const latest = await storage2.scheduledTaskRuns.getById(runId);
             if (latest?.project_id === projectId && latest.schedule_id === scheduleId && latest.status !== "starting" && latest.status !== "running") {
               const latestStatus = latest.status === "completed" || latest.status === "skipped" ? "completed" : "failed";
               final = await finishOperation(
@@ -236883,7 +236950,7 @@ async function createProjectChatTools(options) {
           }
           return { ok: final.status !== "failed", operationId: operation.id, scheduleId, runId, status: final.status, skipped };
         } catch (error48) {
-          const persisted = await storage.scheduledTaskRuns.getById(runId);
+          const persisted = await storage2.scheduledTaskRuns.getById(runId);
           if (persisted?.project_id === projectId && persisted.schedule_id === scheduleId) {
             return {
               ok: false,
@@ -236916,7 +236983,7 @@ async function createProjectChatTools(options) {
         status: external_exports.enum(["todo", "in_progress", "done", "cancelled"]).optional()
       }).strict(),
       execute: readInScope(async ({ query, status }) => {
-        const rows = await storage.tasks.queryByProject(projectId, { query, status, limit: LIST_LIMIT });
+        const rows = await storage2.tasks.queryByProject(projectId, { query, status, limit: LIST_LIMIT });
         const validRows = rows.filter((row) => isToolSelectorId(row.id));
         await touchAll("task", validRows.map((row) => row.id));
         return {
@@ -236936,7 +237003,7 @@ async function createProjectChatTools(options) {
       description: "Inspect one task by id, only if it belongs to this project.",
       inputSchema: external_exports.object({ taskId: external_exports.string().min(1).max(MAX_TOOL_SELECTOR_ID) }).strict(),
       execute: readInScope(async ({ taskId }) => {
-        const row = await storage.tasks.getById(taskId);
+        const row = await storage2.tasks.getById(taskId);
         if (!row) throw new Error("Task not found");
         if (row.project_id !== projectId) throw new Error("Object is not part of this project");
         if (!isToolSelectorId(row.id)) throw new Error("Task not found");
@@ -236977,7 +237044,7 @@ async function createProjectChatTools(options) {
       inputSchema: emptySchema,
       execute: readInScope(async () => {
         const [localRows, untrustedRemoteRows] = await Promise.all([
-          storage.agentSessions.listRecentActivityByProject(projectId, LIST_LIMIT / 2, "project-chat"),
+          storage2.agentSessions.listRecentActivityByProject(projectId, LIST_LIMIT / 2, "project-chat"),
           remoteSessions?.listByProject(projectId, LIST_LIMIT / 2) ?? Promise.resolve([])
         ]);
         const remoteRows = safeArrayPrefix(untrustedRemoteRows, LIST_LIMIT / 2);
@@ -237043,9 +237110,9 @@ async function createProjectChatTools(options) {
       description: "Return status and a server-bounded recent transcript for one project agent session.",
       inputSchema: external_exports.object({ sessionId: external_exports.string().min(1).max(MAX_TOOL_SELECTOR_ID) }).strict(),
       execute: readInScope(async ({ sessionId }) => {
-        const local = await storage.agentSessions.getById(sessionId);
+        const local = await storage2.agentSessions.getById(sessionId);
         if (local) {
-          const projection = await storage.agentSessions.getActivityById(sessionId, "project-chat");
+          const projection = await storage2.agentSessions.getActivityById(sessionId, "project-chat");
           if (projection?.projectId !== projectId) throw new Error("Object is not part of this project");
           if (!isToolSelectorId(local.id)) throw new Error("Agent session not found");
           const detail2 = {
@@ -237118,7 +237185,7 @@ async function createProjectChatTools(options) {
       description: "List schedules configured for this project without commands, prompts, or raw configuration.",
       inputSchema: emptySchema,
       execute: readInScope(async () => {
-        const rows = await storage.scheduledTasks.listByProject(projectId, LIST_LIMIT);
+        const rows = await storage2.scheduledTasks.listByProject(projectId, LIST_LIMIT);
         const validRows = rows.filter((row) => isToolSelectorId(row.id));
         await touchAll("schedule", validRows.map((row) => row.id));
         return {
@@ -237140,7 +237207,7 @@ async function createProjectChatTools(options) {
       description: "List recent runs across this project's schedules without raw output or reports.",
       inputSchema: emptySchema,
       execute: readInScope(async () => {
-        const rows = await storage.scheduledTaskRuns.listRecentByProject(projectId, LIST_LIMIT);
+        const rows = await storage2.scheduledTaskRuns.listRecentByProject(projectId, LIST_LIMIT);
         const validRows = rows.filter((row) => isToolSelectorId(row.id));
         await touchAll("schedule_run", validRows.map((row) => row.id));
         return {
@@ -237160,9 +237227,9 @@ async function createProjectChatTools(options) {
       description: "Inspect one project schedule run with server-bounded output and report previews.",
       inputSchema: external_exports.object({ runId: external_exports.string().min(1).max(MAX_TOOL_SELECTOR_ID) }).strict(),
       execute: readInScope(async ({ runId }) => {
-        const run2 = await storage.scheduledTaskRuns.getById(runId);
+        const run2 = await storage2.scheduledTaskRuns.getById(runId);
         if (!run2) throw new Error("Schedule run not found");
-        const schedule = await storage.scheduledTasks.getById(run2.schedule_id);
+        const schedule = await storage2.scheduledTasks.getById(run2.schedule_id);
         if (!schedule) throw new Error("Schedule run not found");
         if (schedule.project_id !== projectId) throw new Error("Object is not part of this project");
         if (!isToolSelectorId(run2.id)) throw new Error("Schedule run not found");
@@ -237326,8 +237393,8 @@ async function* adaptProjectChatFullStream(fullStream, signal) {
   if (pending) yield pending;
 }
 var DefaultProjectChatModelRunner = class {
-  constructor(storage) {
-    this.storage = storage;
+  constructor(storage2) {
+    this.storage = storage2;
   }
   storage;
   async *run(input) {
@@ -237389,9 +237456,9 @@ function projectChatAiTools(domainTools) {
   return adapted;
 }
 var ProjectChatManager = class {
-  constructor(storage, runner, options = {}) {
-    this.storage = storage;
-    this.runner = runner ?? new DefaultProjectChatModelRunner(storage);
+  constructor(storage2, runner, options = {}) {
+    this.storage = storage2;
+    this.runner = runner ?? new DefaultProjectChatModelRunner(storage2);
     this.drainTimeoutMs = options.drainTimeoutMs ?? 2e3;
     this.idleEvictionMs = options.idleEvictionMs ?? 3e4;
     this.terminalRetryDelayMs = options.terminalRetryDelayMs ?? 100;
@@ -239230,8 +239297,8 @@ var FINAL_VERDICT_PROMPT = [
 ].join("\n");
 var REVIEWER_AGENT_TYPES = /* @__PURE__ */ new Set(["claude-code", "codex"]);
 var WorkflowEngine = class {
-  constructor(storage, agentOps) {
-    this.storage = storage;
+  constructor(storage2, agentOps) {
+    this.storage = storage2;
     this.agentOps = agentOps;
   }
   storage;
@@ -240186,7 +240253,7 @@ var ReverseConnectManager = class {
     const conn = this.connections.get(this.resolveId(remoteServerId));
     return conn !== void 0 && conn.ws.readyState === 1;
   }
-  async sendHttpRequest(remoteServerId, method, path23, body, timeoutMs = DEFAULT_HTTP_TIMEOUT_MS) {
+  async sendHttpRequest(remoteServerId, method, path23, body, timeoutMs = DEFAULT_HTTP_TIMEOUT_MS, extraHeaders) {
     const conn = this.connections.get(this.resolveId(remoteServerId));
     if (!conn || conn.ws.readyState !== 1) {
       return {
@@ -240202,7 +240269,10 @@ var ReverseConnectManager = class {
       requestId,
       method,
       path: path23,
-      headers: body !== void 0 ? { "content-type": "application/json" } : {},
+      headers: {
+        ...body !== void 0 ? { "content-type": "application/json" } : {},
+        ...extraHeaders
+      },
       body: body !== void 0 ? JSON.stringify(body) : void 0
     };
     return new Promise((resolve3) => {
@@ -240566,10 +240636,10 @@ var BrowserManager = class {
 // src/remote-executor-monitor.ts
 import { randomUUID as randomUUID8 } from "crypto";
 var RemoteExecutorMonitor = class {
-  constructor(reverseConnectManager, eventBus, storage, remoteExecutorMap) {
+  constructor(reverseConnectManager, eventBus, storage2, remoteExecutorMap) {
     this.reverseConnectManager = reverseConnectManager;
     this.eventBus = eventBus;
-    this.storage = storage;
+    this.storage = storage2;
     this.remoteExecutorMap = remoteExecutorMap;
     this.reverseConnectManager.setStatusChangeHandler((_remoteServerId, status) => {
       if (status !== "online") return;
@@ -240718,8 +240788,8 @@ function validateCron(expr, timezone) {
   }
 }
 var SchedulerService = class {
-  constructor(storage, processManager, remote) {
-    this.storage = storage;
+  constructor(storage2, processManager, remote) {
+    this.storage = storage2;
     this.processManager = processManager;
     this.remote = remote;
   }
@@ -241247,8 +241317,8 @@ function notificationTitle(kind) {
   return TITLE_BY_KIND[kind] ?? "Update";
 }
 var NotificationService = class {
-  constructor(storage, eventBus) {
-    this.storage = storage;
+  constructor(storage2, eventBus) {
+    this.storage = storage2;
     this.eventBus = eventBus;
   }
   storage;
@@ -241403,18 +241473,18 @@ var emptyReasons = () => ({
   dangling_checkout: 0,
   snapshot_mismatch: 0
 });
-async function registerReportedWorktrees(storage, opts) {
+async function registerReportedWorktrees(storage2, opts) {
   for (const worktree of opts.worktrees) {
     const branch = worktree.branch ?? "";
     const fallbackPath = branch ? conventionalWorktreePath(opts.remotePath, branch) : opts.remotePath;
     const reportedPath = typeof worktree.worktreePath === "string" ? worktree.worktreePath : null;
-    const existing = await storage.workspaceRegistry.getByProjectBranch(
+    const existing = await storage2.workspaceRegistry.getByProjectBranch(
       opts.projectId,
       branch,
       opts.targetId
     );
     if (existing && (!reportedPath || existing.checkout.path_source === "reported" && existing.checkout.worktree_path === reportedPath)) continue;
-    await storage.workspaceRegistry.registerReadyCheckout({
+    await storage2.workspaceRegistry.registerReadyCheckout({
       projectId: opts.projectId,
       branch,
       targetId: opts.targetId,
@@ -241424,20 +241494,20 @@ async function registerReportedWorktrees(storage, opts) {
     });
   }
 }
-async function syncLocalWorkspaceRegistry(storage) {
-  const projects = await storage.workspaceBindingMigration.listUnboundLocalProjects();
+async function syncLocalWorkspaceRegistry(storage2) {
+  const projects = await storage2.workspaceBindingMigration.listUnboundLocalProjects();
   for (const project of projects) {
     try {
-      await getRegisteredWorktreeBranches(storage, project.id, project.path);
+      await getRegisteredWorktreeBranches(storage2, project.id, project.path);
     } catch (error48) {
       console.warn(`[WorkspaceBinding] Local registry sync failed for ${project.id}:`, error48);
     }
   }
 }
-async function syncRemoteWorkspaceRegistry(storage, listWorktrees, opts = {}) {
-  const projects = await storage.projects.getAll();
+async function syncRemoteWorkspaceRegistry(storage2, listWorktrees, opts = {}) {
+  const projects = await storage2.projects.getAll();
   for (const project of projects) {
-    const remotes = await storage.projectRemotes.getByProject(project.id);
+    const remotes = await storage2.projectRemotes.getByProject(project.id);
     for (const remote of remotes) {
       if (opts.remoteServerId && remote.remote_server_id !== opts.remoteServerId) continue;
       try {
@@ -241445,7 +241515,7 @@ async function syncRemoteWorkspaceRegistry(storage, listWorktrees, opts = {}) {
         if (!result.ok) continue;
         const worktrees = result.data?.worktrees;
         if (!Array.isArray(worktrees)) continue;
-        await registerReportedWorktrees(storage, {
+        await registerReportedWorktrees(storage2, {
           projectId: project.id,
           targetId: remote.remote_server_id,
           remotePath: remote.remote_path,
@@ -241460,7 +241530,7 @@ async function syncRemoteWorkspaceRegistry(storage, listWorktrees, opts = {}) {
     }
   }
 }
-async function runWorkspaceBindingBackfill(storage, kind, opts = {}) {
+async function runWorkspaceBindingBackfill(storage2, kind, opts = {}) {
   const now3 = opts.now ?? Date.now;
   const deadline = now3() + (opts.budgetMs ?? DEFAULT_BUDGET_MS);
   const summary = {
@@ -241471,7 +241541,7 @@ async function runWorkspaceBindingBackfill(storage, kind, opts = {}) {
   };
   let cursor = "";
   for (; ; ) {
-    const batch = await storage.workspaceBindingMigration.backfill({
+    const batch = await storage2.workspaceBindingMigration.backfill({
       kind,
       dryRun: false,
       batchSize: opts.batchSize ?? DEFAULT_BATCH_SIZE,
@@ -241490,22 +241560,22 @@ async function runWorkspaceBindingBackfill(storage, kind, opts = {}) {
     }
   }
 }
-async function healWorkspaceBindings(storage, deps = {}, opts = {}) {
-  const probes = await Promise.all(["local", "remote"].map((kind) => storage.workspaceBindingMigration.backfill({ kind, dryRun: true, batchSize: 1 })));
+async function healWorkspaceBindings(storage2, deps = {}, opts = {}) {
+  const probes = await Promise.all(["local", "remote"].map((kind) => storage2.workspaceBindingMigration.backfill({ kind, dryRun: true, batchSize: 1 })));
   if (probes.every((probe) => probe.scanned === 0)) {
     return {
       local: { scanned: 0, updated: 0, reasons: emptyReasons(), incomplete: false },
       remote: { scanned: 0, updated: 0, reasons: emptyReasons(), incomplete: false }
     };
   }
-  if (!opts.remoteServerId) await syncLocalWorkspaceRegistry(storage);
+  if (!opts.remoteServerId) await syncLocalWorkspaceRegistry(storage2);
   if (deps.listRemoteWorktrees) {
-    await syncRemoteWorkspaceRegistry(storage, deps.listRemoteWorktrees, {
+    await syncRemoteWorkspaceRegistry(storage2, deps.listRemoteWorktrees, {
       remoteServerId: opts.remoteServerId
     });
   }
-  const local = opts.remoteServerId ? { scanned: 0, updated: 0, reasons: emptyReasons(), incomplete: false } : await runWorkspaceBindingBackfill(storage, "local", opts);
-  const remote = await runWorkspaceBindingBackfill(storage, "remote", opts);
+  const local = opts.remoteServerId ? { scanned: 0, updated: 0, reasons: emptyReasons(), incomplete: false } : await runWorkspaceBindingBackfill(storage2, "local", opts);
+  const remote = await runWorkspaceBindingBackfill(storage2, "remote", opts);
   return { local, remote };
 }
 function formatBackfillSummary(scope, result) {
@@ -241536,8 +241606,8 @@ function parseRetentionDays(raw) {
   if (value < SESSION_RETENTION_DAYS_MIN || value > SESSION_RETENTION_DAYS_MAX) return null;
   return value;
 }
-async function readRetentionDays(storage) {
-  return parseRetentionDays(await storage.settings.get(SESSION_RETENTION_SETTING_KEY));
+async function readRetentionDays(storage2) {
+  return parseRetentionDays(await storage2.settings.get(SESSION_RETENTION_SETTING_KEY));
 }
 function retentionCutoff(days, now3) {
   return now3 - days * MS_PER_DAY;
@@ -241713,12 +241783,12 @@ var DEFAULT_DEADLINE_MS = 5e3;
 var PER_WORKER_CONCURRENCY = 3;
 var LOCAL_CONCURRENCY = 4;
 var REMOTE_ACTIVITY_TARGET_LIMIT = 100;
-async function listSearchTargets(storage, userId) {
-  const projects = await storage.projects.getAll(userId);
+async function listSearchTargets(storage2, userId) {
+  const projects = await storage2.projects.getAll(userId);
   const targets = [];
   for (const p2 of projects) {
     if (p2.path) targets.push({ projectId: p2.id, targetId: "local", projectPath: p2.path });
-    const remotes = await storage.projectRemotes.getByProject(p2.id);
+    const remotes = await storage2.projectRemotes.getByProject(p2.id);
     for (const r of remotes) {
       targets.push({
         projectId: p2.id,
@@ -242582,11 +242652,21 @@ function resolveLevel(flagLevel) {
   console.warn(`Warning: invalid log level "${requested}" (valid: ${[...VALID_LEVELS].join(", ")}); using "info"`);
   return "info";
 }
+var traceLoggers = /* @__PURE__ */ new WeakMap();
+function withTraceContext(base) {
+  const ctx = getTraceContext();
+  if (!ctx) return base;
+  const cached2 = traceLoggers.get(ctx);
+  if (cached2 && cached2.base === base) return cached2.child;
+  const child = base.child({ traceId: ctx.traceId, spanId: ctx.spanId });
+  traceLoggers.set(ctx, { base, child });
+  return child;
+}
 function getLogger() {
   if (!rootLogger) {
     rootLogger = (0, import_pino.pino)({ level: resolveLevel(void 0) });
   }
-  return rootLogger;
+  return withTraceContext(rootLogger);
 }
 function setupLogging(opts) {
   const level = resolveLevel(opts.level);
@@ -242649,11 +242729,11 @@ function installConsoleBridge(logger) {
       debug: console.debug
     };
   }
-  console.log = (...args) => logger.info(format(...args));
-  console.info = (...args) => logger.info(format(...args));
-  console.warn = (...args) => logger.warn(format(...args));
-  console.error = (...args) => logger.error(format(...args));
-  console.debug = (...args) => logger.debug(format(...args));
+  console.log = (...args) => withTraceContext(logger).info(format(...args));
+  console.info = (...args) => withTraceContext(logger).info(format(...args));
+  console.warn = (...args) => withTraceContext(logger).warn(format(...args));
+  console.error = (...args) => withTraceContext(logger).error(format(...args));
+  console.debug = (...args) => withTraceContext(logger).debug(format(...args));
 }
 function installCrashHandlers(logger) {
   if (crashHandlersInstalled) return;
@@ -246798,12 +246878,12 @@ function writeBriefCache(key2, brief) {
     briefCache.delete(oldest.value);
   }
 }
-async function generateIntentBrief(storage, userId, messages) {
+async function generateIntentBrief(storage2, userId, messages) {
   let conversation;
   let mainOk;
   let fastOk;
   try {
-    const config2 = await getChatProviderConfig(storage, userId);
+    const config2 = await getChatProviderConfig(storage2, userId);
     mainOk = isModelConfigured(config2, config2.main);
     fastOk = isModelConfigured(config2, config2.fast);
     if (!mainOk && !fastOk) return null;
@@ -246818,17 +246898,17 @@ async function generateIntentBrief(storage, userId, messages) {
   if (cached2 !== null) return cached2;
   const pending = briefInFlight.get(key2);
   if (pending) return pending;
-  const run2 = distillConversation(storage, userId, messages, conversation, mainOk, fastOk).then((brief) => {
+  const run2 = distillConversation(storage2, userId, messages, conversation, mainOk, fastOk).then((brief) => {
     if (brief !== null) writeBriefCache(key2, brief);
     return brief;
   }).finally(() => briefInFlight.delete(key2));
   briefInFlight.set(key2, run2);
   return run2;
 }
-async function distillConversation(storage, userId, messages, conversation, mainOk, fastOk) {
+async function distillConversation(storage2, userId, messages, conversation, mainOk, fastOk) {
   try {
-    const distillModel = mainOk ? await resolveChatModel(storage, userId) : await resolveFastChatModel(storage, userId);
-    const compactModel = fastOk ? await resolveFastChatModel(storage, userId) : distillModel;
+    const distillModel = mainOk ? await resolveChatModel(storage2, userId) : await resolveFastChatModel(storage2, userId);
+    const compactModel = fastOk ? await resolveFastChatModel(storage2, userId) : distillModel;
     if (conversation.length <= COMPACT_TRIGGER_CHARS) {
       try {
         const brief = await distill(distillModel, conversation, userId, true);
@@ -246906,11 +246986,11 @@ function buildHistoryWindow(entries, historyEpoch, opts = {}) {
 }
 
 // src/routes/agent-session-routes.ts
-async function resolveProjectPath(projectId, storage) {
+async function resolveProjectPath(projectId, storage2) {
   if (projectId.startsWith("path:")) {
     return projectId.slice(5);
   }
-  const project = await storage.projects.getById(projectId);
+  const project = await storage2.projects.getById(projectId);
   return project?.path ?? null;
 }
 var MESSAGE_TEXT_CHAR_LIMIT = 64 * 1024;
@@ -249461,7 +249541,7 @@ var mergeActivity = (local, remote, limit) => {
   for (const row of [...local, ...remote]) if (!byId.has(row.id)) byId.set(row.id, row);
   return [...byId.values()].sort((left, right) => (right.lastActiveAt ?? 0) - (left.lastActiveAt ?? 0) || left.id.localeCompare(right.id)).slice(0, limit);
 };
-async function getProjectActivity(storage, projectId, userId) {
+async function getProjectActivity(storage2, projectId, userId) {
   const [
     recentThreads,
     localRecentSessions,
@@ -249476,18 +249556,18 @@ async function getProjectActivity(storage, projectId, userId) {
     remoteCounts,
     nextScheduleAt
   ] = await Promise.all([
-    storage.projectChatThreads.listByProject(projectId, userId, RECENT_THREAD_LIMIT),
-    storage.agentSessions.listRecentActivityByProject(projectId, RECENT_SESSION_LIMIT, "project-activity"),
-    storage.searchCache.listRemoteSessionActivityByProject(projectId, RECENT_SESSION_LIMIT, "project-activity"),
-    storage.scheduledTaskRuns.getRecentByProject(projectId, RECENT_RUN_LIMIT),
-    storage.tasks.listPriorityByProject(projectId, PRIORITY_TASK_LIMIT),
-    storage.agentSessions.listAttentionActivityByProject(projectId, ATTENTION_LIMIT, "project-activity"),
-    storage.searchCache.listRemoteSessionAttentionByProject(projectId, ATTENTION_LIMIT, "project-activity"),
-    storage.scheduledTaskRuns.getAttentionByProject(projectId, ATTENTION_LIMIT),
-    storage.agentSessions.countRunningActivityByProject(projectId),
-    storage.scheduledTaskRuns.countByProjectStatuses(projectId, ["starting", "running"]),
-    storage.searchCache.countRemoteSessionActivityByProject(projectId),
-    storage.scheduledTasks.getEarliestNextRunAt(projectId)
+    storage2.projectChatThreads.listByProject(projectId, userId, RECENT_THREAD_LIMIT),
+    storage2.agentSessions.listRecentActivityByProject(projectId, RECENT_SESSION_LIMIT, "project-activity"),
+    storage2.searchCache.listRemoteSessionActivityByProject(projectId, RECENT_SESSION_LIMIT, "project-activity"),
+    storage2.scheduledTaskRuns.getRecentByProject(projectId, RECENT_RUN_LIMIT),
+    storage2.tasks.listPriorityByProject(projectId, PRIORITY_TASK_LIMIT),
+    storage2.agentSessions.listAttentionActivityByProject(projectId, ATTENTION_LIMIT, "project-activity"),
+    storage2.searchCache.listRemoteSessionAttentionByProject(projectId, ATTENTION_LIMIT, "project-activity"),
+    storage2.scheduledTaskRuns.getAttentionByProject(projectId, ATTENTION_LIMIT),
+    storage2.agentSessions.countRunningActivityByProject(projectId),
+    storage2.scheduledTaskRuns.countByProjectStatuses(projectId, ["starting", "running"]),
+    storage2.searchCache.countRemoteSessionActivityByProject(projectId),
+    storage2.scheduledTasks.getEarliestNextRunAt(projectId)
   ]);
   const recentAgentSessions = mergeActivity(
     localRecentSessions,
@@ -251701,7 +251781,7 @@ var websocket_routes_default = (0, import_fastify_plugin24.default)(routes23, {
 
 // src/routes/reverse-connect-routes.ts
 var import_fastify_plugin25 = __toESM(require_plugin2(), 1);
-import { randomBytes as randomBytes3, createHash as createHash8, verify as cryptoVerify } from "crypto";
+import { randomBytes as randomBytes4, createHash as createHash8, verify as cryptoVerify } from "crypto";
 
 // src/utils/rate-limited-warn.ts
 function createRateLimitedWarn(windowMs, maxKeys) {
@@ -251784,7 +251864,7 @@ var routes24 = async (fastify2) => {
         const ws = socket;
         const serverId = server.id;
         const ownerId = await fastify2.storage.remoteServers.getOwnerId(serverId) ?? "";
-        const nonce = randomBytes3(32);
+        const nonce = randomBytes4(32);
         let settled = false;
         let stashedVersion;
         const recordWorkerVersion = async (reported) => {
@@ -254244,6 +254324,43 @@ var getAuth = ((req, options) => {
   return getAuthObjectForAcceptedToken({ authObject: authReq.auth, acceptsToken: options?.acceptsToken });
 });
 
+// src/trace-context-hooks.ts
+function registerTraceContext(server) {
+  server.addHook("onRequest", (req, _reply, done) => {
+    const ctx = newTraceContext(req.headers["traceparent"]);
+    req.traceContext = ctx;
+    req.traceStartMs = Date.now();
+    runWithTraceContext(ctx, done);
+  });
+  server.addHook("onSend", (req, reply, payload, done) => {
+    if (req.traceContext) {
+      reply.header("traceparent", formatTraceparent(req.traceContext));
+    }
+    done(null, payload);
+  });
+  server.addHook("onResponse", (req, reply, done) => {
+    const ctx = req.traceContext;
+    if (ctx) {
+      const status = reply.statusCode;
+      const level = status >= 500 ? "error" : status >= 400 ? "warn" : "debug";
+      getLogger()[level](
+        {
+          method: req.method,
+          // The route *pattern* (/api/projects/:id), not the concrete URL:
+          // low-cardinality and structurally incapable of carrying the query
+          // string, where WebSocket/SSE auth material rides.
+          route: req.routeOptions?.url,
+          statusCode: status,
+          ms: req.traceStartMs ? Date.now() - req.traceStartMs : void 0,
+          continuedTrace: ctx.continued
+        },
+        "request completed"
+      );
+    }
+    done();
+  });
+}
+
 // src/server.ts
 var API_KEY2 = process.env.VIBEDECKX_API_KEY || void 0;
 function requireAuth(req, reply) {
@@ -254322,10 +254439,12 @@ var createServer = async (opts) => {
   });
   server.decorate("authEnabled", authEnabled);
   server.decorate("noLocalProjects", noLocalProjects);
+  registerTraceContext(server);
   server.addHook("onRequest", (req, reply, done) => {
     reply.header("access-control-allow-origin", "*");
     reply.header("access-control-allow-methods", "GET, POST, PUT, DELETE, OPTIONS");
-    reply.header("access-control-allow-headers", "Content-Type, Upgrade, Connection, X-Vibedeckx-Api-Key, X-Request-Id, Authorization");
+    reply.header("access-control-allow-headers", "Content-Type, Upgrade, Connection, X-Vibedeckx-Api-Key, X-Request-Id, Authorization, traceparent");
+    reply.header("access-control-expose-headers", "traceparent");
     done();
   });
   server.addHook("onRequest", (req, reply, done) => {
@@ -254353,23 +254472,6 @@ var createServer = async (opts) => {
       done();
     });
   }
-  server.addHook("onRequest", (req, _reply, done) => {
-    const requestId = req.headers["x-request-id"];
-    if (requestId) {
-      req.startTime = Date.now();
-      console.log(`[remote] ${requestId} ${req.method} ${redactUrlForLog(req.url)}`);
-    }
-    done();
-  });
-  server.addHook("onResponse", (req, reply, done) => {
-    const requestId = req.headers["x-request-id"];
-    if (requestId) {
-      const startTime = req.startTime;
-      const ms = startTime ? Date.now() - startTime : 0;
-      console.log(`[remote] ${requestId} ${req.method} ${redactUrlForLog(req.url)} -> ${reply.statusCode} (${ms}ms)`);
-    }
-    done();
-  });
   server.options("/*", async (req, reply) => {
     return reply.code(204).send();
   });
@@ -256570,8 +256672,8 @@ an authenticating proxy in front, or keep the default loopback bind (127.0.0.1).
     console.log(`Starting vibedeckx${tls ? " (HTTPS)" : ""}...`);
     const uiRoot = await resolveUiRoot({ uiDir: flags["ui-dir"], noUi: flags["no-ui"] });
     const dbPath = path22.join(dataDir, "data.sqlite");
-    const storage = await createSqliteStorage(dbPath);
-    const server = await createServer({ storage, authEnabled, noLocalProjects, tls, uiRoot });
+    const storage2 = await createSqliteStorage(dbPath);
+    const server = await createServer({ storage: storage2, authEnabled, noLocalProjects, tls, uiRoot });
     const url2 = await server.start(port, host);
     console.log(`Server running at ${url2}`);
     if (!tls && uiRoot) {
@@ -256592,7 +256694,7 @@ an authenticating proxy in front, or keep the default loopback bind (127.0.0.1).
       forceExit.unref();
       try {
         await server.close();
-        await storage.close();
+        await storage2.close();
       } catch (err) {
         console.error("Error during shutdown:", err);
       }
@@ -256676,7 +256778,7 @@ var connectCommand = buildCommand({
       return;
     }
     const requestedPort = flags.port ?? 0;
-    let storage;
+    let storage2;
     let server;
     let client;
     let ownedState;
@@ -256698,7 +256800,7 @@ var connectCommand = buildCommand({
         errors.push(error48);
       }
       try {
-        await storage?.close();
+        await storage2?.close();
       } catch (error48) {
         errors.push(error48);
       }
@@ -256729,11 +256831,11 @@ var connectCommand = buildCommand({
       });
       console.log("Starting vibedeckx in reverse-connect mode...");
       const dbPath = path22.join(dataDir, "data.sqlite");
-      storage = await createSqliteStorage(dbPath);
+      storage2 = await createSqliteStorage(dbPath);
       const preflight = await preflightIdentityCheck({
         connectTo: flags["connect-to"],
         token,
-        settings: storage.settings,
+        settings: storage2.settings,
         force: flags.force ?? false
       });
       if (preflight.checked && preflight.identity) {
@@ -256742,7 +256844,7 @@ var connectCommand = buildCommand({
         );
       }
       server = await createServer({
-        storage,
+        storage: storage2,
         acceptRemote: true,
         uiRoot: null
       });