@omercnet/paseo-omp 5.1.1-next.350.1 → 5.1.1-next.352.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omercnet/paseo-omp",
-  "version": "5.1.1-next.350.1",
+  "version": "5.1.1-next.352.1",
   "type": "module",
   "description": "Paseo integration for OMP, including its direct provider and workspace tooling.",
   "license": "MIT",

package/scripts/prepare-dependencies.mjs

@@ -1,9 +1,11 @@
-import { execFileSync } from "node:child_process";
+import { execSync } from "node:child_process";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
 const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+// Run through the shell so Windows resolves npm.cmd: Node refuses to spawn .cmd files without one.
+const INSTALL_COMMAND = "npm ci --omit=dev --ignore-scripts --workspaces=false";
 
 function loadRootCatalog(root) {
   for (let directory = root; ; directory = dirname(directory)) {
@@ -27,6 +29,8 @@ function stageManifest(root, catalog, install) {
     manifest.dependencies[name] = catalog[name];
   }
   delete manifest.devDependencies;
+  // npm-shrinkwrap.json is generated without overrides, so npm ci rejects a manifest that keeps them.
+  delete manifest.overrides;
 
   writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
   try {
@@ -36,18 +40,11 @@ function stageManifest(root, catalog, install) {
   }
 }
 
-export function prepareDependencies(root = projectRoot, execute = execFileSync) {
+export function prepareDependencies(root = projectRoot, execute = execSync) {
   const catalog = loadRootCatalog(root);
   if (!catalog) return false;
   stageManifest(root, catalog, () => {
-    execute(
-      process.platform === "win32" ? "npm.cmd" : "npm",
-      ["ci", "--omit=dev", "--ignore-scripts", "--workspaces=false"],
-      {
-        cwd: root,
-        stdio: "inherit",
-      },
-    );
+    execute(INSTALL_COMMAND, { cwd: root, stdio: "inherit" });
   });
   return true;
 }

package/server/package-version.ts

@@ -1,2 +1,2 @@
 /** Release Please keeps this bundle-safe constant aligned with package.json. */
-export const PASEO_OMP_PACKAGE_VERSION = "5.1.1-next.350.1"; // x-release-please-version
+export const PASEO_OMP_PACKAGE_VERSION = "5.1.1-next.352.1"; // x-release-please-version

package/server/provider/omp-rpc-process.ts

@@ -64,12 +64,15 @@ export async function terminatePosixProcessTree(
 
 export type ProcessTreeCleanup = "verified" | "uncertain" | "failed";
 
-export async function stopWindowsTree(pid: number): Promise<ProcessTreeCleanup> {
+export async function stopWindowsTree(
+  pid: number,
+  spawnTaskkill: typeof spawn = spawn,
+): Promise<ProcessTreeCleanup> {
   const result = Promise.withResolvers<ProcessTreeCleanup>();
   const systemRoot = process.env.SystemRoot ?? WINDOWS_DEFAULT_SYSTEM_ROOT;
   let taskkill: ChildProcessWithoutNullStreams;
   try {
-    taskkill = spawn(
+    taskkill = spawnTaskkill(
       join(systemRoot, "System32", "taskkill.exe"),
       ["/PID", String(pid), "/T", "/F"],
       {
@@ -99,13 +102,10 @@ export async function stopWindowsTree(pid: number): Promise<ProcessTreeCleanup>
   }, PROCESS_STOP_TIMEOUT_MS);
   taskkill.once("error", () => finish("failed"));
   taskkill.once("close", (code, signal) => {
-    finish(
-      code === 0 && signal === null
-        ? "verified"
-        : code === 128 && signal === null
-          ? "uncertain"
-          : "failed",
-    );
+    // 128 means taskkill found no such process because it already exited; retrying only repeats
+    // 128. Callers still wait for the root OMP process's own exit, so a live root cannot pass.
+    // Descendants of an already exited root cannot be enumerated by taskkill and are not checked.
+    finish((code === 0 || code === 128) && signal === null ? "verified" : "failed");
   });
   return result.promise;
 }

package/server/provider/registration.ts

@@ -118,6 +118,7 @@ export interface OmpProviderOptions {
   timelineScheduler?: OmpTimelineScheduler;
   replayTimeoutMs?: number;
   environment?: NodeJS.ProcessEnv;
+  platform?: NodeJS.Platform;
   /** Fixed, non-secret profile/store identity for providers whose configuration is server-owned. */
   catalogIdentity?: Readonly<Record<string, string>>;
   mcpInitializationTimeoutMs?: number;
@@ -156,6 +157,7 @@ export function createOmpProvider(options: OmpProviderOptions = {}): ProviderReg
     });
   const nativeReservations = new OmpNativeSessionReservations();
   const sessionLimit = options.sessionLimit ?? new OmpSessionLimit();
+  const platform = options.platform ?? process.platform;
   const checkAvailability: NonNullable<ProviderRegistrationCompat["checkAvailability"]> = async (
     catalogOptions,
     context,
@@ -165,6 +167,12 @@ export function createOmpProvider(options: OmpProviderOptions = {}): ProviderReg
     }
     const providerOptions = parseOmpProviderOptions(catalogOptions.providerOptions);
     const environment = { ...(options.environment ?? process.env), ...providerOptions.env };
+    // Windows env names are case-insensitive, but a copy keeps only the literal key (often
+    // `Path`), so `environment.PATH` would miss it and OMP would look not installed.
+    if (platform === "win32" && environment.PATH === undefined) {
+      const pathKey = Object.keys(environment).find((name) => name.toUpperCase() === "PATH");
+      if (pathKey !== undefined) environment.PATH = environment[pathKey];
+    }
     const configuredCommand: readonly [string, ...string[]] = providerOptions.command?.[0]
       ? [providerOptions.command[0], ...providerOptions.command.slice(1)]
       : [environment.OMP_COMMAND || "omp"];
@@ -173,6 +181,7 @@ export function createOmpProvider(options: OmpProviderOptions = {}): ProviderReg
       cwd:
         catalogOptions.scope === "workspace" && catalogOptions.cwd ? catalogOptions.cwd : homedir(),
       environment,
+      platform,
       timeoutMs: context?.timeoutMs,
     });
   };