jules-orchestrator-kit 0.75.0 → 0.75.2

package/src/secret-scanner.mjs

@@ -254,6 +254,11 @@ export function secretScanVariants(addedLines) {
   // Collapse method concatenations like .concat("...") or .join("")
   dejoined = dejoined.replace(/\.concat\(\s*["'`]/g, "").replace(/\.join\(\s*["'`]{2}\s*\)/g, "");
 
+  // Collapse array elements like ["A", "B"]
+  dejoined = dejoined.replace(/["'`]\s*,\s*["'`]/g, "");
+  // Collapse split variables across newlines (e.g. const a = "AKIA"; const b = "...")
+  dejoined = dejoined.replace(/["'`]\s*[,;+]*\s*[\r\n]+\s*(?:(?:export\s+)?(?:const|let|var)\s+[A-Za-z0-9_]+\s*=\s*)?["'`]/g, "");
+
   // Collapse whitespace/newlines between adjacent base64 characters (including line-wrapped PEM/base64, template literals, and quoted string chunks)
   const base64Dejoined = stripped
     .replace(/([A-Za-z0-9+/=_-])\s*[\r\n]+\s*(?=[A-Za-z0-9+/=_-])/g, "$1")
@@ -266,9 +271,16 @@ export function secretScanVariants(addedLines) {
   // source-level join AND spelled with homoglyphs still surfaces.
   const confusable = normalizeSecretText(stripped);
   const confusableDejoined = normalizeSecretText(dejoined);
+  const uniDecoded = dejoined
+    .replace(/\\u([0-9a-fA-F]{4})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
+    .replace(/\\x([0-9a-fA-F]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
+
+  const stringLiteralsCollapsed = (stripped.match(/(["'`])(?:(?!\1)[^\n])*\1/g) || [])
+    .map(s => s.slice(1, -1))
+    .join('');
 
   return {
-    all: [...new Set([addedLines, stripped, dejoined, base64Dejoined, hexDecoded, pctDecoded, confusable, confusableDejoined])],
+    all: [...new Set([addedLines, stripped, dejoined, base64Dejoined, hexDecoded, pctDecoded, confusable, confusableDejoined, uniDecoded, stringLiteralsCollapsed])],
     normalized: dejoined,
     base64Normalized: base64Dejoined,
   };

package/src/security.mjs

@@ -167,6 +167,10 @@ function splitDiffByFile(diffText) {
       current.lines.push({ text: line.slice(1), no: lineNo });
       if (lineNo !== null) lineNo++;
     } else if (lineNo !== null && !line.startsWith("-") && !line.startsWith("\\")) {
+      if (line.startsWith(" ")) {
+        if (!current) select(null);
+        current.lines.push({ text: line.slice(1), no: lineNo });
+      }
       lineNo++; // A context line advances the post-image just as an added one does.
     }
   }

package/src/state.mjs

@@ -233,24 +233,36 @@ export function withVfsMutex(mutexDir, fn, opts = {}) {
   const maxRetries = opts.maxRetries || 200;
   const retryDelayMs = opts.retryDelayMs || 10;
 
+  const staleMs = opts.staleMs || 2000;
+
   for (let i = 0; i < maxRetries; i++) {
+    let acquired = false;
     try {
       mkdirSync(mutexDir);
-      try {
-        return fn();
-      } finally {
-        try {
-          rmdirSync(mutexDir);
-        } catch (_) {}
-      }
+      acquired = true;
     } catch (err) {
       if (err.code === "EEXIST") {
+        try {
+          if (Date.now() - statSync(mutexDir).mtimeMs > staleMs) {
+            rmdirSync(mutexDir);
+          }
+        } catch (_) {}
         const deadline = Date.now() + retryDelayMs;
         while (Date.now() < deadline) {}
         continue;
       }
       throw err;
     }
+    
+    if (acquired) {
+      try {
+        return fn();
+      } finally {
+        try {
+          rmdirSync(mutexDir);
+        } catch (_) {}
+      }
+    }
   }
   throw new MutexTimeoutError(`Failed to acquire VFS mutex lock at ${mutexDir} after ${maxRetries} retries`);
 }
@@ -634,9 +646,10 @@ export function acquireLock(agentName, taskId, files = [], rootOrOpts = resolveR
   const root = typeof rootOrOpts === "string" ? rootOrOpts : (rootOrOpts?.root || resolveRoot());
   const branch = (typeof rootOrOpts === "object" && rootOrOpts?.branch) || opts?.branch || process.env.JULES_BRANCH || process.env.BRANCH_NAME || "";
   const lockDir = getLockDir(root);
-  const lockFile = join(lockDir, `${taskId}.json`);
+  return withVfsMutex(join(lockDir, ".acquire.mutex"), () => {
+    const lockFile = join(lockDir, `${taskId}.json`);
 
-  if (existsSync(lockFile)) {
+    if (existsSync(lockFile)) {
     try {
       const existing = JSON.parse(readFileSync(lockFile, "utf-8"));
       if (isLockLive(existing)) {
@@ -740,6 +753,7 @@ export function acquireLock(agentName, taskId, files = [], rootOrOpts = resolveR
       try { closeSync(fd); } catch (_) {}
     }
   }
+  });
 }
 
 export function releaseLock(taskId, rootOrOpts = resolveRoot()) {

package/src/wizard-task.mjs

@@ -1,5 +1,5 @@
 import { writeFileSync, mkdirSync, existsSync } from "node:fs";
-import { resolve, join } from "node:path";
+import { resolve } from "node:path";
 import { untrackedOnboardingArtifacts } from "./git.mjs";
 import { loadConfig } from "./config.mjs";
 import { gate } from "./engine.mjs";
@@ -220,33 +220,22 @@ export function planTaskCreate(root = process.cwd(), inputObj = {}) {
   const rawId = inputObj.id || `TASK-${Date.now().toString(36).toUpperCase()}`;
   const taskId = String(rawId).replace(/[^a-zA-Z0-9_-]/g, "_");
 
-  const hasAstro = existsSync(join(root, "astro.config.mjs")) || existsSync(join(root, "astro.config.ts"));
-  const hasWrangler =
-    existsSync(join(root, "wrangler.jsonc")) ||
-    existsSync(join(root, "wrangler.json")) ||
-    existsSync(join(root, "wrangler.toml"));
-
+  const configInvariants = Array.isArray(config.invariants) ? config.invariants : [];
   const autoInvariants = [
     "Preserve existing signatures, surrounding logic, and coding style.",
     "Do not modify files outside scope.allow.",
+    ...configInvariants,
   ];
-  if (hasAstro) {
-    autoInvariants.push("Zero-JS runtime-princip: skicka noll onödig klient-JS i src/ och använd plana <img> framför Astro <Image>.");
-  }
-  if (hasWrangler) {
-    autoInvariants.push("Edge runtime constraints: inga otillåtna Node-imports (t.ex. node:fs, node:path, sharp) i workerd runtime-kod.");
-  }
   const invariants = Array.isArray(inputObj.invariants) && inputObj.invariants.length > 0
     ? inputObj.invariants
     : autoInvariants;
 
-  const autoMcpDirectives = [];
-  if (hasAstro) autoMcpDirectives.push("astro-docs");
-  if (hasWrangler) autoMcpDirectives.push("cloudflare-docs");
-  if (existsSync(join(root, "emdash.config.ts"))) autoMcpDirectives.push("emdash-docs");
-  if (autoMcpDirectives.length > 0) autoMcpDirectives.push("context7");
-
-  const mcpDirectives = inputObj.mcpDirectives || inputObj.mcp_directives || (autoMcpDirectives.length > 0 ? autoMcpDirectives : undefined);
+  const configDirectives = Array.isArray(config.mcp_directives)
+    ? config.mcp_directives
+    : Array.isArray(config.mcpDirectives)
+      ? config.mcpDirectives
+      : [];
+  const mcpDirectives = inputObj.mcpDirectives || inputObj.mcp_directives || (configDirectives.length > 0 ? configDirectives : undefined);
   const mcpDirectiveLine = mcpDirectives && mcpDirectives.length > 0
     ? `MCP DIRECTIVE: Mandating pre-execution documentation lookup via [${mcpDirectives.join(" | ")}] before modifying code.\n\n`
     : "";