openfox 2.0.110 → 2.0.112

package/dist/{chunk-WCQOHRUX.js → chunk-JDT63SSP.js}

@@ -1,6 +1,6 @@
 import {
   updateSessionMcpDisabledServers
-} from "./chunk-4ZXRERIW.js";
+} from "./chunk-C5NQF2K4.js";
 import {
   getDatabase
 } from "./chunk-LCQ5AN6Y.js";
@@ -62,4 +62,4 @@ export {
   clearSessionOverrides,
   getAllSessionOverrides
 };
-//# sourceMappingURL=chunk-WCQOHRUX.js.map
+//# sourceMappingURL=chunk-JDT63SSP.js.map

package/dist/{chunk-VT2X3DMC.js → chunk-JNHKKUGJ.js}

@@ -1,7 +1,7 @@
 import {
   SETTINGS_KEYS,
   getSetting
-} from "./chunk-VXKPZUCT.js";
+} from "./chunk-RT2A2RRL.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -455,4 +455,4 @@ export {
   getOverrideAgentIds,
   resolveDefaultAgentId
 };
-//# sourceMappingURL=chunk-VT2X3DMC.js.map
+//# sourceMappingURL=chunk-JNHKKUGJ.js.map

package/dist/{chunk-JAX5OEMM.js → chunk-JURM3RPZ.js}

@@ -1,3 +1,7 @@
+import {
+  normalizeAskOptions
+} from "./chunk-LCLH6ZUL.js";
+
 // src/server/utils/async.ts
 function createDeferred() {
   let resolve;
@@ -56,8 +60,21 @@ var askUserTool = {
           },
           options: {
             type: "array",
-            items: { type: "string" },
-            description: "Options for choice-type questions"
+            description: "Options for choice-type questions. Each entry may be a plain string or an object {value, label, description?} (or legacy {label, description?}). The server normalizes everything to {value, label, description?}.",
+            items: {
+              oneOf: [
+                { type: "string" },
+                {
+                  type: "object",
+                  properties: {
+                    value: { type: "string" },
+                    label: { type: "string" },
+                    description: { type: "string" }
+                  },
+                  required: ["label"]
+                }
+              ]
+            }
           }
         },
         required: ["question"]
@@ -67,7 +84,7 @@ var askUserTool = {
   async execute(args, context) {
     const question = args["question"];
     const type = args["type"] ?? "text";
-    const options = args["options"];
+    const options = normalizeAskOptions(args["options"]);
     const callId = context.toolCallId ?? crypto.randomUUID();
     const deferred = createDeferred();
     void deferred.promise.catch(() => {
@@ -156,4 +173,4 @@ export {
   awaitAnswer,
   getPendingQuestionsForSession
 };
-//# sourceMappingURL=chunk-JAX5OEMM.js.map
+//# sourceMappingURL=chunk-JURM3RPZ.js.map

package/dist/chunk-LCLH6ZUL.js

@@ -0,0 +1,43 @@
+// src/shared/ask-options.ts
+function normalizeAskOptions(raw) {
+  if (raw == null) return void 0;
+  if (typeof raw === "string") {
+    const parts = raw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
+    return parts.length > 0 ? parts.map((label) => ({ value: label, label })) : void 0;
+  }
+  if (!Array.isArray(raw)) return void 0;
+  const out = [];
+  for (const item of raw) {
+    if (typeof item === "string") {
+      const trimmed = item.trim();
+      if (trimmed.length > 0) {
+        out.push({ value: trimmed, label: trimmed });
+      }
+      continue;
+    }
+    if (item != null && typeof item === "object") {
+      const obj = item;
+      const labelRaw = obj["label"];
+      const valueRaw = obj["value"];
+      if (typeof labelRaw === "string" && labelRaw.trim().length > 0) {
+        const label = labelRaw.trim();
+        const value = typeof valueRaw === "string" && valueRaw.length > 0 ? valueRaw : label;
+        const descRaw = obj["description"];
+        const opt = {
+          value,
+          label
+        };
+        if (typeof descRaw === "string" && descRaw.length > 0) {
+          opt.description = descRaw;
+        }
+        out.push(opt);
+      }
+    }
+  }
+  return out.length > 0 ? out : void 0;
+}
+
+export {
+  normalizeAskOptions
+};
+//# sourceMappingURL=chunk-LCLH6ZUL.js.map

package/dist/{chunk-6EV7X5MP.js → chunk-N4RTAGFY.js}

@@ -1,7 +1,7 @@
 import {
   SETTINGS_KEYS,
   getSetting
-} from "./chunk-VXKPZUCT.js";
+} from "./chunk-RT2A2RRL.js";
 
 // src/server/utils/platform.ts
 import os from "os";
@@ -63,4 +63,4 @@ export {
   isWindowsPath,
   isAbsolutePath
 };
-//# sourceMappingURL=chunk-6EV7X5MP.js.map
+//# sourceMappingURL=chunk-N4RTAGFY.js.map

package/dist/{chunk-LXYNP7LL.js → chunk-NB2D6I64.js}

@@ -4,19 +4,25 @@ import {
   buildSnapshot,
   foldContextState,
   foldSessionState,
-  spreadOptionalMessageFields
-} from "./chunk-ACJNRPTO.js";
+  spreadOptionalMessageFields,
+  trimSnapshotStreamingOutput
+} from "./chunk-QGXLZZBS.js";
 import {
   updateSessionMessageCount
-} from "./chunk-4ZXRERIW.js";
+} from "./chunk-C5NQF2K4.js";
 import {
   getRuntimeConfig
-} from "./chunk-VT2X3DMC.js";
+} from "./chunk-JNHKKUGJ.js";
+import {
+  SETTINGS_KEYS
+} from "./chunk-RT2A2RRL.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
 
 // src/server/events/store.ts
+import { existsSync, statSync, unlinkSync } from "fs";
+var SNAPSHOT_BACKUP_RETENTION_MS = 10 * 24 * 60 * 60 * 1e3;
 function createEventIterator(state, subscriber) {
   return {
     [Symbol.asyncIterator]() {
@@ -714,6 +720,188 @@ var EventStore = class _EventStore {
     logger.info("Orphaned sessions found", { count: orphaned.length, ids: orphaned });
     return orphaned;
   }
+  /**
+   * Remove an expired rollback backup (`<db>.pre-de-dup.bak`) once it has aged
+   * past the retention window. Best-effort: failures are logged at debug level
+   * and never abort the caller (startup or manual migration).
+   */
+  pruneExpiredRollbackBackup() {
+    const dbName = this.db.name;
+    if (!dbName || dbName === ":memory:") return;
+    const backupPath = `${dbName}.pre-de-dup.bak`;
+    try {
+      if (!existsSync(backupPath)) return;
+      const ageMs = Date.now() - statSync(backupPath).mtimeMs;
+      if (ageMs <= SNAPSHOT_BACKUP_RETENTION_MS) return;
+      unlinkSync(backupPath);
+      logger.info("Pruned expired rollback backup", {
+        backupPath,
+        ageDays: Math.round(ageMs / (24 * 60 * 60 * 1e3))
+      });
+    } catch (error) {
+      logger.debug("Could not prune expired rollback backup", {
+        backupPath,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  /**
+   * Rewrite every persisted snapshot with the snapshot streaming
+   * de-duplication applied (see trimSnapshotStreamingOutput). Every finished
+   * tool call's streaming output is dropped — it is never read again once the
+   * call has a result; only pending (in-flight) calls keep their stream.
+   *
+   * Safe by construction: before the first rewrite it creates a rollback copy
+   * of the database (`<db>.pre-de-dup.bak`, only once) — the migration refuses
+   * to rewrite if that backup cannot be created. Expired rollback backups are
+   * auto-pruned (10-day retention) at the start of every invocation. Idempotent:
+   * after a successful run the maintenance flag is set and subsequent runs are
+   * a no-op. Returns a report used for the audit trail.
+   */
+  async migrateSnapshotStreams() {
+    this.pruneExpiredRollbackBackup();
+    const flag = this.getMaintenanceFlag();
+    if (flag === "true") {
+      return {
+        skipped: true,
+        backupPath: null,
+        scanned: 0,
+        rewritten: 0,
+        droppedStreams: 0,
+        bytesBefore: 0,
+        bytesAfter: 0,
+        kept: { pending: 0, samples: [] }
+      };
+    }
+    const dbName = this.db.name;
+    let backupPath = null;
+    if (dbName && dbName !== ":memory:") {
+      backupPath = `${dbName}.pre-de-dup.bak`;
+      try {
+        if (!existsSync(backupPath)) {
+          logger.info("Creating rollback backup before snapshot stream de-dup", { backupPath });
+          await this.db.backup(backupPath);
+        }
+      } catch (error) {
+        logger.error("Aborting snapshot stream de-dup: could not create rollback backup", {
+          backupPath,
+          error: error instanceof Error ? error.message : String(error)
+        });
+        return {
+          skipped: true,
+          backupPath: null,
+          scanned: 0,
+          rewritten: 0,
+          droppedStreams: 0,
+          bytesBefore: 0,
+          bytesAfter: 0,
+          kept: { pending: 0, samples: [] }
+        };
+      }
+    }
+    const rows = this.db.prepare(`SELECT id, session_id, payload FROM events WHERE event_type = 'turn.snapshot'`).all();
+    const update = this.db.prepare(`UPDATE events SET payload = ? WHERE id = ?`);
+    const kept = { pending: 0, samples: [] };
+    let rewritten = 0;
+    let droppedStreams = 0;
+    let bytesBefore = 0;
+    let bytesAfter = 0;
+    this.db.transaction(() => {
+      for (const row of rows) {
+        bytesBefore += Buffer.byteLength(row.payload);
+        let parsed;
+        try {
+          parsed = JSON.parse(row.payload);
+        } catch {
+          bytesAfter += Buffer.byteLength(row.payload);
+          continue;
+        }
+        let snapshotDropped = 0;
+        for (const message of parsed.messages ?? []) {
+          for (const tc of message.toolCalls ?? []) {
+            if (!tc.streamingOutput || tc.streamingOutput.length === 0) continue;
+            if (tc.result === void 0) {
+              kept.pending++;
+              if (kept.samples.length < 20) {
+                kept.samples.push({ sessionId: row.session_id, tool: tc.name });
+              }
+            } else {
+              snapshotDropped++;
+            }
+          }
+        }
+        if (snapshotDropped === 0) {
+          bytesAfter += Buffer.byteLength(row.payload);
+          continue;
+        }
+        const { messages, droppedStreams: dropped } = trimSnapshotStreamingOutput(parsed.messages ?? []);
+        if (dropped === 0) {
+          bytesAfter += Buffer.byteLength(row.payload);
+          continue;
+        }
+        const next = { ...parsed, messages };
+        const nextPayload = JSON.stringify(next);
+        update.run(nextPayload, row.id);
+        rewritten++;
+        droppedStreams += dropped;
+        bytesAfter += Buffer.byteLength(nextPayload);
+      }
+    })();
+    this.setSettingViaDb(SETTINGS_KEYS.MAINTENANCE_SNAPSHOT_STREAMS_MIGRATED, "true");
+    logger.info("Snapshot stream migration complete", {
+      scanned: rows.length,
+      rewritten,
+      droppedStreams,
+      keptPending: kept.pending,
+      bytesSaved: bytesBefore - bytesAfter
+    });
+    return {
+      skipped: false,
+      backupPath,
+      scanned: rows.length,
+      rewritten,
+      droppedStreams,
+      bytesBefore,
+      bytesAfter,
+      kept
+    };
+  }
+  /**
+   * Read a maintenance flag from the settings table, tolerating databases
+   * without that table (e.g. minimal test fixtures).
+   */
+  getMaintenanceFlag() {
+    try {
+      const row = this.db.prepare(`SELECT value FROM settings WHERE key = ?`).get(SETTINGS_KEYS.MAINTENANCE_SNAPSHOT_STREAMS_MIGRATED);
+      return row?.value ?? null;
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * Upsert a maintenance flag, tolerating databases without the settings table.
+   */
+  setSettingViaDb(key, value) {
+    try {
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      this.db.prepare(
+        `INSERT INTO settings (key, value, updated_at)
+           VALUES (?, ?, ?)
+           ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`
+      ).run(key, value, now);
+    } catch {
+    }
+  }
+  /**
+   * Collapse the WAL into the main database and truncate the file. Safe to
+   * call anytime; a no-op when the WAL is empty.
+   */
+  checkpointWal() {
+    const result = this.db.pragma("wal_checkpoint(TRUNCATE)");
+    const summary = result[0] ?? { busy: 0, log: 0, checkpointed: 0 };
+    logger.debug("WAL checkpoint", summary);
+    return summary;
+  }
 };
 var eventStoreInstance = null;
 function initEventStore(db) {
@@ -728,6 +916,25 @@ function initEventStore(db) {
   if (result.deletedSnapshots > 0) {
     logger.info("Storage optimized", result);
   }
+  setImmediate(() => {
+    void (async () => {
+      try {
+        const report = await eventStoreInstance.migrateSnapshotStreams();
+        if (!report.skipped) {
+          logger.info("Snapshot stream de-dup (auto)", {
+            rewritten: report.rewritten,
+            droppedStreams: report.droppedStreams,
+            bytesSaved: report.bytesBefore - report.bytesAfter,
+            backupPath: report.backupPath
+          });
+        }
+      } catch (error) {
+        logger.warn("Snapshot stream de-dup failed at startup", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    })();
+  });
   setImmediate(() => {
     try {
       logger.info("Starting orphaned session consolidation");
@@ -749,6 +956,15 @@ function initEventStore(db) {
     } catch {
     }
   });
+  setImmediate(() => {
+    try {
+      eventStoreInstance.checkpointWal();
+    } catch (error) {
+      logger.debug("WAL checkpoint failed at startup", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  });
   return eventStoreInstance;
 }
 function resetStaleRunningSessions(eventStore, db) {
@@ -1249,4 +1465,4 @@ export {
   truncateSessionMessages,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-LXYNP7LL.js.map
+//# sourceMappingURL=chunk-NB2D6I64.js.map

package/dist/{chunk-VKWVPQJ5.js → chunk-OAN4BXEW.js}

@@ -8,6 +8,7 @@ function buildUpdatedServerConfig(patch, existing, persistedCfg) {
   const mergedEnv = patch.env !== void 0 ? patch.env : transportChanged ? void 0 : existing.config.env;
   const mergedUrl = patch.url !== void 0 ? patch.url : transportChanged ? void 0 : existing.config.url;
   const mergedHeaders = patch.headers !== void 0 ? patch.headers : transportChanged ? void 0 : existing.config.headers;
+  const mergedOauth = patch.oauth !== void 0 ? patch.oauth : transportChanged ? void 0 : existing.config.oauth;
   const mergedTimeout = patch.timeout !== void 0 ? patch.timeout : existing.config.timeout;
   const mergedDisabled = patch.disabled !== void 0 ? patch.disabled : existing.config.disabled;
   if (patch.timeout !== void 0 && (typeof patch.timeout !== "number" || patch.timeout <= 0)) {
@@ -26,6 +27,7 @@ function buildUpdatedServerConfig(patch, existing, persistedCfg) {
     ...mergedEnv && Object.keys(mergedEnv).length > 0 ? { env: mergedEnv } : {},
     ...mergedUrl ? { url: mergedUrl } : {},
     ...mergedHeaders && Object.keys(mergedHeaders).length > 0 ? { headers: mergedHeaders } : {},
+    ...mergedOauth ? { oauth: mergedOauth } : {},
     ...mergedTimeout !== void 0 ? { timeout: mergedTimeout } : {},
     ...mergedDisabled !== void 0 ? { disabled: mergedDisabled } : {},
     ...persistedCfg?.disabledTools && persistedCfg.disabledTools.length > 0 ? { disabledTools: persistedCfg.disabledTools } : {},
@@ -58,4 +60,4 @@ export {
   buildUpdatedServerConfig,
   applyMcpServerUpdate
 };
-//# sourceMappingURL=chunk-VKWVPQJ5.js.map
+//# sourceMappingURL=chunk-OAN4BXEW.js.map

package/dist/{chunk-4R7G5JB6.js → chunk-P45RJGOT.js}

@@ -26,4 +26,4 @@ export {
   isClientMessage,
   isServerMessage
 };
-//# sourceMappingURL=chunk-4R7G5JB6.js.map
+//# sourceMappingURL=chunk-P45RJGOT.js.map

package/dist/chunk-P5AA7OYJ.js

@@ -0,0 +1,7 @@
+// src/constants.ts
+var VERSION = "2.0.112";
+
+export {
+  VERSION
+};
+//# sourceMappingURL=chunk-P5AA7OYJ.js.map

package/dist/{chunk-E5HZKNTY.js → chunk-PCC4DBPF.js}

@@ -1,7 +1,7 @@
 import {
   SETTINGS_KEYS,
   getSetting
-} from "./chunk-VXKPZUCT.js";
+} from "./chunk-RT2A2RRL.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -164,4 +164,4 @@ export {
   WorkspaceInUseError,
   OpenAIHttpClient
 };
-//# sourceMappingURL=chunk-E5HZKNTY.js.map
+//# sourceMappingURL=chunk-PCC4DBPF.js.map

package/dist/{chunk-ACJNRPTO.js → chunk-QGXLZZBS.js}

@@ -1,6 +1,9 @@
+import {
+  normalizeAskOptions
+} from "./chunk-LCLH6ZUL.js";
 import {
   resolveDefaultAgentId
-} from "./chunk-VT2X3DMC.js";
+} from "./chunk-JNHKKUGJ.js";
 
 // src/server/events/apply-events.ts
 function markComplete(msg, reason) {
@@ -763,7 +766,12 @@ function foldSessionState(events, initialWindowId, maxTokens, initialMessages, d
       }
       case "chat.ask_user": {
         const data = event.data;
-        pendingUserInput = { callId: data.callId, question: data.question, type: data.type, options: data.options };
+        pendingUserInput = {
+          callId: data.callId,
+          question: data.question,
+          type: data.type,
+          options: normalizeAskOptions(data.options)
+        };
         break;
       }
       case "task.completed": {
@@ -828,34 +836,33 @@ function foldWaitingWorkflow(events) {
   }
   return waitingWorkflow;
 }
-var SNAPSHOT_STREAMING_TAIL_BYTES = 1024 * 1024;
-function truncateSnapshotStreamingOutput(messages) {
-  return messages.map((message) => {
+function trimSnapshotStreamingOutput(messages) {
+  let droppedStreams = 0;
+  let keptStreams = 0;
+  const trimmedMessages = messages.map((message) => {
     const toolCalls = message.toolCalls;
     if (!toolCalls) return message;
     let changed = false;
     const newToolCalls = toolCalls.map((tc) => {
       if (!tc.streamingOutput || tc.streamingOutput.length === 0) return tc;
-      if (tc.result === void 0) return tc;
-      let total = 0;
-      for (const chunk of tc.streamingOutput) total += chunk.content.length;
-      if (total <= SNAPSHOT_STREAMING_TAIL_BYTES) return tc;
-      const kept = [];
-      let keptBytes = 0;
-      for (let i = tc.streamingOutput.length - 1; i >= 0 && keptBytes < SNAPSHOT_STREAMING_TAIL_BYTES; i--) {
-        const chunk = tc.streamingOutput[i];
-        kept.unshift(chunk);
-        keptBytes += chunk.content.length;
-      }
-      changed = true;
-      return { ...tc, streamingOutput: kept, streamingOutputTruncated: true };
+      if (tc.result !== void 0) {
+        droppedStreams++;
+        changed = true;
+        const { streamingOutput: _omitted, streamingOutputTruncated: _omittedFlag, ...rest } = tc;
+        void _omitted;
+        void _omittedFlag;
+        return rest;
+      }
+      keptStreams++;
+      return tc;
     });
     if (!changed) return message;
     return { ...message, toolCalls: newToolCalls };
   });
+  return { messages: trimmedMessages, droppedStreams, keptStreams };
 }
 function buildSnapshot(foldedState, latestSeq, snapshotAt = Date.now()) {
-  const messages = truncateSnapshotStreamingOutput(foldedState.messages);
+  const { messages } = trimSnapshotStreamingOutput(foldedState.messages);
   return {
     mode: foldedState.mode,
     phase: foldedState.phase,
@@ -901,7 +908,7 @@ function buildSnapshotFromSessionState(input) {
     latestSnapshotEvent.data.messages,
     events.slice(latestSnapshotIndex + 1)
   ) : foldedState.messages;
-  const trimmedMessages = truncateSnapshotStreamingOutput(messages);
+  const { messages: trimmedMessages } = trimSnapshotStreamingOutput(messages);
   return {
     mode: session.mode,
     phase: session.phase,
@@ -954,7 +961,8 @@ export {
   foldPendingConfirmations,
   foldSessionState,
   foldWaitingWorkflow,
+  trimSnapshotStreamingOutput,
   buildSnapshot,
   buildSnapshotFromSessionState
 };
-//# sourceMappingURL=chunk-ACJNRPTO.js.map
+//# sourceMappingURL=chunk-QGXLZZBS.js.map