@scheduler-systems/gal-run 0.0.662 → 0.0.663

package/dist/index.cjs

@@ -3881,7 +3881,7 @@ var cliVersion, defaultApiUrl, BUILD_CONSTANTS, constants_default;
 var init_constants = __esm({
   "module_6"() {
     "use strict";
-    cliVersion = true ? "0.0.662" : "0.0.0-dev";
+    cliVersion = true ? "0.0.663" : "0.0.0-dev";
     defaultApiUrl = true ? "https://api.gal.run" : "http://localhost:3000";
     BUILD_CONSTANTS = Object.freeze([cliVersion, defaultApiUrl]);
     constants_default = BUILD_CONSTANTS;
@@ -4235,6 +4235,74 @@ function buildWindowsNativeCommand(version2, force) {
   ].join("; ");
   return `powershell -NoProfile -ExecutionPolicy Bypass -Command "${command}"`;
 }
+function quoteShellArg(value) {
+  if (process.platform === "win32") {
+    return `"${value.replace(/(["^%])/g, "^$1")}"`;
+  }
+  return `'${value.replace(/'/g, "'\\''")}'`;
+}
+function createShellCommandError(command, exitCode, stdout, stderr) {
+  const message = stderr || stdout || `Command failed with ${exitCode === null ? "no exit code" : `exit code ${exitCode}`}: ${command}`;
+  const error2 = new Error(message);
+  error2.stdout = stdout;
+  error2.stderr = stderr;
+  error2.exitCode = exitCode;
+  return error2;
+}
+function getShellCommandErrorOutput(error2) {
+  if (error2 instanceof Error) {
+    const shellError = error2;
+    return [shellError.stderr, shellError.stdout, shellError.message].filter(Boolean).join("\n");
+  }
+  return String(error2);
+}
+function runShellCommand(command) {
+  return new Promise((resolve23, reject) => {
+    const child = (0, import_child_process.spawn)(command, [], {
+      shell: true,
+      timeout: 12e4
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (data) => {
+      stdout += data.toString();
+    });
+    child.stderr?.on("data", (data) => {
+      stderr += data.toString();
+    });
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve23({ stdout, stderr });
+      } else {
+        reject(createShellCommandError(command, code, stdout, stderr));
+      }
+    });
+    child.on("error", (err) => {
+      reject(err);
+    });
+  });
+}
+function parsePnpmUnexpectedStoreError(output) {
+  if (!output.includes("ERR_PNPM_UNEXPECTED_STORE") && !output.includes("Unexpected store location")) {
+    return null;
+  }
+  const linkedStoreDir = output.match(/currently linked from the store at "([^"]+)"/)?.[1];
+  const wantedStoreDir = output.match(/pnpm now wants to use the store at "([^"]+)"/)?.[1];
+  return {
+    linkedStoreDir,
+    wantedStoreDir
+  };
+}
+function buildPnpmUnexpectedStoreRetryCommand(command, output) {
+  if (/\s--store-dir(?:=|\s)/.test(command)) {
+    return null;
+  }
+  const parsed = parsePnpmUnexpectedStoreError(output);
+  if (!parsed?.linkedStoreDir) {
+    return null;
+  }
+  return `${command} --store-dir ${quoteShellArg(parsed.linkedStoreDir)}`;
+}
 function buildInstallCommand(method, operation, options = {}) {
   const version2 = normalizeInstallVersion(options.version);
   const registryUrl = options.registryUrl || getRegistryUrl();
@@ -4268,31 +4336,32 @@ function executeInstallCommand(method, operation, options = {}) {
 }
 async function executeInstallCommandAsync(method, operation, options = {}) {
   const command = buildInstallCommand(method, operation, options);
-  return new Promise((resolve23, reject) => {
-    const child = (0, import_child_process.spawn)(command, [], {
-      shell: true,
-      timeout: 12e4
-    });
-    let stdout = "";
-    let stderr = "";
-    child.stdout?.on("data", (data) => {
-      stdout += data.toString();
-    });
-    child.stderr?.on("data", (data) => {
-      stderr += data.toString();
-    });
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve23(stdout);
-      } else {
-        const error2 = new Error(stderr || `Command failed with exit code ${code}`);
-        reject(error2);
-      }
-    });
-    child.on("error", (err) => {
-      reject(err);
-    });
-  });
+  try {
+    const result = await runShellCommand(command);
+    return result.stdout;
+  } catch (error2) {
+    const output = getShellCommandErrorOutput(error2);
+    const retryCommand = method === "pnpm" ? buildPnpmUnexpectedStoreRetryCommand(command, output) : null;
+    if (!retryCommand) {
+      throw error2;
+    }
+    try {
+      const retryResult = await runShellCommand(retryCommand);
+      const note = `Recovered from pnpm global store mismatch by retrying with: ${retryCommand}`;
+      return [note, retryResult.stdout].filter(Boolean).join("\n");
+    } catch (retryError) {
+      const retryOutput = getShellCommandErrorOutput(retryError);
+      throw new Error(
+        [
+          output.trim(),
+          "",
+          "Detected pnpm global store mismatch and retry with the existing store also failed.",
+          `Retry manually with: ${retryCommand}`,
+          retryOutput.trim()
+        ].filter(Boolean).join("\n")
+      );
+    }
+  }
 }
 function describeInstallMethod(method) {
   switch (method) {
@@ -11842,7 +11911,7 @@ function detectEnvironment() {
     return "dev";
   }
   try {
-    const version2 = true ? "0.0.662" : void 0;
+    const version2 = true ? "0.0.663" : void 0;
     if (version2 && version2.includes("-local")) {
       return "dev";
     }
@@ -14523,7 +14592,7 @@ function getId() {
 }
 function getCliVersion() {
   try {
-    return true ? "0.0.662" : "0.0.0-dev";
+    return true ? "0.0.663" : "0.0.0-dev";
   } catch {
     return "0.0.0-dev";
   }
@@ -187600,7 +187669,7 @@ var init_gal_code_session_collection = __esm({
 });
 
 function resolveCliVersion() {
-  return true ? "0.0.662" : "0.0.0-dev";
+  return true ? "0.0.663" : "0.0.0-dev";
 }
 function resolveGalCodeRunnerAsset(version2) {
   const platformMap = {
@@ -187975,7 +188044,7 @@ async function uploadSessionArchive(config, cwd, commandArgs, startedAt, exitCod
       return;
     }
     const endedAt = /* @__PURE__ */ new Date();
-    const wrapperVersion = true ? "0.0.662" : "0.0.0-dev";
+    const wrapperVersion = true ? "0.0.663" : "0.0.0-dev";
     const model = childEnv.GAL_CODE_MODEL ?? "glm-vertex/glm-5";
     await uploadGalCodeSessionArchive(
       {
@@ -214688,8 +214757,21 @@ function createUpdateCommand() {
         updateSpinner.fail(source_default.red("Update failed"));
         const msg = error2 instanceof Error ? error2.message : String(error2);
         console.error(source_default.dim(msg));
-        console.log(`
+        const pnpmRetryCommand = method === "pnpm" ? buildPnpmUnexpectedStoreRetryCommand(installCommand, msg) : null;
+        const pnpmStoreMismatch = method === "pnpm" ? parsePnpmUnexpectedStoreError(msg) : null;
+        if (pnpmRetryCommand) {
+          console.log(`
+Retry manually with existing pnpm store: ${source_default.cyan(pnpmRetryCommand)}`);
+        } else if (pnpmStoreMismatch) {
+          console.log(
+            `
+Detected a pnpm global store mismatch. Use the store path shown in pnpm's "currently linked from the store at" line:
+  ${source_default.cyan(`${installCommand} --store-dir <linked-store-dir>`)}`
+          );
+        } else {
+          console.log(`
 Retry manually with: ${source_default.cyan(installCommand)}`);
+        }
         const isBackground = process.env.GAL_AUTO_UPDATE === "1";
         trackUpdate({
           success: false,
@@ -239643,7 +239725,7 @@ var init_index = __esm({
   }
 });
 
-var cliVersion10 = true ? "0.0.662" : "0.0.0-dev";
+var cliVersion10 = true ? "0.0.663" : "0.0.0-dev";
 var args = process.argv.slice(2);
 var requestedGlobalHelp = args.length === 1 && (args[0] === "--help" || args[0] === "-h");
 var requestedVersion = args.length === 1 && (args[0] === "--version" || args[0] === "-V");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scheduler-systems/gal-run",
-  "version": "0.0.662",
+  "version": "0.0.663",
   "description": "GAL CLI - Command-line tool for managing AI agent configurations across your organization",
   "license": "Elastic-2.0",
   "private": false,