overlord-cli 0.2608131824.0 → 0.2608132027.0

package/dist/index.js

@@ -63,6 +63,10 @@ var init_redact_secrets = __esm({
 });
 
 // src/errors.ts
+function isUnlinkableExecutionRequestError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("invalid_execution_request_transition");
+}
 function formatCliError(error) {
   if (error instanceof CliError) {
     return redactSecrets(error.message);
@@ -16527,6 +16531,31 @@ var init_dist2 = __esm({
   }
 });
 
+// ../packages/core/dist/service/latch-environment.js
+function isUtf8Locale(value) {
+  return typeof value === "string" && UTF8_LOCALE_PATTERN.test(value);
+}
+function latchChildEnvironment({ baseEnv = process.env, platform: platform2 = process.platform } = {}) {
+  const effective = baseEnv.LC_ALL ?? baseEnv.LC_CTYPE ?? baseEnv.LANG;
+  if (isUtf8Locale(effective))
+    return { ...baseEnv };
+  const env = {
+    ...baseEnv,
+    // macOS ships the bare `UTF-8` locale; glibc systems ship `C.UTF-8`.
+    LC_CTYPE: platform2 === "darwin" ? "UTF-8" : "C.UTF-8"
+  };
+  if (env.LC_ALL !== void 0 && !isUtf8Locale(env.LC_ALL))
+    delete env.LC_ALL;
+  return env;
+}
+var UTF8_LOCALE_PATTERN;
+var init_latch_environment = __esm({
+  "../packages/core/dist/service/latch-environment.js"() {
+    "use strict";
+    UTF8_LOCALE_PATTERN = /utf-?8/i;
+  }
+});
+
 // ../packages/core/dist/service/latch-launch.js
 function trimmed(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
@@ -16553,7 +16582,7 @@ function buildLatchCreateManifest({ commandString, shell = process.env.SHELL?.tr
   return {
     format_version: LATCH_MANIFEST_FORMAT_VERSION,
     launch: {
-      argv: [shellPath, "-lc", commandString],
+      argv: [shellPath, "-ilc", commandString],
       cwd,
       env: cleanedEnv,
       inherit_env: true,
@@ -16658,7 +16687,8 @@ function runLatchJson({ executable, args }) {
     encoding: "utf8",
     shell: false,
     timeout: 1e4,
-    maxBuffer: 1024 * 1024
+    maxBuffer: 1024 * 1024,
+    env: latchChildEnvironment()
   });
   if (result.error) {
     throw new LatchSessionCommandError(result.error.message);
@@ -16738,6 +16768,7 @@ var LatchSessionCommandError;
 var init_latch_session = __esm({
   "../packages/core/dist/service/latch-session.js"() {
     "use strict";
+    init_latch_environment();
     init_latch_launch();
     LatchSessionCommandError = class extends Error {
       constructor(message) {
@@ -16838,7 +16869,8 @@ async function collectLatchEvents({ executable = "latch", providerSessionId, fro
   const bin = trimmed3(executable) ?? "latch";
   return new Promise((resolve, reject) => {
     const child = spawn3(bin, ["events", sessionId, "--json", "--from", String(fromCursor)], {
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      env: latchChildEnvironment()
     });
     let stdout = "";
     let stderr = "";
@@ -16894,7 +16926,7 @@ async function collectLatchEvents({ executable = "latch", providerSessionId, fro
         finish({ ended: true, error: new LatchSessionCommandError(detail) });
         return;
       }
-      finish({ ended: signal == null && (code === 0 || code === null) });
+      finish({ ended: signal === null && (code === 0 || code === null) });
     });
   });
 }
@@ -16902,6 +16934,7 @@ var HARNESS_EVENT_TYPES;
 var init_latch_events = __esm({
   "../packages/core/dist/service/latch-events.js"() {
     "use strict";
+    init_latch_environment();
     init_latch_session();
     HARNESS_EVENT_TYPES = /* @__PURE__ */ new Set([
       "user_message",
@@ -17547,6 +17580,7 @@ var SUPPORTED_LATCH_PROTOCOL_VERSION, REQUIRED_LATCH_CAPABILITIES, LATCH_STANDAL
 var init_latch_discovery = __esm({
   "../packages/core/dist/service/latch-discovery.js"() {
     "use strict";
+    init_latch_environment();
     init_terminal_profile_types2();
     SUPPORTED_LATCH_PROTOCOL_VERSION = 1;
     REQUIRED_LATCH_CAPABILITIES = ["create"];
@@ -17557,7 +17591,8 @@ var init_latch_discovery = __esm({
         const stdout = execFileSync3(executable, argv, {
           encoding: "utf8",
           stdio: ["ignore", "pipe", "pipe"],
-          timeout: 5e3
+          timeout: 5e3,
+          env: latchChildEnvironment()
         });
         return { status: 0, stdout: String(stdout), stderr: "" };
       } catch (error) {
@@ -17594,7 +17629,8 @@ function probeLatchInteractionCapabilities({ executable = "latch", providerSessi
   const help = spawnSync3(bin, ["send", "--help"], {
     encoding: "utf8",
     shell: false,
-    timeout: 5e3
+    timeout: 5e3,
+    env: latchChildEnvironment()
   });
   if (help.error || help.status !== 0) {
     const detail = (help.stderr || help.stdout || help.error?.message || "latch send is unavailable").trim().slice(0, 200);
@@ -17637,7 +17673,8 @@ function resolveLatchInput({ executable = "latch", providerSessionId, requestId,
     encoding: "utf8",
     shell: false,
     timeout: 1e4,
-    maxBuffer: 1024 * 1024
+    maxBuffer: 1024 * 1024,
+    env: latchChildEnvironment()
   });
   if (result.error)
     throw new LatchSessionCommandError(result.error.message);
@@ -17655,6 +17692,7 @@ function resolveLatchInput({ executable = "latch", providerSessionId, requestId,
 var init_latch_send = __esm({
   "../packages/core/dist/service/latch-send.js"() {
     "use strict";
+    init_latch_environment();
     init_latch_session();
   }
 });
@@ -19089,7 +19127,7 @@ function spawnLatchJson({
   const result = spawnSync4(executable, args, {
     encoding: "utf8",
     input: stdin,
-    env: process.env,
+    env: latchChildEnvironment(),
     maxBuffer: 2 * 1024 * 1024
   });
   return {
@@ -19176,6 +19214,7 @@ function openLatchViewer({
 var init_latch_launch2 = __esm({
   "src/latch-launch.ts"() {
     "use strict";
+    init_latch_environment();
     init_latch_launch();
     init_terminal_profile_types2();
   }
@@ -19884,7 +19923,7 @@ async function launchAgent({
   }) : null;
   if (existingProviderSession && plan.latchCommandString) {
     const shell = process.env.SHELL?.trim() || "/bin/bash";
-    const result2 = spawnSync5(shell, ["-lc", plan.latchCommandString], {
+    const result2 = spawnSync5(shell, ["-ilc", plan.latchCommandString], {
       cwd: options.workingDirectory,
       env,
       stdio: "inherit"
@@ -19894,7 +19933,7 @@ async function launchAgent({
         ...plan,
         execution: {
           command: shell,
-          args: ["-lc", plan.latchCommandString],
+          args: ["-ilc", plan.latchCommandString],
           useShell: false,
           terminal: null,
           display: `Latch session ${existingProviderSession.providerSessionId} (inline) \u203A ${plan.latchCommandString}`
@@ -21400,6 +21439,11 @@ var init_vcs = __esm({
 // src/record-touched.ts
 import { readFileSync as readFileSync20 } from "node:fs";
 import path29 from "node:path";
+function firstNonEmptyString(value) {
+  if (typeof value !== "string") return null;
+  const trimmed7 = value.trim();
+  return trimmed7 ? trimmed7 : null;
+}
 function collectCandidates(toolInput) {
   const counts = /* @__PURE__ */ new Map();
   const order = [];
@@ -21411,22 +21455,43 @@ function collectCandidates(toolInput) {
     counts.set(trimmed7, (counts.get(trimmed7) ?? 0) + amount);
   };
   bump(toolInput.file_path, 1);
+  bump(toolInput.filePath, 1);
+  bump(toolInput.path, 1);
   bump(toolInput.notebook_path, 1);
   const edits = toolInput.edits;
   if (Array.isArray(edits)) {
-    const topLevelPath = toolInput.file_path;
-    if (typeof topLevelPath === "string" && topLevelPath.trim()) {
-      counts.set(topLevelPath.trim(), (counts.get(topLevelPath.trim()) ?? 0) - 1);
+    const topLevelPath = firstNonEmptyString(toolInput.file_path) ?? firstNonEmptyString(toolInput.filePath) ?? firstNonEmptyString(toolInput.path);
+    if (topLevelPath) {
+      counts.set(topLevelPath, (counts.get(topLevelPath) ?? 0) - 1);
     }
     for (const edit of edits) {
       if (edit && typeof edit === "object") {
-        const value = edit.file_path ?? topLevelPath;
+        const record = edit;
+        const value = record.file_path ?? record.filePath ?? record.path ?? topLevelPath;
         bump(value, 1);
       }
     }
   }
   return order.map((filePath) => ({ filePath, editCount: Math.max(counts.get(filePath) ?? 1, 1) }));
 }
+function resolveHookWorkingDirectory({
+  payload,
+  fallbackCwd,
+  env
+}) {
+  const fromCwd = firstNonEmptyString(payload.cwd);
+  if (fromCwd) return path29.resolve(fromCwd);
+  const roots = payload.workspace_roots;
+  if (Array.isArray(roots)) {
+    const fromRoots = firstNonEmptyString(roots[0]);
+    if (fromRoots) return path29.resolve(fromRoots);
+  }
+  for (const key of PROJECT_DIR_ENV_KEYS) {
+    const fromEnv = firstNonEmptyString(env[key]);
+    if (fromEnv) return path29.resolve(fromEnv);
+  }
+  return path29.resolve(fallbackCwd);
+}
 function compact(value, limit = 500) {
   if (typeof value !== "string") return null;
   const text = value.split(/\s+/).filter(Boolean).join(" ");
@@ -21486,7 +21551,8 @@ function recentAssistantContext(transcriptPath) {
 function recordTouchedFromPayload({
   rawPayload,
   missionOverride,
-  fallbackCwd
+  fallbackCwd,
+  env = process.env
 }) {
   let payload;
   try {
@@ -21497,8 +21563,7 @@ function recordTouchedFromPayload({
   const toolInputRaw = payload.tool_input;
   const toolInput = toolInputRaw && typeof toolInputRaw === "object" ? toolInputRaw : {};
   const toolName = typeof payload.tool_name === "string" && payload.tool_name.trim() ? payload.tool_name.trim() : "file edit";
-  const cwd = typeof payload.cwd === "string" && payload.cwd.trim() ? payload.cwd.trim() : fallbackCwd;
-  const workingDirectory = path29.resolve(cwd);
+  const workingDirectory = resolveHookWorkingDirectory({ payload, fallbackCwd, env });
   const trimmedOverride = missionOverride?.trim();
   let missionId;
   let ambiguous = false;
@@ -21507,7 +21572,10 @@ function recordTouchedFromPayload({
   } else {
     const resolved = resolveActiveMissionForCwd(workingDirectory);
     if (!resolved) {
-      return { recorded: false, reason: "no active session manifest entry for this cwd" };
+      return {
+        recorded: false,
+        reason: `no active session manifest entry for this cwd (${workingDirectory})`
+      };
     }
     missionId = resolved.missionId;
     ambiguous = resolved.ambiguous;
@@ -21538,11 +21606,17 @@ function recordTouchedFromPayload({
   });
   return { recorded: true, missionId, ambiguous, files: candidates.length };
 }
+var PROJECT_DIR_ENV_KEYS;
 var init_record_touched = __esm({
   "src/record-touched.ts"() {
     "use strict";
     init_vcs();
     init_vcs_sessions();
+    PROJECT_DIR_ENV_KEYS = [
+      "CURSOR_PROJECT_DIR",
+      "CLAUDE_PROJECT_DIR",
+      "CLAUDE_PROJECT_ROOT"
+    ];
   }
 });
 
@@ -22711,10 +22785,24 @@ async function runProtocolCommand({
       workingDirectory
     })
   };
-  const result = await runtime.backend.post({
-    path: `/api/protocol/${encodeURIComponent(subcommand)}`,
-    body: protocolBody
-  });
+  const protocolPath = `/api/protocol/${encodeURIComponent(subcommand)}`;
+  let result;
+  try {
+    result = await runtime.backend.post({
+      path: protocolPath,
+      body: protocolBody
+    });
+  } catch (error) {
+    if (subcommand === "attach" && typeof flags["--execution-request-id"] === "string" && isUnlinkableExecutionRequestError(error)) {
+      delete flags["--execution-request-id"];
+      result = await runtime.backend.post({
+        path: protocolPath,
+        body: { ...protocolBody, flags }
+      });
+    } else {
+      throw error;
+    }
+  }
   if ((subcommand === "attach" || subcommand === "resume-follow-up") && missionId) {
     writeBaseline({
       workingDirectory,
@@ -22768,7 +22856,7 @@ async function runProtocolCommand({
       )
     );
     if (connectorInstallsEditHook && !hasTouchedFilesLog({ workingDirectory, missionId }) && readChangedFiles(workingDirectory).length > 0) {
-      const warning = `[overlord] warning: no touched-files log found at deliver for mission ${missionId} in ${workingDirectory}, even though this connector installs a PostToolUse edit hook. Deliver is falling back to baseline-only attribution, which can misattribute concurrent sessions' edits. Check ~/.ovld/logs/post-tool-use-hook.log for why the hook did not record any touched files.`;
+      const warning = `[overlord] warning: no touched-files log found at deliver for mission ${missionId} in ${workingDirectory}, even though this connector installs a PostToolUse edit hook. Deliver is falling back to baseline-only attribution, which can misattribute concurrent sessions' edits. Check ~/.ovld/logs/cursor-post-tool-use-hook.log and ~/.ovld/logs/post-tool-use-hook.log for why the hook did not record any touched files.`;
       console.error(warning);
       const sessionKeyForAlert = typeof flags["--session-key"] === "string" ? flags["--session-key"] : void 0;
       if (sessionKeyForAlert) {