replicas-engine 0.1.118 → 0.1.120

package/dist/src/index.js

@@ -42,6 +42,18 @@ function requireValidURL(value, name) {
     throw new Error(`Invalid engine environment: ${name} must be a valid URL`);
   }
 }
+function parseClaudeAuthMethod(value) {
+  if (value === "oauth" || value === "api_key" || value === "bedrock") {
+    return value;
+  }
+  return void 0;
+}
+function parseCodexAuthMethod(value) {
+  if (value === "oauth" || value === "api_key") {
+    return value;
+  }
+  return void 0;
+}
 var IS_WARMING_MODE = process.argv.includes("--warming");
 function loadEngineEnv() {
   const HOME_DIR = homedir();
@@ -66,7 +78,9 @@ function loadEngineEnv() {
     CLAUDE_CODE_USE_BEDROCK: readEnv("CLAUDE_CODE_USE_BEDROCK"),
     AWS_ACCESS_KEY_ID: readEnv("AWS_ACCESS_KEY_ID"),
     AWS_SECRET_ACCESS_KEY: readEnv("AWS_SECRET_ACCESS_KEY"),
-    AWS_REGION: readEnv("AWS_REGION")
+    AWS_REGION: readEnv("AWS_REGION"),
+    REPLICAS_CLAUDE_AUTH_METHOD: parseClaudeAuthMethod(readEnv("REPLICAS_CLAUDE_AUTH_METHOD")),
+    REPLICAS_CODEX_AUTH_METHOD: parseCodexAuthMethod(readEnv("REPLICAS_CODEX_AUTH_METHOD"))
   };
   if (!IS_WARMING_MODE && !env.WORKSPACE_ID) {
     console.error("WORKSPACE_ID is not set \u2014 this is required in normal (non-warming) mode");
@@ -362,7 +376,7 @@ var codexTokenManager = new CodexTokenManager();
 import { readdir, stat } from "fs/promises";
 import { existsSync as existsSync2 } from "fs";
 import { execFileSync as execFileSync2 } from "child_process";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 
 // src/utils/state.ts
 import { readFile, writeFile, mkdir, rename, unlink } from "fs/promises";
@@ -413,7 +427,12 @@ function coerceRepoState(value) {
   if (typeof value.path !== "string") return null;
   if (typeof value.defaultBranch !== "string") return null;
   if (typeof value.currentBranch !== "string") return null;
-  if (!(value.prUrl === null || typeof value.prUrl === "string")) return null;
+  if (!Array.isArray(value.prUrls)) return null;
+  const prUrls = [];
+  for (const entry of value.prUrls) {
+    if (typeof entry !== "string") return null;
+    if (!prUrls.includes(entry)) prUrls.push(entry);
+  }
   if (!(value.gitDiff === null || isEngineRepoDiff(value.gitDiff))) return null;
   if (typeof value.startHooksCompleted !== "boolean") return null;
   return {
@@ -421,7 +440,7 @@ function coerceRepoState(value) {
     path: value.path,
     defaultBranch: value.defaultBranch,
     currentBranch: value.currentBranch,
-    prUrl: value.prUrl,
+    prUrls,
     gitDiff: value.gitDiff,
     startHooksCompleted: value.startHooksCompleted
   };
@@ -482,6 +501,8 @@ async function saveRepoState(repoName, state, fallbackState) {
 
 // src/git/commands.ts
 import { execFileSync } from "child_process";
+import { readFileSync } from "fs";
+import { join as join3 } from "path";
 function runGitCommand(args, cwd) {
   return execFileSync("git", args, {
     cwd,
@@ -489,6 +510,15 @@ function runGitCommand(args, cwd) {
     stdio: ["pipe", "pipe", "pipe"]
   }).trim();
 }
+function readRepoHeadBranch(repoPath) {
+  try {
+    const contents = readFileSync(join3(repoPath, ".git", "HEAD"), "utf-8").trim();
+    const match = contents.match(/^ref:\s+refs\/heads\/(.+)$/);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
 function branchExists(branchName, cwd) {
   try {
     runGitCommand(["rev-parse", "--verify", branchName], cwd);
@@ -507,6 +537,9 @@ function getCurrentBranch(cwd) {
 }
 
 // src/git/service.ts
+function appendUniqueUrl(urls, url) {
+  return urls.includes(url) ? urls : [...urls, url];
+}
 var GitService = class {
   defaultBranchCache = /* @__PURE__ */ new Map();
   cachedPrByRepo = /* @__PURE__ */ new Map();
@@ -522,13 +555,13 @@ var GitService = class {
     const entries = await readdir(root);
     const repos = [];
     for (const entry of entries) {
-      const fullPath = join3(root, entry);
+      const fullPath = join4(root, entry);
       try {
         const entryStat = await stat(fullPath);
         if (!entryStat.isDirectory()) {
           continue;
         }
-        const hasGit = Boolean(await this.safeStat(join3(fullPath, ".git")));
+        const hasGit = Boolean(await this.safeStat(join4(fullPath, ".git")));
         if (!hasGit) {
           continue;
         }
@@ -563,7 +596,7 @@ var GitService = class {
           path: repo.path,
           defaultBranch: repo.defaultBranch,
           currentBranch,
-          prUrl: persistedMatchesCurrentBranch ? persistedState.prUrl : null,
+          prUrls: persistedState?.prUrls ?? [],
           gitDiff: persistedMatchesCurrentBranch ? persistedState.gitDiff : null,
           startHooksCompleted: persistedState?.startHooksCompleted ?? false
         });
@@ -572,7 +605,7 @@ var GitService = class {
     }
     return states;
   }
-  async refreshRepos() {
+  async refreshRepos(observedBranchesByRepo) {
     const repos = await this.listRepositories();
     const states = [];
     for (const repo of repos) {
@@ -580,12 +613,29 @@ var GitService = class {
         const persistedState = await loadRepoState(repo.name);
         const currentBranch = getCurrentBranch(repo.path) ?? repo.defaultBranch;
         const startHooksCompleted = persistedState?.startHooksCompleted ?? false;
-        states.push(await this.refreshRepoMetadata(repo, currentBranch, startHooksCompleted, persistedState));
+        const observed = observedBranchesByRepo?.get(repo.name);
+        states.push(
+          await this.refreshRepoMetadata(repo, currentBranch, startHooksCompleted, persistedState, observed)
+        );
       } catch {
       }
     }
     return states;
   }
+  // Fast branch snapshot for per-event observation during a turn. Reads
+  // .git/HEAD directly for each repo (no subprocess) so callers can safely
+  // invoke this on every agent event without measurable overhead.
+  async snapshotCurrentBranches() {
+    const repos = await this.listRepositories();
+    const branches = /* @__PURE__ */ new Map();
+    for (const repo of repos) {
+      const branch = readRepoHeadBranch(repo.path);
+      if (branch) {
+        branches.set(repo.name, branch);
+      }
+    }
+    return branches;
+  }
   async setBranchNameAndCheckout(name) {
     ENGINE_ENV.WORKSPACE_BRANCH_NAME = name;
     return this.initializeGitRepository();
@@ -618,7 +668,7 @@ var GitService = class {
           path: repo.path,
           defaultBranch: repo.defaultBranch,
           currentBranch: repo.defaultBranch,
-          prUrl: null,
+          prUrls: [],
           gitDiff: null,
           startHooksCompleted: false
         };
@@ -645,7 +695,7 @@ var GitService = class {
         }
         const branchName = this.findAvailableBranchName(workspaceName, repo.path);
         runGitCommand(["checkout", "-b", branchName], repo.path);
-        await saveRepoState(repo.name, { currentBranch: branchName, prUrl: null }, baselineState);
+        await saveRepoState(repo.name, { currentBranch: branchName }, baselineState);
         results.push({
           name: repo.name,
           success: true,
@@ -723,56 +773,50 @@ var GitService = class {
         return { status: "found", url: cachedPr.prUrl };
       }
       const persistedRepoState = persistedRepoStateArg ?? await loadRepoState(repoName);
-      if (persistedRepoState?.prUrl && persistedRepoState.currentBranch === currentBranch) {
-        this.cachedPrByRepo.set(repoName, {
-          prUrl: persistedRepoState.prUrl,
-          currentBranch
-        });
-        return { status: "found", url: persistedRepoState.prUrl };
-      }
       this.cachedPrByRepo.delete(repoName);
-      if (persistedRepoState?.prUrl && persistedRepoState.currentBranch !== currentBranch) {
-        await saveRepoState(repoName, { prUrl: null }, persistedRepoState);
-      }
-      try {
-        const remoteRef = execFileSync2("git", ["ls-remote", "--heads", "origin", currentBranch], {
-          cwd: repoPath,
-          encoding: "utf-8",
-          stdio: ["pipe", "pipe", "pipe"]
-        }).trim();
-        if (!remoteRef) {
-          return { status: "not_found" };
-        }
-      } catch {
-        return { status: "error" };
-      }
-      try {
-        const prInfo = execFileSync2("gh", ["pr", "view", "--json", "url", "--jq", ".url"], {
-          cwd: repoPath,
-          encoding: "utf-8",
-          stdio: ["pipe", "pipe", "pipe"]
-        }).trim();
-        if (prInfo) {
-          this.cachedPrByRepo.set(repoName, {
-            prUrl: prInfo,
-            currentBranch
-          });
-          if (persistedRepoState) {
-            await saveRepoState(repoName, { prUrl: prInfo }, persistedRepoState);
-          }
-          return { status: "found", url: prInfo };
+      const result = this.lookupPrOnRemote(repoName, repoPath, currentBranch);
+      if (result.status === "found") {
+        this.cachedPrByRepo.set(repoName, { prUrl: result.url, currentBranch });
+        if (persistedRepoState && !persistedRepoState.prUrls.includes(result.url)) {
+          await saveRepoState(
+            repoName,
+            { prUrls: appendUniqueUrl(persistedRepoState.prUrls, result.url) },
+            persistedRepoState
+          );
         }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.warn(`[GitService] gh pr view failed for ${repoName}: ${message}`);
-        return { status: "error" };
       }
-      return { status: "not_found" };
+      return result;
     } catch (error) {
       console.error("Error checking for pull request:", error);
       return { status: "error" };
     }
   }
+  lookupPrOnRemote(repoName, repoPath, branch) {
+    try {
+      const remoteRef = execFileSync2("git", ["ls-remote", "--heads", "origin", branch], {
+        cwd: repoPath,
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+      if (!remoteRef) {
+        return { status: "not_found" };
+      }
+    } catch {
+      return { status: "error" };
+    }
+    try {
+      const prInfo = execFileSync2("gh", ["pr", "view", branch, "--json", "url", "--jq", ".url"], {
+        cwd: repoPath,
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+      return prInfo ? { status: "found", url: prInfo } : { status: "not_found" };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(`[GitService] gh pr view ${branch} failed for ${repoName}: ${message}`);
+      return { status: "error" };
+    }
+  }
   resolveDefaultBranch(repoPath) {
     const cached = this.defaultBranchCache.get(repoPath);
     if (cached) {
@@ -807,22 +851,27 @@ var GitService = class {
     const normalized = name.toLowerCase().replace(/[^a-z0-9._/-]+/g, "-").replace(/\/{2,}/g, "/").replace(/^-+|-+$/g, "");
     return normalized || "replicas";
   }
-  async refreshRepoMetadata(repo, currentBranch, startHooksCompleted, persistedState) {
+  async refreshRepoMetadata(repo, currentBranch, startHooksCompleted, persistedState, observedBranches) {
     const prResult = await this.getPullRequestUrl(repo.name, repo.path, currentBranch, persistedState);
-    let prUrl;
+    let prUrls = persistedState?.prUrls ?? [];
     if (prResult.status === "found") {
-      prUrl = prResult.url;
-    } else if (prResult.status === "not_found") {
-      prUrl = null;
-    } else {
-      prUrl = persistedState?.prUrl ?? null;
+      prUrls = appendUniqueUrl(prUrls, prResult.url);
+    }
+    if (observedBranches) {
+      for (const branch of observedBranches) {
+        if (branch === currentBranch) continue;
+        const branchResult = this.lookupPrOnRemote(repo.name, repo.path, branch);
+        if (branchResult.status === "found") {
+          prUrls = appendUniqueUrl(prUrls, branchResult.url);
+        }
+      }
     }
     const state = {
       name: repo.name,
       path: repo.path,
       defaultBranch: repo.defaultBranch,
       currentBranch,
-      prUrl,
+      prUrls,
       gitDiff: this.getGitDiffStats(repo.path, repo.defaultBranch),
       startHooksCompleted
     };
@@ -845,10 +894,10 @@ var gitService = new GitService();
 // src/utils/logger.ts
 import { appendFile, mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
 import { homedir as homedir3 } from "os";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 import { format } from "util";
 import { randomBytes } from "crypto";
-var LOG_DIR = join4(homedir3(), ".replicas", "logs");
+var LOG_DIR = join5(homedir3(), ".replicas", "logs");
 var EngineLogger = class {
   _sessionId = null;
   filePath = null;
@@ -860,7 +909,7 @@ var EngineLogger = class {
   async initialize() {
     await mkdir2(LOG_DIR, { recursive: true });
     this._sessionId = this.createSessionId();
-    this.filePath = join4(LOG_DIR, `${this._sessionId}.log`);
+    this.filePath = join5(LOG_DIR, `${this._sessionId}.log`);
     await writeFile2(this.filePath, `=== Replicas Engine Session ${this._sessionId} ===
 `, "utf-8");
     this.patchConsole();
@@ -913,7 +962,7 @@ var engineLogger = new EngineLogger();
 // src/services/replicas-config-service.ts
 import { readFile as readFile4, appendFile as appendFile2, writeFile as writeFile5, mkdir as mkdir5 } from "fs/promises";
 import { existsSync as existsSync4 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { homedir as homedir5 } from "os";
 import { exec } from "child_process";
 import { promisify as promisify2 } from "util";
@@ -1102,7 +1151,7 @@ function parseReplicasConfigString(content, filename) {
 }
 
 // ../shared/src/engine/environment.ts
-var DAYTONA_SNAPSHOT_ID = "22-04-2026-islington-v1";
+var DAYTONA_SNAPSHOT_ID = "23-04-2026-islington-v1";
 
 // ../shared/src/engine/types.ts
 var DEFAULT_CHAT_TITLES = {
@@ -1120,14 +1169,14 @@ var WORKSPACE_FILE_CONTENT_MAX_SIZE_BYTES = 1 * 1024 * 1024;
 import { mkdir as mkdir3, readFile as readFile2, writeFile as writeFile3 } from "fs/promises";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { execFile } from "child_process";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 var REPLICAS_DIR = SANDBOX_PATHS.REPLICAS_DIR;
-var DETAILS_FILE = join5(REPLICAS_DIR, "environment-details.json");
-var CLAUDE_CREDENTIALS_PATH = join5(homedir4(), ".claude", ".credentials.json");
-var CODEX_AUTH_PATH = join5(homedir4(), ".codex", "auth.json");
+var DETAILS_FILE = join6(REPLICAS_DIR, "environment-details.json");
+var CLAUDE_CREDENTIALS_PATH = join6(homedir4(), ".claude", ".credentials.json");
+var CODEX_AUTH_PATH = join6(homedir4(), ".codex", "auth.json");
 function detectClaudeAuthMethod() {
   if (existsSync3(CLAUDE_CREDENTIALS_PATH)) {
     return "oauth";
@@ -1273,8 +1322,8 @@ var environmentDetailsService = new EnvironmentDetailsService();
 // src/services/start-hook-logs-service.ts
 import { createHash } from "crypto";
 import { mkdir as mkdir4, readFile as readFile3, writeFile as writeFile4, readdir as readdir2 } from "fs/promises";
-import { join as join6 } from "path";
-var LOGS_DIR = join6(SANDBOX_PATHS.REPLICAS_DIR, "start-hook-logs");
+import { join as join7 } from "path";
+var LOGS_DIR = join7(SANDBOX_PATHS.REPLICAS_DIR, "start-hook-logs");
 function sanitizeFilename(name) {
   const safe = name.replace(/[^a-zA-Z0-9._-]/g, "_");
   const hash = createHash("sha256").update(name).digest("hex").slice(0, 8);
@@ -1294,7 +1343,7 @@ var StartHookLogsService = class {
   async saveRepoLog(repoName, entry) {
     await this.ensureDir();
     const log = { repoName, ...entry };
-    await writeFile4(join6(LOGS_DIR, repoFilename(repoName)), `${JSON.stringify(log, null, 2)}
+    await writeFile4(join7(LOGS_DIR, repoFilename(repoName)), `${JSON.stringify(log, null, 2)}
 `, "utf-8");
   }
   async getAllLogs() {
@@ -1313,7 +1362,7 @@ var StartHookLogsService = class {
         continue;
       }
       try {
-        const raw = await readFile3(join6(LOGS_DIR, file), "utf-8");
+        const raw = await readFile3(join7(LOGS_DIR, file), "utf-8");
         const stored = JSON.parse(raw);
         logs.push(withPreview(stored));
       } catch {
@@ -1324,7 +1373,7 @@ var StartHookLogsService = class {
   }
   async getFullOutput(repoName) {
     try {
-      const raw = await readFile3(join6(LOGS_DIR, repoFilename(repoName)), "utf-8");
+      const raw = await readFile3(join7(LOGS_DIR, repoFilename(repoName)), "utf-8");
       const stored = JSON.parse(raw);
       if (stored.repoName !== repoName) {
         return null;
@@ -1342,7 +1391,7 @@ var startHookLogsService = new StartHookLogsService();
 
 // src/services/replicas-config-service.ts
 var execAsync = promisify2(exec);
-var START_HOOKS_LOG = join7(homedir5(), ".replicas", "startHooks.log");
+var START_HOOKS_LOG = join8(homedir5(), ".replicas", "startHooks.log");
 var START_HOOKS_RUNNING_PROMPT = `IMPORTANT - Start Hooks Running:
 Start hooks are shell commands/scripts set by repository owners that run on workspace startup.
 These hooks are currently executing in the background. You can:
@@ -1353,7 +1402,7 @@ The start hooks may install dependencies, build projects, or perform other setup
 If your task depends on setup being complete, check the log file before proceeding.`;
 async function readReplicasConfigFromDir(dirPath) {
   for (const filename of REPLICAS_CONFIG_FILENAMES) {
-    const configPath = join7(dirPath, filename);
+    const configPath = join8(dirPath, filename);
     if (!existsSync4(configPath)) {
       continue;
     }
@@ -1417,7 +1466,7 @@ var ReplicasConfigService = class {
     const logLine = `[${timestamp}] ${message}
 `;
     try {
-      await mkdir5(join7(homedir5(), ".replicas"), { recursive: true });
+      await mkdir5(join8(homedir5(), ".replicas"), { recursive: true });
       await appendFile2(START_HOOKS_LOG, logLine, "utf-8");
     } catch (error) {
       console.error("Failed to write to start hooks log:", error);
@@ -1441,7 +1490,7 @@ var ReplicasConfigService = class {
     this.hooksRunning = true;
     this.hooksCompleted = false;
     try {
-      await mkdir5(join7(homedir5(), ".replicas"), { recursive: true });
+      await mkdir5(join8(homedir5(), ".replicas"), { recursive: true });
       await writeFile5(
         START_HOOKS_LOG,
         `=== Start Hooks Execution Log ===
@@ -1528,7 +1577,7 @@ Repositories: ${hookEntries.length}
           path: entry.workingDirectory,
           defaultBranch: entry.defaultBranch,
           currentBranch: entry.defaultBranch,
-          prUrl: null,
+          prUrls: [],
           gitDiff: null,
           startHooksCompleted: false
         };
@@ -1593,10 +1642,10 @@ var replicasConfigService = new ReplicasConfigService();
 // src/services/event-service.ts
 import { appendFile as appendFile3, mkdir as mkdir6 } from "fs/promises";
 import { homedir as homedir6 } from "os";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 import { randomUUID } from "crypto";
-var ENGINE_DIR = join8(homedir6(), ".replicas", "engine");
-var EVENTS_FILE = join8(ENGINE_DIR, "events.jsonl");
+var ENGINE_DIR = join9(homedir6(), ".replicas", "engine");
+var EVENTS_FILE = join9(ENGINE_DIR, "events.jsonl");
 var EventService = class {
   subscribers = /* @__PURE__ */ new Map();
   writeChain = Promise.resolve();
@@ -1689,14 +1738,14 @@ var previewService = new PreviewService();
 import { existsSync as existsSync7 } from "fs";
 import { mkdir as mkdir10, readFile as readFile8, rm, writeFile as writeFile8 } from "fs/promises";
 import { homedir as homedir9 } from "os";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import { randomUUID as randomUUID4 } from "crypto";
 
 // src/managers/claude-manager.ts
 import {
   query
 } from "@anthropic-ai/claude-agent-sdk";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 import { mkdir as mkdir8, appendFile as appendFile4 } from "fs/promises";
 import { homedir as homedir7 } from "os";
 
@@ -2412,6 +2461,43 @@ var CodingAgentManager = class {
   }
 };
 
+// src/utils/agent-env.ts
+function buildClaudeAgentEnv(overrides) {
+  const env = { ...process.env };
+  if (overrides) {
+    Object.assign(env, overrides);
+  }
+  if (shouldStripAnthropicApiKey()) {
+    env.ANTHROPIC_API_KEY = void 0;
+  }
+  return env;
+}
+function buildCodexAgentEnv() {
+  const env = {};
+  for (const [key, value] of Object.entries(process.env)) {
+    if (typeof value === "string") {
+      env[key] = value;
+    }
+  }
+  if (shouldStripOpenAIApiKey()) {
+    delete env.OPENAI_API_KEY;
+  }
+  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";
+}
+function shouldStripOpenAIApiKey() {
+  return ENGINE_ENV.REPLICAS_CODEX_AUTH_METHOD === "oauth";
+}
+
 // src/managers/claude-manager.ts
 var PromptStream = class {
   queue = [];
@@ -2467,7 +2553,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
   disallowedToolsOverride;
   constructor(options) {
     super(options);
-    this.historyFile = options.historyFilePath ?? join9(homedir7(), ".replicas", "claude", "history.jsonl");
+    this.historyFile = options.historyFilePath ?? join10(homedir7(), ".replicas", "claude", "history.jsonl");
     this.systemPromptOverride = options.systemPromptOverride;
     this.toolsOverride = options.tools;
     this.mcpServersConfig = options.mcpServers;
@@ -2557,7 +2643,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         preset: "claude_code",
         append: combinedInstructions
       };
-      const queryEnv = this.envOverrides ? { ...process.env, ...this.envOverrides } : process.env;
+      const queryEnv = buildClaudeAgentEnv(this.envOverrides);
       const response = query({
         prompt: promptStream,
         options: {
@@ -2650,7 +2736,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     };
   }
   async initialize() {
-    const historyDir = join9(homedir7(), ".replicas", "claude");
+    const historyDir = join10(homedir7(), ".replicas", "claude");
     await mkdir8(historyDir, { recursive: true });
     if (this.initialSessionId) {
       this.sessionId = this.initialSessionId;
@@ -2704,11 +2790,11 @@ import { Codex } from "@openai/codex-sdk";
 import { randomUUID as randomUUID3 } from "crypto";
 import { readdir as readdir3, stat as stat2, writeFile as writeFile7, mkdir as mkdir9, readFile as readFile7 } from "fs/promises";
 import { existsSync as existsSync6 } from "fs";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 import { homedir as homedir8 } from "os";
 import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
 var DEFAULT_MODEL = "gpt-5.4";
-var CODEX_CONFIG_PATH = join10(homedir8(), ".codex", "config.toml");
+var CODEX_CONFIG_PATH = join11(homedir8(), ".codex", "config.toml");
 function isLinearThoughtEvent2(event) {
   return event.content.type === "thought";
 }
@@ -2729,10 +2815,12 @@ var CodexManager = class extends CodingAgentManager {
   activeAbortController = null;
   constructor(options) {
     super(options);
-    this.codex = new Codex(
-      ENGINE_ENV.OPENAI_API_KEY ? { apiKey: ENGINE_ENV.OPENAI_API_KEY } : void 0
-    );
-    this.tempImageDir = join10(homedir8(), ".replicas", "codex", "temp-images");
+    const codexApiKey = resolveCodexApiKey();
+    this.codex = new Codex({
+      env: buildCodexAgentEnv(),
+      ...codexApiKey ? { apiKey: codexApiKey } : {}
+    });
+    this.tempImageDir = join11(homedir8(), ".replicas", "codex", "temp-images");
     this.initializeManager(this.processMessageInternal.bind(this));
   }
   async initialize() {
@@ -2752,7 +2840,7 @@ var CodexManager = class extends CodingAgentManager {
    */
   async updateCodexConfig(developerInstructions) {
     try {
-      const codexDir = join10(homedir8(), ".codex");
+      const codexDir = join11(homedir8(), ".codex");
       await mkdir9(codexDir, { recursive: true });
       let config = {};
       if (existsSync6(CODEX_CONFIG_PATH)) {
@@ -2788,7 +2876,7 @@ var CodexManager = class extends CodingAgentManager {
     for (const image of images) {
       const ext = image.source.media_type.split("/")[1] || "png";
       const filename = `img_${randomUUID3()}.${ext}`;
-      const filepath = join10(this.tempImageDir, filename);
+      const filepath = join11(this.tempImageDir, filename);
       const buffer = Buffer.from(image.source.data, "base64");
       await writeFile7(filepath, buffer);
       tempPaths.push(filepath);
@@ -2927,13 +3015,13 @@ var CodexManager = class extends CodingAgentManager {
   }
   // Helper methods for finding session files
   async findSessionFile(threadId) {
-    const sessionsDir = join10(homedir8(), ".codex", "sessions");
+    const sessionsDir = join11(homedir8(), ".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 = join10(sessionsDir, String(year), month, day);
+      const todayDir = join11(sessionsDir, String(year), month, day);
       const file = await this.findFileInDirectory(todayDir, threadId);
       if (file) return file;
       for (let daysAgo = 1; daysAgo <= 7; daysAgo++) {
@@ -2942,7 +3030,7 @@ var CodexManager = class extends CodingAgentManager {
         const searchYear = date.getFullYear();
         const searchMonth = String(date.getMonth() + 1).padStart(2, "0");
         const searchDay = String(date.getDate()).padStart(2, "0");
-        const searchDir = join10(sessionsDir, String(searchYear), searchMonth, searchDay);
+        const searchDir = join11(sessionsDir, String(searchYear), searchMonth, searchDay);
         const file2 = await this.findFileInDirectory(searchDir, threadId);
         if (file2) return file2;
       }
@@ -2956,7 +3044,7 @@ var CodexManager = class extends CodingAgentManager {
       const files = await readdir3(directory);
       for (const file of files) {
         if (file.endsWith(".jsonl") && file.includes(threadId)) {
-          const fullPath = join10(directory, file);
+          const fullPath = join11(directory, file);
           const stats = await stat2(fullPath);
           if (stats.isFile()) {
             return fullPath;
@@ -3495,7 +3583,7 @@ function getEnvironmentSection() {
     `Platform: ${process.platform}`,
     getShellInfoLine(),
     `OS Version: ${unameSR}`,
-    `The most recent Claude model family is Claude 4.5/4.6. Model IDs \u2014 Opus 4.6: 'claude-opus-4-6', Sonnet 4.6: 'claude-sonnet-4-6', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.`
+    `The most recent Claude model family is Claude 4.5/4.6/4.7. Model IDs \u2014 Opus 4.7: 'claude-opus-4-7', Sonnet 4.6: 'claude-sonnet-4-6', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.`
   ];
   return [
     `# Environment`,
@@ -3639,11 +3727,11 @@ var DuplicateDefaultChatError = class extends Error {
 };
 
 // src/services/chat/chat-service.ts
-var ENGINE_DIR2 = join11(homedir9(), ".replicas", "engine");
-var CHATS_FILE = join11(ENGINE_DIR2, "chats.json");
-var CLAUDE_HISTORY_DIR = join11(ENGINE_DIR2, "claude-histories");
-var RELAY_HISTORY_DIR = join11(ENGINE_DIR2, "relay-histories");
-var CODEX_AUTH_PATH2 = join11(homedir9(), ".codex", "auth.json");
+var ENGINE_DIR2 = join12(homedir9(), ".replicas", "engine");
+var CHATS_FILE = join12(ENGINE_DIR2, "chats.json");
+var CLAUDE_HISTORY_DIR = join12(ENGINE_DIR2, "claude-histories");
+var RELAY_HISTORY_DIR = join12(ENGINE_DIR2, "relay-histories");
+var CODEX_AUTH_PATH2 = join12(homedir9(), ".codex", "auth.json");
 function isCodexAvailable() {
   return existsSync7(CODEX_AUTH_PATH2) || Boolean(ENGINE_ENV.OPENAI_API_KEY);
 }
@@ -3801,7 +3889,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(join11(dir, `${persisted.id}.jsonl`), { force: true });
+      await rm(join12(dir, `${persisted.id}.jsonl`), { force: true });
     }
   }
   async getChatHistory(chatId) {
@@ -3844,7 +3932,7 @@ var ChatService = class {
     if (persisted.provider === "claude") {
       provider = new ClaudeManager({
         workingDirectory: this.workingDirectory,
-        historyFilePath: join11(CLAUDE_HISTORY_DIR, `${persisted.id}.jsonl`),
+        historyFilePath: join12(CLAUDE_HISTORY_DIR, `${persisted.id}.jsonl`),
         initialSessionId: persisted.providerSessionId,
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
@@ -3853,7 +3941,7 @@ var ChatService = class {
     } else if (persisted.provider === "relay") {
       provider = new RelayManager({
         workingDirectory: this.workingDirectory,
-        historyFilePath: join11(RELAY_HISTORY_DIR, `${persisted.id}.jsonl`),
+        historyFilePath: join12(RELAY_HISTORY_DIR, `${persisted.id}.jsonl`),
         initialSessionId: persisted.providerSessionId,
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
@@ -3874,7 +3962,8 @@ var ChatService = class {
       persisted,
       provider,
       pendingMessageIds: [],
-      hasActiveTurn: false
+      hasActiveTurn: false,
+      observedBranchesByRepo: /* @__PURE__ */ new Map()
     };
   }
   touch(chat) {
@@ -3922,6 +4011,8 @@ var ChatService = class {
       });
     }
     this.touch(chat);
+    this.observeCurrentBranches(chat).catch(() => {
+    });
     this.publish({
       type: "chat.turn.delta",
       payload: {
@@ -3937,7 +4028,7 @@ var ChatService = class {
       return;
     }
     if (!chat.hasActiveTurn) {
-      await this.publishAgentTurnCompleteWebhook();
+      await this.publishAgentTurnCompleteWebhook(chat);
       return;
     }
     chat.hasActiveTurn = false;
@@ -3950,7 +4041,7 @@ var ChatService = class {
       }
     }).catch(() => {
     });
-    await this.publishAgentTurnCompleteWebhook();
+    await this.publishAgentTurnCompleteWebhook(chat);
   }
   getRuntimeChat(chatId) {
     return this.chats.get(chatId) ?? null;
@@ -3986,15 +4077,31 @@ var ChatService = class {
     };
     await eventService.publish(event);
   }
-  async publishAgentTurnCompleteWebhook() {
+  async observeCurrentBranches(chat) {
+    try {
+      const snapshot = await gitService.snapshotCurrentBranches();
+      for (const [repoName, branch] of snapshot) {
+        let observed = chat.observedBranchesByRepo.get(repoName);
+        if (!observed) {
+          observed = /* @__PURE__ */ new Set();
+          chat.observedBranchesByRepo.set(repoName, observed);
+        }
+        observed.add(branch);
+      }
+    } catch {
+    }
+  }
+  async publishAgentTurnCompleteWebhook(chat) {
     try {
       await githubTokenManager.refreshOnce();
     } catch {
     }
     const linearSessionId = ENGINE_ENV.LINEAR_SESSION_ID;
+    const observedBranches = chat.observedBranchesByRepo;
+    chat.observedBranchesByRepo = /* @__PURE__ */ new Map();
     let repoStatuses;
     try {
-      repoStatuses = await gitService.refreshRepos();
+      repoStatuses = await gitService.refreshRepos(observedBranches);
       console.log(`Repository Statuses Refreshed: `, repoStatuses);
     } catch (error) {
       console.error("[ChatService] Failed to refresh repo statuses:", error);
@@ -4012,15 +4119,15 @@ var ChatService = class {
 import { Hono } from "hono";
 import { z as z2 } from "zod";
 import { readdir as readdir6, stat as stat3, readFile as readFile12 } from "fs/promises";
-import { join as join15, resolve } from "path";
+import { join as join16, resolve } from "path";
 
 // src/services/plan-service.ts
 import { readdir as readdir4, readFile as readFile9 } from "fs/promises";
 import { homedir as homedir10 } from "os";
-import { basename, join as join12 } from "path";
+import { basename, join as join13 } from "path";
 var PLAN_DIRECTORIES = [
-  join12(homedir10(), ".claude", "plans"),
-  join12(homedir10(), ".replicas", "plans")
+  join13(homedir10(), ".claude", "plans"),
+  join13(homedir10(), ".replicas", "plans")
 ];
 function isMarkdownFile(filename) {
   return filename.toLowerCase().endsWith(".md");
@@ -4054,7 +4161,7 @@ var PlanService = class {
       return null;
     }
     for (const directory of PLAN_DIRECTORIES) {
-      const filePath = join12(directory, safeFilename);
+      const filePath = join13(directory, safeFilename);
       try {
         const content = await readFile9(filePath, "utf-8");
         return { filename: safeFilename, content };
@@ -4071,13 +4178,13 @@ import { execFile as execFile2 } from "child_process";
 import { promisify as promisify3 } from "util";
 import { readFile as readFile11 } from "fs/promises";
 import { existsSync as existsSync8 } from "fs";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 
 // src/services/warm-hook-logs-service.ts
 import { createHash as createHash2 } from "crypto";
 import { mkdir as mkdir11, readFile as readFile10, writeFile as writeFile9, readdir as readdir5 } from "fs/promises";
-import { join as join13 } from "path";
-var LOGS_DIR2 = join13(SANDBOX_PATHS.REPLICAS_DIR, "warm-hook-logs");
+import { join as join14 } from "path";
+var LOGS_DIR2 = join14(SANDBOX_PATHS.REPLICAS_DIR, "warm-hook-logs");
 function sanitizeFilename2(name) {
   const safe = name.replace(/[^a-zA-Z0-9._-]/g, "_");
   const hash = createHash2("sha256").update(name).digest("hex").slice(0, 8);
@@ -4104,7 +4211,7 @@ var WarmHookLogsService = class {
       hookName: "organization",
       ...entry
     };
-    await writeFile9(join13(LOGS_DIR2, globalFilename()), `${JSON.stringify(log, null, 2)}
+    await writeFile9(join14(LOGS_DIR2, globalFilename()), `${JSON.stringify(log, null, 2)}
 `, "utf-8");
   }
   async saveRepoHookLog(repoName, entry) {
@@ -4114,7 +4221,7 @@ var WarmHookLogsService = class {
       hookName: repoName,
       ...entry
     };
-    await writeFile9(join13(LOGS_DIR2, repoFilename2(repoName)), `${JSON.stringify(log, null, 2)}
+    await writeFile9(join14(LOGS_DIR2, repoFilename2(repoName)), `${JSON.stringify(log, null, 2)}
 `, "utf-8");
   }
   async getAllLogs() {
@@ -4133,7 +4240,7 @@ var WarmHookLogsService = class {
         continue;
       }
       try {
-        const raw = await readFile10(join13(LOGS_DIR2, file), "utf-8");
+        const raw = await readFile10(join14(LOGS_DIR2, file), "utf-8");
         const stored = JSON.parse(raw);
         logs.push(withPreview2(stored));
       } catch {
@@ -4150,7 +4257,7 @@ var WarmHookLogsService = class {
   async getFullOutput(hookType, hookName) {
     const filename = hookType === "global" ? globalFilename() : repoFilename2(hookName);
     try {
-      const raw = await readFile10(join13(LOGS_DIR2, filename), "utf-8");
+      const raw = await readFile10(join14(LOGS_DIR2, filename), "utf-8");
       const stored = JSON.parse(raw);
       if (stored.hookType !== hookType || stored.hookName !== hookName) {
         return null;
@@ -4197,7 +4304,7 @@ async function executeHookScript(params) {
 }
 async function readRepoWarmHook(repoPath) {
   for (const filename of REPLICAS_CONFIG_FILENAMES) {
-    const configPath = join14(repoPath, filename);
+    const configPath = join15(repoPath, filename);
     if (!existsSync8(configPath)) {
       continue;
     }
@@ -4724,7 +4831,7 @@ function createV1Routes(deps) {
       const logFiles = files.filter((f) => f.endsWith(".log"));
       const sessions = await Promise.all(
         logFiles.map(async (filename) => {
-          const filePath = join15(LOG_DIR, filename);
+          const filePath = join16(LOG_DIR, filename);
           const fileStat = await stat3(filePath);
           const sessionId = filename.replace(/\.log$/, "");
           return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-engine",
-  "version": "0.1.118",
+  "version": "0.1.120",
   "description": "Lightweight API server for Replicas workspaces",
   "type": "module",
   "main": "dist/src/index.js",