omnius 1.0.878 → 1.0.880

package/dist/update-worker-runtime.js

@@ -3178,7 +3178,7 @@ var require_util = __commonJS({
         }
         path3 = url.path;
       }
-      var isAbsolute6 = exports.isAbsolute(path3);
+      var isAbsolute7 = exports.isAbsolute(path3);
       var parts = path3.split(/\/+/);
       for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
         part = parts[i];
@@ -3198,7 +3198,7 @@ var require_util = __commonJS({
       }
       path3 = parts.join("/");
       if (path3 === "") {
-        path3 = isAbsolute6 ? "/" : ".";
+        path3 = isAbsolute7 ? "/" : ".";
       }
       if (url) {
         url.path = path3;
@@ -3207,7 +3207,7 @@ var require_util = __commonJS({
       return path3;
     }
     exports.normalize = normalize;
-    function join18(aRoot, aPath) {
+    function join19(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -3239,7 +3239,7 @@ var require_util = __commonJS({
       }
       return joined;
     }
-    exports.join = join18;
+    exports.join = join19;
     exports.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
@@ -3412,7 +3412,7 @@ var require_util = __commonJS({
             parsed.path = parsed.path.substring(0, index + 1);
           }
         }
-        sourceURL = join18(urlGenerate(parsed), sourceURL);
+        sourceURL = join19(urlGenerate(parsed), sourceURL);
       }
       return normalize(sourceURL);
     }
@@ -13228,7 +13228,7 @@ ${lanes.join("\n")}
         getCurrentDirectory,
         getAccessibleSortedChildDirectories,
         fileSystemEntryExists,
-        realpath,
+        realpath: realpath2,
         setTimeout: setTimeout2,
         clearTimeout: clearTimeout2
       }) {
@@ -13404,7 +13404,7 @@ ${lanes.join("\n")}
         function updateChildWatches(parentDir, parentDirPath, options) {
           const parentWatcher = cache.get(parentDirPath);
           if (!parentWatcher) return false;
-          const target = normalizePath(realpath(parentDir));
+          const target = normalizePath(realpath2(parentDir));
           let hasChanges;
           let newChildWatches;
           if (filePathComparer(target, parentDir) === 0) {
@@ -13415,7 +13415,7 @@ ${lanes.join("\n")}
                 /* Directory */
               ) ? mapDefined(getAccessibleSortedChildDirectories(parentDir), (child) => {
                 const childFullName = getNormalizedAbsolutePath(child, parentDir);
-                return !isIgnoredPath(childFullName, options) && filePathComparer(childFullName, normalizePath(realpath(childFullName))) === 0 ? childFullName : void 0;
+                return !isIgnoredPath(childFullName, options) && filePathComparer(childFullName, normalizePath(realpath2(childFullName))) === 0 ? childFullName : void 0;
               }) : emptyArray,
               parentWatcher.childWatches,
               (child, childWatcher) => filePathComparer(child, childWatcher.dirName),
@@ -13499,7 +13499,7 @@ ${lanes.join("\n")}
         getCurrentDirectory,
         fsSupportsRecursiveFsWatch,
         getAccessibleSortedChildDirectories,
-        realpath,
+        realpath: realpath2,
         tscWatchFile,
         useNonPollingWatchers,
         tscWatchDirectory,
@@ -13639,7 +13639,7 @@ ${lanes.join("\n")}
               fileSystemEntryExists,
               getAccessibleSortedChildDirectories,
               watchDirectory: nonRecursiveWatchDirectory,
-              realpath,
+              realpath: realpath2,
               setTimeout: setTimeout2,
               clearTimeout: clearTimeout2
             });
@@ -13878,7 +13878,7 @@ ${lanes.join("\n")}
             // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
             fsSupportsRecursiveFsWatch,
             getAccessibleSortedChildDirectories: (path3) => getAccessibleFileSystemEntries(path3).directories,
-            realpath,
+            realpath: realpath2,
             tscWatchFile: process.env.TSC_WATCHFILE,
             useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
             tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
@@ -13952,7 +13952,7 @@ ${lanes.join("\n")}
             enableCPUProfiler,
             disableCPUProfiler,
             cpuProfilingEnabled: () => !!activeSession || contains(process.execArgv, "--cpu-prof") || contains(process.execArgv, "--prof"),
-            realpath,
+            realpath: realpath2,
             debugMode: !!process.env.NODE_INSPECTOR_IPC || !!process.env.VSCODE_INSPECTOR_OPTIONS || some(process.execArgv, (arg) => /^--(?:inspect|debug)(?:-brk)?(?:=\d+)?$/i.test(arg)) || !!process.recordreplay,
             tryEnableSourceMapsForHost() {
               try {
@@ -14184,7 +14184,7 @@ ${lanes.join("\n")}
             }
           }
           function readDirectory(path3, extensions, excludes, includes, depth) {
-            return matchFiles(path3, extensions, excludes, includes, useCaseSensitiveFileNames2, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
+            return matchFiles(path3, extensions, excludes, includes, useCaseSensitiveFileNames2, process.cwd(), depth, getAccessibleFileSystemEntries, realpath2);
           }
           function fileSystemEntryExists(path3, entryKind) {
             const stat = statSync4(path3);
@@ -14220,7 +14220,7 @@ ${lanes.join("\n")}
           function fsRealPathHandlingLongPath(path3) {
             return path3.length < 260 ? _fs.realpathSync.native(path3) : _fs.realpathSync(path3);
           }
-          function realpath(path3) {
+          function realpath2(path3) {
             try {
               return fsRealpath(path3);
             } catch {
@@ -28370,7 +28370,7 @@ ${lanes.join("\n")}
       function getRegexFromPattern(pattern, useCaseSensitiveFileNames2) {
         return new RegExp(pattern, useCaseSensitiveFileNames2 ? "" : "i");
       }
-      function matchFiles(path3, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath) {
+      function matchFiles(path3, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath2) {
         path3 = normalizePath(path3);
         currentDirectory = normalizePath(currentDirectory);
         const patterns = getFileMatcherPatterns(path3, excludes, includes, useCaseSensitiveFileNames2, currentDirectory);
@@ -28385,7 +28385,7 @@ ${lanes.join("\n")}
         }
         return flatten(results);
         function visitDirectory(path22, absolutePath, depth2) {
-          const canonicalPath = toCanonical(realpath(absolutePath));
+          const canonicalPath = toCanonical(realpath2(absolutePath));
           if (visited.has(canonicalPath)) return;
           visited.set(canonicalPath, true);
           const { files, directories } = getFileSystemEntries(path22);
@@ -38826,8 +38826,8 @@ ${lanes.join("\n")}
         return void 0;
       }
       function tryRenameExternalModule(factory2, moduleName, sourceFile) {
-        const rename = sourceFile.renamedDependencies && sourceFile.renamedDependencies.get(moduleName.text);
-        return rename ? factory2.createStringLiteral(rename) : void 0;
+        const rename2 = sourceFile.renamedDependencies && sourceFile.renamedDependencies.get(moduleName.text);
+        return rename2 ? factory2.createStringLiteral(rename2) : void 0;
       }
       function tryGetModuleNameFromFile(factory2, file, host, options) {
         if (!file) {
@@ -129580,7 +129580,7 @@ ${lanes.join("\n")}
           }
         }
         function createImportCallExpressionAMD(arg, containsLexicalThis) {
-          const resolve10 = factory2.createUniqueName("resolve");
+          const resolve11 = factory2.createUniqueName("resolve");
           const reject = factory2.createUniqueName("reject");
           const parameters = [
             factory2.createParameterDeclaration(
@@ -129589,7 +129589,7 @@ ${lanes.join("\n")}
               /*dotDotDotToken*/
               void 0,
               /*name*/
-              resolve10
+              resolve11
             ),
             factory2.createParameterDeclaration(
               /*modifiers*/
@@ -129606,7 +129606,7 @@ ${lanes.join("\n")}
                 factory2.createIdentifier("require"),
                 /*typeArguments*/
                 void 0,
-                [factory2.createArrayLiteralExpression([arg || factory2.createOmittedExpression()]), resolve10, reject]
+                [factory2.createArrayLiteralExpression([arg || factory2.createOmittedExpression()]), resolve11, reject]
               )
             )
           ]);
@@ -140607,7 +140607,7 @@ ${lanes.join("\n")}
           addOrDeleteFileOrDirectory,
           addOrDeleteFile,
           clearCache,
-          realpath: host.realpath && realpath
+          realpath: host.realpath && realpath2
         };
         function toPath3(fileName) {
           return toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -140718,7 +140718,7 @@ ${lanes.join("\n")}
           const rootResult = tryReadDirectory2(rootDir2, rootDirPath);
           let rootSymLinkResult;
           if (rootResult !== void 0) {
-            return matchFiles(rootDir2, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath);
+            return matchFiles(rootDir2, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath2);
           }
           return host.readDirectory(rootDir2, extensions, excludes, includes, depth);
           function getFileSystemEntries(dir) {
@@ -140747,7 +140747,7 @@ ${lanes.join("\n")}
             return result;
           }
         }
-        function realpath(s) {
+        function realpath2(s) {
           return host.realpath ? host.realpath(s) : s;
         }
         function clearFirstAncestorEntry(fileOrDirectoryPath) {
@@ -141202,7 +141202,7 @@ ${lanes.join("\n")}
           return getDirectoryPath(normalizePath(system.getExecutingFilePath()));
         }
         const newLine = getNewLineCharacter(options);
-        const realpath = system.realpath && ((path3) => system.realpath(path3));
+        const realpath2 = system.realpath && ((path3) => system.realpath(path3));
         const compilerHost = {
           getSourceFile: createGetSourceFile((fileName) => compilerHost.readFile(fileName), setParentNodes),
           getDefaultLibLocation,
@@ -141222,7 +141222,7 @@ ${lanes.join("\n")}
           directoryExists: (directoryName) => system.directoryExists(directoryName),
           getEnvironmentVariable: (name) => system.getEnvironmentVariable ? system.getEnvironmentVariable(name) : "",
           getDirectories: (path3) => system.getDirectories(path3),
-          realpath,
+          realpath: realpath2,
           readDirectory: (path3, extensions, include, exclude, depth) => system.readDirectory(path3, extensions, include, exclude, depth),
           createDirectory: (d) => system.createDirectory(d),
           createHash: maybeBind(system, system.createHash)
@@ -142417,9 +142417,9 @@ ${lanes.join("\n")}
             /*ignoreCase*/
             false
           )) {
-            const basename9 = getBaseFileName(a.fileName);
-            if (basename9 === "lib.d.ts" || basename9 === "lib.es6.d.ts") return 0;
-            const name = removeSuffix(removePrefix(basename9, "lib."), ".d.ts");
+            const basename10 = getBaseFileName(a.fileName);
+            if (basename10 === "lib.d.ts" || basename10 === "lib.es6.d.ts") return 0;
+            const name = removeSuffix(removePrefix(basename10, "lib."), ".d.ts");
             const index = libs.indexOf(name);
             if (index !== -1) return index + 1;
           }
@@ -173528,19 +173528,19 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       function convertNamedExport(sourceFile, assignment, changes, exports2) {
         const { text: text2 } = assignment.left.name;
-        const rename = exports2.get(text2);
-        if (rename !== void 0) {
+        const rename2 = exports2.get(text2);
+        if (rename2 !== void 0) {
           const newNodes = [
             makeConst(
               /*modifiers*/
               void 0,
-              rename,
+              rename2,
               assignment.right
             ),
             makeExportDeclaration([factory.createExportSpecifier(
               /*isTypeOnly*/
               false,
-              rename,
+              rename2,
               text2
             )])
           ];
@@ -205053,9 +205053,9 @@ ${options.prefix}` : "\n" : options.prefix
             if (this.host.realpath) {
               Debug.assert(!!this.containingProjects.length);
               const project = this.containingProjects[0];
-              const realpath = this.host.realpath(this.path);
-              if (realpath) {
-                this.realpath = project.toPath(realpath);
+              const realpath2 = this.host.realpath(this.path);
+              if (realpath2) {
+                this.realpath = project.toPath(realpath2);
                 if (this.realpath !== this.path) {
                   project.projectService.realpathToScriptInfos.add(this.realpath, this);
                 }
@@ -206345,8 +206345,8 @@ ${options.prefix}` : "\n" : options.prefix
             }
           };
           for (const file of files) {
-            const basename9 = getBaseFileName(file);
-            if (basename9 === "package.json" || basename9 === "bower.json") {
+            const basename10 = getBaseFileName(file);
+            if (basename10 === "package.json" || basename10 === "bower.json") {
               createProjectWatcher(
                 file,
                 "FileWatcher"
@@ -209092,9 +209092,9 @@ ${options.prefix}` : "\n" : options.prefix
           this.filenameToScriptInfo.delete(info.path);
           this.filenameToScriptInfoVersion.set(info.path, info.textStorage.version);
           this.stopWatchingScriptInfo(info);
-          const realpath = info.getRealpathIfDifferent();
-          if (realpath) {
-            this.realpathToScriptInfos.remove(realpath, info);
+          const realpath2 = info.getRealpathIfDifferent();
+          if (realpath2) {
+            this.realpathToScriptInfos.remove(realpath2, info);
           }
           info.closeSourceMapFileWatcher();
         }
@@ -209983,9 +209983,9 @@ All files are: ${JSON.stringify(names)}`,
         getSymlinkedProjects(info) {
           let projects;
           if (this.realpathToScriptInfos) {
-            const realpath = info.getRealpathIfDifferent();
-            if (realpath) {
-              forEach(this.realpathToScriptInfos.get(realpath), combineProjects);
+            const realpath2 = info.getRealpathIfDifferent();
+            if (realpath2) {
+              forEach(this.realpathToScriptInfos.get(realpath2), combineProjects);
             }
             forEach(this.realpathToScriptInfos.get(info.path), combineProjects);
           }
@@ -210030,8 +210030,8 @@ All files are: ${JSON.stringify(names)}`,
               var _a3;
               const fileOrDirectoryPath = removeIgnoredPath(this.toPath(fileOrDirectory));
               if (!fileOrDirectoryPath) return;
-              const basename9 = getBaseFileName(fileOrDirectoryPath);
-              if (((_a3 = result.affectedModuleSpecifierCacheProjects) == null ? void 0 : _a3.size) && (basename9 === "package.json" || basename9 === "node_modules")) {
+              const basename10 = getBaseFileName(fileOrDirectoryPath);
+              if (((_a3 = result.affectedModuleSpecifierCacheProjects) == null ? void 0 : _a3.size) && (basename10 === "package.json" || basename10 === "node_modules")) {
                 result.affectedModuleSpecifierCacheProjects.forEach((project) => {
                   var _a22;
                   (_a22 = project.getModuleSpecifierCache()) == null ? void 0 : _a22.clear();
@@ -216517,8 +216517,8 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
         installPackage(options) {
           this.packageInstallId++;
           const request = { kind: "installPackage", ...options, id: this.packageInstallId };
-          const promise = new Promise((resolve10, reject) => {
-            (this.packageInstalledPromise ?? (this.packageInstalledPromise = /* @__PURE__ */ new Map())).set(this.packageInstallId, { resolve: resolve10, reject });
+          const promise = new Promise((resolve11, reject) => {
+            (this.packageInstalledPromise ?? (this.packageInstalledPromise = /* @__PURE__ */ new Map())).set(this.packageInstallId, { resolve: resolve11, reject });
           });
           this.installer.send(request);
           return promise;
@@ -218778,7 +218778,7 @@ var require_path_browserify = __commonJS({
     }
     var posix = {
       // path.resolve([from ...], to)
-      resolve: function resolve10() {
+      resolve: function resolve11() {
         var resolvedPath = "";
         var resolvedAbsolute = false;
         var cwd;
@@ -218813,19 +218813,19 @@ var require_path_browserify = __commonJS({
       normalize: function normalize(path3) {
         assertPath(path3);
         if (path3.length === 0) return ".";
-        var isAbsolute6 = path3.charCodeAt(0) === 47;
+        var isAbsolute7 = path3.charCodeAt(0) === 47;
         var trailingSeparator = path3.charCodeAt(path3.length - 1) === 47;
-        path3 = normalizeStringPosix(path3, !isAbsolute6);
-        if (path3.length === 0 && !isAbsolute6) path3 = ".";
+        path3 = normalizeStringPosix(path3, !isAbsolute7);
+        if (path3.length === 0 && !isAbsolute7) path3 = ".";
         if (path3.length > 0 && trailingSeparator) path3 += "/";
-        if (isAbsolute6) return "/" + path3;
+        if (isAbsolute7) return "/" + path3;
         return path3;
       },
-      isAbsolute: function isAbsolute6(path3) {
+      isAbsolute: function isAbsolute7(path3) {
         assertPath(path3);
         return path3.length > 0 && path3.charCodeAt(0) === 47;
       },
-      join: function join18() {
+      join: function join19() {
         if (arguments.length === 0)
           return ".";
         var joined;
@@ -218912,7 +218912,7 @@ var require_path_browserify = __commonJS({
       _makeLong: function _makeLong(path3) {
         return path3;
       },
-      dirname: function dirname10(path3) {
+      dirname: function dirname11(path3) {
         assertPath(path3);
         if (path3.length === 0) return ".";
         var code = path3.charCodeAt(0);
@@ -218934,7 +218934,7 @@ var require_path_browserify = __commonJS({
         if (hasRoot && end === 1) return "//";
         return path3.slice(0, end);
       },
-      basename: function basename9(path3, ext2) {
+      basename: function basename10(path3, ext2) {
         if (ext2 !== void 0 && typeof ext2 !== "string") throw new TypeError('"ext" argument must be a string');
         assertPath(path3);
         var start = 0;
@@ -219035,9 +219035,9 @@ var require_path_browserify = __commonJS({
         var ret = { root: "", dir: "", base: "", ext: "", name: "" };
         if (path3.length === 0) return ret;
         var code = path3.charCodeAt(0);
-        var isAbsolute6 = code === 47;
+        var isAbsolute7 = code === 47;
         var start;
-        if (isAbsolute6) {
+        if (isAbsolute7) {
           ret.root = "/";
           start = 1;
         } else {
@@ -219073,11 +219073,11 @@ var require_path_browserify = __commonJS({
         preDotState === 0 || // The (right-most) trimmed path component is exactly '..'
         preDotState === 1 && startDot === end - 1 && startDot === startPart + 1) {
           if (end !== -1) {
-            if (startPart === 0 && isAbsolute6) ret.base = ret.name = path3.slice(1, end);
+            if (startPart === 0 && isAbsolute7) ret.base = ret.name = path3.slice(1, end);
             else ret.base = ret.name = path3.slice(startPart, end);
           }
         } else {
-          if (startPart === 0 && isAbsolute6) {
+          if (startPart === 0 && isAbsolute7) {
             ret.name = path3.slice(1, startDot);
             ret.base = path3.slice(1, end);
           } else {
@@ -219087,7 +219087,7 @@ var require_path_browserify = __commonJS({
           ret.ext = path3.slice(startDot, end);
         }
         if (startPart > 0) ret.dir = path3.slice(0, startPart - 1);
-        else if (isAbsolute6) ret.dir = "/";
+        else if (isAbsolute7) ret.dir = "/";
         return ret;
       },
       sep: "/",
@@ -221980,7 +221980,7 @@ var require_ts_morph_common = __commonJS({
         }
       }
     };
-    function matchFiles(path4, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getEntries, realpath, directoryExists) {
+    function matchFiles(path4, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getEntries, realpath2, directoryExists) {
       return ts__namespace.matchFiles.apply(this, arguments);
     }
     function getFileMatcherPatterns(path4, excludes, includes, useCaseSensitiveFileNames, currentDirectory) {
@@ -222969,12 +222969,12 @@ ${nodeLocation}` : message;
     };
     var NodeRuntimeFileSystem = class {
       delete(path4) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve11, reject) => {
           fs__namespace.rm(path4, { recursive: true }, (err) => {
             if (err)
               reject(err);
             else
-              resolve10();
+              resolve11();
           });
         });
       }
@@ -222993,12 +222993,12 @@ ${nodeLocation}` : message;
         }));
       }
       readFile(filePath, encoding = "utf-8") {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve11, reject) => {
           fs__namespace.readFile(filePath, encoding, (err, data) => {
             if (err)
               reject(err);
             else
-              resolve10(data);
+              resolve11(data);
           });
         });
       }
@@ -223006,12 +223006,12 @@ ${nodeLocation}` : message;
         return fs__namespace.readFileSync(filePath, encoding);
       }
       async writeFile(filePath, fileText) {
-        await new Promise((resolve10, reject) => {
+        await new Promise((resolve11, reject) => {
           fs__namespace.writeFile(filePath, fileText, (err) => {
             if (err)
               reject(err);
             else
-              resolve10();
+              resolve11();
           });
         });
       }
@@ -223025,12 +223025,12 @@ ${nodeLocation}` : message;
         fs__namespace.mkdirSync(dirPath, { recursive: true });
       }
       move(srcPath, destPath) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve11, reject) => {
           fs__namespace.rename(srcPath, destPath, (err) => {
             if (err)
               reject(err);
             else
-              resolve10();
+              resolve11();
           });
         });
       }
@@ -223038,12 +223038,12 @@ ${nodeLocation}` : message;
         fs__namespace.renameSync(srcPath, destPath);
       }
       copy(srcPath, destPath) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve11, reject) => {
           fs__namespace.copyFile(srcPath, destPath, (err) => {
             if (err)
               reject(err);
             else
-              resolve10();
+              resolve11();
           });
         });
       }
@@ -223051,15 +223051,15 @@ ${nodeLocation}` : message;
         fs__namespace.copyFileSync(srcPath, destPath);
       }
       stat(path4) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve11, reject) => {
           fs__namespace.stat(path4, (err, stat) => {
             if (err) {
               if (err.code === "ENOENT" || err.code === "ENOTDIR")
-                resolve10(void 0);
+                resolve11(void 0);
               else
                 reject(err);
             } else {
-              resolve10(stat);
+              resolve11(stat);
             }
           });
         });
@@ -247743,6 +247743,10 @@ init_process_lifecycle();
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
 var runContextStorage = new AsyncLocalStorage2();
 
+// packages/execution/dist/shell-run-control.js
+init_process_lifecycle();
+init_process_kill();
+
 // packages/execution/dist/tools/shell.js
 init_process_kill();
 init_process_lifecycle();
@@ -296772,7 +296776,6 @@ var DEFAULT_INLINE_EPISODES_MAX_BYTES = 1024 * 1024 * 1024;
 init_process_async();
 
 // packages/execution/dist/tools/background-task.js
-init_process_kill();
 init_process_lifecycle();
 
 // packages/execution/dist/tools/image.js
@@ -299671,7 +299674,7 @@ async function getDaemonReportedIdentity(port) {
 async function waitForDaemonReady(port, expectedVersion, attempts = 24) {
   let observedVersion = null;
   for (let attempt = 0; attempt < attempts; attempt++) {
-    await new Promise((resolve10) => setTimeout(resolve10, 500));
+    await new Promise((resolve11) => setTimeout(resolve11, 500));
     const identity = await getDaemonReportedIdentity(port);
     if (!identity) continue;
     observedVersion = identity.bootVersion;
@@ -299682,10 +299685,10 @@ async function waitForDaemonReady(port, expectedVersion, attempts = 24) {
   return { ok: false, observedVersion };
 }
 function delay(ms) {
-  return new Promise((resolve10) => setTimeout(resolve10, ms));
+  return new Promise((resolve11) => setTimeout(resolve11, ms));
 }
 function runUtilityCommand(command, args, timeout) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     let settled = false;
     let stdout = "";
     let stderr = "";
@@ -299695,7 +299698,7 @@ function runUtilityCommand(command, args, timeout) {
       if (settled) return;
       settled = true;
       if (timer) clearTimeout(timer);
-      resolve10({ available, code, stdout, stderr });
+      resolve11({ available, code, stdout, stderr });
     };
     let child;
     try {
@@ -299704,7 +299707,7 @@ function runUtilityCommand(command, args, timeout) {
         windowsHide: true
       });
     } catch {
-      resolve10({ available: false, code: null, stdout: "", stderr: "" });
+      resolve11({ available: false, code: null, stdout: "", stderr: "" });
       return;
     }
     child.stdout?.setEncoding("utf8");
@@ -299860,13 +299863,13 @@ async function portHolderPids(port) {
   return daemonListenerPids(port);
 }
 async function daemonPortIsFree(port) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     const probe = createNetServer();
     let settled = false;
     const finish = (free) => {
       if (settled) return;
       settled = true;
-      resolve10(free);
+      resolve11(free);
     };
     probe.once("error", () => finish(false));
     probe.once("listening", () => {
@@ -300173,7 +300176,7 @@ async function quiesceDaemonForUpdate(port = getDaemonPort()) {
 
 // packages/cli/src/update-service.ts
 import { spawn as spawn2 } from "node:child_process";
-import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash3, randomUUID as randomUUID3 } from "node:crypto";
 import {
   constants,
   chmodSync,
@@ -300194,7 +300197,7 @@ import {
   writeSync as writeSync2
 } from "node:fs";
 import { homedir as homedir15 } from "node:os";
-import { dirname as dirname8, join as join15 } from "node:path";
+import { dirname as dirname9, join as join16 } from "node:path";
 
 // packages/cli/src/service-version.ts
 var OmniusVersionError = class extends Error {
@@ -300249,6 +300252,87 @@ function compareOmniusVersions(left, right) {
   return 0;
 }
 
+// packages/cli/src/npm-install-recovery.ts
+import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
+import { lstat, realpath, rename, rm } from "node:fs/promises";
+import { basename as basename8, dirname as dirname8, isAbsolute as isAbsolute6, join as join15, resolve as resolve10 } from "node:path";
+function parseNpmRenameCollision(diagnostic) {
+  const fields = /* @__PURE__ */ new Map();
+  let previousPathField = false;
+  for (const line of diagnostic.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "").split(/\r?\n/)) {
+    const match2 = /^\s*npm\s+(?:error|ERR!)\s+(code|syscall|path|dest)\s+(.+?)\s*$/.exec(line);
+    if (previousPathField && line.trim() && !/^\s*npm\s+(?:error|ERR!)(?:\s|$)/.test(line)) return null;
+    if (match2) {
+      if (fields.has(match2[1])) return null;
+      fields.set(match2[1], match2[2]);
+      previousPathField = match2[1] === "path" || match2[1] === "dest";
+    } else if (line.trim()) previousPathField = false;
+  }
+  const code = fields.get("code"), path3 = fields.get("path"), dest = fields.get("dest");
+  if (code !== "ENOTEMPTY" && code !== "EEXIST" || fields.get("syscall") !== "rename" || !path3 || !dest || /[\x00-\x1f\x7f]/.test(path3 + dest)) return null;
+  return { code, syscall: "rename", path: path3, dest };
+}
+function retiredNpmPackagePath(packagePath) {
+  const suffix = createHash2("sha1").update(packagePath).digest("base64").replace(/[^a-zA-Z0-9]/g, "").slice(0, 8);
+  return join15(dirname8(packagePath), `.${basename8(packagePath)}-${suffix}`);
+}
+function assertNotCancelled(signal) {
+  signal?.throwIfAborted();
+}
+function sameIdentity(left, right) {
+  return left.dev === right.dev && left.ino === right.ino;
+}
+function assertOwnedDirectory(metadata, label) {
+  if (!metadata.isDirectory() || metadata.isSymbolicLink() || process.platform !== "win32" && (metadata.uid !== process.getuid?.() || (metadata.mode & 2) !== 0)) {
+    throw new Error(`Cannot recover npm retirement collision: ${label} must be an owned directory, not a link.`);
+  }
+}
+async function recoverNpmRetirementCollision(collision, modulesRoot, options = {}) {
+  const current = () => {
+    assertNotCancelled(options.signal);
+    options.assertOwned?.();
+    assertNotCancelled(options.signal);
+  };
+  current();
+  if (collision.code !== "ENOTEMPTY" && collision.code !== "EEXIST" || collision.syscall !== "rename" || !isAbsolute6(modulesRoot) || /[\x00-\x1f\x7f]/.test(modulesRoot + collision.path + collision.dest)) return null;
+  const root = resolve10(modulesRoot), source = join15(root, "omnius"), retired = retiredNpmPackagePath(source);
+  if (collision.path !== source || collision.dest !== retired || dirname8(retired) !== root) return null;
+  const rootBefore = await lstat(root);
+  assertOwnedDirectory(rootBefore, "global modules root");
+  const canonicalRoot = await realpath(root);
+  let before;
+  try {
+    before = await lstat(retired);
+  } catch (error) {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  }
+  assertOwnedDirectory(before, "retired package");
+  const backup = join15(root, `.omnius-update-recovery-${randomUUID2()}`);
+  current();
+  const [rootNow, candidateNow] = await Promise.all([lstat(root), lstat(retired)]);
+  if (!sameIdentity(rootBefore, rootNow) || !sameIdentity(before, candidateNow) || await realpath(root) !== canonicalRoot) throw new Error("npm retirement directory changed before recovery; no cleanup was attempted.");
+  assertOwnedDirectory(rootNow, "global modules root");
+  assertOwnedDirectory(candidateNow, "retired package");
+  current();
+  await rename(retired, backup);
+  return { modulesRoot: root, retiredPath: retired, backupPath: backup, device: before.dev, inode: before.ino };
+}
+async function removeVerifiedNpmRetirementBackup(backup) {
+  const root = resolve10(backup.modulesRoot);
+  if (!isAbsolute6(backup.modulesRoot) || dirname8(backup.backupPath) !== root || !/^\.omnius-update-recovery-[a-f0-9-]{36}$/.test(basename8(backup.backupPath)) || backup.retiredPath !== retiredNpmPackagePath(join15(root, "omnius"))) {
+    throw new Error("Refusing cleanup outside the preserved npm retirement directory.");
+  }
+  const rootMetadata = await lstat(root);
+  assertOwnedDirectory(rootMetadata, "global modules root");
+  const metadata = await lstat(backup.backupPath);
+  assertOwnedDirectory(metadata, "preserved retirement directory");
+  if (metadata.dev !== backup.device || metadata.ino !== backup.inode) {
+    throw new Error("Preserved npm retirement directory identity changed; its contents were retained.");
+  }
+  await rm(backup.backupPath, { recursive: true });
+}
+
 // packages/cli/src/update-service.ts
 var UpdateCancelledError = class extends Error {
   constructor(message = "Update cancelled. Package changes already made are retained; no rollback is claimed.") {
@@ -300260,7 +300344,7 @@ var UpdateOwnershipBusyError = class extends Error {
 };
 function cancellationPath(operationId, paths) {
   if (!/^[a-zA-Z0-9_-]{1,128}$/.test(operationId)) throw new Error("Invalid update operation identity");
-  return join15(paths.stateDir, `cancel-${operationId}.json`);
+  return join16(paths.stateDir, `cancel-${operationId}.json`);
 }
 function watchUpdateCancellation(operationId, paths = resolveUpdatePaths()) {
   const controller = new AbortController();
@@ -300288,16 +300372,16 @@ function watchUpdateCancellation(operationId, paths = resolveUpdatePaths()) {
   } };
 }
 function resolveUpdatePaths(env = process.env, platform2 = process.platform, home = homedir15()) {
-  const stateBase = platform2 === "win32" ? env["LOCALAPPDATA"] || join15(home, "AppData", "Local") : platform2 === "darwin" ? join15(home, "Library", "Application Support") : env["XDG_STATE_HOME"] || join15(home, ".local", "state");
-  const cacheBase = platform2 === "win32" ? env["LOCALAPPDATA"] || join15(home, "AppData", "Local") : platform2 === "darwin" ? join15(home, "Library", "Caches") : env["XDG_CACHE_HOME"] || join15(home, ".cache");
-  const stateDir = join15(stateBase, platform2 === "win32" ? "Omnius" : "omnius", "update");
-  const cacheDir = join15(cacheBase, platform2 === "win32" ? "Omnius" : "omnius", "npm-update");
+  const stateBase = platform2 === "win32" ? env["LOCALAPPDATA"] || join16(home, "AppData", "Local") : platform2 === "darwin" ? join16(home, "Library", "Application Support") : env["XDG_STATE_HOME"] || join16(home, ".local", "state");
+  const cacheBase = platform2 === "win32" ? env["LOCALAPPDATA"] || join16(home, "AppData", "Local") : platform2 === "darwin" ? join16(home, "Library", "Caches") : env["XDG_CACHE_HOME"] || join16(home, ".cache");
+  const stateDir = join16(stateBase, platform2 === "win32" ? "Omnius" : "omnius", "update");
+  const cacheDir = join16(cacheBase, platform2 === "win32" ? "Omnius" : "omnius", "npm-update");
   return {
     stateDir,
     cacheDir,
-    stateFile: join15(stateDir, "state.json"),
-    lockFile: join15(stateDir, "update.lock"),
-    logFile: join15(stateDir, "update.log")
+    stateFile: join16(stateDir, "state.json"),
+    lockFile: join16(stateDir, "update.lock"),
+    logFile: join16(stateDir, "update.log")
   };
 }
 function ensurePrivateDirectories(paths) {
@@ -300358,7 +300442,7 @@ function processIdentity(pid) {
 }
 function withUpdateOwnership(paths, mutation) {
   ensurePrivateDirectories(paths);
-  const path3 = paths.lockFile + ".guard", nonce = randomUUID2();
+  const path3 = paths.lockFile + ".guard", nonce = randomUUID3();
   let fd;
   try {
     fd = openSync3(path3, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW, 384);
@@ -300412,7 +300496,7 @@ async function retryUpdateOwnership(attempt, timeoutMs = 2e3) {
       } catch {
       }
       if (!live) throw error;
-      await new Promise((resolve10) => setTimeout(resolve10, 25));
+      await new Promise((resolve11) => setTimeout(resolve11, 25));
     }
   }
 }
@@ -300421,7 +300505,7 @@ function releaseMatchingUpdateLock(paths, operationId, pid) {
   if (lock?.operation_id === operationId && (pid === void 0 || lock.pid === pid)) unlinkSync3(paths.lockFile);
 }
 function atomicPrivateJson(path3, value) {
-  const temp = `${path3}.${process.pid}.${randomUUID2()}.tmp`;
+  const temp = `${path3}.${process.pid}.${randomUUID3()}.tmp`;
   try {
     writeFileSync4(temp, `${JSON.stringify(value, null, 2)}
 `, {
@@ -300477,8 +300561,8 @@ function assertExactUpdateTarget(targetVersion, fromVersion) {
   return target;
 }
 function npmCandidates(execPath = process.execPath) {
-  const nodeDir = dirname8(execPath);
-  return process.platform === "win32" ? [join15(nodeDir, "npm.cmd"), join15(nodeDir, "npm.exe"), "npm.cmd", "npm"] : [join15(nodeDir, "npm"), "/usr/local/bin/npm", "/usr/bin/npm", "npm"];
+  const nodeDir = dirname9(execPath);
+  return process.platform === "win32" ? [join16(nodeDir, "npm.cmd"), join16(nodeDir, "npm.exe"), "npm.cmd", "npm"] : [join16(nodeDir, "npm"), "/usr/local/bin/npm", "/usr/bin/npm", "npm"];
 }
 function runnableCommand(candidate) {
   return candidate.includes("/") || candidate.includes("\\") ? existsSync6(candidate) : true;
@@ -300496,7 +300580,7 @@ async function runUpdateCommand(command, args, options = {}) {
   if (options.signal?.aborted) {
     return { status: null, stdout: "", stderr: "command cancelled", signal: null, error: new Error("command cancelled") };
   }
-  return await new Promise((resolve10) => {
+  return await new Promise((resolve11) => {
     const child = spawn2(command, args, {
       env: options.env ?? process.env,
       cwd: options.cwd,
@@ -300542,7 +300626,7 @@ async function runUpdateCommand(command, args, options = {}) {
       clearTimeout(timer);
       if (forceTimer) clearTimeout(forceTimer);
       options.signal?.removeEventListener("abort", onAbort);
-      resolve10(result);
+      resolve11(result);
     };
     const onAbort = () => {
       terminate(new Error("command cancelled"));
@@ -300570,10 +300654,10 @@ async function runUpdateCommand(command, args, options = {}) {
 }
 var runCommand = runUpdateCommand;
 function globalPackageCandidates(prefix) {
-  return process.platform === "win32" ? [join15(prefix, "node_modules", "omnius", "package.json"), join15(prefix, "omnius", "package.json")] : [join15(prefix, "lib", "node_modules", "omnius", "package.json"), join15(prefix, "node_modules", "omnius", "package.json")];
+  return process.platform === "win32" ? [join16(prefix, "node_modules", "omnius", "package.json"), join16(prefix, "omnius", "package.json")] : [join16(prefix, "lib", "node_modules", "omnius", "package.json"), join16(prefix, "node_modules", "omnius", "package.json")];
 }
 function globalExecutableCandidates(prefix) {
-  return process.platform === "win32" ? [join15(prefix, "omnius.cmd"), join15(prefix, "omnius.exe"), join15(prefix, "bin", "omnius.cmd")] : [join15(prefix, "bin", "omnius")];
+  return process.platform === "win32" ? [join16(prefix, "omnius.cmd"), join16(prefix, "omnius.exe"), join16(prefix, "bin", "omnius.cmd")] : [join16(prefix, "bin", "omnius")];
 }
 async function inspectGlobalOmniusInstall(expectedVersion, options = {}) {
   const npmPath = options.npmPath ?? resolveNpmPath();
@@ -300606,7 +300690,7 @@ ${versionResult.stderr}`) ?? "";
     executablePath,
     installedVersion,
     executableVersion,
-    packageHash: createHash2("sha256").update(packageJsonRaw).digest("hex")
+    packageHash: createHash3("sha256").update(packageJsonRaw).digest("hex")
   };
 }
 function transitionOnce(current, patch, paths) {
@@ -300632,7 +300716,7 @@ async function quiesceDaemonWithRetry(quiesce, attempts = 3, pauseMs = 250) {
     } catch {
     }
     if (attempt < boundedAttempts && pauseMs > 0) {
-      await new Promise((resolve10) => setTimeout(resolve10, pauseMs));
+      await new Promise((resolve11) => setTimeout(resolve11, pauseMs));
     }
   }
   return false;
@@ -300654,14 +300738,16 @@ async function installGlobalPackageStreaming(input) {
     onStderr: (text2) => process.stderr.write(text2)
   });
   const exitCode = result.status ?? -1;
+  const renameCollision = parseNpmRenameCollision(result.stderr);
   return { exitCode, ...result.error || exitCode !== 0 ? {
     error: result.error?.message || result.stderr.slice(-8e3).trim() || `npm install exited with ${result.signal || exitCode}`
-  } : {} };
+  } : {}, ...renameCollision ? { renameCollision } : {} };
 }
 async function runVerifiedUpdateTransaction(initial, dependencies, paths = resolveUpdatePaths()) {
   let state = initial;
   let daemonQuiesced = false;
   let installStarted = false;
+  let retirementBackup = null;
   let cancelPublication;
   const throwIfCancelled = () => {
     if (dependencies.signal?.aborted) throw new UpdateCancelledError();
@@ -300682,7 +300768,7 @@ async function runVerifiedUpdateTransaction(initial, dependencies, paths = resol
   const npmPath = resolveNpmPath();
   const env = {
     ...process.env,
-    PATH: [dirname8(process.execPath), process.env.PATH ?? ""].filter(Boolean).join(process.platform === "win32" ? ";" : ":"),
+    PATH: [dirname9(process.execPath), process.env.PATH ?? ""].filter(Boolean).join(process.platform === "win32" ? ";" : ":"),
     NPM_CONFIG_CACHE: paths.cacheDir,
     npm_config_cache: paths.cacheDir,
     npm_config_prefer_online: "true",
@@ -300711,10 +300797,39 @@ async function runVerifiedUpdateTransaction(initial, dependencies, paths = resol
     throwIfCancelled();
     const installer = dependencies.install ?? installGlobalPackageStreaming;
     installStarted = true;
-    const installResult = await installer({ npmPath, targetVersion: target, env, signal: dependencies.signal });
-    state = await transition(state, { installer_exit_code: installResult.exitCode }, paths);
-    throwIfCancelled();
-    if (installResult.exitCode !== 0) {
+    for (let attempt = 1; attempt <= 2; attempt++) {
+      state = await transition(state, { installer_attempt: attempt }, paths);
+      throwIfCancelled();
+      const installResult = await installer({ npmPath, targetVersion: target, env, signal: dependencies.signal });
+      state = await transition(state, { installer_exit_code: installResult.exitCode }, paths);
+      throwIfCancelled();
+      if (installResult.exitCode === 0) break;
+      const collision = installResult.renameCollision ?? parseNpmRenameCollision(installResult.error ?? "");
+      if (attempt === 1 && collision) {
+        const rootProbe = await runCommand(npmPath, ["root", "-g"], { env, timeout: 1e4, signal: dependencies.signal });
+        throwIfCancelled();
+        if (rootProbe.status === 0 && rootProbe.stdout.trim()) {
+          retirementBackup = await recoverNpmRetirementCollision(collision, rootProbe.stdout.trim(), {
+            signal: dependencies.signal,
+            assertOwned: () => {
+              const persisted = readUpdateState(paths);
+              if (!persisted || persisted.operation_id !== state.operation_id || persisted.status !== "running" || state.worker_adopted_at && !ownsAdoptedWorker(persisted, state.operation_id, state.pid, paths)) {
+                throw new Error("Update ownership changed before npm collision recovery; no directory was moved.");
+              }
+            }
+          });
+          if (retirementBackup) {
+            state = await transition(state, { npm_recovery: {
+              retired_path: retirementBackup.retiredPath,
+              backup_path: retirementBackup.backupPath,
+              status: "retained"
+            } }, paths);
+            process.stderr.write("[omnius update] Preserved the occupied npm retirement directory; retrying the same package once (attempt 2/2).\n");
+            throwIfCancelled();
+            continue;
+          }
+        }
+      }
       throw new Error(installResult.error || `npm install exited with code ${installResult.exitCode}`);
     }
     const evidence = dependencies.inspectInstall ? await dependencies.inspectInstall(target, npmPath, env) : await inspectGlobalOmniusInstall(target, { npmPath, env });
@@ -300739,7 +300854,7 @@ async function runVerifiedUpdateTransaction(initial, dependencies, paths = resol
       if (daemon?.bootVersion === target && daemon.bootPackageHash === evidence.packageHash) {
         break;
       }
-      if (attempt < 3) await new Promise((resolve10) => setTimeout(resolve10, 1e3));
+      if (attempt < 3) await new Promise((resolve11) => setTimeout(resolve11, 1e3));
     }
     if (!daemon || daemon.bootVersion !== target) {
       const observed = daemon?.bootVersion ?? "unreachable";
@@ -300771,6 +300886,21 @@ async function runVerifiedUpdateTransaction(initial, dependencies, paths = resol
       state = await transition(state, { tray_restarted: true }, paths);
     }
     throwIfCancelled();
+    if (retirementBackup && state.npm_recovery) {
+      const recovery = state.npm_recovery;
+      let cleanupWarning;
+      try {
+        await removeVerifiedNpmRetirementBackup(retirementBackup);
+      } catch (error) {
+        cleanupWarning = error instanceof Error ? error.message : String(error);
+      }
+      state = await transition(state, { npm_recovery: {
+        ...recovery,
+        status: cleanupWarning ? "retained" : "removed",
+        ...cleanupWarning ? { cleanup_warning: cleanupWarning } : {}
+      } }, paths);
+    }
+    throwIfCancelled();
     const now = (/* @__PURE__ */ new Date()).toISOString();
     state = await transition(state, {
       status: "completed",
@@ -300801,6 +300931,7 @@ async function runVerifiedUpdateTransaction(initial, dependencies, paths = resol
       error: cancelled ? "Update cancelled after the owned operation settled." : message,
       remediation: [
         cancelled && installStarted ? "Package files may have changed. No rollback was performed; verify the installed version before retrying." : void 0,
+        state.npm_recovery?.status === "retained" ? `The prior npm retirement directory is preserved at ${state.npm_recovery.backup_path}.` : void 0,
         permissionRemediation(message),
         recoveryNote
       ].filter(Boolean).join(" ") || void 0
@@ -300830,7 +300961,7 @@ import {
   writeSync as writeSync3
 } from "node:fs";
 import { homedir as homedir16, tmpdir as tmpdir6 } from "node:os";
-import { basename as basename8, delimiter, dirname as dirname9, join as join17 } from "node:path";
+import { basename as basename9, delimiter, dirname as dirname10, join as join18 } from "node:path";
 
 // packages/cli/src/tray-menu.ts
 import { execFile as execFile4 } from "node:child_process";
@@ -300854,10 +300985,10 @@ var cachedLimit = trayLabelLimit();
 var run = promisify4(execFile4);
 
 // packages/cli/src/updater.ts
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 var UPDATE_CHECK_INTERVAL_MS = 60 * 1e3;
 var CACHE_DIR = resolveUpdatePaths().stateDir;
-var CACHE_FILE = join16(CACHE_DIR, "registry-check.json");
+var CACHE_FILE = join17(CACHE_DIR, "registry-check.json");
 
 // packages/cli/src/tray.ts
 var DEFAULT_ENDPOINT = "http://127.0.0.1:11435";
@@ -300865,19 +300996,19 @@ function uidSuffix() {
   return typeof process.getuid === "function" ? String(process.getuid()) : "user";
 }
 function resolveTrayPaths(env = process.env, platform2 = process.platform, home = homedir16()) {
-  const runtimeBase = env["XDG_RUNTIME_DIR"] || join17(tmpdir6(), `omnius-${uidSuffix()}`);
-  const stateBase = platform2 === "win32" ? env["LOCALAPPDATA"] || join17(home, "AppData", "Local") : env["XDG_STATE_HOME"] || join17(home, ".local", "state");
-  const configBase = platform2 === "win32" ? env["APPDATA"] || join17(home, "AppData", "Roaming") : env["XDG_CONFIG_HOME"] || join17(home, ".config");
-  const runtimeDir = join17(runtimeBase, "omnius");
-  const stateDir = platform2 === "win32" ? join17(stateBase, "Omnius") : join17(stateBase, "omnius");
-  const autostartFile = platform2 === "darwin" ? join17(home, "Library", "LaunchAgents", "ai.omnius.tray.plist") : platform2 === "win32" ? join17(configBase, "Microsoft", "Windows", "Start Menu", "Programs", "Startup", "omnius-tray.cmd") : join17(configBase, "autostart", "omnius-tray.desktop");
+  const runtimeBase = env["XDG_RUNTIME_DIR"] || join18(tmpdir6(), `omnius-${uidSuffix()}`);
+  const stateBase = platform2 === "win32" ? env["LOCALAPPDATA"] || join18(home, "AppData", "Local") : env["XDG_STATE_HOME"] || join18(home, ".local", "state");
+  const configBase = platform2 === "win32" ? env["APPDATA"] || join18(home, "AppData", "Roaming") : env["XDG_CONFIG_HOME"] || join18(home, ".config");
+  const runtimeDir = join18(runtimeBase, "omnius");
+  const stateDir = platform2 === "win32" ? join18(stateBase, "Omnius") : join18(stateBase, "omnius");
+  const autostartFile = platform2 === "darwin" ? join18(home, "Library", "LaunchAgents", "ai.omnius.tray.plist") : platform2 === "win32" ? join18(configBase, "Microsoft", "Windows", "Start Menu", "Programs", "Startup", "omnius-tray.cmd") : join18(configBase, "autostart", "omnius-tray.desktop");
   return {
     runtimeDir,
     stateDir,
-    pidFile: join17(runtimeDir, "tray.pid"),
-    stateFile: join17(runtimeDir, "tray-state.json"),
-    stdoutLog: join17(stateDir, "tray.log"),
-    stderrLog: join17(stateDir, "tray.err.log"),
+    pidFile: join18(runtimeDir, "tray.pid"),
+    stateFile: join18(runtimeDir, "tray-state.json"),
+    stdoutLog: join18(stateDir, "tray.log"),
+    stderrLog: join18(stateDir, "tray.err.log"),
     autostartFile
   };
 }
@@ -300965,7 +301096,7 @@ function readProcessState(path3) {
   }
 }
 async function commandOutput(command, args, timeout = 2e3) {
-  return await new Promise((resolve10) => {
+  return await new Promise((resolve11) => {
     const child = spawn3(command, args, { stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     let stdout = "";
     let settled = false;
@@ -300973,7 +301104,7 @@ async function commandOutput(command, args, timeout = 2e3) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve10(stdout);
+      resolve11(stdout);
     };
     child.stdout?.on("data", (chunk) => {
       stdout = `${stdout}${chunk.toString()}`.slice(-64 * 1024);
@@ -301070,7 +301201,7 @@ async function stopTray() {
       }
       return true;
     }
-    await new Promise((resolve10) => setTimeout(resolve10, 100));
+    await new Promise((resolve11) => setTimeout(resolve11, 100));
   }
   if (!trayProcessCommandLooksOwned(await processCommandLine(pid))) return false;
   try {
@@ -301089,7 +301220,7 @@ async function stopTray() {
       }
       return true;
     }
-    await new Promise((resolve10) => setTimeout(resolve10, 100));
+    await new Promise((resolve11) => setTimeout(resolve11, 100));
   }
   return false;
 }
@@ -301097,7 +301228,7 @@ async function stopTray() {
 // packages/cli/src/update-worker-runtime.ts
 async function restartTrayWithInstalledExecutable(executable, endpoint) {
   await stopTray();
-  const launched = await new Promise((resolve10) => {
+  const launched = await new Promise((resolve11) => {
     const child = spawn4(executable, ["tray", "start", "--endpoint", endpoint], {
       stdio: "ignore",
       windowsHide: true
@@ -301107,15 +301238,15 @@ async function restartTrayWithInstalledExecutable(executable, endpoint) {
         child.kill();
       } catch {
       }
-      resolve10(false);
+      resolve11(false);
     }, 15e3);
     child.once("error", () => {
       clearTimeout(timer);
-      resolve10(false);
+      resolve11(false);
     });
     child.once("close", (code) => {
       clearTimeout(timer);
-      resolve10(code === 0);
+      resolve11(code === 0);
     });
   });
   if (!launched) return false;
@@ -301123,7 +301254,7 @@ async function restartTrayWithInstalledExecutable(executable, endpoint) {
     const status = await getTrayStatus(endpoint);
     if (status.running && status.ready && status.endpoint === endpoint)
       return true;
-    await new Promise((resolve10) => setTimeout(resolve10, 250));
+    await new Promise((resolve11) => setTimeout(resolve11, 250));
   }
   return false;
 }