diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 24d0c2d2c..67ed6b7d7 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -13,7 +13,7 @@ This is the **GitHub Copilot for Eclipse** plugin - an Eclipse IDE extension tha
 - **Multi-Platform Support**: Windows, macOS (x64/aarch64), and Linux (x64/aarch64)
 
 ### Tech Stack
-- **Java**: Primary language (Java 17+, with Eclipse 4.31+ requiring Java 21+)
+- **Java**: Primary language (Java 21+, with Eclipse 4.38+ requiring Java 21+)
 - **Eclipse RCP/OSGi**: Plugin architecture using Eclipse platform APIs
 - **Maven/Tycho**: Build system for Eclipse plugin development
 - **LSP4E**: Language Server Protocol integration for Eclipse
@@ -46,7 +46,7 @@ You MUST verify compilation and code quality before declaring work complete!
 - Root POM coordinates multi-module build with Tycho
 - Each bundle/feature/test has its own POM inheriting from root
 - Checkstyle validation runs during `verify` phase
-- Target platform defined in `base.target`, `target-terminal.target`, `target-tm-terminal.target`
+- Target platform defined in `target-platforms/2025-12.target`
 
 ### Code Change Review Trigger
 
@@ -569,7 +569,7 @@ distinguish repeated controls with stable context or an ordinal
 
 **When** writing tests → use JUnit 5 for core logic; integration tests for Eclipse integration
 
-**When** adding dependencies → only add necessary bundles; check `base.target` for Eclipse 2024-03 version constraints
+**When** adding dependencies → only add necessary bundles; check `target-platforms/2025-12.target` for Eclipse 2025-12 version constraints
 
 **When** targeting Eclipse versions → support multiple versions when possible
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3823ab471..7d45575de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,10 +32,10 @@ jobs:
       working-directory: com.microsoft.copilot.eclipse.core/copilot-agent
       run: npm i -f
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e78e21d46..3b8c2d5e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,10 +16,10 @@ When you submit a pull request, a CLA bot will automatically determine whether y
 
 ### Prerequisites
 
-- **Java 17** or later (CI uses Temurin 17; use a newer JDK if required by your Eclipse IDE)
+- **Java 21** or later (CI uses Temurin 21; use a newer JDK if required by your Eclipse IDE)
 - **Maven 3.8+** (or use the provided Maven wrapper `./mvnw`)
 - **Node.js 22.13** or later, with npm
-- **Eclipse IDE for Eclipse Committers 2024-03** or later (for development)
+- **Eclipse IDE for Eclipse Committers 2025-12** or later (for development)
 - Recommended: **Eclipse Checkstyle plugin** for code style compliance
   (e.g. install from update site: https://checkstyle.org/eclipse-cs-update-site/)
 
@@ -61,8 +61,10 @@ The installable P2 repository is generated in `com.microsoft.copilot.eclipse.rep
    * Do also import the agent bundle for your OS (e.g., `com.microsoft.copilot.eclipse.core.agent.win32`)
      after building the project with npm and maven or import all OS-specific agent bundles.
 2. Activate one of the target platforms, i.e. open one of the target definition files and select `Set As Active Target Platform`.
-   * target-terminal.target (Eclipse 4.37+)
-   * target-tm-terminal.target (Eclipse 4.36 and earlier)
+   * `target-platforms/2025-12.target` - Eclipse 2025-12 (4.38), provides the modern terminal implementation
+     (`org.eclipse.terminal.*` bundles used by `ui.terminal`, available in Eclipse 2025-09 (4.37) and newer versions)
+   * `target-platforms/2024-12.target` - Eclipse 2024-12 (4.34), provides the legacy TM terminal implementation
+     (`org.eclipse.tm.terminal.*` bundles used by `ui.terminal.tm`, available in Eclipse 2025-06 (4.36) and earlier versions)
 3. For using the Checkstyle configuration (assuming you have installed the Eclipse Checkstyle plugin, see prerequisites),
    add a new named Checkstyle configuration.
    * Select *Window > Preferences > Checkstyle* and press the *New...* button.
@@ -112,8 +114,8 @@ The project is a multi-module Maven/Tycho build consisting of OSGi bundles:
 | `com.microsoft.copilot.eclipse.ui` | User interface: chat view, completion UI, agent tools |
 | `com.microsoft.copilot.eclipse.ui.jobs` | Copilot Jobs view integration |
 | `com.microsoft.copilot.eclipse.terminal.api` | Terminal tool API definitions |
-| `com.microsoft.copilot.eclipse.ui.terminal` | Terminal integration (Eclipse 4.37+) |
-| `com.microsoft.copilot.eclipse.ui.terminal.tm` | TM Terminal integration (Eclipse 4.36 and earlier) |
+| `com.microsoft.copilot.eclipse.ui.terminal` | Modern terminal integration (runs on Eclipse >= 2025-09 / 4.37) |
+| `com.microsoft.copilot.eclipse.ui.terminal.tm` | TM Terminal integration (runs on Eclipse < 2025-09 / 4.37) |
 | `com.microsoft.copilot.eclipse.branding` | Product branding and about dialog |
 | `com.microsoft.copilot.eclipse.core.agent.*` | Platform-specific Copilot language server agent bundles |
 | `com.microsoft.copilot.eclipse.feature` | Eclipse feature definition |
diff --git a/base.target b/base.target
deleted file mode 100644
index a6fc6705a..000000000
--- a/base.target
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target includeMode="feature" name="Copilot for Eclipse Target Definition">
-	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/releases/2025-03/"/>
-			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
-			<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
-			<unit id="org.apache.commons.lang3" version="0.0.0"/>
-			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.jgit" version="0.0.0"/>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
-			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.swtbot.junit4_x" version="0.0.0"/>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<!-- Wildwebdeveloper version 1.3.2 is the latest version that support JavaSE-17 as the execution environment -->
-			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.2/"/>
-				<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/mylyn/updates/release/4.4.0"/>
-			<unit id="org.eclipse.mylyn.wikitext.feature.feature.group" version="4.4.0.v20240820-2036"/>
-			<unit id="org.eclipse.mylyn.wikitext.extras.feature.feature.group" version="4.4.0.v20240706-1405"/>
-		</location>
-		<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="generate" type="Maven">
-			<dependencies>
-				<dependency>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-					<version>5.14.2</version>
-					<type>jar</type>
-				</dependency>
-				<dependency>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-junit-jupiter</artifactId>
-					<version>5.14.2</version>
-					<type>jar</type>
-				</dependency>
-				<dependency>
-					<groupId>org.objenesis</groupId>
-					<artifactId>objenesis</artifactId>
-					<version>3.4</version>
-					<type>jar</type>
-				</dependency>
-			</dependencies>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
-			<unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
-			<unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
-			<unit id="org.w3c.dom.smil" version="1.0.1.v200903091627"/>
-			<unit id="org.w3c.dom.events" version="3.0.0.draft20060413_v201105210656"/>
-		</location>
-		<!-- E4 Tools including CSS Spy -->
-		<!-- E4 CSS Editor and Tools -->
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>
-			<unit id="org.eclipse.e4.tools.css.spy.feature.feature.group" version="0.14.0.v20200923-1237"/>
-			<unit id="org.eclipse.e4.tools.bundle.spy.feature.feature.group" version="0.1.0.v20200923-1237"/>
-			<unit id="org.eclipse.e4.tools.context.spy.feature.feature.group" version="0.17.0.v20200923-1237"/>
-			<unit id="org.eclipse.e4.tools.event.spy.feature.feature.group" version="0.15.0.v20200923-1237"/>
-			<unit id="org.eclipse.e4.tools.model.spy.feature.feature.group" version="0.1.100.v20200923-1237"/>
-			<unit id="org.eclipse.e4.tools.preference.spy.feature.feature.group" version="0.1.0.v20200923-1237"/>
-			<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.18.0.v20200923-1237"/>
-		</location>
-	</locations>
-	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
-</target>
\ No newline at end of file
diff --git a/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF
index eb31b095a..b08c1bcf5 100644
--- a/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.linux.aarch64
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=aarch64))
diff --git a/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF
index d422d0113..855176ae8 100644
--- a/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.linux.x64
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86_64))
diff --git a/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF
index 4e91f8354..eaae707a2 100644
--- a/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.macosx.aarch64
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Eclipse-PlatformFilter: (&(osgi.os=macosx) (osgi.arch=aarch64))
diff --git a/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF
index f00dbc951..387ad4ddb 100644
--- a/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.macosx.x64
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Eclipse-PlatformFilter: (&(osgi.os=macosx)(osgi.arch=x86_64))
diff --git a/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF
index e8f912c1d..11d3e10d1 100644
--- a/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.win32
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Eclipse-PlatformFilter: (osgi.os=win32)
diff --git a/com.microsoft.copilot.eclipse.core.test/.classpath b/com.microsoft.copilot.eclipse.core.test/.classpath
index 38f401ad4..766df48f2 100644
--- a/com.microsoft.copilot.eclipse.core.test/.classpath
+++ b/com.microsoft.copilot.eclipse.core.test/.classpath
@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs
index 21eccc094..a98206bc4 100644
--- a/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
diff --git a/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF
index ebf877391..e4eedf0c0 100644
--- a/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.core.test
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.test;singleton:=true
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Fragment-Host: com.microsoft.copilot.eclipse.core
 Automatic-Module-Name: com.microsoft.copilot.eclipse.core.test
 Import-Package: org.objenesis;version="[3.4.0,4.0.0)",
diff --git a/com.microsoft.copilot.eclipse.core.test/build.properties b/com.microsoft.copilot.eclipse.core.test/build.properties
index 100b378a5..3cb14ae9c 100644
--- a/com.microsoft.copilot.eclipse.core.test/build.properties
+++ b/com.microsoft.copilot.eclipse.core.test/build.properties
@@ -1,5 +1,5 @@
-source.. = src
-output.. = target/classes
+source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .
 
diff --git a/com.microsoft.copilot.eclipse.core/.classpath b/com.microsoft.copilot.eclipse.core/.classpath
index 8d8612144..b1415d56b 100644
--- a/com.microsoft.copilot.eclipse.core/.classpath
+++ b/com.microsoft.copilot.eclipse.core/.classpath
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs
index 21eccc094..2fc4a03ea 100644
--- a/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,17 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
diff --git a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF
index e96a614f6..b78d04d83 100644
--- a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF
@@ -23,10 +23,10 @@ Export-Package: com.microsoft.copilot.eclipse.core,
  com.microsoft.copilot.eclipse.core.lsp.protocol.quota,
  com.microsoft.copilot.eclipse.core.lsp.protocol.tools,
  com.microsoft.copilot.eclipse.core.nes;x-friends:="com.microsoft.copilot.eclipse.ui",
- com.microsoft.copilot.eclipse.core.persistence;x-friends:="com.microsoft.copilot.eclipse.ui,com.microsoft.copilot.eclipse.core.test，com.microsoft.copilot.eclipse.core.utils",
+ com.microsoft.copilot.eclipse.core.persistence;x-friends:="com.microsoft.copilot.eclipse.ui,com.microsoft.copilot.eclipse.core.test,com.microsoft.copilot.eclipse.core.utils",
  com.microsoft.copilot.eclipse.core.utils
 Bundle-Activator: com.microsoft.copilot.eclipse.core.CopilotCore
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.microsoft.copilot.eclipse.core
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui,
diff --git a/com.microsoft.copilot.eclipse.core/build.properties b/com.microsoft.copilot.eclipse.core/build.properties
index d6219466d..326a0702b 100644
--- a/com.microsoft.copilot.eclipse.core/build.properties
+++ b/com.microsoft.copilot.eclipse.core/build.properties
@@ -1,5 +1,5 @@
-source.. = src
-output.. = target/classes
+source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
diff --git a/com.microsoft.copilot.eclipse.repository/category.xml b/com.microsoft.copilot.eclipse.repository/category.xml
index 78f864fa1..3b147199d 100644
--- a/com.microsoft.copilot.eclipse.repository/category.xml
+++ b/com.microsoft.copilot.eclipse.repository/category.xml
@@ -3,5 +3,15 @@
    <feature id="com.microsoft.copilot.eclipse.feature" version="0.21.0.qualifier">
       <category name="com.microsoft.copilot.eclipse.category"/>
    </feature>
+   <bundle id="org.eclipse.lsp4e">
+      <category name="com.microsoft.copilot.eclipse.dependencies.category"/>
+   </bundle>
+   <bundle id="org.eclipse.lsp4j">
+      <category name="com.microsoft.copilot.eclipse.dependencies.category"/>
+   </bundle>
+   <bundle id="org.eclipse.lsp4j.jsonrpc">
+      <category name="com.microsoft.copilot.eclipse.dependencies.category"/>
+   </bundle>
    <category-def name="com.microsoft.copilot.eclipse.category" label="GitHub Copilot"/>
-</site>
\ No newline at end of file
+   <category-def name="com.microsoft.copilot.eclipse.dependencies.category" label="GitHub Copilot Dependencies"/>
+</site>
diff --git a/com.microsoft.copilot.eclipse.swtbot.test/.classpath b/com.microsoft.copilot.eclipse.swtbot.test/.classpath
index 38f401ad4..766df48f2 100644
--- a/com.microsoft.copilot.eclipse.swtbot.test/.classpath
+++ b/com.microsoft.copilot.eclipse.swtbot.test/.classpath
@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs
index 62ef3488c..23fa13b17 100644
--- a/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF
index 468b60478..3a2731834 100644
--- a/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.swtbot.test
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.swtbot.test;singleton:=true
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.microsoft.copilot.eclipse.swtbot.test
 Require-Bundle: org.eclipse.swtbot.swt.finder;bundle-version="4.1.0",
  org.eclipse.swtbot.eclipse.finder;bundle-version="4.1.0",
diff --git a/com.microsoft.copilot.eclipse.swtbot.test/build.properties b/com.microsoft.copilot.eclipse.swtbot.test/build.properties
index 8e6b406ec..73ec1c618 100644
--- a/com.microsoft.copilot.eclipse.swtbot.test/build.properties
+++ b/com.microsoft.copilot.eclipse.swtbot.test/build.properties
@@ -1,5 +1,5 @@
-source.. = src
-output.. = target/classes
+source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
diff --git a/com.microsoft.copilot.eclipse.terminal.api/.classpath b/com.microsoft.copilot.eclipse.terminal.api/.classpath
index 8d8612144..b1415d56b 100644
--- a/com.microsoft.copilot.eclipse.terminal.api/.classpath
+++ b/com.microsoft.copilot.eclipse.terminal.api/.classpath
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs
index 62ef3488c..23fa13b17 100644
--- a/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF
index fbcc5c79a..9a0d746cf 100644
--- a/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: GitHub Copilot
 Export-Package: com.microsoft.copilot.eclipse.terminal.api
 Automatic-Module-Name: com.microsoft.copilot.eclipse.terminal.api
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.30.0,4.0.0)",
  com.microsoft.copilot.eclipse.core;bundle-version="0.21.0",
diff --git a/com.microsoft.copilot.eclipse.terminal.api/build.properties b/com.microsoft.copilot.eclipse.terminal.api/build.properties
index f38581b94..eb7c4c161 100644
--- a/com.microsoft.copilot.eclipse.terminal.api/build.properties
+++ b/com.microsoft.copilot.eclipse.terminal.api/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                scripts/
diff --git a/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath b/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath
index 38f401ad4..2167a547d 100644
--- a/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath
+++ b/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF
index 7acdbcaf6..4be973136 100644
--- a/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF
@@ -4,10 +4,11 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.jobs.test
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.jobs.test;singleton:=true
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.jobs.test
-Require-Bundle: junit-jupiter-api;bundle-version="5.10.1",
- junit-jupiter-params;bundle-version="5.10.1",
+Require-Bundle: junit-jupiter-api;bundle-version="[5.10.1,6.0.0)",
+ junit-jupiter-engine;bundle-version="[5.10.1,6.0.0)",
+ junit-jupiter-params;bundle-version="[5.10.1,6.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.30.0,4.0.0)",
  com.microsoft.copilot.eclipse.ui.jobs;bundle-version="0.21.0"
 Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)"
diff --git a/com.microsoft.copilot.eclipse.ui.jobs/.classpath b/com.microsoft.copilot.eclipse.ui.jobs/.classpath
index 5508535a4..b1415d56b 100644
--- a/com.microsoft.copilot.eclipse.ui.jobs/.classpath
+++ b/com.microsoft.copilot.eclipse.ui.jobs/.classpath
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs
index 20cc7b588..f7d4b5bfd 100644
--- a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF
index 0fee3467d..e76c9cd27 100644
--- a/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.jobs;singleton:=true
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-Activator: com.microsoft.copilot.eclipse.ui.jobs.CopilotJobs
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Localization: plugin
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.jobs
 Bundle-ActivationPolicy: lazy
diff --git a/com.microsoft.copilot.eclipse.ui.jobs/build.properties b/com.microsoft.copilot.eclipse.ui.jobs/build.properties
index 18012dbed..2257d7129 100644
--- a/com.microsoft.copilot.eclipse.ui.jobs/build.properties
+++ b/com.microsoft.copilot.eclipse.ui.jobs/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
diff --git a/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath b/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath
index 8d8612144..c00157781 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath
+++ b/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF
index c4a5f14bc..9bd344f50 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.terminal.tm
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.terminal.tm;singleton:=true
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.terminal.tm
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml
diff --git a/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml b/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml
index 1d4b39049..a10893158 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml
+++ b/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml
@@ -18,7 +18,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<target>
-						<file>../target-tm-terminal.target</file>
+						<file>../target-platforms/2024-12.target</file>
 					</target>
 				</configuration>
 			</plugin>
diff --git a/com.microsoft.copilot.eclipse.ui.terminal/.classpath b/com.microsoft.copilot.eclipse.ui.terminal/.classpath
index e0ce1f7ec..b1415d56b 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal/.classpath
+++ b/com.microsoft.copilot.eclipse.ui.terminal/.classpath
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs
index 62ef3488c..23fa13b17 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF
index 4aa767cfc..bb646a7e7 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.terminal
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.terminal;singleton:=true
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.terminal
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml
diff --git a/com.microsoft.copilot.eclipse.ui.terminal/build.properties b/com.microsoft.copilot.eclipse.ui.terminal/build.properties
index 4aee9b7ab..367dd831e 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal/build.properties
+++ b/com.microsoft.copilot.eclipse.ui.terminal/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/component.xml
\ No newline at end of file
diff --git a/com.microsoft.copilot.eclipse.ui.terminal/pom.xml b/com.microsoft.copilot.eclipse.ui.terminal/pom.xml
index f70016ec1..830edfbf6 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal/pom.xml
+++ b/com.microsoft.copilot.eclipse.ui.terminal/pom.xml
@@ -18,7 +18,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<target>
-						<file>../target-terminal.target</file>
+						<file>../target-platforms/2025-12.target</file>
 					</target>
 				</configuration>
 			</plugin>
diff --git a/com.microsoft.copilot.eclipse.ui.test/.classpath b/com.microsoft.copilot.eclipse.ui.test/.classpath
index 38f401ad4..766df48f2 100644
--- a/com.microsoft.copilot.eclipse.ui.test/.classpath
+++ b/com.microsoft.copilot.eclipse.ui.test/.classpath
@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs
index 62ef3488c..23fa13b17 100644
--- a/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF
index ab85b21d7..cba4993d7 100644
--- a/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.test
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.test;singleton:=true
 Bundle-Version: 0.21.0.qualifier
 Bundle-Vendor: GitHub Copilot
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Fragment-Host: com.microsoft.copilot.eclipse.ui
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.test
 Import-Package: org.objenesis;version="[3.4.0,4.0.0)"
diff --git a/com.microsoft.copilot.eclipse.ui.test/build.properties b/com.microsoft.copilot.eclipse.ui.test/build.properties
index 07c97efed..8ffd63634 100644
--- a/com.microsoft.copilot.eclipse.ui.test/build.properties
+++ b/com.microsoft.copilot.eclipse.ui.test/build.properties
@@ -1,5 +1,5 @@
-source.. = src
-output.. = target/classes
+source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                fragment.xml
diff --git a/com.microsoft.copilot.eclipse.ui/.classpath b/com.microsoft.copilot.eclipse.ui/.classpath
index 8d8612144..b1415d56b 100644
--- a/com.microsoft.copilot.eclipse.ui/.classpath
+++ b/com.microsoft.copilot.eclipse.ui/.classpath
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..4824b8026
--- /dev/null
+++ b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs
index 21eccc094..a98206bc4 100644
--- a/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
diff --git a/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF
index a7cc5c25d..73b4f6120 100644
--- a/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Export-Package: com.microsoft.copilot.eclipse.ui,
  com.microsoft.copilot.eclipse.ui.extensions,
  com.microsoft.copilot.eclipse.ui.nes;x-friends:="com.microsoft.copilot.eclipse.ui.test"
 Bundle-Activator: com.microsoft.copilot.eclipse.ui.CopilotUi
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui
 Bundle-ActivationPolicy: lazy
 Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)"
diff --git a/com.microsoft.copilot.eclipse.ui/build.properties b/com.microsoft.copilot.eclipse.ui/build.properties
index 5ba08abef..9ce23e6a9 100644
--- a/com.microsoft.copilot.eclipse.ui/build.properties
+++ b/com.microsoft.copilot.eclipse.ui/build.properties
@@ -1,5 +1,5 @@
-source.. = src
-output.. = target/classes
+source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
diff --git a/launch/Verify Copilot for Eclipse.launch b/launch/Verify Copilot for Eclipse.launch
new file mode 100644
index 000000000..e2537bd26
--- /dev/null
+++ b/launch/Verify Copilot for Eclipse.launch	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="clean verify -e"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value=""/>
+    <listAttribute key="M2_PROPERTIES"/>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/github-copilot-for-eclipse}"/>
+</launchConfiguration>
diff --git a/launch/plugin_debug_configuration.launch b/launch/plugin_debug_configuration.launch
index 8c8419e65..eedd1787c 100644
--- a/launch/plugin_debug_configuration.launch
+++ b/launch/plugin_debug_configuration.launch
@@ -19,7 +19,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true"/>
diff --git a/pom.xml b/pom.xml
index ba917990f..54d179ec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	</properties>
 
 	<modules>
-        <!-- terminal bundles must be built before ui bundle as ui bundle depends on terminal bundle artifacts -->
+		<!-- terminal bundles must be built before ui bundle as ui bundle depends on terminal bundle artifacts -->
 		<module>com.microsoft.copilot.eclipse.terminal.api</module>
 		<module>com.microsoft.copilot.eclipse.ui.terminal</module>
 		<module>com.microsoft.copilot.eclipse.ui.terminal.tm</module>
@@ -96,7 +96,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<target>
-						<file>../base.target</file>
+						<file>../target-platforms/2025-12.target</file>
 					</target>
 					<executionEnvironment>JavaSE-21</executionEnvironment>
 					<environments>
diff --git a/target-platforms/2024-12.target b/target-platforms/2024-12.target
new file mode 100644
index 000000000..95161df87
--- /dev/null
+++ b/target-platforms/2024-12.target
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Copilot for Eclipse Target Definition for Eclipse 2024-12">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/releases/2024-12/"/>
+			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
+			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.jgit" version="0.0.0"/>
+			<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.mylyn.wikitext.feature.feature.group" version="0.0.0"/>
+			<unit id="org.osgi.service.component" version="0.0.0"/>
+			<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.bundle" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.context" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.core" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.css" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.event" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.model" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.preferences" version="0.0.0"/>
+			<unit id="org.eclipse.tools.layout.spy" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.eclipse.spy" version="0.0.0"/>
+			<unit id="org.apache.commons.lang3" version="0.0.0"/>
+			<unit id="org.apache.commons.logging" version="0.0.0"/>
+			<unit id="com.google.guava" version="0.0.0"/>
+			<unit id="com.google.guava.failureaccess" version="0.0.0"/>
+			<unit id="junit-jupiter-api" version="0.0.0"/>
+			<unit id="junit-jupiter-engine" version="0.0.0"/>
+			<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
+			<unit id="junit-jupiter-params" version="0.0.0"/>
+			<unit id="junit-platform-commons" version="0.0.0"/>
+			<unit id="junit-platform-engine" version="0.0.0"/>
+			<unit id="junit-platform-launcher" version="0.0.0"/>
+			<unit id="junit-platform-runner" version="0.0.0"/>
+			<unit id="junit-platform-suite-api" version="0.0.0"/>
+			<unit id="junit-platform-suite-commons" version="0.0.0"/>
+			<unit id="junit-platform-suite-engine" version="0.0.0"/>
+			<unit id="junit-vintage-engine" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.junit4_x" version="0.0.0"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12/"/>
+			<unit id="org.mockito.mockito-core" version="0.0.0"/>
+			<unit id="org.mockito.junit-jupiter" version="0.0.0"/>
+			<unit id="org.objenesis" version="0.0.0"/>
+			<unit id="org.hamcrest" version="0.0.0"/>
+			<unit id="org.commonmark" version="0.0.0"/>
+			<unit id="org.commonmark-gfm-tables" version="0.0.0"/>
+			<unit id="org.commonmark-task-list-items" version="0.0.0"/>
+			<unit id="org.commonmark-gfm-strikethrough" version="0.0.0"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.29.3/"/>
+			<unit id="com.google.gson" version="0.0.0"/>
+			<unit id="org.commonmark" version="0.0.0"/>
+			<unit id="org.commonmark.ext-gfm-tables" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e.debug.source" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e.source" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
+		</location>
+	</locations>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+</target>
\ No newline at end of file
diff --git a/target-platforms/2025-12.target b/target-platforms/2025-12.target
new file mode 100644
index 000000000..d5ba85bde
--- /dev/null
+++ b/target-platforms/2025-12.target
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Copilot for Eclipse Target Definition for Eclipse 2025-12">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/releases/2025-12/"/>
+			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
+			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.jgit" version="0.0.0"/>
+			<unit id="org.eclipse.terminal.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.mylyn.wikitext.feature.feature.group" version="0.0.0"/>
+			<unit id="org.osgi.service.component" version="0.0.0"/>
+			<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.bundle" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.context" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.core" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.css" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.event" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.model" version="0.0.0"/>
+			<unit id="org.eclipse.pde.spy.preferences" version="0.0.0"/>
+			<unit id="org.eclipse.tools.layout.spy" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.eclipse.spy" version="0.0.0"/>
+			<unit id="org.apache.commons.lang3" version="0.0.0"/>
+			<unit id="org.apache.commons.logging" version="0.0.0"/>
+			<unit id="com.google.guava" version="0.0.0"/>
+			<unit id="com.google.guava.failureaccess" version="0.0.0"/>
+			<unit id="junit-jupiter-api" version="0.0.0"/>
+			<unit id="junit-jupiter-engine" version="0.0.0"/>
+			<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
+			<unit id="junit-jupiter-params" version="0.0.0"/>
+			<unit id="junit-platform-commons" version="0.0.0"/>
+			<unit id="junit-platform-engine" version="0.0.0"/>
+			<unit id="junit-platform-launcher" version="0.0.0"/>
+			<unit id="junit-platform-runner" version="0.0.0"/>
+			<unit id="junit-platform-suite-api" version="0.0.0"/>
+			<unit id="junit-platform-suite-commons" version="0.0.0"/>
+			<unit id="junit-platform-suite-engine" version="0.0.0"/>
+			<unit id="junit-vintage-engine" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.junit4_x" version="0.0.0"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12/"/>
+			<unit id="org.mockito.mockito-core" version="0.0.0"/>
+			<unit id="org.mockito.junit-jupiter" version="0.0.0"/>
+			<unit id="org.objenesis" version="0.0.0"/>
+			<unit id="org.hamcrest" version="0.0.0"/>
+			<unit id="org.commonmark" version="0.0.0"/>
+			<unit id="org.commonmark.ext-gfm-tables" version="0.0.0"/>
+			<unit id="org.commonmark.ext-task-list-items" version="0.0.0"/>
+			<unit id="org.commonmark.ext-gfm-strikethrough" version="0.0.0"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.29.3/"/>
+			<unit id="com.google.gson" version="0.0.0"/>
+			<unit id="org.commonmark" version="0.0.0"/>
+			<unit id="org.commonmark.ext-gfm-tables" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e.debug.source" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e.source" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
+		</location>
+	</locations>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+</target>
\ No newline at end of file
diff --git a/target-terminal.target b/target-terminal.target
deleted file mode 100644
index ad2e7c962..000000000
--- a/target-terminal.target
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="Copilot for Eclipse Target Definition - Terminal">
-	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner"
-            includeSource="true" type="InstallableUnit">
-            <repository
-                location="https://download.eclipse.org/eclipse/updates/4.37/R-4.37-202509050730/" />
-					<unit id="org.eclipse.terminal.feature.feature.group" version="0.0.0" />
-        </location>
-		<location type="Target"
-            uri="file:${project_loc:/github-copilot-for-eclipse}/base.target" />
-    </locations>
-</target>
\ No newline at end of file
diff --git a/target-tm-terminal.target b/target-tm-terminal.target
deleted file mode 100644
index ff989f093..000000000
--- a/target-tm-terminal.target
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="Copilot for Eclipse Target Definition - TM Terminal">
-	<locations>
-			<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/releases/2024-12/"/>
-			<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="0.0.0"/>
-		</location>
-		<location type="Target" uri="file:${project_loc:/github-copilot-for-eclipse}/base.target"/>
-    </locations>
-</target>
\ No newline at end of file