replicas-engine 0.1.276 → 0.1.278

package/dist/src/index.js

@@ -286,7 +286,7 @@ var WORKSPACE_SIZES = ["small", "large"];
 var INVALID_WORKSPACE_SIZE_ERROR = `Invalid size: must be one of ${WORKSPACE_SIZES.join(", ")}`;
 
 // ../shared/src/e2b.ts
-var E2B_TEMPLATE_NAME = "replicas-sandbox-2026-06-07-v1";
+var E2B_TEMPLATE_NAME = "replicas-sandbox-2026-06-07-v3";
 
 // ../shared/src/runtime-env.ts
 function parsePosixEnvFile(content) {
@@ -3236,6 +3236,14 @@ async function getCurrentBranch(cwd) {
     return null;
   }
 }
+async function resolveDiffBase(repoPath, defaultBranch) {
+  const baseBranch = `origin/${defaultBranch}`;
+  try {
+    return await runGitCommand(["merge-base", baseBranch, "HEAD"], repoPath);
+  } catch {
+  }
+  return await branchExists(baseBranch, repoPath) ? baseBranch : "HEAD";
+}
 
 // src/git/service.ts
 var FULL_DIFF_MAX_BUFFER = 50 * 1024 * 1024;
@@ -3450,7 +3458,7 @@ var GitService = class {
   getGitDiffStats(repoPath, defaultBranch) {
     return this.diffStatsInFlight.run(repoPath, async () => {
       try {
-        const diffBase = await this.getDiffBase(repoPath, defaultBranch);
+        const diffBase = await resolveDiffBase(repoPath, defaultBranch);
         const shortstat = await runGitCommand(["diff", diffBase, "--shortstat", "-M"], repoPath);
         let added = 0;
         let removed = 0;
@@ -3468,7 +3476,7 @@ var GitService = class {
           removed
         };
       } catch (error) {
-        console.error("Error getting git diff:", error);
+        console.warn(`[GitService] getGitDiffStats failed for ${repoPath} (defaultBranch=${defaultBranch}):`, error instanceof Error ? error.message : error);
         return null;
       }
     });
@@ -3559,7 +3567,7 @@ var GitService = class {
   getFullGitDiff(repoPath, defaultBranch) {
     return this.fullDiffInFlight.run(repoPath, async () => {
       try {
-        const diffBase = await this.getDiffBase(repoPath, defaultBranch);
+        const diffBase = await resolveDiffBase(repoPath, defaultBranch);
         const { stdout: trackedDiff } = await execFileAsync("git", ["diff", diffBase, "-M", "-C"], {
           cwd: repoPath,
           encoding: "utf-8",
@@ -3580,14 +3588,6 @@ var GitService = class {
       return "";
     }
   }
-  async getDiffBase(repoPath, defaultBranch) {
-    const baseBranch = `origin/${defaultBranch}`;
-    try {
-      return await runGitCommand(["merge-base", baseBranch, "HEAD"], repoPath);
-    } catch {
-      return baseBranch;
-    }
-  }
   async getPullRequestUrl(repoName, repoPath, currentBranchArg, persistedRepoStateArg) {
     try {
       const currentBranch = currentBranchArg ?? await getCurrentBranch(repoPath);
@@ -3676,9 +3676,7 @@ var GitService = class {
       this.defaultBranchCache.set(repoPath, fromSymbolicRef);
       return fromSymbolicRef;
     }
-    const fallback = "main";
-    this.defaultBranchCache.set(repoPath, fallback);
-    return fallback;
+    return "main";
   }
   async resolveDefaultBranchFromSymbolicRef(repoPath) {
     try {
@@ -4666,10 +4664,10 @@ async function registerDesktopPreview() {
 }
 
 // src/services/chat/chat-service.ts
-import { existsSync as existsSync8 } from "fs";
-import { appendFile as appendFile5, copyFile, mkdir as mkdir12, readFile as readFile9, rename as rename2, rm } from "fs/promises";
-import { homedir as homedir13 } from "os";
-import { join as join15 } from "path";
+import { existsSync as existsSync7 } from "fs";
+import { appendFile as appendFile5, copyFile, mkdir as mkdir11, readFile as readFile8, rename as rename2, rm } from "fs/promises";
+import { homedir as homedir12 } from "os";
+import { join as join14 } from "path";
 import { randomUUID as randomUUID5 } from "crypto";
 
 // src/managers/claude-manager.ts
@@ -4849,212 +4847,6 @@ function mapTodoStatus(status) {
   }
   return "pending";
 }
-function convertCodexEvent(event, linearSessionId) {
-  if (event.type === "turn.started") {
-    return {
-      linearSessionId,
-      content: {
-        type: "thought",
-        body: "Processing..."
-      }
-    };
-  }
-  if (event.type === "item.started") {
-    const item = event.item;
-    if (!item) return null;
-    if (item.type === "agent_message") {
-      const text = "text" in item ? String(item.text || "") : "";
-      if (text) {
-        return {
-          linearSessionId,
-          content: {
-            type: "thought",
-            body: text
-          }
-        };
-      }
-    }
-    if (item.type === "reasoning") {
-      const text = "text" in item ? String(item.text || "") : "";
-      if (text) {
-        return {
-          linearSessionId,
-          content: {
-            type: "thought",
-            body: text
-          }
-        };
-      }
-    }
-    if (item.type === "command_execution") {
-      const command = "command" in item ? String(item.command || "") : "";
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "Running command",
-          parameter: command
-        }
-      };
-    }
-    if (item.type === "file_change") {
-      const changes = "changes" in item && Array.isArray(item.changes) ? item.changes : [];
-      const paths = changes.map((c) => c.path || "").filter(Boolean);
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "File change",
-          parameter: paths.join(", ") || ""
-        }
-      };
-    }
-    if (item.type === "mcp_tool_call") {
-      const tool2 = "tool" in item ? String(item.tool || "") : "";
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: tool2 || "MCP tool call",
-          parameter: ""
-        }
-      };
-    }
-    if (item.type === "web_search") {
-      const query2 = "query" in item ? String(item.query || "") : "";
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "Web search",
-          parameter: query2
-        }
-      };
-    }
-    if (item.type === "todo_list") {
-      const items = "items" in item && Array.isArray(item.items) ? item.items : [];
-      const completed = items.filter((t) => t.completed).length;
-      const total = items.length;
-      const currentTask = items.find((t) => !t.completed);
-      const summary = `${completed}/${total}`;
-      const parameter = currentTask?.text ? `${summary}: ${currentTask.text}` : summary;
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "Updating plan",
-          parameter
-        }
-      };
-    }
-  }
-  if (event.type === "item.completed") {
-    const item = event.item;
-    if (!item) return null;
-    if (item.type === "command_execution") {
-      const command = "command" in item ? String(item.command || "") : "";
-      const output = "aggregated_output" in item ? String(item.aggregated_output || "") : "";
-      const exitCode = "exit_code" in item ? item.exit_code : void 0;
-      const result = exitCode !== void 0 ? `Exit code: ${exitCode}` : output || "Done";
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "Running command",
-          parameter: command,
-          result
-        }
-      };
-    }
-    if (item.type === "file_change") {
-      const changes = "changes" in item && Array.isArray(item.changes) ? item.changes : [];
-      const paths = changes.map((c) => c.path || "").filter(Boolean);
-      const status = "status" in item ? String(item.status || "") : "";
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "File change",
-          parameter: paths.join(", ") || "",
-          result: status === "completed" ? "Done" : status || "Done"
-        }
-      };
-    }
-    if (item.type === "mcp_tool_call") {
-      const tool2 = "tool" in item ? String(item.tool || "") : "";
-      const status = "status" in item ? String(item.status || "") : "";
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: tool2 || "MCP tool call",
-          parameter: "",
-          result: status === "completed" ? "Done" : status || "Done"
-        }
-      };
-    }
-    if (item.type === "web_search") {
-      const query2 = "query" in item ? String(item.query || "") : "";
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "Web search",
-          parameter: query2,
-          result: "Done"
-        }
-      };
-    }
-    if (item.type === "todo_list") {
-      const items = "items" in item && Array.isArray(item.items) ? item.items : [];
-      const completed = items.filter((t) => t.completed).length;
-      const total = items.length;
-      const currentTask = items.find((t) => !t.completed);
-      const summary = `${completed}/${total}`;
-      const parameter = currentTask?.text ? `${summary}: ${currentTask.text}` : summary;
-      return {
-        linearSessionId,
-        content: {
-          type: "action",
-          action: "Updating plan",
-          parameter,
-          result: "Done"
-        }
-      };
-    }
-    if (item.type === "agent_message") {
-      const text = "text" in item ? String(item.text || "") : "";
-      if (text) {
-        return {
-          linearSessionId,
-          content: {
-            type: "thought",
-            body: text
-          }
-        };
-      }
-    }
-  }
-  return null;
-}
-function extractPlanFromCodexEvent(event) {
-  if (event.type !== "item.started" && event.type !== "item.completed") {
-    return null;
-  }
-  const item = event.item;
-  if (!item || item.type !== "todo_list") {
-    return null;
-  }
-  const items = "items" in item && Array.isArray(item.items) ? item.items : [];
-  if (items.length === 0) {
-    return null;
-  }
-  const hasIncomplete = items.some((entry) => !entry.completed);
-  return items.filter((entry) => Boolean(entry.text && entry.text.trim().length > 0)).map((entry) => ({
-    content: entry.text.trim(),
-    status: entry.completed ? "completed" : hasIncomplete ? "inProgress" : "pending"
-  }));
-}
 function codexAspReasoningText(item) {
   return [...item.summary, ...item.content].filter(Boolean).join("\n").trim();
 }
@@ -5618,12 +5410,6 @@ function buildCodexAgentEnv() {
   delete env.GH_CONFIG_DIR;
   return env;
 }
-function resolveCodexApiKey() {
-  if (shouldStripOpenAIApiKey()) {
-    return void 0;
-  }
-  return ENGINE_ENV.OPENAI_API_KEY;
-}
 function shouldStripAnthropicApiKey() {
   const method = ENGINE_ENV.REPLICAS_CLAUDE_AUTH_METHOD;
   return method === "oauth" || method === "bedrock";
@@ -6746,7 +6532,7 @@ var AspClient = class {
 // src/managers/codex-asp/app-server-process.ts
 var DEFAULT_CODEX_BINARY = "codex";
 var DEFAULT_CODEX_ARGS = ["app-server", "--listen", "stdio://"];
-var ENGINE_PACKAGE_VERSION = "0.1.276";
+var ENGINE_PACKAGE_VERSION = "0.1.278";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";
@@ -6949,25 +6735,6 @@ function buildCodexRateLimitsSnapshot(fields) {
     planType: fields.planType
   };
 }
-function extractCodexRateLimitsSnapshotFromJsonl(parsed) {
-  if (!isRecord4(parsed)) return null;
-  const payload = isRecord4(parsed.payload) ? parsed.payload : parsed;
-  const rateLimits = isRecord4(payload.rate_limits) ? payload.rate_limits : null;
-  if (!rateLimits) return null;
-  const credits = isRecord4(rateLimits.credits) ? rateLimits.credits : null;
-  const hasCredits = credits && typeof credits.has_credits === "boolean" ? credits.has_credits : null;
-  const unlimited = credits && typeof credits.unlimited === "boolean" ? credits.unlimited : null;
-  const balance = credits && typeof credits.balance === "string" ? credits.balance : null;
-  const rateLimitResetType = typeof rateLimits.rate_limit_reached_type === "string" && rateLimits.rate_limit_reached_type.length > 0 ? rateLimits.rate_limit_reached_type : null;
-  const planType = typeof rateLimits.plan_type === "string" ? rateLimits.plan_type : null;
-  return buildCodexRateLimitsSnapshot({
-    unlimited,
-    hasCredits,
-    balance,
-    rateLimitResetType,
-    planType
-  });
-}
 var CodexQuotaStatusTracker = class {
   lastEmittedQuotaState = "ok";
   latestQuotaSnapshot = null;
@@ -8446,410 +8213,6 @@ var CodexAspManager = class extends CodingAgentManager {
   }
 };
 
-// src/managers/codex-manager.ts
-import { Codex } from "@openai/codex-sdk";
-import { readdir as readdir3, stat as stat2, writeFile as writeFile6, mkdir as mkdir11, readFile as readFile8 } from "fs/promises";
-import { existsSync as existsSync7 } from "fs";
-import { join as join14 } from "path";
-import { homedir as homedir12 } from "os";
-import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
-var CODEX_CONFIG_PATH = join14(homedir12(), ".codex", "config.toml");
-function isJsonlEvent2(value) {
-  if (!isRecord4(value)) {
-    return false;
-  }
-  return typeof value.timestamp === "string" && typeof value.type === "string" && isRecord4(value.payload);
-}
-function sleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
-}
-var CodexManager = class extends CodingAgentManager {
-  codex;
-  currentThreadId = null;
-  currentThread = null;
-  activeAbortController = null;
-  quotaStatus = new CodexQuotaStatusTracker();
-  constructor(options) {
-    super(options);
-    this.codex = this.createCodexClient();
-    this.initializeManager(this.processMessageInternal.bind(this));
-  }
-  createCodexClient() {
-    const codexApiKey = resolveCodexApiKey();
-    return new Codex({
-      env: buildCodexAgentEnv(),
-      ...codexApiKey ? { apiKey: codexApiKey } : {}
-    });
-  }
-  resetCodexClient() {
-    this.codex = this.createCodexClient();
-    this.currentThread = null;
-  }
-  async initialize() {
-    if (this.initialSessionId) {
-      this.currentThreadId = this.initialSessionId;
-      console.log(`[CodexManager] Restored thread ID from persisted state: ${this.currentThreadId}`);
-    }
-  }
-  async flushQuotaSnapshotFromCurrentSession() {
-    if (!this.currentThreadId) return;
-    try {
-      const sessionFile = await this.findSessionFile(this.currentThreadId);
-      if (!sessionFile) return;
-      const content = await readFile8(sessionFile, "utf-8");
-      const lines = content.split("\n").map((line) => line.trim()).filter(Boolean);
-      let latest = null;
-      for (const line of lines) {
-        try {
-          const parsed = JSON.parse(line);
-          const snapshot = extractCodexRateLimitsSnapshotFromJsonl(parsed);
-          if (snapshot) {
-            latest = snapshot;
-          }
-        } catch {
-        }
-      }
-      if (latest) {
-        this.emitQuotaStatus(latest);
-      }
-    } catch (error) {
-      console.warn("[CodexManager] Failed to flush quota snapshot from session:", error);
-    }
-  }
-  emitQuotaStatus(snapshot, force = false) {
-    const event = this.quotaStatus.apply(snapshot, force);
-    if (event) this.onEvent(event);
-  }
-  async interruptActiveTurn() {
-    if (this.activeAbortController) {
-      this.activeAbortController.abort();
-    }
-  }
-  /**
-   * Update the developer_instructions in ~/.codex/config.toml
-   * This sets the system prompt that Codex will use for this turn
-   */
-  async updateCodexConfig(developerInstructions) {
-    try {
-      const codexDir = join14(homedir12(), ".codex");
-      await mkdir11(codexDir, { recursive: true });
-      let config = {};
-      if (existsSync7(CODEX_CONFIG_PATH)) {
-        try {
-          const existingContent = await readFile8(CODEX_CONFIG_PATH, "utf-8");
-          const parsed = parseToml(existingContent);
-          if (isRecord4(parsed)) {
-            config = parsed;
-          }
-        } catch (parseError) {
-          console.warn("[CodexManager] Failed to parse existing config.toml, starting fresh:", parseError);
-        }
-      }
-      if (developerInstructions) {
-        config.developer_instructions = developerInstructions;
-      } else {
-        delete config.developer_instructions;
-      }
-      const tomlContent = stringifyToml(config);
-      await writeFile6(CODEX_CONFIG_PATH, tomlContent, "utf-8");
-      console.log("[CodexManager] Updated config.toml with developer_instructions");
-    } catch (error) {
-      console.error("[CodexManager] Failed to update config.toml:", error);
-    }
-  }
-  async processMessageInternal(request) {
-    try {
-      await this.executeCodexTurn(request);
-    } catch (error) {
-      if (isCodexAuthError(error)) {
-        const refreshed = await codexTokenManager.fetchFreshCredentials(error instanceof Error ? error.message : String(error));
-        if (refreshed) {
-          this.resetCodexClient();
-          await this.executeCodexTurn(request);
-          return;
-        }
-      }
-      throw error;
-    }
-  }
-  async executeCodexTurn(request) {
-    if (this.quotaStatus.blocked && this.quotaStatus.latestSnapshot) {
-      await this.flushQuotaSnapshotFromCurrentSession();
-      if (this.quotaStatus.blocked && this.quotaStatus.latestSnapshot) {
-        this.emitQuotaStatus(this.quotaStatus.latestSnapshot, true);
-        try {
-          await this.onTurnComplete();
-        } catch (error) {
-          console.error("[CodexManager] onTurnComplete failed during quota-blocked turn:", error);
-        }
-        return;
-      }
-    }
-    const {
-      message,
-      model,
-      customInstructions,
-      images,
-      permissionMode,
-      thinkingLevel
-    } = request;
-    const linearSessionId = ENGINE_ENV.LINEAR_SESSION_ID;
-    let tempImagePaths = [];
-    let stopTail = null;
-    let abortController = null;
-    try {
-      if (images && images.length > 0) {
-        const normalizedImages = await normalizeImages(images);
-        tempImagePaths = await saveNormalizedImagesToTempFiles(normalizedImages);
-      }
-      const developerInstructions = this.buildCombinedInstructions(customInstructions);
-      await this.updateCodexConfig(developerInstructions);
-      const sandboxMode = "danger-full-access";
-      const webSearchMode = "live";
-      const codexReasoningEffort = codexReasoningEffortForThinkingLevel(thinkingLevel);
-      const additionalDirectories = await getAgentAdditionalDirectories();
-      const threadOptions = {
-        workingDirectory: this.workingDirectory,
-        skipGitRepoCheck: true,
-        sandboxMode,
-        model: model || DEFAULT_CODEX_MODEL,
-        webSearchMode,
-        additionalDirectories,
-        ...codexReasoningEffort ? { modelReasoningEffort: codexReasoningEffort } : {}
-      };
-      abortController = new AbortController();
-      this.activeAbortController = abortController;
-      if (this.currentThreadId) {
-        this.currentThread = this.codex.resumeThread(this.currentThreadId, threadOptions);
-      } else {
-        this.currentThread = this.codex.startThread(threadOptions);
-        const { events } = await this.currentThread.runStreamed("Hello", { signal: abortController.signal });
-        for await (const event of events) {
-          if (event.type === "thread.started") {
-            this.currentThreadId = event.thread_id;
-            await this.onSaveSessionId(this.currentThreadId);
-            console.log(`[CodexManager] Captured and persisted thread ID: ${this.currentThreadId}`);
-          }
-        }
-        if (!this.currentThreadId && this.currentThread.id) {
-          this.currentThreadId = this.currentThread.id;
-          await this.onSaveSessionId(this.currentThreadId);
-          console.log(`[CodexManager] Captured and persisted thread ID from thread.id: ${this.currentThreadId}`);
-        }
-      }
-      stopTail = this.currentThreadId ? await this.startSessionTail(this.currentThreadId) : null;
-      let input;
-      if (tempImagePaths.length > 0) {
-        const inputItems = [
-          { type: "text", text: message },
-          ...tempImagePaths.map((path4) => ({ type: "local_image", path: path4 }))
-        ];
-        input = inputItems;
-      } else {
-        input = message;
-      }
-      try {
-        const { events } = await this.currentThread.runStreamed(input, { signal: abortController.signal });
-        const linearForwarder = new LinearEventForwarder(linearSessionId);
-        for await (const event of events) {
-          if (linearSessionId) {
-            linearForwarder.sendPlan(extractPlanFromCodexEvent(event));
-            linearForwarder.sendEvent(convertCodexEvent(event, linearSessionId));
-          }
-        }
-        linearForwarder.flushThoughtAsResponse();
-      } catch (error) {
-        await this.flushQuotaSnapshotFromCurrentSession();
-        if (this.quotaStatus.blocked) {
-          return;
-        }
-        throw error;
-      }
-    } finally {
-      if (stopTail) {
-        await stopTail();
-      }
-      await removeTempImageFiles(tempImagePaths);
-      try {
-        await this.onTurnComplete();
-      } catch (error) {
-        console.error("[CodexManager] onTurnComplete failed:", error);
-      }
-      this.activeAbortController = null;
-    }
-  }
-  async getHistory() {
-    if (!this.currentThreadId) {
-      return {
-        thread_id: null,
-        events: []
-      };
-    }
-    const sessionFile = await this.findSessionFile(this.currentThreadId);
-    if (!sessionFile) {
-      return {
-        thread_id: this.currentThreadId,
-        events: []
-      };
-    }
-    const events = await readJSONL(sessionFile);
-    return {
-      thread_id: this.currentThreadId,
-      events
-    };
-  }
-  // Helper methods for finding session files
-  async findSessionFile(threadId) {
-    const sessionsDir = join14(homedir12(), ".codex", "sessions");
-    try {
-      const now = /* @__PURE__ */ new Date();
-      const year = now.getFullYear();
-      const month = String(now.getMonth() + 1).padStart(2, "0");
-      const day = String(now.getDate()).padStart(2, "0");
-      const todayDir = join14(sessionsDir, String(year), month, day);
-      const file = await this.findFileInDirectory(todayDir, threadId);
-      if (file) return file;
-      for (let daysAgo = 1; daysAgo <= 7; daysAgo++) {
-        const date = new Date(now);
-        date.setDate(date.getDate() - daysAgo);
-        const searchYear = date.getFullYear();
-        const searchMonth = String(date.getMonth() + 1).padStart(2, "0");
-        const searchDay = String(date.getDate()).padStart(2, "0");
-        const searchDir = join14(sessionsDir, String(searchYear), searchMonth, searchDay);
-        const file2 = await this.findFileInDirectory(searchDir, threadId);
-        if (file2) return file2;
-      }
-      return null;
-    } catch (error) {
-      return null;
-    }
-  }
-  async findFileInDirectory(directory, threadId) {
-    try {
-      const files = await readdir3(directory);
-      for (const file of files) {
-        if (file.endsWith(".jsonl") && file.includes(threadId)) {
-          const fullPath = join14(directory, file);
-          const stats = await stat2(fullPath);
-          if (stats.isFile()) {
-            return fullPath;
-          }
-        }
-      }
-      return null;
-    } catch (error) {
-      return null;
-    }
-  }
-  async waitForSessionFile(threadId, timeoutMs = 5e3) {
-    const start = Date.now();
-    while (Date.now() - start < timeoutMs) {
-      const sessionFile = await this.findSessionFile(threadId);
-      if (sessionFile) {
-        return sessionFile;
-      }
-      await sleep(100);
-    }
-    return null;
-  }
-  // @openai/codex-sdk doesn't expose manual /compact (TUI-only); we only mirror the auto-compaction rollout entries to the UI.
-  trackNativeCompaction(event) {
-    if (event.type === "compacted") {
-      this.setCompacting(false);
-      return;
-    }
-    if (event.type !== "event_msg") return;
-    const msg = event.payload.msg;
-    if (!msg) return;
-    const itemType = msg.payload?.item?.type;
-    if (itemType !== "context_compaction") return;
-    if (msg.type === "item_started") {
-      this.setCompacting(true);
-    } else if (msg.type === "item_completed") {
-      this.setCompacting(false);
-    }
-  }
-  async startSessionTail(threadId) {
-    const sessionFile = await this.waitForSessionFile(threadId);
-    if (!sessionFile) {
-      return async () => {
-      };
-    }
-    let active = true;
-    const seenLines = /* @__PURE__ */ new Set();
-    const seedSeenLines = async () => {
-      try {
-        const content = await readFile8(sessionFile, "utf-8");
-        const lines = content.split("\n").map((line) => line.trim()).filter(Boolean);
-        let latest = null;
-        for (const line of lines) {
-          seenLines.add(line);
-          try {
-            const parsed = JSON.parse(line);
-            const snapshot = extractCodexRateLimitsSnapshotFromJsonl(parsed);
-            if (snapshot) latest = snapshot;
-          } catch {
-          }
-        }
-        if (latest) {
-          this.quotaStatus.prime(latest);
-        }
-      } catch {
-      }
-    };
-    await seedSeenLines();
-    const pump = async () => {
-      let emitted = 0;
-      try {
-        const content = await readFile8(sessionFile, "utf-8");
-        const lines = content.split("\n");
-        const completeLines = content.endsWith("\n") ? lines : lines.slice(0, -1);
-        for (const line of completeLines) {
-          const trimmed = line.trim();
-          if (!trimmed || seenLines.has(trimmed)) {
-            continue;
-          }
-          seenLines.add(trimmed);
-          try {
-            const parsed = JSON.parse(trimmed);
-            const snapshot = extractCodexRateLimitsSnapshotFromJsonl(parsed);
-            if (snapshot) {
-              this.emitQuotaStatus(snapshot);
-            }
-            if (isJsonlEvent2(parsed)) {
-              this.trackNativeCompaction(parsed);
-              this.onEvent(parsed);
-              emitted += 1;
-            }
-          } catch {
-          }
-        }
-      } catch {
-      }
-      return emitted;
-    };
-    const loop = (async () => {
-      while (active) {
-        await pump();
-        await sleep(100);
-      }
-      await pump();
-    })();
-    return async () => {
-      active = false;
-      await loop;
-      const deadline = Date.now() + 1500;
-      while (Date.now() < deadline) {
-        const emitted = await pump();
-        if (emitted > 0) {
-          continue;
-        }
-        await sleep(100);
-      }
-    };
-  }
-};
-
 // src/managers/relay-tools.ts
 import { createSdkMcpServer, tool } from "@anthropic-ai/claude-agent-sdk";
 import { z } from "zod";
@@ -9451,19 +8814,19 @@ var DuplicateDefaultChatError = class extends Error {
 };
 
 // src/services/chat/chat-service.ts
-var ENGINE_DIR2 = join15(homedir13(), ".replicas", "engine");
-var CHATS_FILE = join15(ENGINE_DIR2, "chats.json");
-var CLAUDE_HISTORY_DIR = join15(ENGINE_DIR2, "claude-histories");
-var RELAY_HISTORY_DIR = join15(ENGINE_DIR2, "relay-histories");
-var CHAT_SENDERS_DIR = join15(ENGINE_DIR2, "chat-senders");
-var CODEX_AUTH_PATH2 = join15(homedir13(), ".codex", "auth.json");
+var ENGINE_DIR2 = join14(homedir12(), ".replicas", "engine");
+var CHATS_FILE = join14(ENGINE_DIR2, "chats.json");
+var CLAUDE_HISTORY_DIR = join14(ENGINE_DIR2, "claude-histories");
+var RELAY_HISTORY_DIR = join14(ENGINE_DIR2, "relay-histories");
+var CHAT_SENDERS_DIR = join14(ENGINE_DIR2, "chat-senders");
+var CODEX_AUTH_PATH2 = join14(homedir12(), ".codex", "auth.json");
 var CHATS_BACKUP_FILE = `${CHATS_FILE}.bak`;
 function isChatMessageSender(value) {
   if (!isRecord4(value)) return false;
   return typeof value.senderUserId === "string" && typeof value.senderEmail === "string" && typeof value.recordedAt === "string";
 }
 function isCodexAvailable() {
-  return existsSync8(CODEX_AUTH_PATH2) || Boolean(ENGINE_ENV.OPENAI_API_KEY);
+  return existsSync7(CODEX_AUTH_PATH2) || Boolean(ENGINE_ENV.OPENAI_API_KEY);
 }
 function isSameAcceptedUserEvent(event, acceptedEvent) {
   if (areSameUserMessageEvents(event, acceptedEvent)) return true;
@@ -9505,18 +8868,18 @@ function isPersistedChat(value) {
     return false;
   }
   const candidate = value;
-  return typeof candidate.id === "string" && (candidate.provider === "claude" || candidate.provider === "codex" || candidate.provider === "relay") && typeof candidate.title === "string" && typeof candidate.createdAt === "string" && typeof candidate.updatedAt === "string" && (candidate.providerSessionId === null || typeof candidate.providerSessionId === "string") && (candidate.parentChatId === void 0 || candidate.parentChatId === null || typeof candidate.parentChatId === "string") && (candidate.codexBackend === void 0 || candidate.codexBackend === "sdk" || candidate.codexBackend === "asp");
-}
-function codexBackendForChat(chat) {
-  if (chat.provider !== "codex") return "asp";
-  if (chat.codexBackend) return chat.codexBackend;
-  return chat.providerSessionId ? "sdk" : "asp";
+  return typeof candidate.id === "string" && (candidate.provider === "claude" || candidate.provider === "codex" || candidate.provider === "relay") && typeof candidate.title === "string" && typeof candidate.createdAt === "string" && typeof candidate.updatedAt === "string" && (candidate.providerSessionId === null || typeof candidate.providerSessionId === "string") && (candidate.parentChatId === void 0 || candidate.parentChatId === null || typeof candidate.parentChatId === "string");
 }
 function normalizePersistedChat(chat) {
+  const isLegacyCodexSdkChat = chat.provider === "codex" && (chat.codexBackend === "sdk" || chat.codexBackend === void 0 && chat.providerSessionId !== null);
   return {
-    ...chat,
-    parentChatId: chat.parentChatId ?? null,
-    ...chat.provider === "codex" ? { codexBackend: codexBackendForChat(chat) } : {}
+    id: chat.id,
+    provider: chat.provider,
+    title: chat.title,
+    createdAt: chat.createdAt,
+    updatedAt: chat.updatedAt,
+    providerSessionId: isLegacyCodexSdkChat ? null : chat.providerSessionId,
+    parentChatId: chat.parentChatId ?? null
   };
 }
 function parsePersistedChatsContent(content) {
@@ -9551,10 +8914,10 @@ var ChatService = class {
   chats = /* @__PURE__ */ new Map();
   writeChain = Promise.resolve();
   async initialize() {
-    await mkdir12(ENGINE_DIR2, { recursive: true });
-    await mkdir12(CLAUDE_HISTORY_DIR, { recursive: true });
-    await mkdir12(RELAY_HISTORY_DIR, { recursive: true });
-    await mkdir12(CHAT_SENDERS_DIR, { recursive: true });
+    await mkdir11(ENGINE_DIR2, { recursive: true });
+    await mkdir11(CLAUDE_HISTORY_DIR, { recursive: true });
+    await mkdir11(RELAY_HISTORY_DIR, { recursive: true });
+    await mkdir11(CHAT_SENDERS_DIR, { recursive: true });
     const persisted = await this.loadChats();
     for (const chat of persisted) {
       const runtime = this.createRuntimeChat(chat);
@@ -9606,8 +8969,7 @@ var ChatService = class {
       createdAt: now,
       updatedAt: now,
       providerSessionId: null,
-      parentChatId,
-      ...request.provider === "codex" ? { codexBackend: "asp" } : {}
+      parentChatId
     };
     const runtime = this.createRuntimeChat(persisted);
     this.chats.set(persisted.id, runtime);
@@ -9653,7 +9015,7 @@ var ChatService = class {
     };
   }
   senderFilePath(chatId) {
-    return join15(CHAT_SENDERS_DIR, `${chatId}.jsonl`);
+    return join14(CHAT_SENDERS_DIR, `${chatId}.jsonl`);
   }
   async appendSender(chatId, sender) {
     try {
@@ -9664,7 +9026,7 @@ var ChatService = class {
   }
   async readSenders(chatId) {
     try {
-      const content = await readFile9(this.senderFilePath(chatId), "utf-8");
+      const content = await readFile8(this.senderFilePath(chatId), "utf-8");
       const lines = content.split("\n").filter((line) => line.trim().length > 0);
       const senders = [];
       for (const line of lines) {
@@ -9803,7 +9165,7 @@ var ChatService = class {
   async deleteHistoryFile(persisted) {
     if (persisted.provider === "claude" || persisted.provider === "relay") {
       const dir = persisted.provider === "claude" ? CLAUDE_HISTORY_DIR : RELAY_HISTORY_DIR;
-      await rm(join15(dir, `${persisted.id}.jsonl`), { force: true });
+      await rm(join14(dir, `${persisted.id}.jsonl`), { force: true });
     }
     await rm(this.senderFilePath(persisted.id), { force: true });
   }
@@ -9860,7 +9222,7 @@ var ChatService = class {
     if (persisted.provider === "claude") {
       provider = new ClaudeManager({
         workingDirectory: this.workingDirectory,
-        historyFilePath: join15(CLAUDE_HISTORY_DIR, `${persisted.id}.jsonl`),
+        historyFilePath: join14(CLAUDE_HISTORY_DIR, `${persisted.id}.jsonl`),
         initialSessionId: persisted.providerSessionId,
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
@@ -9869,7 +9231,7 @@ var ChatService = class {
     } else if (persisted.provider === "relay") {
       provider = new RelayManager({
         workingDirectory: this.workingDirectory,
-        historyFilePath: join15(RELAY_HISTORY_DIR, `${persisted.id}.jsonl`),
+        historyFilePath: join14(RELAY_HISTORY_DIR, `${persisted.id}.jsonl`),
         initialSessionId: persisted.providerSessionId,
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
@@ -9878,8 +9240,7 @@ var ChatService = class {
         codexAvailable: isCodexAvailable()
       });
     } else {
-      const CodexProviderCtor = codexBackendForChat(persisted) === "sdk" ? CodexManager : CodexAspManager;
-      provider = new CodexProviderCtor({
+      provider = new CodexAspManager({
         workingDirectory: this.workingDirectory,
         initialSessionId: persisted.providerSessionId,
         onSaveSessionId: saveSession,
@@ -10021,7 +9382,7 @@ var ChatService = class {
   }
   async loadChats() {
     try {
-      const content = await readFile9(CHATS_FILE, "utf-8");
+      const content = await readFile8(CHATS_FILE, "utf-8");
       return parsePersistedChatsContent(content);
     } catch (error) {
       if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
@@ -10036,7 +9397,7 @@ var ChatService = class {
         console.error("[ChatService] Failed to quarantine corrupt chats file:", renameError);
       }
       try {
-        const backupContent = await readFile9(CHATS_BACKUP_FILE, "utf-8");
+        const backupContent = await readFile8(CHATS_BACKUP_FILE, "utf-8");
         return parsePersistedChatsContent(backupContent);
       } catch (backupError) {
         if (backupError && typeof backupError === "object" && "code" in backupError && backupError.code === "ENOENT") {
@@ -10111,8 +9472,8 @@ var ChatService = class {
 
 // src/services/repo-file-service.ts
 import { execFile as execFile2 } from "child_process";
-import { readFile as readFile10, realpath, stat as stat3 } from "fs/promises";
-import { join as join16, resolve, extname } from "path";
+import { readFile as readFile9, realpath, stat as stat2 } from "fs/promises";
+import { join as join15, resolve, extname } from "path";
 var CACHE_TTL_MS = 3e4;
 var SEARCH_TIMEOUT_MS = 15e3;
 var MAX_CONTENT_BYTES = 256 * 1024;
@@ -10272,11 +9633,11 @@ var RepoFileService = class {
     const repo = repos.find((r) => r.name === repoName);
     if (!repo) return null;
     try {
-      const fullPath = await realpath(resolve(join16(repo.path, filePath)));
+      const fullPath = await realpath(resolve(join15(repo.path, filePath)));
       const repoRoot = await realpath(repo.path);
       const repoPrefix = repoRoot.endsWith("/") ? repoRoot : repoRoot + "/";
       if (!fullPath.startsWith(repoPrefix) && fullPath !== repoRoot) return null;
-      const fileStat = await stat3(fullPath);
+      const fileStat = await stat2(fullPath);
       if (!fileStat.isFile()) return null;
       const sizeBytes = fileStat.size;
       if (isBinaryExtension(filePath)) {
@@ -10301,7 +9662,7 @@ var RepoFileService = class {
           tooLarge: true
         };
       }
-      const content = await readFile10(fullPath, "utf-8");
+      const content = await readFile9(fullPath, "utf-8");
       return {
         repoName,
         path: filePath,
@@ -10346,13 +9707,9 @@ var RepoFileService = class {
   async listChangedFiles(repoPath, defaultBranch) {
     const changedFiles = /* @__PURE__ */ new Set();
     try {
-      const mergeBase = await execGitAsync(
-        ["merge-base", `origin/${defaultBranch}`, "HEAD"],
-        repoPath,
-        SEARCH_TIMEOUT_MS
-      );
+      const diffBase = await resolveDiffBase(repoPath, defaultBranch);
       const diffOutput = await execGitAsync(
-        ["diff", "--name-only", "-M", mergeBase.trim()],
+        ["diff", "--name-only", "-M", diffBase],
         repoPath,
         SEARCH_TIMEOUT_MS
       );
@@ -10383,16 +9740,16 @@ var RepoFileService = class {
 // src/v1-routes.ts
 import { Hono } from "hono";
 import { z as z2 } from "zod";
-import { readdir as readdir6, stat as stat5, readFile as readFile14 } from "fs/promises";
-import { join as join20, resolve as resolve2 } from "path";
+import { readdir as readdir5, stat as stat4, readFile as readFile13 } from "fs/promises";
+import { join as join19, resolve as resolve2 } from "path";
 
 // src/services/canvas-service.ts
-import { readdir as readdir4, readFile as readFile11, stat as stat4 } from "fs/promises";
-import { homedir as homedir14 } from "os";
-import { basename, join as join17 } from "path";
+import { readdir as readdir3, readFile as readFile10, stat as stat3 } from "fs/promises";
+import { homedir as homedir13 } from "os";
+import { basename, join as join16 } from "path";
 var CANVAS_DIRECTORIES = [
-  join17(homedir14(), ".claude", "plans"),
-  join17(homedir14(), ".replicas", "canvas")
+  join16(homedir13(), ".claude", "plans"),
+  join16(homedir13(), ".replicas", "canvas")
 ];
 var MAX_CANVAS_FILE_BYTES = 5 * 1024 * 1024;
 function isTextKind(kind) {
@@ -10407,7 +9764,7 @@ var CanvasService = class {
     for (const directory of CANVAS_DIRECTORIES) {
       let entries;
       try {
-        entries = await readdir4(directory, { withFileTypes: true });
+        entries = await readdir3(directory, { withFileTypes: true });
       } catch {
         continue;
       }
@@ -10418,7 +9775,7 @@ var CanvasService = class {
         const { kind } = classifyCanvasFilename(entry.name);
         let sizeBytes = 0;
         try {
-          const s = await stat4(join17(directory, entry.name));
+          const s = await stat3(join16(directory, entry.name));
           sizeBytes = s.size;
         } catch {
           continue;
@@ -10433,10 +9790,10 @@ var CanvasService = class {
     if (!safe || safe !== filename || safe.startsWith(".")) return null;
     const { kind, mimeType } = classifyCanvasFilename(safe);
     for (const directory of CANVAS_DIRECTORIES) {
-      const filePath = join17(directory, safe);
+      const filePath = join16(directory, safe);
       let sizeBytes = 0;
       try {
-        const s = await stat4(filePath);
+        const s = await stat3(filePath);
         sizeBytes = s.size;
       } catch {
         continue;
@@ -10452,10 +9809,10 @@ var CanvasService = class {
       }
       try {
         if (isTextKind(kind)) {
-          const content = await readFile11(filePath, "utf-8");
+          const content = await readFile10(filePath, "utf-8");
           return { filename: safe, kind, sizeBytes, mimeType, content };
         }
-        const buf = await readFile11(filePath);
+        const buf = await readFile10(filePath);
         return { filename: safe, kind, sizeBytes, mimeType, base64: buf.toString("base64") };
       } catch {
         continue;
@@ -10468,16 +9825,16 @@ var canvasService = new CanvasService();
 
 // src/services/warm-hooks-service.ts
 import { spawn as spawn4 } from "child_process";
-import { readFile as readFile13 } from "fs/promises";
-import { existsSync as existsSync9 } from "fs";
-import { join as join19 } from "path";
+import { readFile as readFile12 } from "fs/promises";
+import { existsSync as existsSync8 } from "fs";
+import { join as join18 } from "path";
 
 // src/services/warm-hook-logs-service.ts
-import { mkdir as mkdir13, readFile as readFile12, writeFile as writeFile7, readdir as readdir5, appendFile as appendFile6, unlink as unlink3 } from "fs/promises";
-import { homedir as homedir15 } from "os";
-import { join as join18 } from "path";
-var LOGS_DIR2 = join18(homedir15(), ".replicas", "warm-hook-logs");
-var CURRENT_RUN_LOG = join18(LOGS_DIR2, "current-run.log");
+import { mkdir as mkdir12, readFile as readFile11, writeFile as writeFile6, readdir as readdir4, appendFile as appendFile6, unlink as unlink3 } from "fs/promises";
+import { homedir as homedir14 } from "os";
+import { join as join17 } from "path";
+var LOGS_DIR2 = join17(homedir14(), ".replicas", "warm-hook-logs");
+var CURRENT_RUN_LOG = join17(LOGS_DIR2, "current-run.log");
 var GLOBAL_FILENAME = "global.json";
 function withPreview2(stored) {
   const preview = buildHookOutputPreview(stored.output);
@@ -10485,7 +9842,7 @@ function withPreview2(stored) {
 }
 var WarmHookLogsService = class {
   async ensureDir() {
-    await mkdir13(LOGS_DIR2, { recursive: true });
+    await mkdir12(LOGS_DIR2, { recursive: true });
   }
   async saveGlobalHookLog(entry) {
     await this.ensureDir();
@@ -10494,7 +9851,7 @@ var WarmHookLogsService = class {
       hookName: "organization",
       ...entry
     };
-    await writeFile7(join18(LOGS_DIR2, GLOBAL_FILENAME), `${JSON.stringify(log, null, 2)}
+    await writeFile6(join17(LOGS_DIR2, GLOBAL_FILENAME), `${JSON.stringify(log, null, 2)}
 `, "utf-8");
   }
   async saveEnvironmentHookLog(entry) {
@@ -10504,7 +9861,7 @@ var WarmHookLogsService = class {
       hookName: "environment",
       ...entry
     };
-    await writeFile7(join18(LOGS_DIR2, ENVIRONMENT_HOOK_LOG_FILENAME), `${JSON.stringify(log, null, 2)}
+    await writeFile6(join17(LOGS_DIR2, ENVIRONMENT_HOOK_LOG_FILENAME), `${JSON.stringify(log, null, 2)}
 `, "utf-8");
   }
   async saveRepoHookLog(repoName, entry) {
@@ -10514,13 +9871,13 @@ var WarmHookLogsService = class {
       hookName: repoName,
       ...entry
     };
-    await writeFile7(join18(LOGS_DIR2, repoHookLogFilename(repoName)), `${JSON.stringify(log, null, 2)}
+    await writeFile6(join17(LOGS_DIR2, repoHookLogFilename(repoName)), `${JSON.stringify(log, null, 2)}
 `, "utf-8");
   }
   async getAllLogs() {
     let files;
     try {
-      files = await readdir5(LOGS_DIR2);
+      files = await readdir4(LOGS_DIR2);
     } catch (err) {
       if (err.code === "ENOENT") {
         return [];
@@ -10533,7 +9890,7 @@ var WarmHookLogsService = class {
         continue;
       }
       try {
-        const raw = await readFile12(join18(LOGS_DIR2, file), "utf-8");
+        const raw = await readFile11(join17(LOGS_DIR2, file), "utf-8");
         const stored = JSON.parse(raw);
         logs.push(withPreview2(stored));
       } catch {
@@ -10562,7 +9919,7 @@ var WarmHookLogsService = class {
   }
   async getCurrentRunLog() {
     try {
-      return await readFile12(CURRENT_RUN_LOG, "utf-8");
+      return await readFile11(CURRENT_RUN_LOG, "utf-8");
     } catch (err) {
       if (err.code === "ENOENT") return null;
       throw err;
@@ -10571,7 +9928,7 @@ var WarmHookLogsService = class {
   async getFullOutput(hookType, hookName) {
     const filename = hookType === "global" ? GLOBAL_FILENAME : hookType === "environment" ? ENVIRONMENT_HOOK_LOG_FILENAME : repoHookLogFilename(hookName);
     try {
-      const raw = await readFile12(join18(LOGS_DIR2, filename), "utf-8");
+      const raw = await readFile11(join17(LOGS_DIR2, filename), "utf-8");
       const stored = JSON.parse(raw);
       if (stored.hookType !== hookType || stored.hookName !== hookName) {
         return null;
@@ -10590,12 +9947,12 @@ var warmHookLogsService = new WarmHookLogsService();
 // src/services/warm-hooks-service.ts
 async function readRepoWarmHook(repoPath) {
   for (const filename of REPLICAS_CONFIG_FILENAMES) {
-    const configPath = join19(repoPath, filename);
-    if (!existsSync9(configPath)) {
+    const configPath = join18(repoPath, filename);
+    if (!existsSync8(configPath)) {
       continue;
     }
     try {
-      const raw = await readFile13(configPath, "utf-8");
+      const raw = await readFile12(configPath, "utf-8");
       const config = parseReplicasConfigString(raw, filename);
       if (!config.warmHook) {
         return null;
@@ -11488,12 +10845,12 @@ function createV1Routes(deps) {
   });
   app2.get("/logs", async (c) => {
     try {
-      const files = await readdir6(LOG_DIR).catch(() => []);
+      const files = await readdir5(LOG_DIR).catch(() => []);
       const logFiles = files.filter((f) => f.endsWith(".log"));
       const sessions = await Promise.all(
         logFiles.map(async (filename) => {
-          const filePath = join20(LOG_DIR, filename);
-          const fileStat = await stat5(filePath);
+          const filePath = join19(LOG_DIR, filename);
+          const fileStat = await stat4(filePath);
           const sessionId = filename.replace(/\.log$/, "");
           return {
             sessionId,
@@ -11529,7 +10886,7 @@ function createV1Routes(deps) {
       const limit = Math.min(parseInt(c.req.query("limit") || "500", 10), 5e3);
       let content;
       try {
-        content = await readFile14(filePath, "utf-8");
+        content = await readFile13(filePath, "utf-8");
       } catch {
         return c.json(jsonError("Log session not found"), 404);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-engine",
-  "version": "0.1.276",
+  "version": "0.1.278",
   "description": "Lightweight API server for Replicas workspaces",
   "type": "module",
   "main": "dist/src/index.js",
@@ -32,7 +32,6 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.2.112",
     "@hono/node-server": "^1.19.5",
-    "@openai/codex-sdk": "^0.124.0",
     "hono": "^4.10.3",
     "smol-toml": "^1.6.0",
     "yaml": "^2.8.2",