querysub 0.502.0 → 0.503.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.502.0",
+  "version": "0.503.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/3-path-functions/pathFunctionLoader.ts

@@ -177,7 +177,7 @@ let moduleResolver = async (spec: {
             await executeCommand("git", ["reset", "--hard", spec.gitRef], { cwd: repoPath });
 
             // Yarn install
-            await executeCommand("yarn", ["install"], { cwd: repoPath });
+            await executeCommand("yarn", ["install", "--mutex", "network"], { cwd: repoPath });
 
             // Delete querysub, and replace it with a symlink. Otherwise the synchronization code
             //  will run again, and a lot of setup code will run again, etc, and nothing will work correctly.

package/src/deployManager/machineApplyMainCode.ts

@@ -743,7 +743,7 @@ const resyncServicesBase = runInSerial(measureWrap(async function resyncServices
                     let nodeModulesMissing = !await fsExistsAsync(gitFolder + "node_modules");
                     if (afterGitRef !== prevGitRef || nodeModulesMissing) {
                         console.log(green(`Yarn installing for ${magenta(screenName)} (ref ${prevGitRef} -> ${afterGitRef}, nodeModulesMissing=${nodeModulesMissing})`));
-                        await runPromise(`yarn install`, { cwd: gitFolder });
+                        await runPromise(`yarn install --mutex network`, { cwd: gitFolder });
                     }
                 }
                 let parameterPath = folder + "/parameters.json";

package/src/deployManager/machineController.ts

@@ -136,7 +136,7 @@ class MachineControllerBase {
             gitFolder,
             gitRef: config.gitRef,
         });
-        await runPromise("yarn install", { cwd: gitFolder });
+        await runPromise("yarn install --mutex network", { cwd: gitFolder });
         await runPromise("bash machine-startup.sh", { cwd: os.homedir(), detach: true });
     }
 

package/src/diagnostics/logs/errorTickets/autoFixer.ts

@@ -172,19 +172,33 @@ async function applyPatch(ticketId: string, commentId: string): Promise<void> {
         throw new Error(`Comment ${commentId} is not a patch comment on ticket ${ticketId}`);
     }
 
+    // Relative paths may belong to either the application repo or the querysub repo (a sibling / dependency) — file paths are unique across the two, so whichever one actually has the file wins.
+    function resolvePatchFilePath(file: string): { fullPath: string | undefined; candidates: string[] } {
+        let candidates = Array.from(new Set([
+            path.resolve(process.cwd(), file),
+            path.resolve(QUERYSUB_ROOT, file),
+        ]));
+        for (let candidate of candidates) {
+            if (fs.existsSync(candidate)) {
+                return { fullPath: candidate, candidates };
+            }
+        }
+        return { fullPath: undefined, candidates };
+    }
+
     // Validate everything before writing anything, so a patch is all-or-nothing.
     let writes: { fullPath: string; newContents: string }[] = [];
     for (let patchFile of comment.patchFiles) {
-        let fullPath = path.resolve(process.cwd(), patchFile.file);
+        let { fullPath, candidates } = resolvePatchFilePath(patchFile.file);
         if (!patchFile.oldText) {
-            if (fs.existsSync(fullPath) && fs.readFileSync(fullPath, "utf8").trim()) {
-                throw new Error(`Patch wants to create ${patchFile.file}, but it already exists and is not empty`);
+            if (fullPath && fs.readFileSync(fullPath, "utf8").trim()) {
+                throw new Error(`Patch wants to create ${patchFile.file}, but it already exists at ${fullPath} and is not empty`);
             }
-            writes.push({ fullPath, newContents: patchFile.newText });
+            writes.push({ fullPath: fullPath ?? candidates[0], newContents: patchFile.newText });
             continue;
         }
-        if (!fs.existsSync(fullPath)) {
-            throw new Error(`Patch targets ${patchFile.file}, which does not exist (cwd is ${process.cwd()})`);
+        if (!fullPath) {
+            throw new Error(`Patch targets ${patchFile.file}, which does not exist. Tried: ${candidates.join(", ")}`);
         }
         let contents = fs.readFileSync(fullPath, "utf8");
         let index = contents.indexOf(patchFile.oldText);
@@ -532,7 +546,7 @@ PHASE 2 — FIX. Only after you have added your diagnosis comment, decide on the
   1. Downgrading logging: when the "error" is not actually an error, patch the logging call site to downgrade it from an error to a warning or a plain log, so it stops being reported.
   2. Actually fixing the broken code.
   3. Gathering more information: if you could NOT determine the root cause from the available logs, propose patches that ADD logging statements to the relevant code paths so the next investigation has the information it needs.
-Each patch file entry is { file, oldText, newText }: oldText must be copied exactly from the current file contents and should be unique within the file; it is replaced with newText. An empty oldText creates a new file. Relative file paths are resolved against the application repository (${process.cwd()}); for files in the querysub repository use absolute paths. Keep patches minimal and follow the style of the surrounding code.
+Each patch file entry is { file, oldText, newText }: oldText must be copied exactly from the current file contents and should be unique within the file; it is replaced with newText. An empty oldText creates a new file. Relative file paths are resolved against the application repository (${process.cwd()}) first, then against the querysub repository (${QUERYSUB_ROOT}) — whichever contains the file. Absolute paths also work. Keep patches minimal and follow the style of the surrounding code.
 
 When you are done, call mcp__autofixer__setTicketState with "code-change" if you proposed patches, or "not-a-bug" if the error should simply be ignored without any code change. If you are confused and just cannot figure out what is going on — the logs and code don't add up, and you can't even propose useful additional logging — add a comment explaining what you tried and what confused you, then call mcp__autofixer__setTicketState with "confused". Do NOT edit files directly — only propose changes through mcp__autofixer__addPatch.