overlord-cli 0.2608221603.0 → 0.2608231148.0

package/dist/connectors/VERSION

@@ -1 +1 @@
-0.3.35
+0.3.36

package/dist/connectors/adapters/antigravity/conformance-manifest.yaml

@@ -1,4 +1,4 @@
-contractVersion: "116"
+contractVersion: "117"
 componentType: connector
 componentKey: antigravity
 label: "Antigravity Connector"

package/dist/connectors/adapters/antigravity/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://antigravity.google/schemas/v1/plugin.json",
   "name": "overlord",
-  "version": "0.3.35",
+  "version": "0.3.36",
   "description": "Chat-driven access to Overlord mission protocol workflows through skills and MCP.",
   "author": {
     "name": "Cooperativ",

package/dist/connectors/adapters/claude/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "overlord",
-  "version": "0.3.35",
+  "version": "0.3.36",
   "description": "Overlord mission protocol workflow for Claude Code — attach/update/ask/deliver, slash commands, and hook-driven activity capture.",
   "author": {
     "name": "Cooperativ",

package/dist/connectors/adapters/claude/conformance-manifest.yaml

@@ -1,4 +1,4 @@
-contractVersion: "116"
+contractVersion: "117"
 componentType: connector
 componentKey: claude
 label: "Claude Code Connector"

package/dist/connectors/adapters/codex/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "overlord",
-  "version": "0.3.35",
+  "version": "0.3.36",
   "description": "Chat-driven access to Overlord mission protocol workflows with hook-driven activity capture.",
   "author": {
     "name": "Cooperativ",

package/dist/connectors/adapters/codex/conformance-manifest.yaml

@@ -1,4 +1,4 @@
-contractVersion: "116"
+contractVersion: "117"
 componentType: connector
 componentKey: codex
 label: "Codex Connector"

package/dist/connectors/adapters/cursor/.cursor-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "overlord",
-  "version": "0.3.35",
+  "version": "0.3.36",
   "description": "Overlord mission protocol workflow for Cursor — attach/update/ask/deliver, slash commands, MCP bridge, and follow-up capture.",
   "author": {
     "name": "Cooperativ",

package/dist/connectors/adapters/cursor/codec/cursor.codec.yaml

@@ -69,5 +69,9 @@ events:
     inputPath: tool_input
     callIdPath: call_id
     fileEditKind: file.edited
+    # Live Cursor Write payloads use file_path; path/filePath match the write
+    # formatter's key order so an alternate Cursor dialect still captures.
     filePathPaths:
       - file_path
+      - filePath
+      - path

package/dist/connectors/adapters/cursor/conformance-manifest.yaml

@@ -1,4 +1,4 @@
-contractVersion: "116"
+contractVersion: "117"
 componentType: connector
 componentKey: cursor
 label: "Cursor Connector"

package/dist/connectors/adapters/opencode/conformance-manifest.yaml

@@ -1,4 +1,4 @@
-contractVersion: "116"
+contractVersion: "117"
 componentType: connector
 componentKey: opencode
 label: "OpenCode Connector"

package/dist/connectors/adapters/pi/conformance-manifest.yaml

@@ -1,4 +1,4 @@
-contractVersion: "116"
+contractVersion: "117"
 componentType: connector
 componentKey: pi
 label: "PI Connector"

package/dist/connectors/core/scripts/overlord-mcp.mjs

@@ -1091,7 +1091,7 @@ process.stdin.on('data', async chunk => {
         result: {
           protocolVersion: PROTOCOL_VERSION,
           capabilities: { tools: { listChanged: false } },
-          serverInfo: { name: 'overlord-__OVERLORD_ADAPTER_KEY__', version: '0.3.35' }
+          serverInfo: { name: 'overlord-__OVERLORD_ADAPTER_KEY__', version: '0.3.36' }
         }
       });
       continue;

package/dist/index.js

@@ -67,7 +67,44 @@ function isUnlinkableExecutionRequestError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return message.includes("invalid_execution_request_transition");
 }
+function trimmedStringField({
+  record,
+  key
+}) {
+  const value = record[key];
+  return typeof value === "string" ? value.trim() : "";
+}
+function looksLikeAlreadyLinkedExecutionRequest({ text }) {
+  return text.includes(EXECUTION_REQUEST_ALREADY_LINKED_CODE) || /already linked to another(?: mission)? session/i.test(text);
+}
+function isExecutionRequestAlreadyLinkedPayload(payload) {
+  if (!payload || typeof payload !== "object") return false;
+  const record = payload;
+  if (trimmedStringField({ record, key: "code" }) === EXECUTION_REQUEST_ALREADY_LINKED_CODE) {
+    return true;
+  }
+  const text = [
+    trimmedStringField({ record, key: "error" }),
+    trimmedStringField({ record, key: "message" }),
+    trimmedStringField({ record, key: "detail" })
+  ].join(" ");
+  return looksLikeAlreadyLinkedExecutionRequest({ text });
+}
+function isExecutionRequestAlreadyLinkedError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return looksLikeAlreadyLinkedExecutionRequest({ text: message });
+}
+function formatExecutionRequestAlreadyLinkedDiagnostic() {
+  return [
+    "Attach was rejected because this execution request is already linked to another mission session (`execution_request_already_linked`).",
+    "This is a stale mission-session binding, not a user authentication failure. Do not run `ovld auth login` or `ovld auth repair`.",
+    "Recovery: retry `ovld protocol attach` without `--execution-request-id` (unset OVERLORD_EXECUTION_REQUEST_ID). The existing session remains bound to the request; a new attach can continue the objective without relinking it."
+  ].join("\n");
+}
 function formatCliError(error) {
+  if (isExecutionRequestAlreadyLinkedError(error)) {
+    return redactSecrets(formatExecutionRequestAlreadyLinkedDiagnostic());
+  }
   if (error instanceof CliError) {
     return redactSecrets(error.message);
   }
@@ -76,7 +113,7 @@ function formatCliError(error) {
   }
   return redactSecrets(String(error));
 }
-var CliError;
+var CliError, EXECUTION_REQUEST_ALREADY_LINKED_CODE;
 var init_errors = __esm({
   "src/errors.ts"() {
     "use strict";
@@ -89,6 +126,7 @@ var init_errors = __esm({
         this.exitCode = exitCode;
       }
     };
+    EXECUTION_REQUEST_ALREADY_LINKED_CODE = "execution_request_already_linked";
   }
 });
 
@@ -2593,7 +2631,7 @@ function configureCursorHarness({
       event: "postToolUse",
       command: CURSOR_HOOK_COMMANDS.postToolUse,
       marker: "overlord-post-tool-use",
-      extra: { matcher: "Shell|Write|Edit|MultiEdit|NotebookEdit" }
+      extra: { matcher: "Shell|Write|Edit|MultiEdit|NotebookEdit|StrReplace" }
     }) && "postToolUse",
     mergeHook({
       event: "stop",
@@ -3186,6 +3224,9 @@ Start the Desktop/local backend or run \`ovld config set cloud <url>\`.
     }
     const payload = await readResponseJson2(response);
     if (!response.ok) {
+      if (isExecutionRequestAlreadyLinkedPayload(payload)) {
+        throw new CliError({ message: formatExecutionRequestAlreadyLinkedDiagnostic() });
+      }
       if (response.status === 401 && auth.headers.Authorization) {
         const detail = errorMessageFromJson2(payload) ?? `Backend request failed: ${method} ${path36} (${response.status})`;
         throw new CliError({
@@ -7492,6 +7533,8 @@ var init_tool_normalize = __esm({
       editfile: "edit",
       edit_file: "edit",
       str_replace: "edit",
+      // Cursor/IDE lowercases StrReplace → "strreplace" (no underscore).
+      strreplace: "edit",
       str_replace_editor: "edit",
       apply_patch: "edit",
       applypatch: "edit",
@@ -8074,7 +8117,9 @@ var init_codec_registry_generated = __esm({
             "callIdPath": "call_id",
             "fileEditKind": "file.edited",
             "filePathPaths": [
-              "file_path"
+              "file_path",
+              "filePath",
+              "path"
             ]
           }
         ]
@@ -19366,7 +19411,7 @@ var init_change_ledger = __esm({
 
 // src/active-objective-sessions.ts
 import { createHash as createHash9 } from "node:crypto";
-import { existsSync as existsSync24 } from "node:fs";
+import { existsSync as existsSync24, readdirSync as readdirSync4 } from "node:fs";
 import path22 from "node:path";
 function normalizeIdentifier(value) {
   return typeof value === "string" ? value.trim() : "";
@@ -19529,6 +19574,63 @@ function readObjectiveSessions({
   const aliases = entries.filter((entry) => entry.objectiveAliases.includes(requested));
   return new Set(aliases.map((entry) => entry.objectiveId)).size === 1 ? aliases : [];
 }
+function pathIsUnderWorkingDirectory({
+  absolutePath,
+  workingDirectory
+}) {
+  const root = canonicalDirectory(workingDirectory);
+  const resolved = path22.resolve(absolutePath);
+  return resolved === root || resolved.startsWith(`${root}${path22.sep}`);
+}
+function resolveWorkingDirectoryForObjective({
+  objectiveId,
+  candidateWorkingDirectory,
+  pathHints = []
+}) {
+  const requested = normalizeIdentifier(objectiveId);
+  if (!isValidIdentifier(requested)) return null;
+  const candidate = path22.resolve(candidateWorkingDirectory);
+  const local = readManifest2(candidate);
+  if (local && resolveEntry(local.entries, requested)) {
+    return local.workingDirectory;
+  }
+  const matches = [];
+  const root = path22.join(resolveGlobalDataDir(), "active-objective-sessions");
+  try {
+    if (!existsSync24(root)) return null;
+    for (const name of readdirSync4(root).slice(0, MAX_ACTIVE_SESSION_MANIFEST_FILES)) {
+      if (!name.endsWith(".json")) continue;
+      try {
+        const raw = readBoundedUtf8File(path22.join(root, name), MAX_ACTIVE_SESSION_MANIFEST_BYTES);
+        if (raw === null) continue;
+        const value = JSON.parse(raw);
+        if (value.schemaVersion !== 3 || typeof value.workingDirectory !== "string" || !Array.isArray(value.entries)) {
+          continue;
+        }
+        const entries = value.entries.flatMap((entry) => {
+          const normalized = normalizeEntry(entry);
+          return normalized ? [normalized] : [];
+        });
+        if (!resolveEntry(entries, requested)) continue;
+        const workingDirectory = canonicalDirectory(value.workingDirectory);
+        if (!matches.includes(workingDirectory)) matches.push(workingDirectory);
+      } catch {
+      }
+    }
+  } catch {
+    return null;
+  }
+  if (matches.length === 0) return null;
+  if (matches.length === 1) return matches[0] ?? null;
+  const absoluteHints = pathHints.filter((hint) => typeof hint === "string" && path22.isAbsolute(hint)).map((hint) => path22.resolve(hint));
+  if (absoluteHints.length === 0) return null;
+  const hinted = matches.filter(
+    (workingDirectory) => absoluteHints.some(
+      (absolutePath) => pathIsUnderWorkingDirectory({ absolutePath, workingDirectory })
+    )
+  );
+  return hinted.length === 1 ? hinted[0] ?? null : null;
+}
 function withActiveObjectiveSession({
   workingDirectory,
   objectiveId,
@@ -19591,7 +19693,7 @@ function finalizeActiveSession({
     return false;
   }
 }
-var MAX_ACTIVE_OBJECTIVE_SESSION_BINDINGS, MAX_OBJECTIVE_ALIASES, MAX_ID_LENGTH, MAX_ACTIVE_SESSION_MANIFEST_BYTES;
+var MAX_ACTIVE_OBJECTIVE_SESSION_BINDINGS, MAX_OBJECTIVE_ALIASES, MAX_ID_LENGTH, MAX_ACTIVE_SESSION_MANIFEST_BYTES, MAX_ACTIVE_SESSION_MANIFEST_FILES;
 var init_active_objective_sessions = __esm({
   "src/active-objective-sessions.ts"() {
     "use strict";
@@ -19602,6 +19704,7 @@ var init_active_objective_sessions = __esm({
     MAX_OBJECTIVE_ALIASES = 16;
     MAX_ID_LENGTH = 200;
     MAX_ACTIVE_SESSION_MANIFEST_BYTES = 512 * 1024;
+    MAX_ACTIVE_SESSION_MANIFEST_FILES = 256;
   }
 });
 
@@ -20156,6 +20259,42 @@ function resolveHookWorkingDirectory({
   }
   return path26.resolve(fallbackCwd);
 }
+function withProjectRootFallback({
+  payload,
+  projectRootPaths,
+  workingDirectory
+}) {
+  const rootKey = projectRootPaths?.[0];
+  if (!rootKey || rootKey.includes(".") || !payload || typeof payload !== "object") {
+    return payload;
+  }
+  if (Array.isArray(payload)) return payload;
+  const record = payload;
+  if (exactProjectDirectory(record[rootKey])) return payload;
+  return { ...record, [rootKey]: workingDirectory };
+}
+function collectAbsolutePathHints(payload) {
+  const hints = [];
+  const visit = (value, depth) => {
+    if (hints.length >= MAX_PATH_HINTS || depth > 4) return;
+    if (typeof value === "string") {
+      if (path26.isAbsolute(value) && value.length <= 4096 && !hasControlCharacters(value)) {
+        hints.push(path26.resolve(value));
+      }
+      return;
+    }
+    if (!value || typeof value !== "object") return;
+    if (Array.isArray(value)) {
+      for (const entry of value.slice(0, 8)) visit(entry, depth + 1);
+      return;
+    }
+    for (const entry of Object.values(value).slice(0, 16)) {
+      visit(entry, depth + 1);
+    }
+  };
+  visit(payload, 0);
+  return hints;
+}
 function captureChangeFromPayload({
   agent,
   rawPayload,
@@ -20185,12 +20324,22 @@ function captureChangeFromPayload({
       payloadFailure = "invalid JSON payload";
     }
   }
-  const workingDirectory = resolveHookWorkingDirectory({
+  const candidateWorkingDirectory = resolveHookWorkingDirectory({
     payload: nativePayload,
     projectRootPaths: codec.projectRootPaths,
     fallbackCwd
   });
-  const normalized = payloadFailure ? null : normalizeForAdapter({ codec, payload: nativePayload });
+  const workingDirectory = resolveWorkingDirectoryForObjective({
+    objectiveId,
+    candidateWorkingDirectory,
+    pathHints: collectAbsolutePathHints(nativePayload)
+  }) ?? candidateWorkingDirectory;
+  const payloadForNormalize = withProjectRootFallback({
+    payload: nativePayload,
+    projectRootPaths: codec.projectRootPaths,
+    workingDirectory
+  });
+  const normalized = payloadFailure ? null : normalizeForAdapter({ codec, payload: payloadForNormalize });
   const directPaths = normalized?.kind === "file.edited" && Array.isArray(normalized.payload.paths) ? normalized.payload.paths.filter((value) => typeof value === "string") : [];
   const confidentlyNonMutating = normalized?.kind === "tool.completed" && (normalized.payload.tool === "read" || normalized.payload.tool === "search" || normalized.payload.tool === "fetch");
   return withActiveObjectiveSession({
@@ -20239,6 +20388,7 @@ function captureChangeFromPayload({
     }
   });
 }
+var MAX_PATH_HINTS;
 var init_capture_change = __esm({
   "src/capture-change.ts"() {
     "use strict";
@@ -20248,6 +20398,7 @@ var init_capture_change = __esm({
     init_event();
     init_active_objective_sessions();
     init_change_ledger();
+    MAX_PATH_HINTS = 16;
   }
 });
 
@@ -21464,7 +21615,7 @@ var init_launch = __esm({
 });
 
 // src/launch-bootstrap.ts
-import { existsSync as existsSync26, readdirSync as readdirSync4, readFileSync as readFileSync16, statSync as statSync7 } from "node:fs";
+import { existsSync as existsSync26, readdirSync as readdirSync5, readFileSync as readFileSync16, statSync as statSync7 } from "node:fs";
 import path30 from "node:path";
 function firstCapture(match) {
   if (!match) return null;
@@ -21491,7 +21642,7 @@ function recoverLaunchBootstrapFromProjectTmp({
   const prefix = `launch-${safeMissionPart(trimmedMission)}-`;
   let newest = null;
   try {
-    for (const name of readdirSync4(tmpDir)) {
+    for (const name of readdirSync5(tmpDir)) {
       if (!name.startsWith(prefix) || !name.endsWith(".sh")) continue;
       const filePath = path30.join(tmpDir, name);
       try {
@@ -23655,6 +23806,8 @@ async function runProtocolCommand({
         path: protocolPath,
         body: { ...protocolBody, flags }
       });
+    } else if (isExecutionRequestAlreadyLinkedError(error)) {
+      throw new CliError({ message: formatExecutionRequestAlreadyLinkedDiagnostic() });
     } else {
       throw error;
     }