@martinloop/mcp 0.6.3 → 0.6.4

package/dist/package-version.d.ts

@@ -1 +1 @@
-export declare const MARTIN_MCP_PACKAGE_VERSION = "0.6.3";
+export declare const MARTIN_MCP_PACKAGE_VERSION = "0.6.4";

package/dist/package-version.js

@@ -1,3 +1,3 @@
 // Auto-generated by build — do not edit by hand.
 // Source of truth: packages/mcp/package.json#version
-export const MARTIN_MCP_PACKAGE_VERSION = "0.6.3";
+export const MARTIN_MCP_PACKAGE_VERSION = "0.6.4";

package/dist/tools/tool-support.d.ts

@@ -37,6 +37,9 @@ export interface LoopPreview {
     remainingTokens?: number;
     lastAttempt?: AttemptSummary;
     routingEconomics?: Record<string, unknown>;
+    /** Present when an attempt is executing but not yet in the completed attempts list.
+     * Indicates the backend is actively running — callers must NOT start a concurrent recovery run. */
+    activeAttemptId?: string;
 }
 export interface AttemptArtifactFiles {
     directory: string;

package/dist/tools/tool-support.js

@@ -141,6 +141,19 @@ export function buildLoopPreview(loop) {
         attemptsUsed: loop.attempts.length
     });
     const lastAttempt = loop.attempts.at(-1);
+    // Detect an in-flight attempt: an attempt.started event whose attemptId has
+    // no matching entry in loop.attempts (completed attempts only). This is the
+    // signal callers need to distinguish "backend actively executing" from
+    // "nothing has started yet" after a client transport timeout.
+    const completedAttemptIds = new Set(loop.attempts.map((a) => a.attemptId).filter(Boolean));
+    const activeAttemptEvent = (loop.events ?? [])
+        .filter((e) => e.type === "attempt.started")
+        .at(-1);
+    const activeAttemptId = activeAttemptEvent !== undefined &&
+        typeof activeAttemptEvent.payload["attemptId"] === "string" &&
+        !completedAttemptIds.has(activeAttemptEvent.payload["attemptId"])
+        ? activeAttemptEvent.payload["attemptId"]
+        : undefined;
     return {
         loopId: loop.loopId,
         title: loop.task?.title ?? loop.loopId,
@@ -161,7 +174,8 @@ export function buildLoopPreview(loop) {
             ? { remainingTokens: costState.remainingTokens }
             : {}),
         ...(lastAttempt ? { lastAttempt: buildAttemptSummary(lastAttempt) } : {}),
-        ...(loop.routingEconomics ? { routingEconomics: buildRoutingEconomicsSummary(loop.routingEconomics) } : {})
+        ...(loop.routingEconomics ? { routingEconomics: buildRoutingEconomicsSummary(loop.routingEconomics) } : {}),
+        ...(activeAttemptId !== undefined ? { activeAttemptId } : {})
     };
 }
 function buildRoutingEconomicsSummary(economics) {

package/dist/vendor/adapters/codex-capabilities.js

@@ -33,24 +33,28 @@ function flagContext(help, flag) {
     const index = lines.findIndex((line) => line.includes(flag));
     if (index < 0)
         return "";
-    return lines.slice(Math.max(0, index - 1), Math.min(lines.length, index + 3)).join("\n");
+    let end = index + 1;
+    while (end < lines.length && end < index + 24) {
+        if (/^\s*(?:-\w,\s*)?--[a-z][\w-]*/iu.test(lines[end] ?? ""))
+            break;
+        end += 1;
+    }
+    return lines.slice(Math.max(0, index - 1), end).join("\n");
 }
 function parseAdvertisedValues(help, flag) {
     const flagIndex = help.indexOf(flag);
     if (flagIndex < 0)
         return [];
     const tail = help.slice(flagIndex);
-    const nextFlagOffset = tail.slice(flag.length).search(/\n\s*-/u);
+    const nextFlagOffset = tail.slice(flag.length).search(/\n\s*(?:-\w,\s*)?--[a-z][\w-]*/iu);
     const scoped = nextFlagOffset < 0
         ? tail
         : tail.slice(0, flag.length + nextFlagOffset);
-    const match = scoped.match(/possible values:\s*([^\]\n]+)/iu);
-    if (!match?.[1])
-        return [];
-    return match[1]
-        .split(",")
-        .map((value) => value.trim().replace(/[\].]$/u, ""))
-        .filter(Boolean);
+    const inline = scoped.match(/possible values:[ \t]*([^\]\r\n]+)/iu)?.[1];
+    if (inline?.trim()) {
+        return inline.split(",").map((value) => value.trim().replace(/[\].]$/u, "")).filter(Boolean);
+    }
+    return [...scoped.matchAll(/^\s*-\s+([a-z][a-z0-9-]*):/gimu)].map((match) => match[1]).filter(Boolean);
 }
 function buildInjectedSpawnPlan(binaryPath, args, platform) {
     if (platform !== "win32")
@@ -214,7 +218,8 @@ export function resolveCodexAutonomyCandidates(profile, intent = DEFAULT_AGENT_E
             binaryPath: profile.binaryPath,
             intent,
             strategy: "sandbox+approval",
-            sandboxValue: "workspace-write"
+            sandboxValue: "workspace-write",
+            ...(profile.approvalPolicy?.values?.includes("never") ? { approvalValue: "never" } : {})
         });
     }
     // Keep provider automation as a compatibility fallback. It is never trusted

package/dist/vendor/adapters/codex-host.js

@@ -1,7 +1,7 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, extname, join, resolve } from "node:path";
-import { tmpdir } from "node:os";
+import { userInfo } from "node:os";
 import { normalizeProviderExecutionTimeoutMs } from "../contracts/index.js";
 import { createSpawnPlan, resolveNpmShimScript } from "./cli-bridge.js";
 import { buildCodexExecArgs, buildCodexStdin, cacheCodexCapabilityProfile, probeCodexCapabilities, resolveCodexAutonomyCandidates } from "./codex-capabilities.js";
@@ -437,7 +437,10 @@ export function probeCodexLaunch(input) {
             for (const transport of transports) {
                 const marker = `.martin-codex-write-probe-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}.tmp`;
                 const markerPath = join(input.workingDirectory, marker);
-                const outsideRoot = mkdtempSync(join(tmpdir(), "martin-codex-outside-probe-"));
+                // Codex workspace-write intentionally permits the host temp directory,
+                // and the repo can be nested inside a broader writable host workspace.
+                // Probe from the user-home boundary so the denial canary is outside both.
+                const outsideRoot = mkdtempSync(join(userInfo().homedir, ".martin-codex-outside-probe-"));
                 const outsideMarkerPath = join(outsideRoot, ".martin-codex-outside-probe.tmp");
                 const prompt = buildMarkerPrompt(marker, outsideMarkerPath);
                 let args;

package/dist/vendor/core/index.js

@@ -1,4 +1,3 @@
-import { spawnSync } from "node:child_process";
 import { DEFAULT_AGENT_EXECUTION_INTENT, normalizeProviderExecutionTimeoutMs, appendLoopEvent, createLoopRecord } from "../contracts/index.js";
 import { classifyFailure, computeEvidenceVector, evaluatePatchDecision, evaluateCostGovernor, evaluateBudgetPreflight, inferExit, nextPolicyPhase, policyPhaseToLifecycleState, scorePatchDecision, selectRecoveryRecipe } from "./policy.js";
 import { evaluateChangeApprovalLeash, evaluateFilesystemLeash, evaluateSecretLeash, redactSecretsFromText, resolveExecutionProfile, evaluateVerificationLeash } from "./leash.js";
@@ -776,6 +775,12 @@ export async function runMartin(input) {
                     capturedAt: attemptStartedAt
                 })
                 : undefined;
+            // Persist attempt.started state before blocking on provider execution.
+            // If the MCP client transport times out (default 300 s), a status query against
+            // the stable run ID must see this attempt as active rather than observing
+            // attempts=0 with no in-progress state — which falsely implies nothing happened
+            // and causes callers to start a concurrent recovery run before the backend finishes.
+            await persistLoopRecordIfSupported(input.store, loop);
             let result;
             try {
                 result = await executingAdapter.execute({
@@ -1136,7 +1141,7 @@ export async function runMartin(input) {
             // VERIFY: Run grounding scan on patch diff if available
             // Uses the task's repoRoot to build/load the grounding index, then scans any diff
             let groundingScanResult;
-            const patchDiff = buildPatchDiff(result, changedFiles, input.task.repoRoot);
+            const patchDiff = buildPatchDiff(result, changedFiles);
             if (patchDiff && input.task.repoRoot) {
                 try {
                     const groundingIndex = await loadOrBuildRepoGroundingIndex(input.task.repoRoot);
@@ -1569,34 +1574,20 @@ function resolveChangedFiles(result, repoRoot, rollbackBoundary) {
     }
     return listAttemptChangedFilesSinceBoundary({ repoRoot, boundary: rollbackBoundary });
 }
-function buildPatchDiff(result, changedFiles, repoRoot) {
+function buildPatchDiff(result, changedFiles) {
     // Use structured diff stats to build a minimal diff header if no raw diff is available
-    const files = result.execution?.changedFiles?.length ? result.execution.changedFiles : changedFiles;
-    if (files.length > 0) {
-        return files
-            .map((file) => buildSyntheticDiffHeader(file, repoRoot))
+    if (result.execution?.changedFiles?.length) {
+        // Build a synthetic diff header from changed file list
+        return result.execution.changedFiles
+            .map((file) => `--- a/${file}\n+++ b/${file}\n@@ -0,0 +1 @@\n+`)
             .join("\n");
     }
-    return undefined;
-}
-function buildSyntheticDiffHeader(file, repoRoot) {
-    const normalizedFile = file.replace(/\\/gu, "/");
-    const isNewWorkspaceFile = repoRoot ? isUntrackedWorkspaceFile(repoRoot, normalizedFile) : false;
-    const before = isNewWorkspaceFile ? "/dev/null" : `a/${normalizedFile}`;
-    return `--- ${before}\n+++ b/${normalizedFile}\n@@ -0,0 +1 @@\n+`;
-}
-function isUntrackedWorkspaceFile(repoRoot, file) {
-    const result = spawnSync("git", ["ls-files", "--others", "--exclude-standard", "--", file], {
-        cwd: repoRoot,
-        encoding: "utf8"
-    });
-    if (result.status !== 0 || typeof result.stdout !== "string") {
-        return false;
+    if (changedFiles.length > 0) {
+        return changedFiles
+            .map((file) => `--- a/${file}\n+++ b/${file}\n@@ -0,0 +1 @@\n+`)
+            .join("\n");
     }
-    return result.stdout
-        .split(/\r?\n/u)
-        .map((line) => line.trim().replace(/\\/gu, "/"))
-        .includes(file);
+    return undefined;
 }
 function createBudgetSettlement(input) {
     const totalActualUsd = getUsageUsd(input.usage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@martinloop/mcp",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "mcpName": "io.github.Keesan12/martin-loop",
   "private": false,
   "type": "module",

package/server.json

@@ -7,12 +7,12 @@
     "url": "https://github.com/Keesan12/martin-loop",
     "source": "github"
   },
-  "version": "0.6.3",
+  "version": "0.6.4",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "@martinloop/mcp",
-      "version": "0.6.3",
+      "version": "0.6.4",
       "transport": {
         "type": "stdio"
       }