From 4e7b6e751f1297676b1b4d57dbdf8779962f40a7 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 19:22:13 +0100
Subject: [PATCH 01/22] prepare package.json

---
 vscode/packages/npm-package/package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vscode/packages/npm-package/package.json b/vscode/packages/npm-package/package.json
index 4f3728f624..23819dcc96 100644
--- a/vscode/packages/npm-package/package.json
+++ b/vscode/packages/npm-package/package.json
@@ -1,6 +1,7 @@
 {
+  "$schema": "https://www.schemastore.org/package.json",
   "name": "@microsoft/kiota",
-  "version": "1.25.1",
+  "version": "1.30.0",
   "description": "npm package exposing Kiota CLI functionality to TypeScript",
   "repository": {
     "url": "https://github.com/microsoft/kiota.git",
@@ -22,6 +23,7 @@
       "default": "./dist/cjs/index.js"
     }
   },
+  "type": "module",
   "types": "dist/esm/types/index.d.ts",
   "typesVersions": {
     "*": {

From 4ba01eb5d2a4a5c27601f2731bf3dab3c85803fe Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 19:22:34 +0100
Subject: [PATCH 02/22] schemas - and node resolution

---
 vscode/packages/npm-package/tsconfig.cjs.json | 1 +
 vscode/packages/npm-package/tsconfig.esm.json | 4 +++-
 vscode/packages/npm-package/tsconfig.json     | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/vscode/packages/npm-package/tsconfig.cjs.json b/vscode/packages/npm-package/tsconfig.cjs.json
index cc9752b01d..ba724e0890 100644
--- a/vscode/packages/npm-package/tsconfig.cjs.json
+++ b/vscode/packages/npm-package/tsconfig.cjs.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://www.schemastore.org/tsconfig.json",
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/cjs",
diff --git a/vscode/packages/npm-package/tsconfig.esm.json b/vscode/packages/npm-package/tsconfig.esm.json
index 396bc45f90..d7f60bd942 100644
--- a/vscode/packages/npm-package/tsconfig.esm.json
+++ b/vscode/packages/npm-package/tsconfig.esm.json
@@ -1,8 +1,10 @@
 {
+  "$schema": "https://www.schemastore.org/tsconfig.json",
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/esm",
-    "module": "ESNext",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "declaration": true,
     "declarationDir": "./dist/esm/types"
   }
diff --git a/vscode/packages/npm-package/tsconfig.json b/vscode/packages/npm-package/tsconfig.json
index 9f89f94649..2cb50f361c 100644
--- a/vscode/packages/npm-package/tsconfig.json
+++ b/vscode/packages/npm-package/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://www.schemastore.org/tsconfig.json",
   "compilerOptions": {
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",

From 2bb4b46eb325bac556be18da869666085efedba5 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 19:50:44 +0100
Subject: [PATCH 03/22] runtime with

---
 vscode/packages/npm-package/install.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode/packages/npm-package/install.ts b/vscode/packages/npm-package/install.ts
index 58e0011274..645509f42f 100644
--- a/vscode/packages/npm-package/install.ts
+++ b/vscode/packages/npm-package/install.ts
@@ -5,7 +5,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { getKiotaConfig } from './config';
 
-import runtimeJson from './runtime.json';
+import runtimeJson from './runtime.json' with { type: 'json' };
 
 const kiotaInstallStatusKey = "kiotaInstallStatus";
 const installDelayInMs = 30000; // 30 seconds

From c8fdc7eba07790b40e5d73b50082363392a9f5bb Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:06:39 +0100
Subject: [PATCH 04/22] TSCONFIG Fixes

---
 vscode/packages/npm-package/tsconfig.cjs.json |  1 -
 vscode/packages/npm-package/tsconfig.esm.json |  3 ---
 vscode/packages/npm-package/tsconfig.json     | 13 ++++++-------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/vscode/packages/npm-package/tsconfig.cjs.json b/vscode/packages/npm-package/tsconfig.cjs.json
index ba724e0890..f2462f056c 100644
--- a/vscode/packages/npm-package/tsconfig.cjs.json
+++ b/vscode/packages/npm-package/tsconfig.cjs.json
@@ -4,7 +4,6 @@
   "compilerOptions": {
     "outDir": "./dist/cjs",
     "module": "CommonJS",
-    "declaration": true,
     "declarationDir": "./dist/cjs/types"
   }
 }
diff --git a/vscode/packages/npm-package/tsconfig.esm.json b/vscode/packages/npm-package/tsconfig.esm.json
index d7f60bd942..5d25772372 100644
--- a/vscode/packages/npm-package/tsconfig.esm.json
+++ b/vscode/packages/npm-package/tsconfig.esm.json
@@ -3,9 +3,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/esm",
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "declaration": true,
     "declarationDir": "./dist/esm/types"
   }
 }
diff --git a/vscode/packages/npm-package/tsconfig.json b/vscode/packages/npm-package/tsconfig.json
index 2cb50f361c..5b95cfe8e7 100644
--- a/vscode/packages/npm-package/tsconfig.json
+++ b/vscode/packages/npm-package/tsconfig.json
@@ -1,16 +1,17 @@
 {
   "$schema": "https://www.schemastore.org/tsconfig.json",
   "compilerOptions": {
+    "declaration": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "rootDir": ".",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "rootDir": "./lib/",
     "outDir": "./dist",
     "strict": true,
     "types": [
       "node",
       "jest"
     ],
-    "moduleResolution": "node",
     "target": "ESNext",
     "lib": [
       "ESNext"
@@ -21,9 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "skipLibCheck": true,
   },
-  "exclude": [
-    "dist",
-    "node_modules",
-    "tests"
+  "include": [
+    "./lib/**/*.ts"
   ]
 }

From a99f2a489850af13f0382542c1b56ecae3000420 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:06:51 +0100
Subject: [PATCH 05/22] Move files to lib

---
 vscode/packages/npm-package/index.ts             | 13 -------------
 vscode/packages/npm-package/{ => lib}/config.ts  |  0
 vscode/packages/npm-package/{ => lib}/connect.ts |  0
 vscode/packages/npm-package/lib/index.ts         | 13 +++++++++++++
 vscode/packages/npm-package/{ => lib}/install.ts |  4 ++--
 vscode/packages/npm-package/{ => lib}/types.ts   |  0
 vscode/packages/npm-package/{ => lib}/utils.ts   |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 vscode/packages/npm-package/index.ts
 rename vscode/packages/npm-package/{ => lib}/config.ts (100%)
 rename vscode/packages/npm-package/{ => lib}/connect.ts (100%)
 create mode 100644 vscode/packages/npm-package/lib/index.ts
 rename vscode/packages/npm-package/{ => lib}/install.ts (98%)
 rename vscode/packages/npm-package/{ => lib}/types.ts (100%)
 rename vscode/packages/npm-package/{ => lib}/utils.ts (98%)

diff --git a/vscode/packages/npm-package/index.ts b/vscode/packages/npm-package/index.ts
deleted file mode 100644
index 5f3c228955..0000000000
--- a/vscode/packages/npm-package/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export * from './config';
-export * from './lib/generateClient';
-export * from './lib/generatePlugin';
-export * from './lib/getKiotaTree';
-export * from './lib/getKiotaVersion';
-export * from './lib/getManifestDetails';
-export * from './lib/languageInformation';
-export * from './lib/migrateFromLockFile';
-export * from './lib/removeItem';
-export * from './lib/searchDescription';
-export * from './lib/updateClients';
-export * from './types';
-export * from './utils';
diff --git a/vscode/packages/npm-package/config.ts b/vscode/packages/npm-package/lib/config.ts
similarity index 100%
rename from vscode/packages/npm-package/config.ts
rename to vscode/packages/npm-package/lib/config.ts
diff --git a/vscode/packages/npm-package/connect.ts b/vscode/packages/npm-package/lib/connect.ts
similarity index 100%
rename from vscode/packages/npm-package/connect.ts
rename to vscode/packages/npm-package/lib/connect.ts
diff --git a/vscode/packages/npm-package/lib/index.ts b/vscode/packages/npm-package/lib/index.ts
new file mode 100644
index 0000000000..670e4204b9
--- /dev/null
+++ b/vscode/packages/npm-package/lib/index.ts
@@ -0,0 +1,13 @@
+export * from './config.js';
+export * from './generateClient.js';
+export * from './generatePlugin.js';
+export * from './getKiotaTree.js';
+export * from './getKiotaVersion.js';
+export * from './getManifestDetails.js';
+export * from './languageInformation.js';
+export * from './migrateFromLockFile.js';
+export * from './removeItem.js';
+export * from './searchDescription.js';
+export * from './updateClients.js';
+export * from './types.js';
+export * from './utils.js';
diff --git a/vscode/packages/npm-package/install.ts b/vscode/packages/npm-package/lib/install.ts
similarity index 98%
rename from vscode/packages/npm-package/install.ts
rename to vscode/packages/npm-package/lib/install.ts
index 645509f42f..945235549a 100644
--- a/vscode/packages/npm-package/install.ts
+++ b/vscode/packages/npm-package/lib/install.ts
@@ -3,9 +3,9 @@ import { createHash } from 'crypto';
 import * as https from 'https';
 import * as fs from 'fs';
 import * as path from 'path';
-import { getKiotaConfig } from './config';
+import { getKiotaConfig } from '../config.js';
 
-import runtimeJson from './runtime.json' with { type: 'json' };
+import runtimeJson from '../runtime.json' with { type: 'json' };
 
 const kiotaInstallStatusKey = "kiotaInstallStatus";
 const installDelayInMs = 30000; // 30 seconds
diff --git a/vscode/packages/npm-package/types.ts b/vscode/packages/npm-package/lib/types.ts
similarity index 100%
rename from vscode/packages/npm-package/types.ts
rename to vscode/packages/npm-package/lib/types.ts
diff --git a/vscode/packages/npm-package/utils.ts b/vscode/packages/npm-package/lib/utils.ts
similarity index 98%
rename from vscode/packages/npm-package/utils.ts
rename to vscode/packages/npm-package/lib/utils.ts
index f4b1216810..d8bdbdce1f 100644
--- a/vscode/packages/npm-package/utils.ts
+++ b/vscode/packages/npm-package/lib/utils.ts
@@ -1,4 +1,4 @@
-import { KiotaLogEntry, MaturityLevel, DependencyType, LogLevel } from "./types";
+import { KiotaLogEntry, MaturityLevel, DependencyType, LogLevel } from "../types.js";
 
 export function getLogEntriesForLevel(logEntries: KiotaLogEntry[], ...levels: LogLevel[]): KiotaLogEntry[] {
   return logEntries.filter((entry) => levels.indexOf(entry.level) !== -1);

From 69d7d3c8c842d02d8dae82e1badbb741baf6959e Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:14:47 +0100
Subject: [PATCH 06/22] fix .js

---
 vscode/packages/npm-package/lib/connect.ts             | 2 +-
 vscode/packages/npm-package/lib/generateClient.ts      | 4 ++--
 vscode/packages/npm-package/lib/generatePlugin.ts      | 6 +++---
 vscode/packages/npm-package/lib/getKiotaTree.ts        | 4 ++--
 vscode/packages/npm-package/lib/getKiotaVersion.ts     | 2 +-
 vscode/packages/npm-package/lib/getManifestDetails.ts  | 4 ++--
 vscode/packages/npm-package/lib/getPluginManifest.ts   | 4 ++--
 vscode/packages/npm-package/lib/install.ts             | 2 +-
 vscode/packages/npm-package/lib/languageInformation.ts | 4 ++--
 vscode/packages/npm-package/lib/migrateFromLockFile.ts | 4 ++--
 vscode/packages/npm-package/lib/removeItem.ts          | 4 ++--
 vscode/packages/npm-package/lib/searchDescription.ts   | 4 ++--
 vscode/packages/npm-package/lib/updateClients.ts       | 4 ++--
 vscode/packages/npm-package/lib/utils.ts               | 2 +-
 14 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/vscode/packages/npm-package/lib/connect.ts b/vscode/packages/npm-package/lib/connect.ts
index c36fc72b22..4625fa9c74 100644
--- a/vscode/packages/npm-package/lib/connect.ts
+++ b/vscode/packages/npm-package/lib/connect.ts
@@ -1,6 +1,6 @@
 import * as cp from 'child_process';
 import * as rpc from 'vscode-jsonrpc/node';
-import { ensureKiotaIsPresent, getKiotaPath } from './install';
+import { ensureKiotaIsPresent, getKiotaPath } from './install.js';
 
 
 export default async function connectToKiota<T>(callback: (connection: rpc.MessageConnection) => Promise<T | undefined>, workingDirectory: string = process.cwd()): Promise<T | undefined | Error> {
diff --git a/vscode/packages/npm-package/lib/generateClient.ts b/vscode/packages/npm-package/lib/generateClient.ts
index f4f68c4f79..a88d4835f1 100644
--- a/vscode/packages/npm-package/lib/generateClient.ts
+++ b/vscode/packages/npm-package/lib/generateClient.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { checkForSuccess } from "../utils";
+import connectToKiota from "./connect.js";
+import { checkForSuccess } from "./utils.js";
 import { ConsumerOperation, GenerationConfiguration, KiotaGenerationLanguage, KiotaLogEntry, KiotaResult } from "../types";
 
 export interface ClientGenerationOptions {
diff --git a/vscode/packages/npm-package/lib/generatePlugin.ts b/vscode/packages/npm-package/lib/generatePlugin.ts
index bd52364e1a..10f7137e69 100644
--- a/vscode/packages/npm-package/lib/generatePlugin.ts
+++ b/vscode/packages/npm-package/lib/generatePlugin.ts
@@ -1,9 +1,9 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { KiotaPluginType, GeneratePluginResult, ConsumerOperation, GenerationConfiguration, KiotaLogEntry, PluginAuthType } from "../types";
+import connectToKiota from "./connect.js";
+import { KiotaPluginType, GeneratePluginResult, ConsumerOperation, GenerationConfiguration, KiotaLogEntry, PluginAuthType } from "./types.js";
 import * as path from "path";
-import { checkForSuccess } from "../utils";
+import { checkForSuccess } from "./utils.js";
 
 export interface PluginGenerationOptions {
   descriptionPath: string;
diff --git a/vscode/packages/npm-package/lib/getKiotaTree.ts b/vscode/packages/npm-package/lib/getKiotaTree.ts
index 8d68a2230b..7073eb17f0 100644
--- a/vscode/packages/npm-package/lib/getKiotaTree.ts
+++ b/vscode/packages/npm-package/lib/getKiotaTree.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { KiotaTreeResult, KiotaShowConfiguration } from "../types";
+import connectToKiota from "./connect.js";
+import { KiotaTreeResult, KiotaShowConfiguration } from "./types.js";
 
 export interface KiotaResultOptions {
   descriptionPath: string;
diff --git a/vscode/packages/npm-package/lib/getKiotaVersion.ts b/vscode/packages/npm-package/lib/getKiotaVersion.ts
index 1c578af2aa..d2c28a11f4 100644
--- a/vscode/packages/npm-package/lib/getKiotaVersion.ts
+++ b/vscode/packages/npm-package/lib/getKiotaVersion.ts
@@ -1,6 +1,6 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from '../connect';
+import connectToKiota from './connect.js';
 
 /**
  * Retrieves the version of Kiota by connecting to the Kiota service.
diff --git a/vscode/packages/npm-package/lib/getManifestDetails.ts b/vscode/packages/npm-package/lib/getManifestDetails.ts
index a27ace6113..abcaefbedd 100644
--- a/vscode/packages/npm-package/lib/getManifestDetails.ts
+++ b/vscode/packages/npm-package/lib/getManifestDetails.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { KiotaManifestResult, KiotaGetManifestDetailsConfiguration } from "../types";
+import connectToKiota from "./connect.js";
+import { KiotaManifestResult, KiotaGetManifestDetailsConfiguration } from "./types.js";
 
 export interface ManifestOptions {
   manifestPath: string;
diff --git a/vscode/packages/npm-package/lib/getPluginManifest.ts b/vscode/packages/npm-package/lib/getPluginManifest.ts
index 09b55d67bc..4a10dd2429 100644
--- a/vscode/packages/npm-package/lib/getPluginManifest.ts
+++ b/vscode/packages/npm-package/lib/getPluginManifest.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { PluginManifestResult } from "../types";
+import connectToKiota from "./connect.js";
+import { PluginManifestResult } from "./types.js";
 
 export interface GetPluginManifestOptions {
   descriptionPath: string;
diff --git a/vscode/packages/npm-package/lib/install.ts b/vscode/packages/npm-package/lib/install.ts
index 945235549a..a3f0bae671 100644
--- a/vscode/packages/npm-package/lib/install.ts
+++ b/vscode/packages/npm-package/lib/install.ts
@@ -3,7 +3,7 @@ import { createHash } from 'crypto';
 import * as https from 'https';
 import * as fs from 'fs';
 import * as path from 'path';
-import { getKiotaConfig } from '../config.js';
+import { getKiotaConfig } from './config.js';
 
 import runtimeJson from '../runtime.json' with { type: 'json' };
 
diff --git a/vscode/packages/npm-package/lib/languageInformation.ts b/vscode/packages/npm-package/lib/languageInformation.ts
index c599fb8857..44865d96db 100644
--- a/vscode/packages/npm-package/lib/languageInformation.ts
+++ b/vscode/packages/npm-package/lib/languageInformation.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { LanguagesInformation } from "../types";
+import connectToKiota from "./connect.js";
+import { LanguagesInformation } from "./types.js";
 
 export interface LanguageInformationConfiguration {
   descriptionUrl: string; clearCache: boolean;
diff --git a/vscode/packages/npm-package/lib/migrateFromLockFile.ts b/vscode/packages/npm-package/lib/migrateFromLockFile.ts
index 065e8b8c53..c9ca9d35f1 100644
--- a/vscode/packages/npm-package/lib/migrateFromLockFile.ts
+++ b/vscode/packages/npm-package/lib/migrateFromLockFile.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { KiotaLogEntry } from "../types";
+import connectToKiota from "./connect.js";
+import { KiotaLogEntry } from "./types.js";
 
 /**
  * Migrates data from a lock file located in the specified directory.
diff --git a/vscode/packages/npm-package/lib/removeItem.ts b/vscode/packages/npm-package/lib/removeItem.ts
index 97cd791ac4..f701ba02bd 100644
--- a/vscode/packages/npm-package/lib/removeItem.ts
+++ b/vscode/packages/npm-package/lib/removeItem.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { KiotaResult, KiotaLogEntry } from "../types";
+import connectToKiota from "./connect.js";
+import { KiotaResult, KiotaLogEntry } from "./types.js";
 
 export interface RemoveItemConfiguration {
   cleanOutput: boolean;
diff --git a/vscode/packages/npm-package/lib/searchDescription.ts b/vscode/packages/npm-package/lib/searchDescription.ts
index 405fa09bef..ad4b19fd98 100644
--- a/vscode/packages/npm-package/lib/searchDescription.ts
+++ b/vscode/packages/npm-package/lib/searchDescription.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from '../connect';
-import { KiotaSearchResultItem, KiotaSearchResult } from "../types";
+import connectToKiota from './connect.js';
+import { KiotaSearchResultItem, KiotaSearchResult } from "./types.js";
 
 export interface SearchConfiguration {
   searchTerm: string;
diff --git a/vscode/packages/npm-package/lib/updateClients.ts b/vscode/packages/npm-package/lib/updateClients.ts
index 1c5e8e97f8..c409da7eac 100644
--- a/vscode/packages/npm-package/lib/updateClients.ts
+++ b/vscode/packages/npm-package/lib/updateClients.ts
@@ -1,7 +1,7 @@
 import * as rpc from "vscode-jsonrpc/node";
 
-import connectToKiota from "../connect";
-import { KiotaLogEntry } from "../types";
+import connectToKiota from "./connect.js";
+import { KiotaLogEntry } from "./types.js";
 
 export interface UpdateClientsConfiguration {
   cleanOutput: boolean;
diff --git a/vscode/packages/npm-package/lib/utils.ts b/vscode/packages/npm-package/lib/utils.ts
index d8bdbdce1f..2a25395f5b 100644
--- a/vscode/packages/npm-package/lib/utils.ts
+++ b/vscode/packages/npm-package/lib/utils.ts
@@ -1,4 +1,4 @@
-import { KiotaLogEntry, MaturityLevel, DependencyType, LogLevel } from "../types.js";
+import { KiotaLogEntry, MaturityLevel, DependencyType, LogLevel } from "./types.js.js";
 
 export function getLogEntriesForLevel(logEntries: KiotaLogEntry[], ...levels: LogLevel[]): KiotaLogEntry[] {
   return logEntries.filter((entry) => levels.indexOf(entry.level) !== -1);

From e7ef68a0fb51b1db64d330e6398e571433f636b5 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:20:51 +0100
Subject: [PATCH 07/22] fixes

---
 vscode/packages/npm-package/lib/removeItem.ts | 4 ++--
 vscode/packages/npm-package/lib/utils.ts      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vscode/packages/npm-package/lib/removeItem.ts b/vscode/packages/npm-package/lib/removeItem.ts
index f701ba02bd..6d75bb4416 100644
--- a/vscode/packages/npm-package/lib/removeItem.ts
+++ b/vscode/packages/npm-package/lib/removeItem.ts
@@ -44,7 +44,7 @@ export async function removePlugin({ pluginName, cleanOutput, workingDirectory }
 
   if (result) {
     return {
-      isSuccess: result.some(k => k.message.includes('removed successfully')),
+      isSuccess: result.some((k: any) => k.message.includes('removed successfully')),
       logs: result
     };
   }
@@ -80,7 +80,7 @@ export async function removeClient({ clientName, cleanOutput, workingDirectory }
 
   if (result) {
     return {
-      isSuccess: result.some(k => k.message.includes('removed successfully')),
+      isSuccess: result.some((k: any) => k.message.includes('removed successfully')),
       logs: result
     };
   }
diff --git a/vscode/packages/npm-package/lib/utils.ts b/vscode/packages/npm-package/lib/utils.ts
index 2a25395f5b..e84b2b5c4c 100644
--- a/vscode/packages/npm-package/lib/utils.ts
+++ b/vscode/packages/npm-package/lib/utils.ts
@@ -1,4 +1,4 @@
-import { KiotaLogEntry, MaturityLevel, DependencyType, LogLevel } from "./types.js.js";
+import { KiotaLogEntry, MaturityLevel, DependencyType, LogLevel } from "./types.js";
 
 export function getLogEntriesForLevel(logEntries: KiotaLogEntry[], ...levels: LogLevel[]): KiotaLogEntry[] {
   return logEntries.filter((entry) => levels.indexOf(entry.level) !== -1);

From adafa53fbe06b514b9d30eebeb56c6c005504346 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:21:29 +0100
Subject: [PATCH 08/22] bit more fix

---
 vscode/package-lock.json                          | 15 +++++++++++++--
 vscode/packages/npm-package/lib/generateClient.ts |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/vscode/package-lock.json b/vscode/package-lock.json
index 746d207781..3a24b9a97d 100644
--- a/vscode/package-lock.json
+++ b/vscode/package-lock.json
@@ -93,6 +93,7 @@
       "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
@@ -2918,6 +2919,7 @@
       "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.56.1",
         "@typescript-eslint/types": "8.56.1",
@@ -4009,6 +4011,7 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4364,6 +4367,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -4888,6 +4892,7 @@
       "integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -9286,6 +9291,7 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -9917,6 +9923,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -10056,7 +10063,8 @@
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "peer": true
     },
     "node_modules/type-check": {
       "version": "0.4.0",
@@ -10114,6 +10122,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -10291,6 +10300,7 @@
       "integrity": "sha512-LLBBA4oLmT7sZdHiYE/PeVuifOxYyE2uL/V+9VQP7YSYdJU7bSf7H8bZRRxW8kEPMkmVjnrXmoR3oejIdX0xbg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.8",
@@ -10340,6 +10350,7 @@
       "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.6.1",
         "@webpack-cli/configtest": "^3.0.1",
@@ -10791,7 +10802,7 @@
     },
     "packages/npm-package": {
       "name": "@microsoft/kiota",
-      "version": "1.25.1",
+      "version": "1.30.0",
       "license": "MIT",
       "dependencies": {
         "adm-zip": "^0.5.16",
diff --git a/vscode/packages/npm-package/lib/generateClient.ts b/vscode/packages/npm-package/lib/generateClient.ts
index a88d4835f1..919888d19a 100644
--- a/vscode/packages/npm-package/lib/generateClient.ts
+++ b/vscode/packages/npm-package/lib/generateClient.ts
@@ -2,7 +2,7 @@ import * as rpc from "vscode-jsonrpc/node";
 
 import connectToKiota from "./connect.js";
 import { checkForSuccess } from "./utils.js";
-import { ConsumerOperation, GenerationConfiguration, KiotaGenerationLanguage, KiotaLogEntry, KiotaResult } from "../types";
+import { ConsumerOperation, GenerationConfiguration, KiotaGenerationLanguage, KiotaLogEntry, KiotaResult } from "./types.js";
 
 export interface ClientGenerationOptions {
   openAPIFilePath: string;

From 438de5e157bf2415a1b85e7aba486687f305483e Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:25:18 +0100
Subject: [PATCH 09/22] .

---
 vscode/package-lock.json                 | 20 ++++++++++----------
 vscode/packages/npm-package/package.json |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/vscode/package-lock.json b/vscode/package-lock.json
index 3a24b9a97d..1234f16e99 100644
--- a/vscode/package-lock.json
+++ b/vscode/package-lock.json
@@ -10261,15 +10261,6 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/vscode-jsonrpc": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.1.tgz",
-      "integrity": "sha512-kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/walker": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
@@ -10808,7 +10799,7 @@
         "adm-zip": "^0.5.16",
         "original-fs": "^1.2.0",
         "uuid": "^13.0.0",
-        "vscode-jsonrpc": "^8.2.1"
+        "vscode-jsonrpc": "^9.0.0-next.11"
       },
       "devDependencies": {
         "@types/adm-zip": "^0.5.7",
@@ -10819,6 +10810,15 @@
         "ts-jest": "^29.4.6",
         "ts-loader": "^9.5.4"
       }
+    },
+    "packages/npm-package/node_modules/vscode-jsonrpc": {
+      "version": "9.0.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
+      "integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
     }
   }
 }
diff --git a/vscode/packages/npm-package/package.json b/vscode/packages/npm-package/package.json
index 23819dcc96..dfa28c9ebe 100644
--- a/vscode/packages/npm-package/package.json
+++ b/vscode/packages/npm-package/package.json
@@ -63,7 +63,7 @@
     "adm-zip": "^0.5.16",
     "original-fs": "^1.2.0",
     "uuid": "^13.0.0",
-    "vscode-jsonrpc": "^8.2.1"
+    "vscode-jsonrpc": "^9.0.0-next.11"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.7",

From b2dfcdbb369ddbe198140cc48b1688b823d07ed1 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:27:11 +0100
Subject: [PATCH 10/22] fix-tsconfig.cjs.json

---
 vscode/packages/npm-package/tsconfig.cjs.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vscode/packages/npm-package/tsconfig.cjs.json b/vscode/packages/npm-package/tsconfig.cjs.json
index f2462f056c..c1a029ccbb 100644
--- a/vscode/packages/npm-package/tsconfig.cjs.json
+++ b/vscode/packages/npm-package/tsconfig.cjs.json
@@ -3,7 +3,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/cjs",
-    "module": "CommonJS",
+    "module": "commonjs",
+    "moduleResolution": "node",
     "declarationDir": "./dist/cjs/types"
   }
 }

From 8dd39d481c87bab5171eacd848e80ff2e526488f Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:29:09 +0100
Subject: [PATCH 11/22] .

---
 vscode/packages/npm-package/lib/install.ts         | 2 +-
 vscode/packages/npm-package/{ => lib}/runtime.json | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename vscode/packages/npm-package/{ => lib}/runtime.json (100%)

diff --git a/vscode/packages/npm-package/lib/install.ts b/vscode/packages/npm-package/lib/install.ts
index a3f0bae671..4b77c2d4aa 100644
--- a/vscode/packages/npm-package/lib/install.ts
+++ b/vscode/packages/npm-package/lib/install.ts
@@ -5,7 +5,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { getKiotaConfig } from './config.js';
 
-import runtimeJson from '../runtime.json' with { type: 'json' };
+import runtimeJson from './runtime.json' with { type: 'json' };
 
 const kiotaInstallStatusKey = "kiotaInstallStatus";
 const installDelayInMs = 30000; // 30 seconds
diff --git a/vscode/packages/npm-package/runtime.json b/vscode/packages/npm-package/lib/runtime.json
similarity index 100%
rename from vscode/packages/npm-package/runtime.json
rename to vscode/packages/npm-package/lib/runtime.json

From b52a338bfa119a131d0eb0a40d1fe840eb904b61 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:29:50 +0100
Subject: [PATCH 12/22] remove-script

---
 vscode/packages/npm-package/package.json      |  1 -
 .../npm-package/scripts/copy-files.js         | 30 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 vscode/packages/npm-package/scripts/copy-files.js

diff --git a/vscode/packages/npm-package/package.json b/vscode/packages/npm-package/package.json
index dfa28c9ebe..be18e3ac4d 100644
--- a/vscode/packages/npm-package/package.json
+++ b/vscode/packages/npm-package/package.json
@@ -48,7 +48,6 @@
     "build:esm": "tsc --project tsconfig.esm.json",
     "build:cjs": "tsc --project tsconfig.cjs.json",
     "clean": "rimraf dist",
-    "copy-files": "node scripts/copy-files.js",
     "generate-readme": "node scripts/generate-readme.js",
     "test:coverage": "jest --coverage --runInBand",
     "prepack": "npm run build",
diff --git a/vscode/packages/npm-package/scripts/copy-files.js b/vscode/packages/npm-package/scripts/copy-files.js
deleted file mode 100644
index 113d5c0dad..0000000000
--- a/vscode/packages/npm-package/scripts/copy-files.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const sourceFile = path.resolve(__dirname, '..', 'runtime.json'); // Move up one level from the `scripts` folder
-const destDirs = [
-  path.resolve(__dirname, '..', 'dist', 'esm'),
-  path.resolve(__dirname, '..', 'dist', 'cjs'),
-];
-
-try {
-  if (!fs.existsSync(sourceFile)) {
-    throw new Error(`Source file does not exist: ${sourceFile}`);
-  }
-
-  destDirs.forEach((destDir) => {
-    try {
-      if (!fs.existsSync(destDir)) {
-        fs.mkdirSync(destDir, { recursive: true });
-      }
-
-      const destFile = path.join(destDir, 'runtime.json');
-      fs.copyFileSync(sourceFile, destFile);
-      console.log(`Copied to ${destFile}`);
-    } catch (err) {
-      console.error(`Failed to copy to ${destDir}: ${err.message}`);
-    }
-  });
-} catch (err) {
-  console.error(`Error: ${err.message}`);
-}
\ No newline at end of file

From 2fa980f7c59ebfca37185387ea1011e5d066187a Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:41:08 +0100
Subject: [PATCH 13/22] revert to stable

---
 vscode/package-lock.json                 | 2 +-
 vscode/packages/npm-package/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vscode/package-lock.json b/vscode/package-lock.json
index 1234f16e99..ba983ce83b 100644
--- a/vscode/package-lock.json
+++ b/vscode/package-lock.json
@@ -10799,7 +10799,7 @@
         "adm-zip": "^0.5.16",
         "original-fs": "^1.2.0",
         "uuid": "^13.0.0",
-        "vscode-jsonrpc": "^9.0.0-next.11"
+        "vscode-jsonrpc": "^8.2.1"
       },
       "devDependencies": {
         "@types/adm-zip": "^0.5.7",
diff --git a/vscode/packages/npm-package/package.json b/vscode/packages/npm-package/package.json
index be18e3ac4d..0e7acd7734 100644
--- a/vscode/packages/npm-package/package.json
+++ b/vscode/packages/npm-package/package.json
@@ -62,7 +62,7 @@
     "adm-zip": "^0.5.16",
     "original-fs": "^1.2.0",
     "uuid": "^13.0.0",
-    "vscode-jsonrpc": "^9.0.0-next.11"
+    "vscode-jsonrpc": "^8.2.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.7",

From 885ce113122e5a21e779816b0b06dd1f5486ea5d Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:49:06 +0100
Subject: [PATCH 14/22] Fixes to TSCONFIG

---
 vscode/packages/npm-package/tsconfig.cjs.json | 4 ++--
 vscode/packages/npm-package/tsconfig.json     | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/vscode/packages/npm-package/tsconfig.cjs.json b/vscode/packages/npm-package/tsconfig.cjs.json
index c1a029ccbb..1db1c7bcc6 100644
--- a/vscode/packages/npm-package/tsconfig.cjs.json
+++ b/vscode/packages/npm-package/tsconfig.cjs.json
@@ -3,8 +3,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/cjs",
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "declarationDir": "./dist/cjs/types"
   }
 }
diff --git a/vscode/packages/npm-package/tsconfig.json b/vscode/packages/npm-package/tsconfig.json
index 5b95cfe8e7..5ee7f8a70b 100644
--- a/vscode/packages/npm-package/tsconfig.json
+++ b/vscode/packages/npm-package/tsconfig.json
@@ -2,9 +2,10 @@
   "$schema": "https://www.schemastore.org/tsconfig.json",
   "compilerOptions": {
     "declaration": true,
+    "declarationMap": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "rootDir": "./lib/",
     "outDir": "./dist",
     "strict": true,
@@ -12,7 +13,7 @@
       "node",
       "jest"
     ],
-    "target": "ESNext",
+    "target": "esnext",
     "lib": [
       "ESNext"
     ],

From a8796b3fb90bbc2990a7cc6c4e10e90228cce0df Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 20:50:15 +0100
Subject: [PATCH 15/22] install webpack

---
 vscode/package-lock.json                 | 47 ++++++++++++------------
 vscode/packages/npm-package/package.json |  5 ++-
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/vscode/package-lock.json b/vscode/package-lock.json
index ba983ce83b..1f9617d715 100644
--- a/vscode/package-lock.json
+++ b/vscode/package-lock.json
@@ -4094,9 +4094,9 @@
       }
     },
     "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4835,9 +4835,9 @@
       "dev": true
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz",
-      "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.0.tgz",
+      "integrity": "sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9286,9 +9286,9 @@
       }
     },
     "node_modules/schema-utils/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -9726,9 +9726,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.44.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.1.tgz",
-      "integrity": "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==",
+      "version": "5.46.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz",
+      "integrity": "sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -9745,16 +9745,15 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.16",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
-      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
+      "version": "5.3.17",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.17.tgz",
+      "integrity": "sha512-YR7PtUp6GMU91BgSJmlaX/rS2lGDbAF7D+Wtq7hRO+MiljNmodYvqslzCFiYVAgW+Qoaaia/QUIP4lGXufjdZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
         "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
         "terser": "^5.31.1"
       },
       "engines": {
@@ -10286,9 +10285,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.105.3",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.3.tgz",
-      "integrity": "sha512-LLBBA4oLmT7sZdHiYE/PeVuifOxYyE2uL/V+9VQP7YSYdJU7bSf7H8bZRRxW8kEPMkmVjnrXmoR3oejIdX0xbg==",
+      "version": "5.105.4",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.4.tgz",
+      "integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -10303,7 +10302,7 @@
         "acorn-import-phases": "^1.0.3",
         "browserslist": "^4.28.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.19.0",
+        "enhanced-resolve": "^5.20.0",
         "es-module-lexer": "^2.0.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -10315,7 +10314,7 @@
         "neo-async": "^2.6.2",
         "schema-utils": "^4.3.3",
         "tapable": "^2.3.0",
-        "terser-webpack-plugin": "^5.3.16",
+        "terser-webpack-plugin": "^5.3.17",
         "watchpack": "^2.5.1",
         "webpack-sources": "^3.3.4"
       },
@@ -10341,7 +10340,6 @@
       "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.6.1",
         "@webpack-cli/configtest": "^3.0.1",
@@ -10808,7 +10806,10 @@
         "jest": "^30.2.0",
         "rimraf": "^6.1.3",
         "ts-jest": "^29.4.6",
-        "ts-loader": "^9.5.4"
+        "ts-loader": "^9.5.4",
+        "typescript": "^5.9.3",
+        "webpack": "^5.105.4",
+        "webpack-cli": "^6.0.1"
       }
     },
     "packages/npm-package/node_modules/vscode-jsonrpc": {
diff --git a/vscode/packages/npm-package/package.json b/vscode/packages/npm-package/package.json
index 0e7acd7734..50a0ae41c2 100644
--- a/vscode/packages/npm-package/package.json
+++ b/vscode/packages/npm-package/package.json
@@ -71,6 +71,9 @@
     "jest": "^30.2.0",
     "rimraf": "^6.1.3",
     "ts-jest": "^29.4.6",
-    "ts-loader": "^9.5.4"
+    "ts-loader": "^9.5.4",
+    "typescript": "^5.9.3",
+    "webpack": "^5.105.4",
+    "webpack-cli": "^6.0.1"
   }
 }

From 6c0da1bc84d118a1353903c752a63b2e536248cc Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 21:02:38 +0100
Subject: [PATCH 16/22] .

---
 vscode/packages/npm-package/package.json      | 36 +++++--------------
 vscode/packages/npm-package/tsconfig.cjs.json | 10 ------
 vscode/packages/npm-package/tsconfig.esm.json |  8 -----
 vscode/packages/npm-package/tsconfig.json     |  2 +-
 4 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 vscode/packages/npm-package/tsconfig.cjs.json
 delete mode 100644 vscode/packages/npm-package/tsconfig.esm.json

diff --git a/vscode/packages/npm-package/package.json b/vscode/packages/npm-package/package.json
index 50a0ae41c2..7e6ea33791 100644
--- a/vscode/packages/npm-package/package.json
+++ b/vscode/packages/npm-package/package.json
@@ -11,42 +11,24 @@
     "lib": "lib",
     "test": "tests"
   },
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "main": "dist/index.js",
   "exports": {
-    "import": {
-      "types": "./dist/esm/types/index.d.ts",
-      "default": "./dist/esm/index.js"
-    },
-    "require": {
-      "types": "./dist/cjs/types/index.d.ts",
-      "default": "./dist/cjs/index.js"
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "type": "module",
-  "types": "dist/esm/types/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "import": [
-        "./dist/esm/types/index.d.ts"
-      ],
-      "require": [
-        "./dist/cjs/types/index.d.ts"
-      ]
-    }
-  },
+  "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "runtime.json"
+    "dist"
   ],
   "scripts": {
     "lint": "eslint",
     "test": "jest --runInBand",
     "test:unit": "jest --config=jest.config.unit.cjs",
     "test:integration": "jest --config=jest.config.integration.cjs --runInBand",
-    "build": "npm run clean && npm run build:esm && npm run build:cjs && npm run copy-files",
-    "build:esm": "tsc --project tsconfig.esm.json",
-    "build:cjs": "tsc --project tsconfig.cjs.json",
+    "build": "npm run clean && tsc --project tsconfig.json",
     "clean": "rimraf dist",
     "generate-readme": "node scripts/generate-readme.js",
     "test:coverage": "jest --coverage --runInBand",
@@ -72,8 +54,6 @@
     "rimraf": "^6.1.3",
     "ts-jest": "^29.4.6",
     "ts-loader": "^9.5.4",
-    "typescript": "^5.9.3",
-    "webpack": "^5.105.4",
-    "webpack-cli": "^6.0.1"
+    "typescript": "^5.9.3"
   }
 }
diff --git a/vscode/packages/npm-package/tsconfig.cjs.json b/vscode/packages/npm-package/tsconfig.cjs.json
deleted file mode 100644
index 1db1c7bcc6..0000000000
--- a/vscode/packages/npm-package/tsconfig.cjs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "$schema": "https://www.schemastore.org/tsconfig.json",
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./dist/cjs",
-    "module": "Node16",
-    "moduleResolution": "Node16",
-    "declarationDir": "./dist/cjs/types"
-  }
-}
diff --git a/vscode/packages/npm-package/tsconfig.esm.json b/vscode/packages/npm-package/tsconfig.esm.json
deleted file mode 100644
index 5d25772372..0000000000
--- a/vscode/packages/npm-package/tsconfig.esm.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$schema": "https://www.schemastore.org/tsconfig.json",
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./dist/esm",
-    "declarationDir": "./dist/esm/types"
-  }
-}
diff --git a/vscode/packages/npm-package/tsconfig.json b/vscode/packages/npm-package/tsconfig.json
index 5ee7f8a70b..57457e36b7 100644
--- a/vscode/packages/npm-package/tsconfig.json
+++ b/vscode/packages/npm-package/tsconfig.json
@@ -7,7 +7,7 @@
     "module": "esnext",
     "moduleResolution": "bundler",
     "rootDir": "./lib/",
-    "outDir": "./dist",
+    "outDir": "./dist/",
     "strict": true,
     "types": [
       "node",

From 9c2ced7acc15f889ad03c4bac05f7fba85e8f33f Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Tue, 3 Mar 2026 21:12:09 +0100
Subject: [PATCH 17/22] not required

---
 vscode/packages/npm-package/package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vscode/packages/npm-package/package.json b/vscode/packages/npm-package/package.json
index 7e6ea33791..20c53ea9ae 100644
--- a/vscode/packages/npm-package/package.json
+++ b/vscode/packages/npm-package/package.json
@@ -28,7 +28,7 @@
     "test": "jest --runInBand",
     "test:unit": "jest --config=jest.config.unit.cjs",
     "test:integration": "jest --config=jest.config.integration.cjs --runInBand",
-    "build": "npm run clean && tsc --project tsconfig.json",
+    "build": "npm run clean && tsc --project ./tsconfig.json",
     "clean": "rimraf dist",
     "generate-readme": "node scripts/generate-readme.js",
     "test:coverage": "jest --coverage --runInBand",
@@ -53,7 +53,6 @@
     "jest": "^30.2.0",
     "rimraf": "^6.1.3",
     "ts-jest": "^29.4.6",
-    "ts-loader": "^9.5.4",
-    "typescript": "^5.9.3"
+    "ts-loader": "^9.5.4"
   }
 }

From 5d106f7a314d7700d89e1831ce8f9efcc4ee5cb7 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Thu, 5 Mar 2026 20:21:21 +0100
Subject: [PATCH 18/22] change-module-to-nodenext

---
 vscode/packages/npm-package/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vscode/packages/npm-package/tsconfig.json b/vscode/packages/npm-package/tsconfig.json
index 57457e36b7..3c47cc1365 100644
--- a/vscode/packages/npm-package/tsconfig.json
+++ b/vscode/packages/npm-package/tsconfig.json
@@ -4,8 +4,8 @@
     "declaration": true,
     "declarationMap": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "rootDir": "./lib/",
     "outDir": "./dist/",
     "strict": true,

From 08f0c5c62e9fe1dbef58881a6e3fba9e2b0bd935 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Thu, 5 Mar 2026 20:26:44 +0100
Subject: [PATCH 19/22] fix-CI-references

---
 .azure-pipelines/ci-build.yml                | 4 ++--
 .github/workflows/build-vscode-extension.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
index 5721174e95..31dd6dad84 100644
--- a/.azure-pipelines/ci-build.yml
+++ b/.azure-pipelines/ci-build.yml
@@ -626,7 +626,7 @@ extends:
                 displayName: "Set version suffix"
               - pwsh: $(Build.SourcesDirectory)/scripts/get-version-from-csproj.ps1
                 displayName: "Get Kiota's version-number from .csproj"
-              - pwsh: $(Build.SourcesDirectory)/scripts/update-vscode-releases.ps1 -version $(artifactVersion)$(versionSuffix) -packageJsonFilePath $(Build.SourcesDirectory)/vscode/packages/microsoft-kiota/package.json -runtimeFilePath $(Build.SourcesDirectory)/vscode/packages/npm-package/runtime.json -binaryFolderPath $(Build.ArtifactStagingDirectory)/Binaries
+              - pwsh: $(Build.SourcesDirectory)/scripts/update-vscode-releases.ps1 -version $(artifactVersion)$(versionSuffix) -packageJsonFilePath $(Build.SourcesDirectory)/vscode/packages/microsoft-kiota/package.json -runtimeFilePath $(Build.SourcesDirectory)/vscode/packages/npm-package/lib/runtime.json -binaryFolderPath $(Build.ArtifactStagingDirectory)/Binaries
                 displayName: "Update VSCode extension version-number"
               - script: npm i -g @vscode/vsce rimraf
                 displayName: "Install Global dependencies"
@@ -745,7 +745,7 @@ extends:
                 displayName: "Set version suffix"
               - pwsh: $(Build.SourcesDirectory)/scripts/get-version-from-csproj.ps1
                 displayName: "Get Kiota's version-number from .csproj"
-              - pwsh: $(Build.SourcesDirectory)/scripts/update-vscode-releases.ps1 -version $(artifactVersion)$(versionSuffix) -packageJsonFilePath $(Build.SourcesDirectory)/vscode/packages/microsoft-kiota/package.json -runtimeFilePath $(Build.SourcesDirectory)/vscode/packages/npm-package/runtime.json -binaryFolderPath $(Build.ArtifactStagingDirectory)/Binaries
+              - pwsh: $(Build.SourcesDirectory)/scripts/update-vscode-releases.ps1 -version $(artifactVersion)$(versionSuffix) -packageJsonFilePath $(Build.SourcesDirectory)/vscode/packages/microsoft-kiota/package.json -runtimeFilePath $(Build.SourcesDirectory)/vscode/packages/npm-package/lib/runtime.json -binaryFolderPath $(Build.ArtifactStagingDirectory)/Binaries
                 displayName: "Update NPM package version-number"
               - script: |
                   npm i -g rimraf
diff --git a/.github/workflows/build-vscode-extension.yml b/.github/workflows/build-vscode-extension.yml
index 4671affc2a..f0ae20f27a 100644
--- a/.github/workflows/build-vscode-extension.yml
+++ b/.github/workflows/build-vscode-extension.yml
@@ -60,7 +60,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: scripts/update-vscode-releases.ps1 -version "v${{ steps.last_release.outputs.RELEASE_VERSION }}" -packageJsonFilePath "./vscode/packages/microsoft-kiota/package.json" -runtimeFilePath "./vscode/packages/npm-package/runtime.json" -online
+      - run: scripts/update-vscode-releases.ps1 -version "v${{ steps.last_release.outputs.RELEASE_VERSION }}" -packageJsonFilePath "./vscode/packages/microsoft-kiota/package.json" -runtimeFilePath "./vscode/packages/npm-package/lib/runtime.json" -online
         shell: pwsh
 
       - name: Install dependencies
@@ -142,7 +142,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: scripts/update-vscode-releases.ps1 -version "${{ steps.last_release.outputs.RELEASE_VERSION }}" -packageJsonFilePath "./vscode/packages/microsoft-kiota/package.json" -runtimeFilePath "./vscode/packages/npm-package/runtime.json" -online
+      - run: scripts/update-vscode-releases.ps1 -version "${{ steps.last_release.outputs.RELEASE_VERSION }}" -packageJsonFilePath "./vscode/packages/microsoft-kiota/package.json" -runtimeFilePath "./vscode/packages/npm-package/lib/runtime.json" -online
         shell: pwsh
 
       - name: Install dependencies

From 6a9ea5c73b348aa2129a8d47e7460cb9b8a284c3 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Thu, 5 Mar 2026 20:33:37 +0100
Subject: [PATCH 20/22] KiotaLogEntry-Infer-value

---
 vscode/packages/npm-package/lib/removeItem.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode/packages/npm-package/lib/removeItem.ts b/vscode/packages/npm-package/lib/removeItem.ts
index 6d75bb4416..7cabb3c0d7 100644
--- a/vscode/packages/npm-package/lib/removeItem.ts
+++ b/vscode/packages/npm-package/lib/removeItem.ts
@@ -80,7 +80,7 @@ export async function removeClient({ clientName, cleanOutput, workingDirectory }
 
   if (result) {
     return {
-      isSuccess: result.some((k: any) => k.message.includes('removed successfully')),
+      isSuccess: result.some(k => k.message.includes('removed successfully')),
       logs: result
     };
   }

From 66454a53ab8ea3c9f5c1d0e1578b7df38f8da0f4 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Sat, 7 Mar 2026 11:46:20 +0100
Subject: [PATCH 21/22] fix-KiotaLogEntry

---
 vscode/packages/npm-package/lib/removeItem.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode/packages/npm-package/lib/removeItem.ts b/vscode/packages/npm-package/lib/removeItem.ts
index 7cabb3c0d7..f701ba02bd 100644
--- a/vscode/packages/npm-package/lib/removeItem.ts
+++ b/vscode/packages/npm-package/lib/removeItem.ts
@@ -44,7 +44,7 @@ export async function removePlugin({ pluginName, cleanOutput, workingDirectory }
 
   if (result) {
     return {
-      isSuccess: result.some((k: any) => k.message.includes('removed successfully')),
+      isSuccess: result.some(k => k.message.includes('removed successfully')),
       logs: result
     };
   }

From 9701b2502ec00d93625c8c11cd2bf89d77d17ba3 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo <deinok@deinok.com>
Date: Sat, 7 Mar 2026 11:52:50 +0100
Subject: [PATCH 22/22] fix-test-paths

---
 vscode/packages/npm-package/tests/assertUtils.ts              | 2 +-
 .../tests/integration/integrationGeneratePlugin.spec.ts       | 4 ++--
 .../tests/integration/integrationGetKiotaTree.spec.ts         | 2 +-
 .../npm-package/tests/integration/integrationInstall.spec.ts  | 4 ++--
 vscode/packages/npm-package/tests/integration/setup.ts        | 2 +-
 vscode/packages/npm-package/tests/unit/generateClient.spec.ts | 2 +-
 vscode/packages/npm-package/tests/unit/generatePlugin.spec.ts | 4 ++--
 vscode/packages/npm-package/tests/unit/getKiotaTree.spec.ts   | 2 +-
 .../npm-package/tests/unit/getManifestDetails.spec.ts         | 2 +-
 .../npm-package/tests/unit/migrateFromLockFile.spec.ts        | 2 +-
 vscode/packages/npm-package/tests/unit/removeItem.spec.ts     | 2 +-
 .../npm-package/tests/unit/searchDescriptions.spec.ts         | 2 +-
 vscode/packages/npm-package/tests/unit/stubs.util.ts          | 2 +-
 vscode/packages/npm-package/tests/unit/updateClients.spec.ts  | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/vscode/packages/npm-package/tests/assertUtils.ts b/vscode/packages/npm-package/tests/assertUtils.ts
index 578a9e363a..750fbdba91 100644
--- a/vscode/packages/npm-package/tests/assertUtils.ts
+++ b/vscode/packages/npm-package/tests/assertUtils.ts
@@ -1,4 +1,4 @@
-import { KiotaLogEntry, LogLevel } from "../types";
+import { KiotaLogEntry, LogLevel } from "../lib/types";
 
 export function existsEqualOrGreaterThanLevelLogs(logs: KiotaLogEntry[] | undefined, level: LogLevel): boolean {
   if (!logs) return false;
diff --git a/vscode/packages/npm-package/tests/integration/integrationGeneratePlugin.spec.ts b/vscode/packages/npm-package/tests/integration/integrationGeneratePlugin.spec.ts
index 7f3e336359..25d3f345fd 100644
--- a/vscode/packages/npm-package/tests/integration/integrationGeneratePlugin.spec.ts
+++ b/vscode/packages/npm-package/tests/integration/integrationGeneratePlugin.spec.ts
@@ -3,8 +3,8 @@ import path from 'path';
 import { generatePlugin } from '../../lib/generatePlugin';
 import { getKiotaTree } from '../../lib/getKiotaTree';
 import { getPluginManifest } from '../../lib/getPluginManifest';
-import { KiotaPluginType, ConsumerOperation, LogLevel } from '../../types';
-import { PluginAuthType } from '../../types';
+import { KiotaPluginType, ConsumerOperation, LogLevel } from '../../lib/types';
+import { PluginAuthType } from '../../lib/types';
 import { existsEqualOrGreaterThanLevelLogs } from '../assertUtils';
 
 async function loadJSON(filename: string) {
diff --git a/vscode/packages/npm-package/tests/integration/integrationGetKiotaTree.spec.ts b/vscode/packages/npm-package/tests/integration/integrationGetKiotaTree.spec.ts
index cc76e0718d..60091f50bf 100644
--- a/vscode/packages/npm-package/tests/integration/integrationGetKiotaTree.spec.ts
+++ b/vscode/packages/npm-package/tests/integration/integrationGetKiotaTree.spec.ts
@@ -7,7 +7,7 @@ import {
   ApiKeySecurityScheme,
   OpenIdSecurityScheme,
   OpenApiSpecVersion,
-} from "../../types";
+} from "../../lib/types";
 import { getKiotaTree } from "../../lib/getKiotaTree";
 import { existsEqualOrGreaterThanLevelLogs } from "../assertUtils";
 
diff --git a/vscode/packages/npm-package/tests/integration/integrationInstall.spec.ts b/vscode/packages/npm-package/tests/integration/integrationInstall.spec.ts
index d672c1c1b0..267fa7b3e7 100644
--- a/vscode/packages/npm-package/tests/integration/integrationInstall.spec.ts
+++ b/vscode/packages/npm-package/tests/integration/integrationInstall.spec.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 
-import { setKiotaConfig } from '../../config';
-import { ensureKiotaIsPresentInPath, getCurrentPlatform, getKiotaPath, Package } from '../../install';
+import { setKiotaConfig } from '../../lib/config';
+import { ensureKiotaIsPresentInPath, getCurrentPlatform, getKiotaPath, Package } from '../../lib/install';
 import testRuntimeJson from '../test_runtime.json';
 import path from 'path';
 
diff --git a/vscode/packages/npm-package/tests/integration/setup.ts b/vscode/packages/npm-package/tests/integration/setup.ts
index 3d71b1104a..a69e593cad 100644
--- a/vscode/packages/npm-package/tests/integration/setup.ts
+++ b/vscode/packages/npm-package/tests/integration/setup.ts
@@ -1,5 +1,5 @@
 import { Config } from '@jest/types';
-import { ensureKiotaIsPresent } from '../../install';
+import { ensureKiotaIsPresent } from '../../lib/install';
 
 export default async (globalConfig: Config.GlobalConfig, projectConfig: Config.ProjectConfig) => {
     // Ensure kiota binary to optimize integration tests
diff --git a/vscode/packages/npm-package/tests/unit/generateClient.spec.ts b/vscode/packages/npm-package/tests/unit/generateClient.spec.ts
index f4eb977775..c01c05c145 100644
--- a/vscode/packages/npm-package/tests/unit/generateClient.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/generateClient.spec.ts
@@ -1,5 +1,5 @@
 import { generateClient } from '../../lib/generateClient';
-import { KiotaLogEntry, KiotaGenerationLanguage } from '../../types';
+import { KiotaLogEntry, KiotaGenerationLanguage } from '../../lib/types';
 import { setupKiotaStubs } from './stubs.util';
 
 describe("generate client", () => {
diff --git a/vscode/packages/npm-package/tests/unit/generatePlugin.spec.ts b/vscode/packages/npm-package/tests/unit/generatePlugin.spec.ts
index 36588d957f..6ea1cefcea 100644
--- a/vscode/packages/npm-package/tests/unit/generatePlugin.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/generatePlugin.spec.ts
@@ -1,6 +1,6 @@
 import { generatePlugin } from '../../lib/generatePlugin';
-import { KiotaLogEntry } from '../../types';
-import { KiotaPluginType } from '../../types';
+import { KiotaLogEntry } from '../../lib/types';
+import { KiotaPluginType } from '../../lib/types';
 import { setupKiotaStubs } from './stubs.util';
 
 describe("generate plugin", () => {
diff --git a/vscode/packages/npm-package/tests/unit/getKiotaTree.spec.ts b/vscode/packages/npm-package/tests/unit/getKiotaTree.spec.ts
index 4d56cbd021..e18763f717 100644
--- a/vscode/packages/npm-package/tests/unit/getKiotaTree.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/getKiotaTree.spec.ts
@@ -1,4 +1,4 @@
-import { KiotaTreeResult } from '../../types';
+import { KiotaTreeResult } from '../../lib/types';
 import { getKiotaTree } from '../../lib/getKiotaTree';
 import { setupKiotaStubs } from './stubs.util';
 
diff --git a/vscode/packages/npm-package/tests/unit/getManifestDetails.spec.ts b/vscode/packages/npm-package/tests/unit/getManifestDetails.spec.ts
index 935da2cdce..ec423d6d6a 100644
--- a/vscode/packages/npm-package/tests/unit/getManifestDetails.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/getManifestDetails.spec.ts
@@ -1,4 +1,4 @@
-import { KiotaManifestResult } from '../../types';
+import { KiotaManifestResult } from '../../lib/types';
 import { getManifestDetails } from '../../lib/getManifestDetails';
 import { setupKiotaStubs } from './stubs.util';
 
diff --git a/vscode/packages/npm-package/tests/unit/migrateFromLockFile.spec.ts b/vscode/packages/npm-package/tests/unit/migrateFromLockFile.spec.ts
index 9f2bace64f..4b2cc7b6b8 100644
--- a/vscode/packages/npm-package/tests/unit/migrateFromLockFile.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/migrateFromLockFile.spec.ts
@@ -1,4 +1,4 @@
-import { KiotaLogEntry } from '../../types';
+import { KiotaLogEntry } from '../../lib/types';
 import { migrateFromLockFile } from '../../lib/migrateFromLockFile';
 import { setupKiotaStubs } from './stubs.util';
 
diff --git a/vscode/packages/npm-package/tests/unit/removeItem.spec.ts b/vscode/packages/npm-package/tests/unit/removeItem.spec.ts
index c692fed3b4..d0bc3afc6e 100644
--- a/vscode/packages/npm-package/tests/unit/removeItem.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/removeItem.spec.ts
@@ -1,4 +1,4 @@
-import { KiotaLogEntry, KiotaResult } from '../../types';
+import { KiotaLogEntry, KiotaResult } from '../../lib/types';
 import { removeClient, removePlugin } from '../../lib/removeItem';
 import { setupKiotaStubs } from './stubs.util';
 
diff --git a/vscode/packages/npm-package/tests/unit/searchDescriptions.spec.ts b/vscode/packages/npm-package/tests/unit/searchDescriptions.spec.ts
index 343a9bda10..a852d645e4 100644
--- a/vscode/packages/npm-package/tests/unit/searchDescriptions.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/searchDescriptions.spec.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { KiotaSearchResultItem } from '../../types';
+import { KiotaSearchResultItem } from '../../lib/types';
 import { searchDescription } from '../../lib/searchDescription';
 import { setupKiotaStubs } from './stubs.util';
 
diff --git a/vscode/packages/npm-package/tests/unit/stubs.util.ts b/vscode/packages/npm-package/tests/unit/stubs.util.ts
index a4f6327a8a..bc847c98d0 100644
--- a/vscode/packages/npm-package/tests/unit/stubs.util.ts
+++ b/vscode/packages/npm-package/tests/unit/stubs.util.ts
@@ -1,5 +1,5 @@
 import * as rpc from 'vscode-jsonrpc';
-import * as connectToKiota from '../../connect';
+import * as connectToKiota from '../../lib/connect';
 
 export function setupKiotaStubs() {
   const connectionStub = jest.fn();
diff --git a/vscode/packages/npm-package/tests/unit/updateClients.spec.ts b/vscode/packages/npm-package/tests/unit/updateClients.spec.ts
index 90695bf804..ef2f2866f9 100644
--- a/vscode/packages/npm-package/tests/unit/updateClients.spec.ts
+++ b/vscode/packages/npm-package/tests/unit/updateClients.spec.ts
@@ -1,4 +1,4 @@
-import { KiotaLogEntry } from '../../types';
+import { KiotaLogEntry } from '../../lib/types';
 import { updateClients } from '../../lib/updateClients';
 import { setupKiotaStubs } from './stubs.util';