overlord-cli 0.2608131824.0 → 0.2608141252.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,12 +16531,113 @@ var init_dist2 = __esm({
   }
 });
 
-// ../packages/core/dist/service/latch-launch.js
+// ../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/terminal-profile-types.js
+function parseViewerOpenAs(value) {
+  return typeof value === "string" && value.trim().toLowerCase() === "tab" ? "tab" : DEFAULT_VIEWER_OPEN_AS;
+}
 function trimmed(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
+function viewerKindForLauncher(launcher) {
+  const value = trimmed(launcher);
+  if (!value)
+    return "inline";
+  const lowered = value.toLowerCase();
+  if (lowered === "iterm2" || lowered === "iterm")
+    return "iterm";
+  if (lowered === "terminal")
+    return "terminal";
+  return "custom";
+}
+function normalizeExecutionProvider(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return null;
+  const cast = value;
+  const kind = trimmed(cast.kind)?.toLowerCase() === "latch" ? "latch" : "direct";
+  return {
+    kind,
+    executable: trimmed(cast.executable) ?? DEFAULT_LATCH_EXECUTABLE
+  };
+}
+function launchSessionSnapshotFromMetadata(metadata) {
+  const raw = metadata?.[LAUNCH_SESSION_METADATA_KEY];
+  if (!raw || typeof raw !== "object" || Array.isArray(raw))
+    return null;
+  const cast = raw;
+  if (cast.version !== TERMINAL_PROFILE_VERSION)
+    return null;
+  const viewer = cast.viewer && typeof cast.viewer === "object" && !Array.isArray(cast.viewer) ? cast.viewer : null;
+  const launcher = trimmed(viewer?.launcher);
+  const source = (value) => trimmed(value) === "target" ? "target" : "user_default";
+  return {
+    version: TERMINAL_PROFILE_VERSION,
+    executionProvider: normalizeExecutionProvider(cast.executionProvider) ?? {
+      ...DEFAULT_EXECUTION_PROVIDER
+    },
+    viewer: {
+      kind: trimmed(viewer?.kind) ? trimmed(viewer?.kind) : viewerKindForLauncher(launcher),
+      launcher,
+      openOnLaunch: viewer?.openOnLaunch !== false,
+      // A snapshot frozen before `openAs` existed carries none; `window` is what
+      // those runs actually did, so the absent case must not become `tab`.
+      openAs: parseViewerOpenAs(viewer?.openAs)
+    },
+    executionProviderSource: source(cast.executionProviderSource),
+    viewerOpenSource: source(cast.viewerOpenSource),
+    resolvedAt: trimmed(cast.resolvedAt) ?? ""
+  };
+}
+var DEFAULT_VIEWER_OPEN_AS, TERMINAL_PROFILE_VERSION, DEFAULT_LATCH_EXECUTABLE, DEFAULT_EXECUTION_PROVIDER, DEFAULT_OPEN_VIEWER_ON_LAUNCH, DEFAULT_LAUNCH_SESSION_DEFAULTS, LAUNCH_SESSION_METADATA_KEY;
+var init_terminal_profile_types2 = __esm({
+  "../packages/core/dist/service/terminal-profile-types.js"() {
+    "use strict";
+    DEFAULT_VIEWER_OPEN_AS = "window";
+    TERMINAL_PROFILE_VERSION = 1;
+    DEFAULT_LATCH_EXECUTABLE = "latch";
+    DEFAULT_EXECUTION_PROVIDER = {
+      kind: "direct",
+      executable: DEFAULT_LATCH_EXECUTABLE
+    };
+    DEFAULT_OPEN_VIEWER_ON_LAUNCH = true;
+    DEFAULT_LAUNCH_SESSION_DEFAULTS = {
+      executionProvider: { ...DEFAULT_EXECUTION_PROVIDER },
+      openViewerOnLaunch: DEFAULT_OPEN_VIEWER_ON_LAUNCH
+    };
+    LAUNCH_SESSION_METADATA_KEY = "launchSession";
+  }
+});
+
+// ../packages/core/dist/service/latch-launch.js
+function trimmed2(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
 function buildLatchCreateManifest({ commandString, shell = process.env.SHELL?.trim() || "/bin/bash", cwd, env, size = DEFAULT_LATCH_TERMINAL_SIZE, title, name, commandLabel, externalRunId }) {
-  const shellPath = trimmed(shell) ?? "/bin/bash";
+  const shellPath = trimmed2(shell) ?? "/bin/bash";
   const cleanedEnv = {};
   for (const [key, value] of Object.entries(env)) {
     if (key.trim() && typeof value === "string")
@@ -16541,19 +16646,19 @@ function buildLatchCreateManifest({ commandString, shell = process.env.SHELL?.tr
   const display = {
     source: {
       kind: "overlord",
-      ...trimmed(externalRunId) ? { external_run_id: trimmed(externalRunId) } : {}
+      ...trimmed2(externalRunId) ? { external_run_id: trimmed2(externalRunId) } : {}
     }
   };
-  if (trimmed(title))
-    display.title = trimmed(title);
-  if (trimmed(name))
-    display.name = trimmed(name);
-  if (trimmed(commandLabel))
-    display.command_label = trimmed(commandLabel);
+  if (trimmed2(title))
+    display.title = trimmed2(title);
+  if (trimmed2(name))
+    display.name = trimmed2(name);
+  if (trimmed2(commandLabel))
+    display.command_label = trimmed2(commandLabel);
   return {
     format_version: LATCH_MANIFEST_FORMAT_VERSION,
     launch: {
-      argv: [shellPath, "-lc", commandString],
+      argv: [shellPath, "-ilc", commandString],
       cwd,
       env: cleanedEnv,
       inherit_env: true,
@@ -16568,7 +16673,7 @@ function buildLatchCreateManifest({ commandString, shell = process.env.SHELL?.tr
 function parseLatchCreateReport(raw) {
   try {
     const parsed = JSON.parse(raw);
-    const id = trimmed(parsed.session?.id);
+    const id = trimmed2(parsed.session?.id);
     if (!id)
       return null;
     const protocolVersion = typeof parsed.protocolVersion === "number" && Number.isFinite(parsed.protocolVersion) ? parsed.protocolVersion : LATCH_MANIFEST_FORMAT_VERSION;
@@ -16576,9 +16681,9 @@ function parseLatchCreateReport(raw) {
       protocolVersion,
       session: {
         id,
-        name: trimmed(parsed.session?.name) ?? id,
-        state: trimmed(parsed.session?.state) ?? "running",
-        createdAt: trimmed(parsed.session?.createdAt) ?? (/* @__PURE__ */ new Date()).toISOString()
+        name: trimmed2(parsed.session?.name) ?? id,
+        state: trimmed2(parsed.session?.state) ?? "running",
+        createdAt: trimmed2(parsed.session?.createdAt) ?? (/* @__PURE__ */ new Date()).toISOString()
       }
     };
   } catch {
@@ -16590,28 +16695,28 @@ function toExecutionProviderSession({ createReport, executionTargetId, createdAt
     provider: "latch",
     providerSessionId: createReport.session.id,
     sessionName: createReport.session.name,
-    executionTargetId: trimmed(executionTargetId),
+    executionTargetId: trimmed2(executionTargetId),
     agentSessionId: null,
     createdAt: createdAt ?? createReport.session.createdAt,
     lastObservedState: createReport.session.state
   };
 }
 function existingLatchProviderSession({ latchSessionId, executionTargetId, createdAt = (/* @__PURE__ */ new Date()).toISOString() }) {
-  const providerSessionId = trimmed(latchSessionId);
+  const providerSessionId = trimmed2(latchSessionId);
   if (!providerSessionId)
     return null;
   return {
     provider: "latch",
     providerSessionId,
     sessionName: null,
-    executionTargetId: trimmed(executionTargetId),
+    executionTargetId: trimmed2(executionTargetId),
     agentSessionId: null,
     createdAt,
     lastObservedState: "running"
   };
 }
 function latchViewerFlagForKind(kind) {
-  switch (trimmed(kind)?.toLowerCase()) {
+  switch (trimmed2(kind)?.toLowerCase()) {
     case "iterm":
     case "iterm2":
       return "iterm";
@@ -16619,28 +16724,59 @@ function latchViewerFlagForKind(kind) {
       return null;
   }
 }
+function compareLatchProductVersions(a, b) {
+  const parts = (value) => value.trim().split(".").map((segment) => {
+    const parsed = Number.parseInt(segment, 10);
+    return Number.isFinite(parsed) ? parsed : 0;
+  });
+  const left = parts(a);
+  const right = parts(b);
+  const length = Math.max(left.length, right.length);
+  for (let index = 0; index < length; index += 1) {
+    const diff = (left[index] ?? 0) - (right[index] ?? 0);
+    if (diff !== 0)
+      return diff;
+  }
+  return 0;
+}
+function latchSupportsOpenAs(productVersion) {
+  const version = trimmed2(productVersion);
+  if (!version)
+    return false;
+  return compareLatchProductVersions(version, LATCH_OPEN_AS_MIN_PRODUCT_VERSION) >= 0;
+}
+function buildLatchOpenArgs({ providerSessionId, viewer, openAs, productVersion }) {
+  const args = ["open", providerSessionId, "--with", viewer];
+  if (openAs && latchSupportsOpenAs(productVersion)) {
+    args.push("--as", parseViewerOpenAs(openAs));
+  }
+  args.push("--json");
+  return args;
+}
 function latchAttachCommand({ executable = "latch", providerSessionId }) {
-  return `${trimmed(executable) ?? "latch"} attach ${providerSessionId}`;
+  return `${trimmed2(executable) ?? "latch"} attach ${providerSessionId}`;
 }
 function shouldUseLatchProvider({ providerKind, latchSelectable }) {
-  return trimmed(providerKind)?.toLowerCase() === "latch" && latchSelectable === true;
+  return trimmed2(providerKind)?.toLowerCase() === "latch" && latchSelectable === true;
 }
-var LATCH_MANIFEST_FORMAT_VERSION, DEFAULT_LATCH_TERMINAL_SIZE;
+var LATCH_MANIFEST_FORMAT_VERSION, DEFAULT_LATCH_TERMINAL_SIZE, LATCH_OPEN_AS_MIN_PRODUCT_VERSION;
 var init_latch_launch = __esm({
   "../packages/core/dist/service/latch-launch.js"() {
     "use strict";
+    init_terminal_profile_types2();
     LATCH_MANIFEST_FORMAT_VERSION = 1;
     DEFAULT_LATCH_TERMINAL_SIZE = { cols: 120, rows: 36 };
+    LATCH_OPEN_AS_MIN_PRODUCT_VERSION = "0.2608140931.0";
   }
 });
 
 // ../packages/core/dist/service/latch-session.js
 import { spawnSync as spawnSync2 } from "node:child_process";
-function trimmed2(value) {
+function trimmed3(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function parseState(value) {
-  switch (trimmed2(value)) {
+  switch (trimmed3(value)) {
     case "running":
       return "running";
     case "exited":
@@ -16658,7 +16794,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);
@@ -16678,11 +16815,11 @@ function runLatchJson({ executable, args }) {
   }
 }
 function inspectLatchSession({ executable = "latch", providerSessionId }) {
-  const sessionId = trimmed2(providerSessionId);
+  const sessionId = trimmed3(providerSessionId);
   if (!sessionId)
     throw new LatchSessionCommandError("A Latch session id is required.");
   const report = runLatchJson({
-    executable: trimmed2(executable) ?? "latch",
+    executable: trimmed3(executable) ?? "latch",
     args: ["inspect", sessionId, "--json"]
   });
   const state = parseState(report.state);
@@ -16690,47 +16827,61 @@ function inspectLatchSession({ executable = "latch", providerSessionId }) {
     throw new LatchSessionCommandError("Latch returned an unsupported session state.");
   const exit = report.exit && typeof report.exit === "object" && !Array.isArray(report.exit) ? report.exit : null;
   return {
-    providerSessionId: trimmed2(report.id) ?? sessionId,
-    name: trimmed2(report.name) ?? sessionId,
+    providerSessionId: trimmed3(report.id) ?? sessionId,
+    name: trimmed3(report.name) ?? sessionId,
     state,
     exitCode: typeof exit?.code === "number" && Number.isFinite(exit.code) ? exit.code : null,
     inspectedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
 }
-function openLatchSession({ executable = "latch", providerSessionId, viewerKind }) {
-  const sessionId = trimmed2(providerSessionId);
+function readLatchProductVersion(executable) {
+  try {
+    return trimmed3(runLatchJson({ executable, args: ["capabilities", "--json"] }).productVersion);
+  } catch {
+    return null;
+  }
+}
+function openLatchSession({ executable = "latch", providerSessionId, viewerKind, openAs }) {
+  const sessionId = trimmed3(providerSessionId);
   if (!sessionId)
     throw new LatchSessionCommandError("A Latch session id is required.");
   const viewer = latchViewerFlagForKind(viewerKind);
   if (!viewer) {
     throw new LatchSessionCommandError(`Latch cannot open the configured viewer "${viewerKind}".`);
   }
+  const exe = trimmed3(executable) ?? "latch";
   const report = runLatchJson({
-    executable: trimmed2(executable) ?? "latch",
-    args: ["open", sessionId, "--with", viewer, "--json"]
+    executable: exe,
+    args: buildLatchOpenArgs({
+      providerSessionId: sessionId,
+      viewer,
+      openAs,
+      productVersion: openAs ? readLatchProductVersion(exe) : null
+    })
   });
   if (report.opened !== true) {
     throw new LatchSessionCommandError(`Latch did not open the ${viewer} viewer.`);
   }
   return {
-    providerSessionId: trimmed2(report.id) ?? sessionId,
-    viewer: trimmed2(report.viewer) ?? viewer,
-    opened: true
+    providerSessionId: trimmed3(report.id) ?? sessionId,
+    viewer: trimmed3(report.viewer) ?? viewer,
+    opened: true,
+    behavior: trimmed3(report.behavior) ? parseViewerOpenAs(report.behavior) : null
   };
 }
 function stopLatchSession({ executable = "latch", providerSessionId }) {
-  const sessionId = trimmed2(providerSessionId);
+  const sessionId = trimmed3(providerSessionId);
   if (!sessionId)
     throw new LatchSessionCommandError("A Latch session id is required.");
   const report = runLatchJson({
-    executable: trimmed2(executable) ?? "latch",
+    executable: trimmed3(executable) ?? "latch",
     args: ["stop", sessionId, "--json"]
   });
   const state = parseState(report.state);
   if (!state)
     throw new LatchSessionCommandError("Latch returned an unsupported session state.");
   return {
-    providerSessionId: trimmed2(report.id) ?? sessionId,
+    providerSessionId: trimmed3(report.id) ?? sessionId,
     state
   };
 }
@@ -16738,7 +16889,9 @@ var LatchSessionCommandError;
 var init_latch_session = __esm({
   "../packages/core/dist/service/latch-session.js"() {
     "use strict";
+    init_latch_environment();
     init_latch_launch();
+    init_terminal_profile_types2();
     LatchSessionCommandError = class extends Error {
       constructor(message) {
         super(message);
@@ -16750,17 +16903,17 @@ var init_latch_session = __esm({
 
 // ../packages/core/dist/service/latch-events.js
 import { spawn as spawn3 } from "node:child_process";
-function trimmed3(value) {
+function trimmed4(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function parseHarnessEvent(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return null;
   const row = value;
-  const type = trimmed3(row.type);
-  const sessionId = trimmed3(row.sessionId);
-  const at = trimmed3(row.at);
-  const harnessVersion = trimmed3(row.harnessVersion);
+  const type = trimmed4(row.type);
+  const sessionId = trimmed4(row.sessionId);
+  const at = trimmed4(row.at);
+  const harnessVersion = trimmed4(row.harnessVersion);
   const connectorEpoch = typeof row.connectorEpoch === "number" && Number.isFinite(row.connectorEpoch) ? row.connectorEpoch : null;
   if (!type || !HARNESS_EVENT_TYPES.has(type) || !sessionId || !at || !harnessVersion)
     return null;
@@ -16771,26 +16924,26 @@ function parseHarnessEvent(value) {
     case "user_message":
     case "assistant_delta":
     case "assistant_message": {
-      const text = trimmed3(row.text);
+      const text = trimmed4(row.text);
       if (!text)
         return null;
       return { ...base, type, text };
     }
     case "tool_started": {
-      const tool = trimmed3(row.tool);
+      const tool = trimmed4(row.tool);
       if (!tool)
         return null;
       return { ...base, type, tool, input: row.input };
     }
     case "tool_finished": {
-      const tool = trimmed3(row.tool);
+      const tool = trimmed4(row.tool);
       if (!tool)
         return null;
       return { ...base, type, tool, output: row.output };
     }
     case "awaiting_input": {
-      const requestId = trimmed3(row.requestId);
-      const kind = trimmed3(row.kind);
+      const requestId = trimmed4(row.requestId);
+      const kind = trimmed4(row.kind);
       const prompt = typeof row.prompt === "string" ? row.prompt : null;
       if (!requestId || kind !== "permission" && kind !== "question" || prompt === null) {
         return null;
@@ -16806,7 +16959,7 @@ function parseHarnessEvent(value) {
       };
     }
     case "status": {
-      const status = trimmed3(row.status);
+      const status = trimmed4(row.status);
       if (!status)
         return null;
       return { ...base, type, status };
@@ -16831,14 +16984,15 @@ function parseHarnessEventNdjson(raw) {
   return events;
 }
 async function collectLatchEvents({ executable = "latch", providerSessionId, from = 0, idleMs = 250, timeoutMs = 8e3 }) {
-  const sessionId = trimmed3(providerSessionId);
+  const sessionId = trimmed4(providerSessionId);
   if (!sessionId)
     throw new LatchSessionCommandError("A Latch session id is required.");
   const fromCursor = Number.isFinite(from) && from > 0 ? Math.floor(from) : 0;
-  const bin = trimmed3(executable) ?? "latch";
+  const bin = trimmed4(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 +17048,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 +17056,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",
@@ -17248,75 +17403,6 @@ var init_git_tree = __esm({
   }
 });
 
-// ../packages/core/dist/service/terminal-profile-types.js
-function trimmed4(value) {
-  return typeof value === "string" && value.trim() ? value.trim() : null;
-}
-function viewerKindForLauncher(launcher) {
-  const value = trimmed4(launcher);
-  if (!value)
-    return "inline";
-  const lowered = value.toLowerCase();
-  if (lowered === "iterm2" || lowered === "iterm")
-    return "iterm";
-  if (lowered === "terminal")
-    return "terminal";
-  return "custom";
-}
-function normalizeExecutionProvider(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value))
-    return null;
-  const cast = value;
-  const kind = trimmed4(cast.kind)?.toLowerCase() === "latch" ? "latch" : "direct";
-  return {
-    kind,
-    executable: trimmed4(cast.executable) ?? DEFAULT_LATCH_EXECUTABLE
-  };
-}
-function launchSessionSnapshotFromMetadata(metadata) {
-  const raw = metadata?.[LAUNCH_SESSION_METADATA_KEY];
-  if (!raw || typeof raw !== "object" || Array.isArray(raw))
-    return null;
-  const cast = raw;
-  if (cast.version !== TERMINAL_PROFILE_VERSION)
-    return null;
-  const viewer = cast.viewer && typeof cast.viewer === "object" && !Array.isArray(cast.viewer) ? cast.viewer : null;
-  const launcher = trimmed4(viewer?.launcher);
-  const source = (value) => trimmed4(value) === "target" ? "target" : "user_default";
-  return {
-    version: TERMINAL_PROFILE_VERSION,
-    executionProvider: normalizeExecutionProvider(cast.executionProvider) ?? {
-      ...DEFAULT_EXECUTION_PROVIDER
-    },
-    viewer: {
-      kind: trimmed4(viewer?.kind) ? trimmed4(viewer?.kind) : viewerKindForLauncher(launcher),
-      launcher,
-      openOnLaunch: viewer?.openOnLaunch !== false
-    },
-    executionProviderSource: source(cast.executionProviderSource),
-    viewerOpenSource: source(cast.viewerOpenSource),
-    resolvedAt: trimmed4(cast.resolvedAt) ?? ""
-  };
-}
-var TERMINAL_PROFILE_VERSION, DEFAULT_LATCH_EXECUTABLE, DEFAULT_EXECUTION_PROVIDER, DEFAULT_OPEN_VIEWER_ON_LAUNCH, DEFAULT_LAUNCH_SESSION_DEFAULTS, LAUNCH_SESSION_METADATA_KEY;
-var init_terminal_profile_types2 = __esm({
-  "../packages/core/dist/service/terminal-profile-types.js"() {
-    "use strict";
-    TERMINAL_PROFILE_VERSION = 1;
-    DEFAULT_LATCH_EXECUTABLE = "latch";
-    DEFAULT_EXECUTION_PROVIDER = {
-      kind: "direct",
-      executable: DEFAULT_LATCH_EXECUTABLE
-    };
-    DEFAULT_OPEN_VIEWER_ON_LAUNCH = true;
-    DEFAULT_LAUNCH_SESSION_DEFAULTS = {
-      executionProvider: { ...DEFAULT_EXECUTION_PROVIDER },
-      openViewerOnLaunch: DEFAULT_OPEN_VIEWER_ON_LAUNCH
-    };
-    LAUNCH_SESSION_METADATA_KEY = "launchSession";
-  }
-});
-
 // ../packages/core/dist/service/latch-discovery.js
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { existsSync as existsSync16, mkdirSync as mkdirSync9, readFileSync as readFileSync15, statSync as statSync4, writeFileSync as writeFileSync8 } from "node:fs";
@@ -17547,6 +17633,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 +17644,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 +17682,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 +17726,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 +17745,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 +19180,7 @@ function spawnLatchJson({
   const result = spawnSync4(executable, args, {
     encoding: "utf8",
     input: stdin,
-    env: process.env,
+    env: latchChildEnvironment(),
     maxBuffer: 2 * 1024 * 1024
   });
   return {
@@ -19148,7 +19239,9 @@ function createLatchSession({
 function openLatchViewer({
   executable = DEFAULT_LATCH_EXECUTABLE,
   providerSessionId,
-  viewerKind
+  viewerKind,
+  openAs,
+  productVersion
 }) {
   const viewer = latchViewerFlagForKind(viewerKind);
   const attachCommand = latchAttachCommand({ executable, providerSessionId });
@@ -19159,9 +19252,10 @@ function openLatchViewer({
       attachCommand
     };
   }
+  const sendsOpenAs = Boolean(openAs) && latchSupportsOpenAs(productVersion);
   const result = spawnLatchJson({
     executable,
-    args: ["open", providerSessionId, "--with", viewer, "--json"]
+    args: buildLatchOpenArgs({ providerSessionId, viewer, openAs, productVersion })
   });
   if (result.status !== 0) {
     const detail = (result.stderr || result.stdout || `exit ${result.status ?? "null"}`).trim();
@@ -19171,11 +19265,12 @@ function openLatchViewer({
       attachCommand
     };
   }
-  return { ok: true, viewer };
+  return { ok: true, viewer, openAs: sendsOpenAs ? parseViewerOpenAs(openAs) : null };
 }
 var init_latch_launch2 = __esm({
   "src/latch-launch.ts"() {
     "use strict";
+    init_latch_environment();
     init_latch_launch();
     init_terminal_profile_types2();
   }
@@ -19878,13 +19973,14 @@ async function launchAgent({
   let providerFallbackWarning = null;
   let useLatch = false;
   let resolvedLatchExecutable = executable;
+  let latchProductVersion = null;
   const existingProviderSession = providerKind === "latch" ? existingLatchProviderSession({
     latchSessionId: process.env.LATCH_SESSION_ID,
     executionTargetId: options.executionTargetId
   }) : 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 +19990,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}`
@@ -19921,6 +20017,7 @@ async function launchAgent({
       });
       if (useLatch && discovery.state === "found") {
         resolvedLatchExecutable = discovery.resolvedPath;
+        latchProductVersion = discovery.productVersion;
       }
       if (!useLatch) {
         providerFallbackWarning = discovery.state === "not_installed" ? `Latch is not installed on this execution target (${discovery.installCommand}); falling back to direct launch.` : discovery.state === "incompatible" ? `Latch is incompatible (${discovery.missingCapability}: ${discovery.detail}); falling back to direct launch.` : "Latch is unavailable; falling back to direct launch.";
@@ -19945,7 +20042,9 @@ async function launchAgent({
       viewerOpen = openLatchViewer({
         executable: resolvedLatchExecutable,
         providerSessionId: created.providerSession.providerSessionId,
-        viewerKind: snapshot?.viewer.kind ?? "iterm"
+        viewerKind: snapshot?.viewer.kind ?? "iterm",
+        openAs: snapshot?.viewer.openAs ?? null,
+        productVersion: latchProductVersion
       });
     }
     return {
@@ -21400,6 +21499,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 +21515,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 +21611,8 @@ function recentAssistantContext(transcriptPath) {
 function recordTouchedFromPayload({
   rawPayload,
   missionOverride,
-  fallbackCwd
+  fallbackCwd,
+  env = process.env
 }) {
   let payload;
   try {
@@ -21497,8 +21623,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 +21632,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 +21666,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 +22845,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 +22916,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) {