openfox 2.0.0-beta.0 → 2.0.0-beta.10

package/dist/{chunk-XKR3HCAL.js → chunk-NPHYEUYE.js}

@@ -1,18 +1,14 @@
-import {
-  getDatabase
-} from "./chunk-FBGWG4N6.js";
 import {
   buildContextMessagesFromEventHistory,
   buildMessagesFromStoredEvents,
   buildSnapshot,
   foldContextState,
   foldSessionState,
-  spreadOptionalMessageFields,
-  stripPromptContextMessages
-} from "./chunk-NONI4CRP.js";
+  spreadOptionalMessageFields
+} from "./chunk-XJEOP6XU.js";
 import {
-  getRuntimeConfig
-} from "./chunk-CGZHLM3K.js";
+  getDatabase
+} from "./chunk-FBGWG4N6.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -105,6 +101,18 @@ var EventStore = class {
       CREATE INDEX IF NOT EXISTS idx_events_session_type 
       ON events(session_id, event_type)
     `);
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS tombstones (
+        session_id TEXT NOT NULL,
+        seq INTEGER NOT NULL,
+        timestamp INTEGER NOT NULL,
+        UNIQUE(session_id, seq)
+      )
+    `);
+    this.db.exec(`
+      CREATE INDEX IF NOT EXISTS idx_tombstones_session_seq 
+      ON tombstones(session_id, seq)
+    `);
   }
   // --------------------------------------------------------------------------
   // Append
@@ -183,10 +191,41 @@ var EventStore = class {
    * Get all events for a session, optionally starting from a specific seq
    */
   getEvents(sessionId, fromSeq) {
-    const query = fromSeq !== void 0 ? `SELECT * FROM events WHERE session_id = ? AND seq >= ? ORDER BY seq` : `SELECT * FROM events WHERE session_id = ? ORDER BY seq`;
+    const query = fromSeq !== void 0 ? `SELECT e.* FROM events e
+           LEFT JOIN tombstones t ON e.session_id = t.session_id AND e.seq = t.seq
+           WHERE e.session_id = ? AND e.seq >= ? AND t.seq IS NULL
+           ORDER BY e.seq` : `SELECT e.* FROM events e
+           LEFT JOIN tombstones t ON e.session_id = t.session_id AND e.seq = t.seq
+           WHERE e.session_id = ? AND t.seq IS NULL
+           ORDER BY e.seq`;
     const rows = fromSeq !== void 0 ? this.db.prepare(query).all(sessionId, fromSeq) : this.db.prepare(query).all(sessionId);
     return rows.map((row) => this.rowToStoredEvent(row));
   }
+  /**
+   * Soft-delete (tombstone) events by sequence number.
+   * Tombstoned events are hidden from getEvents but remain in the database.
+   *
+   * @param sessionId - The session ID
+   * @param seqs - Array of sequence numbers to tombstone
+   * @returns The number of events tombstoned
+   */
+  tombstoneEvents(sessionId, seqs) {
+    if (seqs.length === 0) return 0;
+    const timestamp = Date.now();
+    const insert = this.db.prepare(
+      `INSERT OR IGNORE INTO tombstones (session_id, seq, timestamp)
+       VALUES (?, ?, ?)`
+    );
+    let count = 0;
+    const transaction = this.db.transaction(() => {
+      for (const seq of seqs) {
+        const result = insert.run(sessionId, seq, timestamp);
+        count += result.changes;
+      }
+    });
+    transaction();
+    return count;
+  }
   /**
    * Get the latest sequence number for a session
    */
@@ -375,13 +414,10 @@ var EventStore = class {
     return result.changes;
   }
   /**
-   * One-time storage optimization: delete old snapshots and strip
-   * promptContext.messages from remaining snapshots across all sessions.
+   * One-time storage optimization: delete old snapshots across all sessions.
    * Safe to run multiple times (idempotent).
    */
   optimizeStorage() {
-    let deletedSnapshots = 0;
-    let strippedSnapshots = 0;
     const deleteResult = this.db.prepare(
       `
         DELETE FROM events
@@ -397,20 +433,7 @@ var EventStore = class {
         )
       `
     ).run();
-    deletedSnapshots = deleteResult.changes;
-    const snapshots = this.db.prepare(`SELECT id, payload FROM events WHERE event_type = 'turn.snapshot'`).all();
-    const updateStmt = this.db.prepare(`UPDATE events SET payload = ? WHERE id = ?`);
-    for (const row of snapshots) {
-      const data = JSON.parse(row.payload);
-      const messages = data.messages;
-      if (!messages) continue;
-      const changed = stripPromptContextMessages(messages);
-      if (changed) {
-        updateStmt.run(JSON.stringify(data), row.id);
-        strippedSnapshots++;
-      }
-    }
-    return { deletedSnapshots, strippedSnapshots };
+    return { deletedSnapshots: deleteResult.changes };
   }
   /**
    * Get the latest snapshot sequence number for a session
@@ -521,7 +544,7 @@ function initEventStore(db) {
   }
   resetStaleRunningSessions(eventStoreInstance, db);
   const result = eventStoreInstance.optimizeStorage();
-  if (result.deletedSnapshots > 0 || result.strippedSnapshots > 0) {
+  if (result.deletedSnapshots > 0) {
     logger.info("Storage optimized", result);
   }
   setImmediate(() => {
@@ -808,6 +831,70 @@ function mapSessionSummaryRow(row) {
   };
 }
 
+// src/server/config.ts
+import { z } from "zod";
+var backendSchema = z.enum(["auto", "vllm", "sglang", "ollama", "llamacpp"]).default("auto");
+var envSchema = z.object({
+  // New env var name, with fallback to old name for backward compatibility
+  OPENFOX_LLM_URL: z.string().url().optional(),
+  OPENFOX_VLLM_URL: z.string().url().optional(),
+  OPENFOX_BACKEND: backendSchema,
+  OPENFOX_MODEL_NAME: z.string().default("qwen3.5-122b-int4-autoround"),
+  OPENFOX_MAX_CONTEXT: z.coerce.number().default(2e5),
+  OPENFOX_PORT: z.coerce.number().default(10369),
+  OPENFOX_HOST: z.string().optional(),
+  OPENFOX_WORKDIR: z.string().optional(),
+  OPENFOX_DB_PATH: z.string().default("./openfox.db"),
+  OPENFOX_LOG_LEVEL: z.enum(["debug", "info", "warn", "error"]).default("info"),
+  OPENFOX_DISABLE_THINKING: z.coerce.boolean().default(false),
+  OPENFOX_DEV: z.coerce.boolean().default(false)
+});
+function loadConfig() {
+  const env = envSchema.parse(process.env);
+  const llmUrl = env.OPENFOX_LLM_URL ?? env.OPENFOX_VLLM_URL ?? "http://localhost:8000/v1";
+  const workdir = env.OPENFOX_WORKDIR ?? process.cwd();
+  return {
+    llm: {
+      baseUrl: llmUrl,
+      model: env.OPENFOX_MODEL_NAME,
+      timeout: 3e5,
+      // 5 minutes (deprecated, kept for backward compatibility)
+      idleTimeout: 3e5,
+      // 5 minutes of inactivity
+      backend: env.OPENFOX_BACKEND,
+      disableThinking: env.OPENFOX_DISABLE_THINKING
+    },
+    context: {
+      maxTokens: env.OPENFOX_MAX_CONTEXT,
+      compactionThreshold: 0.85,
+      compactionTarget: 0.6
+    },
+    agent: {
+      maxIterations: 10,
+      maxConsecutiveFailures: 3,
+      toolTimeout: 3e5
+    },
+    server: {
+      port: env.OPENFOX_PORT,
+      ...env.OPENFOX_HOST !== void 0 ? { host: env.OPENFOX_HOST } : {}
+    },
+    database: {
+      path: env.OPENFOX_DB_PATH
+    },
+    mode: env.OPENFOX_DEV ? "development" : "production",
+    workdir
+  };
+}
+
+// src/server/runtime-config.ts
+var runtimeConfig = null;
+function setRuntimeConfig(config) {
+  runtimeConfig = config;
+}
+function getRuntimeConfig() {
+  return runtimeConfig ?? loadConfig();
+}
+
 // src/server/events/session.ts
 function toSnapshotMessage(message) {
   return {
@@ -890,6 +977,10 @@ function getCurrentContextWindowId(sessionId) {
   const contextResult = foldContextState(events, "");
   return contextResult.currentContextWindowId || void 0;
 }
+function getCurrentWindowMessageOptions(sessionId) {
+  const contextWindowId = getCurrentContextWindowId(sessionId);
+  return contextWindowId ? { contextWindowId } : void 0;
+}
 function getReadFilesCache(sessionId) {
   const state = getSessionState(sessionId);
   return state?.readFiles ?? [];
@@ -976,7 +1067,6 @@ function emitMessageDone(sessionId, messageId, options) {
       ...options?.stats !== void 0 && { stats: options.stats },
       ...options?.segments !== void 0 && { segments: options.segments },
       ...options?.partial !== void 0 && { partial: options.partial },
-      ...options?.promptContext !== void 0 && { promptContext: options.promptContext },
       ...options?.tokenCount !== void 0 && { tokenCount: options.tokenCount }
     }
   });
@@ -1115,11 +1205,11 @@ function emitChatError(sessionId, error, recoverable) {
     data: { error, recoverable }
   });
 }
-function emitFormatRetry(sessionId, attempt, maxAttempts) {
+function emitPatternRetry(sessionId, messageId, pattern, field, attempt, maxAttempts, matchedContent) {
   const eventStore = getEventStore();
   eventStore.append(sessionId, {
-    type: "format.retry",
-    data: { attempt, maxAttempts }
+    type: "pattern.retry",
+    data: { messageId, pattern, field, attempt, maxAttempts, matchedContent }
   });
 }
 function emitTurnSnapshot(sessionId, snapshot) {
@@ -1245,10 +1335,14 @@ export {
   listSessions,
   listSessionsByProject,
   deleteSession,
+  loadConfig,
+  setRuntimeConfig,
+  getRuntimeConfig,
   getSessionState,
   getCurrentWindowMessages,
   getContextMessages,
   getCurrentContextWindowId,
+  getCurrentWindowMessageOptions,
   getReadFilesCache,
   isFileInCache,
   emitSessionInitialized,
@@ -1273,10 +1367,10 @@ export {
   emitContextState,
   emitChatDone,
   emitChatError,
-  emitFormatRetry,
+  emitPatternRetry,
   emitTurnSnapshot,
   truncateSessionMessages,
   compactContext,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-XKR3HCAL.js.map
+//# sourceMappingURL=chunk-NPHYEUYE.js.map

package/dist/{chunk-PSJIT5LZ.js → chunk-RFNEDBVO.js}

@@ -15,9 +15,9 @@ var SETTINGS_KEYS = {
   DISPLAY_USER_PRESETS: "display.userPresets",
   DISPLAY_FOLLOW_SYSTEM_THEME: "display.followSystemTheme",
   DISPLAY_SHOW_OPEN_IN_EDITOR: "display.showOpenInEditorLinks",
-  LLM_DISABLE_XML_PROTECTION: "llm.disableXmlProtection",
   LLM_DYNAMIC_SYSTEM_PROMPT: "llm.dynamicSystemPrompt",
-  KEYBINDINGS: "keybindings"
+  KEYBINDINGS: "keybindings",
+  RETRY_PATTERNS: "agent.retryPatterns"
 };
 var SETTINGS_DEFAULTS = {
   [SETTINGS_KEYS.DISPLAY_SHOW_THINKING]: "true",
@@ -29,8 +29,8 @@ var SETTINGS_DEFAULTS = {
   [SETTINGS_KEYS.DISPLAY_THEME]: JSON.stringify({ preset: "dark" }),
   [SETTINGS_KEYS.DISPLAY_FOLLOW_SYSTEM_THEME]: "true",
   [SETTINGS_KEYS.DISPLAY_SHOW_OPEN_IN_EDITOR]: "false",
-  [SETTINGS_KEYS.LLM_DISABLE_XML_PROTECTION]: "false",
   [SETTINGS_KEYS.LLM_DYNAMIC_SYSTEM_PROMPT]: "false",
+  [SETTINGS_KEYS.RETRY_PATTERNS]: JSON.stringify({ patterns: [], maxRetriesPerTurn: 10 }),
   [SETTINGS_KEYS.KEYBINDINGS]: JSON.stringify({
     terminalToggle: { type: "double-press", key: "Control", threshold: 300 },
     quickAction: { type: "double-press", key: "Shift", threshold: 300 },
@@ -88,4 +88,4 @@ export {
   deleteSetting,
   getAllSettings
 };
-//# sourceMappingURL=chunk-PSJIT5LZ.js.map
+//# sourceMappingURL=chunk-RFNEDBVO.js.map

package/dist/chunk-RI6GAMNP.js

@@ -0,0 +1,13 @@
+// src/server/context/compactor.ts
+function shouldCompact(currentTokens, maxTokens, threshold) {
+  return currentTokens > maxTokens * threshold;
+}
+function getCompactionTarget(maxTokens, targetRatio) {
+  return Math.floor(maxTokens * targetRatio);
+}
+
+export {
+  shouldCompact,
+  getCompactionTarget
+};
+//# sourceMappingURL=chunk-RI6GAMNP.js.map

package/dist/{chunk-HHAJ3QF6.js → chunk-UKTPL5ZG.js}

@@ -1,14 +1,14 @@
 import {
+  buildModelsUrl,
   buildNonStreamingCreateParams,
   buildStreamingCreateParams,
+  ensureVersionPrefix,
   extractThinking,
   getBackendCapabilities,
   getModelProfile,
-  mapFinishReason
-} from "./chunk-HGAMIPFO.js";
-import {
-  ensureVisionFallbackConfigLoaded
-} from "./chunk-SZKEGZIB.js";
+  mapFinishReason,
+  stripVersionPrefix
+} from "./chunk-VIIRNJDT.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -19,7 +19,7 @@ var llmStatus = "unknown";
 var lastActiveUrl = null;
 var CACHE_TTL_MS = 3e4;
 function getCacheKey(url) {
-  return url.replace(/\/v1\/?$/, "");
+  return stripVersionPrefix(url);
 }
 async function detectModel(llmBaseUrl, retries = 3, silent = false) {
   const cacheKey = getCacheKey(llmBaseUrl);
@@ -30,7 +30,7 @@ async function detectModel(llmBaseUrl, retries = 3, silent = false) {
     llmStatus = "connected";
     return cached.model;
   }
-  const url = llmBaseUrl.includes("/v1") ? `${llmBaseUrl}/models` : `${llmBaseUrl}/v1/models`;
+  const url = buildModelsUrl(llmBaseUrl);
   for (let attempt = 1; attempt <= retries; attempt++) {
     try {
       if (silent) {
@@ -140,7 +140,7 @@ var LLMError = class extends OpenFoxError {
 
 // src/server/llm/client.ts
 function createLLMClient(config, initialBackend = "unknown") {
-  const baseURL = config.llm.baseUrl.includes("/v1") ? config.llm.baseUrl : `${config.llm.baseUrl}/v1`;
+  const baseURL = ensureVersionPrefix(config.llm.baseUrl);
   const openai = new OpenAI({
     baseURL,
     apiKey: config.llm.apiKey ?? "not-needed"
@@ -187,23 +187,13 @@ function createLLMClient(config, initialBackend = "unknown") {
       });
       try {
         const shouldDisableThinking = disableThinking || request.disableThinking === true;
-        await ensureVisionFallbackConfigLoaded();
-        const { isVisionFallbackEnabled } = await import("./vision-fallback-3MIZZ6NQ.js");
-        const paramsOptions = {
+        const { params: createParams } = await buildNonStreamingCreateParams({
           model,
           request,
           profile,
           capabilities,
-          disableThinking: shouldDisableThinking,
-          visionFallbackEnabled: isVisionFallbackEnabled()
-        };
-        if (request.onVisionFallbackStart) {
-          paramsOptions.onVisionFallbackStart = request.onVisionFallbackStart;
-        }
-        if (request.onVisionFallbackDone) {
-          paramsOptions.onVisionFallbackDone = request.onVisionFallbackDone;
-        }
-        const { params: createParams } = await buildNonStreamingCreateParams(paramsOptions);
+          disableThinking: shouldDisableThinking
+        });
         const response = await openai.chat.completions.create(createParams, {
           signal: request.signal
         });
@@ -264,18 +254,13 @@ function createLLMClient(config, initialBackend = "unknown") {
         idleTimeout
       });
       try {
-        await ensureVisionFallbackConfigLoaded();
-        const { isVisionFallbackEnabled } = await import("./vision-fallback-3MIZZ6NQ.js");
         const shouldDisableThinking = disableThinking || request.disableThinking === true;
         const createParams = await buildStreamingCreateParams({
           model,
           request,
           profile,
           capabilities,
-          disableThinking: shouldDisableThinking,
-          visionFallbackEnabled: isVisionFallbackEnabled(),
-          onVisionFallbackStart: request.onVisionFallbackStart,
-          onVisionFallbackDone: request.onVisionFallbackDone
+          disableThinking: shouldDisableThinking
         });
         const { params: streamingParams } = createParams;
         const stream = await openai.chat.completions.create(streamingParams, {
@@ -298,6 +283,8 @@ function createLLMClient(config, initialBackend = "unknown") {
             idleTimeoutController.abort();
           }
         }, 100);
+        const onAbort = () => clearInterval(idleTimer);
+        request.signal?.addEventListener("abort", onAbort, { once: true });
         try {
           for await (const chunk of stream) {
             if (idleTimeoutController.signal.aborted) {
@@ -412,6 +399,7 @@ function createLLMClient(config, initialBackend = "unknown") {
           }
         } finally {
           clearInterval(idleTimer);
+          request.signal?.removeEventListener("abort", onAbort);
         }
         if (tagBuffer) {
           if (inThinking) {
@@ -478,4 +466,4 @@ export {
   getLlmStatus,
   clearModelCache
 };
-//# sourceMappingURL=chunk-HHAJ3QF6.js.map
+//# sourceMappingURL=chunk-UKTPL5ZG.js.map