diff --git a/.github/workflows/build-test-lint.yml b/.github/workflows/build-test-lint.yml
index b76f0601..b5072e24 100644
--- a/.github/workflows/build-test-lint.yml
+++ b/.github/workflows/build-test-lint.yml
@@ -15,19 +15,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: ['20.x', '21.x', '22.x', '23.x']
+        node-version: ['22.x', '23.x']
     permissions:
       contents: read
     steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install Dependencies
-      run: npm install
-    - name: Build
-      run: npm run build
-    - name: Test
-      run: npm run test
-
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Dependencies
+        run: npm install
+      - name: Build
+        run: npm run build
+      - name: CLI Integration Test
+        run: node scripts/integration-test.js
+        env:
+          GITHUB_WORKSPACE: ${{ github.workspace }}
diff --git a/scripts/integration-test.js b/scripts/integration-test.js
new file mode 100644
index 00000000..8fdd1fdb
--- /dev/null
+++ b/scripts/integration-test.js
@@ -0,0 +1,149 @@
+const { execSync, spawn } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+// Create a temporary directory for testing
+const tempDir = path.join(os.tmpdir(), 'spark-integration-test-' + Date.now());
+console.log(`Creating test directory at: ${tempDir}`);
+fs.mkdirSync(tempDir, { recursive: true });
+process.chdir(tempDir);
+
+try {
+  // Step 1: Use the local CLI to create a new app
+  console.log('Creating new app with local CLI...');
+  const cliPath = path.resolve(process.env.GITHUB_WORKSPACE || '.', 'packages/cli/dist/index.js');
+  execSync(`node ${cliPath} new my-test-app --template echo`, { stdio: 'inherit' });
+
+  // Change to the newly created app directory
+  process.chdir(path.join(tempDir, 'my-test-app'));
+
+  // Step 2: Replace remote dependencies with local ones
+  console.log('Updating dependencies to use local packages...');
+  const rootDir = process.env.GITHUB_WORKSPACE || path.resolve('../../');
+  const packagesDir = path.join(rootDir, 'packages');
+
+  // Read package.json
+  const packageJsonPath = path.join(tempDir, 'my-test-app', 'package.json');
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+
+  // Get all available local packages
+  const localPackages = fs
+    .readdirSync(packagesDir)
+    .filter((dir) => fs.statSync(path.join(packagesDir, dir)).isDirectory())
+    .filter((dir) => fs.existsSync(path.join(packagesDir, dir, 'package.json')))
+    .map((dir) => {
+      const pkg = JSON.parse(fs.readFileSync(path.join(packagesDir, dir, 'package.json'), 'utf8'));
+      return { name: pkg.name, path: path.join(packagesDir, dir) };
+    });
+
+  // Update dependencies
+  ['dependencies', 'devDependencies'].forEach((depType) => {
+    if (!packageJson[depType]) return;
+
+    Object.keys(packageJson[depType]).forEach((dep) => {
+      if (dep.startsWith('@microsoft/spark.')) {
+        const localPkg = localPackages.find((p) => p.name === dep);
+        if (localPkg) {
+          console.log(`Replacing ${dep} with local version at ${localPkg.path}`);
+          packageJson[depType][dep] = `file:${localPkg.path}`;
+        }
+      }
+    });
+  });
+
+  // Write updated package.json
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+
+  // Step 3: Install dependencies
+  console.log('Installing dependencies...');
+  execSync('npm install', { stdio: 'inherit' });
+
+  // Step 4: Start the dev server and verify it's running
+  console.log('Starting dev server...');
+
+  // Start the server in a separate process so we can listen to its output
+  const devProcess = spawn('npm', ['run', 'dev', '--', '--no-open'], {
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+
+  let serverStarted = false;
+  let timeout = setTimeout(() => {
+    if (!serverStarted) {
+      console.error('Timeout waiting for server to start');
+      devProcess.kill();
+      process.exit(1);
+    }
+  }, 60000); // 60 second timeout
+
+  devProcess.stdout.on('data', (data) => {
+    const output = data.toString();
+    console.log('Server output:', output);
+
+    // Check if the server is listening on port 3000
+    if (
+      output.includes('listening on port 3000') ||
+      output.includes('Server running at http://localhost:3000')
+    ) {
+      serverStarted = true;
+      clearTimeout(timeout);
+
+      console.log('Server is running, preparing to test API...');
+
+      // Wait a moment for the server to fully initialize
+      setTimeout(async () => {
+        try {
+          // Load the Spark API Client
+          const { Client } = require('@microsoft/spark.api');
+
+          // Create a client connected to our local server
+          console.log('Creating Spark API client...');
+          const client = new Client('http://localhost:3001', {
+            headers: { 'x-teams-devtools': 'true' },
+          });
+
+          // Send a message to the server
+          console.log('Sending test message to server...');
+
+          // First create a conversation if needed
+          console.log('Creating/getting a conversation...');
+          const chatId = 'devtools';
+
+          // Use the conversations.activities API like in ChatScreen.tsx
+          const response = await client.conversations.activities(chatId).create({
+            type: 'message',
+            text: 'Test message from integration test',
+          });
+
+          console.log('Received response:', response);
+          console.log('Integration test passed!');
+
+          // Clean up and exit
+          devProcess.kill();
+          process.exit(0);
+        } catch (error) {
+          console.error('Error running integration test:', error);
+          devProcess.kill();
+          process.exit(1);
+        }
+      }, 5000); // Wait 5 seconds before testing
+    }
+  });
+
+  devProcess.stderr.on('data', (data) => {
+    console.error('Server error:', data.toString());
+  });
+
+  devProcess.on('close', (code) => {
+    if (!serverStarted) {
+      console.error(`Server process exited with code ${code} before starting`);
+      process.exit(1);
+    }
+  });
+} catch (error) {
+  console.error('Integration test failed:', error);
+  process.exit(1);
+} finally {
+  // Clean up (optional, could keep for debugging in CI)
+  // fs.rmSync(tempDir, { recursive: true, force: true });
+}