diff --git a/.github/plans/plan-mcp-agentic-invocation.md b/.github/plans/plan-mcp-agentic-invocation.md
new file mode 100644
index 00000000..0273d3de
--- /dev/null
+++ b/.github/plans/plan-mcp-agentic-invocation.md
@@ -0,0 +1,140 @@
+## Plan: MCP Agentic Tool Invocation in PPTB
+
+Enable reliable MCP-driven invocation for PPTB tools with explicit one-way and two-way contracts, while reusing existing invocation plumbing. The recommended approach is to keep current windowed execution for v1, add explicit invocation mode semantics at the MCP boundary, tighten schema and security validation, and publish a clear tool-author contract plus migration guide.
+
+**Steps**
+
+1. Phase 1: Lock scope and invocation model
+
+- Define supported MCP invocation modes and map to PPTB behavior.
+  Mode A: One-way (fire-and-forget) returns immediate accepted response and does not wait for tool return payload.
+  Mode B: Two-way (request-response) waits for tool return payload via existing invocation return path.
+- Set defaults and compatibility.
+  Default to two-way for existing tools.
+  If mode is omitted but tool declares no return schema, treat as one-way.
+- Declare v1 constraints.
+  Keep execution windowed only for now.
+  No streaming partial results in v1.
+  No parallel nested invocations from a single MCP request in v1.
+
+2. Phase 2: Extend contracts and shared types
+
+- Extend invocation contract in type definitions used by tools and host.
+  Add optional mode capabilities in InvocationConfig so each tool can declare allowed agent invocation modes and expected timeout behavior.
+- Extend MCP request contract in server code.
+  Add invocation metadata fields in MCP tool input envelope (for example mode and optional timeout), while preserving backward compatibility with existing prefill schema.
+- Extend schema conversion and registry output.
+  Expose mode support and return expectations in MCP tool descriptions and input schema hints so agents can choose one-way vs two-way correctly.
+
+3. Phase 3: Main-process orchestration changes
+
+- Add MCP invocation mode routing in McpServerManager.
+  One-way path: validate input, launch tool, return accepted result quickly, log correlation id.
+  Two-way path: validate input, launch tool, await returnData result, return structured payload.
+- Reuse ToolWindowManager launch-with-context pipeline.
+  Pass a normalized invocation context including source mcp, mode, correlation id, caller metadata, and timeout envelope.
+- Add timeout and cancellation guardrails.
+  Two-way: enforce per-request timeout and deterministic timeout response.
+  One-way: optional launch timeout only.
+- Add stronger input and output validation.
+  Validate MCP input against converted prefill schema before launch.
+  For two-way mode, validate return payload against returnTopic before responding.
+
+4. Phase 4: Security, auditability, and policy
+
+- Harden tool eligibility checks.
+  Require invocation.agentInvokable true and explicit support for requested mode.
+  Reject mode mismatches with actionable errors.
+- Expand audit logging.
+  Log mode, tool id, correlation id, duration, outcome, schema-validation result, and timeout/cancel reasons.
+- Redaction policy.
+  Ensure sensitive connection-related fields are redacted from invocation logs and MCP error surfaces.
+
+5. Phase 5: Tool runtime surface and compatibility helpers
+
+- Keep existing tool runtime APIs as primary contract.
+  Tools continue to use getLaunchContext and returnData.
+- Add optional invocation metadata to launch context.
+  Include source, mode, correlation id, requested timeout, and expectsResponse boolean so tools can branch behavior safely.
+- Add optional helper semantics.
+  If mode is one-way, returnData is optional and ignored for MCP response lifecycle.
+  If mode is two-way, returnData remains required for successful completion.
+
+6. Phase 6: Documentation and tool-author rollout
+
+- Update inter-tool and MCP docs with normative behavior.
+  Document exact one-way and two-way semantics, error codes, timeout behavior, and compatibility rules.
+- Publish tool-author migration guide.
+  Provide minimal manifest and runtime changes required per mode, plus test checklist.
+- Add validation guidance.
+  Extend docs and validator messaging so tool authors get warnings for inconsistent invocation declarations.
+
+7. Phase 7: Verification via MCP Inspector
+
+- External harness.
+  Use MCP Inspector to exercise list-tools and call-tool flows instead of adding a repository test runner for this phase.
+- Manual checks.
+  Verify one-way and two-way behavior, unsupported mode errors, and timeout handling with MCP Inspector.
+- Regression checks.
+  Existing inter-tool invocation from toolboxAPI remains unchanged.
+- Build gates.
+  Run typecheck, lint, and build before merge.
+
+**Relevant files**
+
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/src/main/mcp/mcpServer.ts — add MCP mode routing, timeout handling, validation orchestration, and response shaping.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/src/main/mcp/agentToolRegistry.ts — enrich exposed agent tool metadata with supported invocation modes and constraints.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/src/main/mcp/schemaConverter.ts — include mode-related schema hints and compatibility mapping.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/src/main/mcp/agentInvocationLogger.ts — add correlation-rich, redacted mode-aware logs.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/src/main/managers/toolWindowManager.ts — pass normalized invocation context and enforce launch/return lifecycle constraints.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/src/main/toolPreloadBridge.ts — ensure invocation context metadata reaches tools without breaking existing API.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/src/common/ipc/channels.ts — add any new channel constants only if needed for explicit mode/timeout signaling.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/packages/types/pptbConfig.d.ts — extend InvocationConfig with mode support declarations and optional timeout policy fields.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/packages/types/toolboxAPI.d.ts — document/extend invocation context typing for source and mode metadata.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/docs/INTER_TOOL_INVOCATION.md — add MCP normative section for one-way and two-way.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/docs/IMPLEMENTATION_CHECKLIST.md — add rollout and validation checklist for agentic invocation readiness.
+- /Users/danish/SourceCode/GitHub/PowerPlatformToolBox/desktop-app/README.md — link to tool-author guidance and MCP enablement overview.
+
+**Verification**
+
+1. Type and lint gates
+   Run pnpm run typecheck and pnpm run lint.
+1. Build gate
+   Run pnpm run build.
+1. MCP discovery verification
+   Call MCP list-tools and verify only tools with agentInvokable true appear and mode metadata is present.
+1. One-way invocation verification
+   Invoke a one-way-enabled tool through MCP, confirm immediate accepted response, confirm tool launch and completion in logs.
+1. Two-way invocation verification
+   Invoke a two-way-enabled tool through MCP with valid input, confirm returned payload is schema-valid and surfaced to MCP caller.
+1. Negative-path verification
+   Attempt mode not supported by tool, invalid prefill shape, and timeout scenario; confirm deterministic error codes and redacted logs.
+1. Regression verification
+   Run an existing tool-to-tool invocation flow from UI to ensure legacy launchTool behavior remains intact.
+
+**Decisions**
+
+- Included scope: MCP-triggered one-way and two-way invocation semantics, schema validation hardening, logging, and tool-author contract updates.
+- Excluded scope: headless execution mode, streaming partial responses, generalized workflow orchestration across multiple tools, and non-windowed runtime.
+- Compatibility rule: existing tools continue to work without changes; new declaration fields are optional with safe defaults.
+
+**Tool-side changes required**
+
+1. Manifest updates
+   Each tool that should be MCP-callable keeps invocation.agentInvokable true and declares supported invocation mode(s) plus accurate prefill and returnTopic schemas.
+1. Runtime handling for one-way tools
+   Tool reads launch context and performs action without assuming caller waits for return data. returnData may be omitted unless needed for local flow.
+1. Runtime handling for two-way tools
+   Tool must call returnData with payload matching returnTopic schema before completing user flow.
+1. Connection assumptions
+   Tools must not assume inherited secondary connection unless declared and selected; handle nulls explicitly.
+1. Validation hygiene
+   Tool output should remain stable and schema-aligned; avoid returning ad-hoc fields not in returnTopic for two-way flows.
+1. UX behavior
+   Because v1 is windowed, tools should render minimal actionable UI for agent-driven launches and auto-complete where safe.
+
+**Further Considerations**
+
+1. Decide whether one-way MCP responses should be pure accepted acknowledgements or include lightweight launch metadata such as correlation id and started timestamp. Recommendation: include correlation id for observability.
+2. Decide timeout defaults globally vs per-tool override in manifest. Recommendation: global default with optional per-tool override.
+3. Decide whether to treat missing returnTopic as implicit one-way eligibility. Recommendation: allow only when tool explicitly declares one-way support to avoid ambiguity.
diff --git a/.github/plans/plan-mcp-headless-unattended-execution.md b/.github/plans/plan-mcp-headless-unattended-execution.md
new file mode 100644
index 00000000..aa31c11a
--- /dev/null
+++ b/.github/plans/plan-mcp-headless-unattended-execution.md
@@ -0,0 +1,80 @@
+## Plan: Fully Unattended MCP Tool Execution (Headless Entry)
+
+This plan adds a pure Node.js headless execution path for MCP-driven tool calls, while reusing the existing MCP and invocation architecture and avoiding duplicate runtime pathways.
+
+### Scope
+
+- Add a CLI/headless entrypoint that runs without Electron UI.
+- Add a headless execution mode to MCP call flow.
+- Require explicit tool opt-in using `invocation.headless: true` in `pptb.config.json`.
+- Reuse existing registry, schema conversion, connection/auth, and invocation logging where possible.
+- Validate using MCP Inspector.
+
+### Non-Goals
+
+- No automatic conversion of UI tools to headless execution.
+- No replacement of existing windowed invocation behavior.
+- No streaming transport in v1 (polling only for long-running jobs).
+
+### Phase 1: CLI Foundation
+
+1. Create `src/cli/index.ts`, `src/cli/constants.ts`, `src/cli/utils.ts`.
+1. Add `bin` entry in `package.json` for `pptb-cli`.
+1. Add dedicated build target (`tsconfig.cli.json`) and compile `dist/cli/index.js`.
+1. Keep implementation minimal and safe until headless manager is introduced.
+
+### Phase 2: MCP Protocol Extension
+
+1. Extend MCP request envelope with `executionMode: "headless"`.
+1. Keep existing default behavior as `windowed` for backward compatibility.
+1. Define response model for async job-based execution (`jobId`, `statusUrl`, `status`).
+
+### Phase 3: Headless Invocation Runtime
+
+1. Add `headlessToolInvocationManager` to run and track headless jobs.
+1. Enforce opt-in: only tools with `invocation.headless: true` are callable in headless mode.
+1. Add deterministic timeout handling and status transitions.
+
+### Phase 4: Auth and Connection Strategy
+
+1. Do not expose `connectionId` externally.
+1. Accept caller-provided auth token in MCP request metadata/body or connection name that is created in PPTB.
+1. If auth token is provided, inject token into a constrained headless tool API surface.
+1. If connection name is provided, authenticate using existing connection and inject token into headless tool API surface.
+
+### Phase 5: Progress and Status
+
+1. Implement polling endpoint for long-running executions.
+1. Return progress metadata and final result via status endpoint.
+1. Keep transport stateless and MCP Inspector-friendly.
+
+### Phase 6: Documentation
+
+1. Update `docs/MCP_IMPLEMENTATION.md` with headless request/response contract.
+1. Add dedicated net-new doc under `docs/` describing architecture changes.
+1. Add author guidance for implementing `invokeHeadless(...)` in tools.
+
+### Phase 7: Validation (Manual validation)
+
+1. Start headless server via CLI.
+1. Validate `list-tools` includes headless-eligible tools only.
+1. Validate `call-tool` with `executionMode=headless`.
+1. Validate status polling, timeout, and error paths.
+1. Confirm existing windowed mode remains unchanged.
+
+### Reuse Map (No Duplication)
+
+- Reuse: `src/main/mcp/agentToolRegistry.ts` for tool discovery.
+- Reuse: `src/main/mcp/schemaConverter.ts` for schema consistency.
+- Reuse: `src/main/mcp/agentInvocationLogger.ts` for audit trail.
+- Reuse: `src/main/mcp/mcpServer.ts` as primary request router (extended, not duplicated).
+- Reuse: existing invocation metadata patterns and correlation IDs.
+
+### Deliverables
+
+- CLI/headless bootstrap scaffold.
+- Headless execution manager.
+- MCP protocol extension for headless mode.
+- Polling endpoint for progress and results.
+- Net-new implementation documentation.
+- Manual verification checklist for MCP Inspector.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 65488c0e..7eed5a06 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,76 @@
-Please fill in this template.
+<!-- PR title format: [Type] Brief description — e.g. [Feature] Add connection export  -->
+<!-- Types: [Feature] | [Fix] | [Docs] | [Refactor] | [Chore] | [Test] -->
+<!-- Target branch: dev (not main) -->
 
--   [ ] Use a meaningful title for the pull request.
--   [ ] Follow the guidelines from the [CONTRIBUTING.md](https://github.com/PowerPlatformToolBox/desktop-app/CONTRIBUTING.md#pull-requests).
--   [ ] Mention the bug or the feature number the PR will be targeting.
--   [ ] Test the change in your own code. (Compile and run)
--   [ ] Resolve all GH Copilot comments.
+## Summary
+
+<!-- One or two sentences describing what this PR does and why. -->
+
+Closes #<!-- issue number -->
+
+## Type of change
+
+- [ ] New feature
+- [ ] Bug fix
+- [ ] Refactor (no functional change)
+- [ ] Documentation
+- [ ] Chore / maintenance (dependency update, build, config)
+- [ ] Test addition / improvement
+
+## Changes
+
+<!-- List the key files/areas changed and what was done. Be specific enough for a reviewer to navigate the diff. -->
+
+-
+
+## Architecture checklist
+
+### Packages (`types` & `validation`)
+
+<!-- Only fill in this section if you touched files under packages/. Otherwise delete it. -->
+
+- [ ] **Not applicable** — no changes to `packages/`
+
+If you did change a package:
+
+- [ ] `@pptb/types` (`types`): type definitions updated and version bumped in `packages/types/package.json`
+- [ ] `@pptb/validate` (`validation`): validation rules updated and version bumped in `packages/validation/package.json`
+
+### Code quality
+
+- [ ] `pnpm run typecheck` passes with **0 errors** (warnings are acceptable)
+- [ ] `pnpm run lint` passes with **0 errors** (warnings are acceptable)
+- [ ] `pnpm run build` completes successfully
+
+## Testing
+
+<!-- Describe how you verified this change works. -->
+
+- [ ] `pnpm run test:unit` passes (for changes to `src/main/`, `src/common/`, or `src/renderer/` utilities)
+- [ ] `pnpm run test:e2e` passes (for UI / navigation / end-to-end flows)
+- [ ] Manually tested in the running app (`pnpm run dev`)
+
+**Scenario tested:**
+
+<!-- e.g. "Opened the app, navigated to X, confirmed Y behaviour" -->
+
+## Screenshots / recordings
+
+<!-- Attach screenshots or a short screen recording for any UI change. Delete this section if not applicable. -->
+
+## Breaking changes
+
+<!-- Does this change affect the tool API (`toolboxAPI` / `dataverseAPI`), existing IPC channels, or `pptoolbox-types`? -->
+
+- [ ] No breaking changes
+- [ ] Yes — describe impact and migration path below:
+
+<!-- Breaking change details -->
+
+## Reviewer notes
+
+<!-- Anything specific you'd like reviewers to focus on, or context that helps them review faster. -->
+
+- [ ] I have added appropriate unit and/or e2e tests for this change
+- [ ] I have resolved all GitHub Copilot review comments
+- [ ] I have followed the guidelines in [CONTRIBUTING.md](https://github.com/PowerPlatformToolBox/desktop-app/blob/dev/CONTRIBUTING.md#pull-requests)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f563c54d..ae6e6633 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
         runs-on: ubuntu-latest
         permissions:
             pull-requests: write
+            issues: write
         steps:
             - name: Checkout PR branch
               uses: actions/checkout@v4
@@ -52,7 +53,7 @@ jobs:
               shell: bash
               run: |
                   TOOLBOX_VERSION=$(node -p "require('./package.json').version")
-                  TYPES_VERSION=$(node -p "require('./packages/package.json').version")
+                  TYPES_VERSION=$(node -p "require('./packages/types/package.json').version")
 
                   # Extract major.minor.patch from both versions (ignore pre-release tags)
                   TOOLBOX_BASE=$(echo "$TOOLBOX_VERSION" | cut -d'-' -f1)
@@ -63,7 +64,7 @@ jobs:
                     echo "The base version (major.minor.patch) must be identical for stable releases."
                     echo ""
                     echo "To fix this:"
-                    echo "1. Update packages/package.json version to match $TOOLBOX_VERSION"
+                    echo "1. Update packages/types/package.json version to match $TOOLBOX_VERSION"
                     echo "2. Commit the change and push"
                     exit 1
                   fi
@@ -81,7 +82,7 @@ jobs:
                   fi
 
                   if [ "${{ steps.validate_types_version.outcome }}" = "failure" ]; then
-                    ERRORS+=("  - @pptb/types version (packages/package.json) does not match the ToolBox version")
+                    ERRORS+=("  - @pptb/types version (packages/types/package.json) does not match the ToolBox version")
                   fi
 
                   if [ ${#ERRORS[@]} -gt 0 ]; then
@@ -94,17 +95,18 @@ jobs:
 
                   echo "✅ All preflight checks passed."
 
-            - name: Comment on PR with failure reason
-              if: failure() && github.event_name == 'pull_request'
+            - name: Update sticky preflight PR comment
+              if: always() && github.event_name == 'pull_request'
               uses: actions/github-script@v7
               with:
                   script: |
                       const outcomes = {
                           validate_release_notes: '${{ steps.validate_release_notes.outcome }}',
-                          validate_types_version: '${{ steps.validate_types_version.outcome }}'
+                          validate_types_version: '${{ steps.validate_types_version.outcome }}',
                       };
 
                       const failures = [];
+                      const MARKER = '<!-- preflight-check-bot -->';
 
                       if (outcomes.validate_release_notes === 'failure') {
                           failures.push(
@@ -116,29 +118,64 @@ jobs:
 
                       if (outcomes.validate_types_version === 'failure') {
                           failures.push(
-                              '### ❌ @pptb/types version mismatch\n' +
-                              'The base version (`major.minor.patch`) in `packages/package.json` does not match the version in `package.json`.\n\n' +
-                              '**To fix:** Update `packages/package.json` so its version matches the ToolBox version.'
+                            '### ❌ @pptb/types version mismatch\n' +
+                            'The base version (`major.minor.patch`) in `packages/types/package.json` does not match the version in `package.json`.\n\n' +
+                            '**To fix:** Update `packages/types/package.json` so its version matches the ToolBox version.'
                           );
                       }
 
-                      const body = [
-                          '## 🚨 Preflight checks failed',
-                          '',
-                          'The following checks must pass before this PR can be merged into `main`:',
-                          '',
-                          ...failures,
-                          '',
-                          `> Triggered by commit ${context.sha.slice(0, 7)} — [view run](https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`
-                      ].join('\n');
-
-                      await github.rest.issues.createComment({
+                      const { data: comments } = await github.rest.issues.listComments({
                           owner: context.repo.owner,
                           repo: context.repo.repo,
                           issue_number: context.issue.number,
-                          body
                       });
 
+                      const existing = comments.find((comment) => comment.body && comment.body.includes(MARKER));
+
+                      let body;
+                      if (failures.length === 0) {
+                          body = [
+                              MARKER,
+                              '## ✅ Preflight checks passed',
+                              '',
+                              'All preflight checks required for merging into `main` are currently passing.',
+                              '',
+                              `> Checked at commit ${context.sha.slice(0, 7)} — [view run](https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`,
+                          ].join('\n');
+                      } else {
+                          const mention = existing ? '' : `@${context.payload.pull_request.user.login} — please address the items below.\n\n`;
+                          body = [
+                              MARKER,
+                              '## 🚨 Preflight checks failed',
+                              '',
+                              mention + 'The following checks must pass before this PR can be merged into `main`:',
+                              '',
+                              ...failures,
+                              '',
+                              `> Checked at commit ${context.sha.slice(0, 7)} — [view run](https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`,
+                          ].join('\n');
+                      }
+
+                      if (existing) {
+                          await github.rest.issues.updateComment({
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              comment_id: existing.id,
+                              body,
+                          });
+                      } else {
+                          await github.rest.issues.createComment({
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              issue_number: context.issue.number,
+                              body,
+                          });
+                      }
+
+                      if (failures.length > 0) {
+                          core.setFailed('Preflight checks failed.');
+                      }
+
     build:
         name: Build
         runs-on: ubuntu-latest
diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
index 0baf6f60..4e78b22a 100644
--- a/.github/workflows/bundle-size.yml
+++ b/.github/workflows/bundle-size.yml
@@ -101,11 +101,11 @@ jobs:
                   fi
 
             - name: Comment PR with bundle size
-              if: github.event_name == 'pull_request'
+              if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
               uses: actions/github-script@v7
               with:
                   script: |
-                      const fs = require('fs');
+                      const MARKER = '<!-- bundle-size-bot -->';
 
                       // Read bundle sizes
                       const mainSize = ${{ steps.analyze.outputs.main_size }};
@@ -121,7 +121,7 @@ jobs:
                         return Math.round(bytes / Math.pow(k, i) * 100) / 100 + ' ' + sizes[i];
                       };
 
-                      const body = `## Bundle Size Report 📦
+                      const body = `${MARKER}\n## Bundle Size Report 📦
 
                       | Bundle | Size |
                       |--------|------|
@@ -141,9 +141,26 @@ jobs:
                       ---
                       *Bundle size tracking is now active! This helps prevent bundle bloat.*`;
 
-                      github.rest.issues.createComment({
-                        issue_number: context.issue.number,
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        body: body
+                      const { data: comments } = await github.rest.issues.listComments({
+                          issue_number: context.issue.number,
+                          owner: context.repo.owner,
+                          repo: context.repo.repo,
                       });
+
+                      const existing = comments.find((comment) => comment.body && comment.body.includes(MARKER));
+
+                      if (existing) {
+                          await github.rest.issues.updateComment({
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              comment_id: existing.id,
+                              body,
+                          });
+                      } else {
+                          await github.rest.issues.createComment({
+                              issue_number: context.issue.number,
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              body,
+                          });
+                      }
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 746a5494..75f139c7 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -158,6 +158,26 @@ jobs:
                   SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
                   SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
 
+            - name: Validate app-update.yml exists (Windows)
+              if: matrix.os == 'windows-latest'
+              shell: powershell
+              run: |
+                  $unpackedDir = Join-Path "${{ github.workspace }}/build" "${{ matrix.win_unpacked_dir }}"
+                  $resourcesDir = Join-Path $unpackedDir "resources"
+                  $appUpdateYml = Join-Path $resourcesDir "app-update.yml"
+
+                  if (-not (Test-Path $appUpdateYml)) {
+                      Write-Host "❌ Missing updater config: $appUpdateYml"
+                      Write-Host "Windows in-app auto-update requires NSIS metadata in resources/app-update.yml."
+                      if (Test-Path $resourcesDir) {
+                          Write-Host "Contents of resources directory:"
+                          Get-ChildItem $resourcesDir | Select-Object Name, Length
+                      }
+                      exit 1
+                  }
+
+                  Write-Host "✅ Found updater config: $appUpdateYml"
+
             - name: Sign Windows installers with Azure Trusted Signing
               if: matrix.os == 'windows-latest'
               uses: azure/artifact-signing-action@v1
diff --git a/.github/workflows/pr-checklist.yml b/.github/workflows/pr-checklist.yml
new file mode 100644
index 00000000..8b15c932
--- /dev/null
+++ b/.github/workflows/pr-checklist.yml
@@ -0,0 +1,236 @@
+name: PR Checklist Validation
+
+on:
+    pull_request:
+        types: [opened, edited, synchronize, reopened]
+        branches:
+            - main
+            - dev
+
+permissions:
+    pull-requests: write
+    issues: write
+    contents: read
+
+jobs:
+    validate-checklist:
+        name: PR Checklist
+        runs-on: ubuntu-latest
+
+        steps:
+            # -----------------------------------------------------------------
+            # Parse the PR body, validate required checkboxes, manage labels,
+            # and post/update a single sticky comment with the result.
+            # -----------------------------------------------------------------
+            - name: Validate checklist and apply labels
+              uses: actions/github-script@v7
+              with:
+                  script: |
+                      const body          = context.payload.pull_request.body  || '';
+                      const title         = context.payload.pull_request.title || '';
+                      const prNumber      = context.payload.pull_request.number;
+                      const author        = context.payload.pull_request.user.login;
+                      const isForkPr      = context.payload.pull_request.head.repo.full_name !== `${context.repo.owner}/${context.repo.repo}`;
+                      const existingLabels = context.payload.pull_request.labels.map(l => l.name);
+
+                      // ── Helpers ─────────────────────────────────────────────────────────
+
+                      /**
+                       * Extract the content of a Markdown section identified by its heading
+                       * prefix (e.g. "## Testing" or "### Code quality").  Stops as soon as
+                       * it encounters another heading at the same level or higher.
+                       */
+                      function extractSection(text, headingPrefix) {
+                          const lines        = text.split('\n');
+                          const headingLevel = (headingPrefix.match(/^(#+)/) || ['', '#'])[1].length;
+                          let capturing      = false;
+                          const result       = [];
+
+                          for (const line of lines) {
+                              if (!capturing && line.startsWith(headingPrefix)) {
+                                  capturing = true;
+                                  result.push(line);
+                              } else if (capturing) {
+                                  const m = line.match(/^(#+)\s/);
+                                  if (m && m[1].length <= headingLevel) break;
+                                  result.push(line);
+                              }
+                          }
+                          return result.join('\n');
+                      }
+
+                      /** True if the section contains at least one `- [x]` line. */
+                      function atLeastOneChecked(section) {
+                          return /^- \[x\]/im.test(section);
+                      }
+
+                      /** True if every checkbox in the section is `- [x]` (none are `- [ ]`). */
+                      function allChecked(section) {
+                          return atLeastOneChecked(section) && !/^- \[ \]/im.test(section);
+                      }
+
+                      // ── Extract relevant sections ────────────────────────────────────────
+
+                      const typeSection     = extractSection(body, '## Type of change');
+                      const packagesSection = extractSection(body, '### Packages');
+                      const codeQuality     = extractSection(body, '### Code quality');
+                      const testingSection  = extractSection(body, '## Testing');
+                      const breakingSection = extractSection(body, '## Breaking changes');
+                      const reviewerSection = extractSection(body, '## Reviewer notes');
+
+                      // ── Validation rules ─────────────────────────────────────────────────
+
+                      const errors = [];
+
+                      // PR title must follow [Type] Brief description
+                      if (!/^\[(Release|Feature|Fix|Docs|Refactor|Chore|Test)\] .+/.test(title)) {
+                          errors.push(
+                              '**PR title** must follow `[Type] Brief description` ' +
+                              '— valid types: `Release` · `Feature` · `Fix` · `Docs` · `Refactor` · `Chore` · `Test`'
+                          );
+                      }
+
+                      // Type of change — at least one
+                      if (!atLeastOneChecked(typeSection)) {
+                          errors.push('**Type of change** — select at least one option');
+                      }
+
+                      // Packages — at least one (including "Not applicable")
+                      if (!atLeastOneChecked(packagesSection)) {
+                          errors.push(
+                              '**Packages** — select at least one option ' +
+                              '(tick "Not applicable" if no package changes were made)'
+                          );
+                      }
+
+                      // Code quality — all boxes must be ticked
+                      if (!allChecked(codeQuality)) {
+                          errors.push('**Code quality** — all checkboxes must be ticked before merging');
+                      }
+
+                      // Testing — all boxes must be ticked
+                      if (!allChecked(testingSection)) {
+                          errors.push('**Testing** — all checkboxes must be ticked before merging');
+                      }
+
+                      // Breaking changes — at least one option selected
+                      if (!atLeastOneChecked(breakingSection)) {
+                          errors.push('**Breaking changes** — select at least one option');
+                      }
+
+                      // Reviewer notes — all boxes must be ticked
+                      if (!allChecked(reviewerSection)) {
+                          errors.push('**Reviewer notes** — all checkboxes must be ticked before merging');
+                      }
+
+                      // ── Label management ─────────────────────────────────────────────────
+
+                      // breaking-change: the "Yes — describe impact" line is checked
+                      const isBreakingChange = /^- \[x\].*Yes/im.test(breakingSection);
+
+                      // package-changed: any @pptb line is checked (i.e. not just "Not applicable")
+                      const isPackageChanged = /^- \[x\].*@pptb/im.test(packagesSection);
+
+                      async function syncLabel(name, shouldHave) {
+                          const has = existingLabels.includes(name);
+                          if (shouldHave && !has) {
+                              await github.rest.issues.addLabels({
+                                  owner: context.repo.owner,
+                                  repo: context.repo.repo,
+                                  issue_number: prNumber,
+                                  labels: [name],
+                              });
+                          } else if (!shouldHave && has) {
+                              try {
+                                  await github.rest.issues.removeLabel({
+                                      owner: context.repo.owner,
+                                      repo: context.repo.repo,
+                                      issue_number: prNumber,
+                                      name,
+                                  });
+                              } catch {
+                                  // Label may have already been removed — ignore
+                              }
+                          }
+                      }
+
+                      if (!isForkPr) {
+                          await syncLabel('breaking-change', isBreakingChange);
+                          await syncLabel('package-changed', isPackageChanged);
+                      }
+
+                      // ── Sticky comment ───────────────────────────────────────────────────
+                      // We post one comment and update it in place on subsequent runs so the
+                      // PR timeline stays clean.
+
+                      const MARKER = '<!-- pr-checklist-bot -->';
+
+                      let existing;
+                      if (!isForkPr) {
+                          const { data: comments } = await github.rest.issues.listComments({
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              issue_number: prNumber,
+                          });
+                          existing = comments.find(c => c.body && c.body.includes(MARKER));
+                      }
+
+                      const labelNote = [
+                          isBreakingChange ? '🔴 `breaking-change` label applied' : null,
+                          isPackageChanged ? '🔵 `package-changed` label applied'  : null,
+                      ].filter(Boolean).join('\n');
+
+                      const forkNote = isForkPr
+                          ? '\n---\nℹ️ This PR is from a fork, so checklist automation cannot update labels or comments due to token permission limits.'
+                          : '';
+
+                      let commentBody;
+
+                      const errorList = errors.map(e => `- ${e}`).join('\n');
+
+                      if (errors.length === 0) {
+                          commentBody =
+                              `${MARKER}\n` +
+                              `### ✅ PR Checklist\n\n` +
+                              `All required checklist items are complete. This PR is ready for review.\n` +
+                              (labelNote ? `\n${labelNote}` : '') +
+                              forkNote;
+                      } else {
+                          // On updates we omit the @mention to avoid re-notifying on every push.
+                          const mention = existing ? '' : `@${author} — please address the items below.\n\n`;
+                          commentBody =
+                              `${MARKER}\n` +
+                              `### ❌ PR Checklist — Action Required\n\n` +
+                              `${mention}` +
+                              `The following items must be completed before this PR can be merged:\n\n` +
+                              `${errorList}\n` +
+                              (labelNote ? `\n---\n${labelNote}` : '') +
+                              forkNote;
+                      }
+
+                      if (!isForkPr) {
+                          if (existing) {
+                              await github.rest.issues.updateComment({
+                                  owner: context.repo.owner,
+                                  repo: context.repo.repo,
+                                  comment_id: existing.id,
+                                  body: commentBody,
+                              });
+                          } else {
+                              await github.rest.issues.createComment({
+                                  owner: context.repo.owner,
+                                  repo: context.repo.repo,
+                                  issue_number: prNumber,
+                                  body: commentBody,
+                              });
+                          }
+                      }
+
+                      // ── Fail the status check ────────────────────────────────────────────
+
+                      if (errors.length > 0) {
+                          core.setFailed(
+                              `PR checklist incomplete — ${errors.length} item${errors.length > 1 ? 's' : ''} outstanding:\n` +
+                              errors.map(e => `  • ${e.replace(/\*\*/g, '')}`).join('\n')
+                          );
+                      }
diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml
index df984c96..cf9d7f92 100644
--- a/.github/workflows/prod-release.yml
+++ b/.github/workflows/prod-release.yml
@@ -43,7 +43,7 @@ jobs:
               shell: bash
               run: |
                   TOOLBOX_VERSION=$(node -p "require('./package.json').version")
-                  TYPES_VERSION=$(node -p "require('./packages/package.json').version")
+                  TYPES_VERSION=$(node -p "require('./packages/types/package.json').version")
 
                   # Extract major.minor.patch from both versions (ignore pre-release tags)
                   TOOLBOX_BASE=$(echo "$TOOLBOX_VERSION" | cut -d'-' -f1)
@@ -54,7 +54,7 @@ jobs:
                     echo "The base version (major.minor.patch) must be identical for stable releases."
                     echo ""
                     echo "To fix this:"
-                    echo "1. Update packages/package.json version to match $TOOLBOX_VERSION"
+                    echo "1. Update packages/types/package.json version to match $TOOLBOX_VERSION"
                     echo "2. Commit the change and push"
                     exit 1
                   fi
@@ -184,6 +184,26 @@ jobs:
                   SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
                   SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
 
+            - name: Validate app-update.yml exists (Windows)
+              if: matrix.os == 'windows-latest'
+              shell: powershell
+              run: |
+                  $unpackedDir = Join-Path "${{ github.workspace }}/build" "${{ matrix.win_unpacked_dir }}"
+                  $resourcesDir = Join-Path $unpackedDir "resources"
+                  $appUpdateYml = Join-Path $resourcesDir "app-update.yml"
+
+                  if (-not (Test-Path $appUpdateYml)) {
+                      Write-Host "❌ Missing updater config: $appUpdateYml"
+                      Write-Host "Windows in-app auto-update requires NSIS metadata in resources/app-update.yml."
+                      if (Test-Path $resourcesDir) {
+                          Write-Host "Contents of resources directory:"
+                          Get-ChildItem $resourcesDir | Select-Object Name, Length
+                      }
+                      exit 1
+                  }
+
+                  Write-Host "✅ Found updater config: $appUpdateYml"
+
             - name: Sign Windows installers with Azure Trusted Signing
               if: matrix.os == 'windows-latest'
               uses: azure/artifact-signing-action@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..058365ab
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,100 @@
+name: Test
+
+on:
+    pull_request:
+        branches:
+            - main
+            - dev
+    workflow_dispatch:
+
+permissions:
+    contents: read
+
+jobs:
+    # -------------------------------------------------------------------------
+    # Unit tests — Jest, no display required
+    # -------------------------------------------------------------------------
+    unit-tests:
+        name: Unit Tests (Jest)
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "20"
+
+            - name: Install pnpm
+              run: npm install -g pnpm@10.18.3
+
+            - name: Install dependencies
+              run: pnpm install
+
+            - name: Run unit tests
+              run: pnpm run test:unit
+
+            - name: Upload coverage
+              if: always()
+              uses: actions/upload-artifact@v4
+              with:
+                  name: unit-coverage
+                  path: coverage/
+                  retention-days: 7
+
+    # -------------------------------------------------------------------------
+    # E2E tests — Playwright + Electron, requires a virtual display (xvfb)
+    # -------------------------------------------------------------------------
+    e2e-tests:
+        name: E2E Tests (Playwright)
+        runs-on: ubuntu-latest
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "20"
+
+            - name: Install pnpm
+              run: npm install -g pnpm@10.18.3
+
+            - name: Install dependencies
+              run: pnpm install
+
+            - name: Install Electron binary
+              run: node ./node_modules/electron/install.js
+
+            - name: Install Playwright browsers
+              run: pnpm exec playwright install --with-deps chromium
+
+            - name: Install Linux display dependencies
+              run: sudo apt-get install -y xvfb libgtk-3-0 libnotify-dev libnss3 libxss1 libasound2t64
+
+            - name: Build application
+              env:
+                  SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+                  SUPABASE_ANON_KEY: ${{ secrets.SUPABASE_ANON_KEY }}
+                  APPINSIGHTS_CONNECTION_STRING: ${{ secrets.APPINSIGHTS_CONNECTION_STRING }}
+                  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+                  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+                  SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+                  SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+              run: pnpm run build
+
+            - name: Run e2e tests
+              run: xvfb-run --auto-servernum pnpm run test:e2e
+              env:
+                  CI: true
+
+            - name: Upload Playwright report
+              if: always()
+              uses: actions/upload-artifact@v4
+              with:
+                  name: playwright-report
+                  path: test-results/
+                  retention-days: 7
diff --git a/.gitignore b/.gitignore
index d4529d60..d04f11bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,6 @@ buildScripts/*/latest-mac.yml
 
 # macOS Finder metadata files
 .DS_Store
+
+# Test Results
+test-results/
diff --git a/README.md b/README.md
index 12f8d992..0b1f2c8f 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,8 @@
 > [!IMPORTANT]
 > Full documentation of the toolbox including How tos, FAQs, architecture, design & security principles is available on our main website [https://docs.powerplatformtoolbox.com/](https://docs.powerplatformtoolbox.com/)
 
+For tool authors working on inter-tool or MCP-based invocation, start with [docs/INTER_TOOL_INVOCATION.md](docs/INTER_TOOL_INVOCATION.md), [docs/MCP_IMPLEMENTATION.md](docs/MCP_IMPLEMENTATION.md), and [docs/MCP_TOOL_AUTHOR_MIGRATION.md](docs/MCP_TOOL_AUTHOR_MIGRATION.md).
+
 ## Releases & Downloads
 
 Power Platform ToolBox releases are published on GitHub:
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3f978782..5b4f2c50 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,37 +1,41 @@
-# Power Platform ToolBox 1.2.3
+# Power Platform ToolBox 1.2.4
 
 ## Highlights
 
-- Support beta and pre-release npm packages in tool discovery and installs
-- Enhanced inter-tool communications; both one-way (send and forget) and two-way (send and receive)
-- Let tools declare capabilities; and find tools by capabilities
-- Tighten terminal command blocking during tool execution
-- Sanitize version scopes before running npm install
+- Side-by-Side Tool View enables working with two tools in parallel in a single session.
+- Power Platform API integration expands available operations for tool and workflow development.
+- Notification Hub centralizes app and tool notifications with improved visibility and history.
+- MCP Server preview adds agentic AI-driven tool invocation support for attended and unattended scenarios.
+- Agent interoperability preview is available for clients such as Claude and GitHub Copilot integrations.
+- Tool execution flows include small UX and reliability improvements across common user paths.
 
 ## Fixes
 
-- Terminal: improve blocking rules and related command handling
-- Terminal: keep stdout processing stable while filtering sentinel output
-- Install flow: sanitize npm version scopes before invoking installs
-- Marketplace: keep prerelease package handling aligned with tool registry metadata
-- Tools: preserve capability metadata for npm and locally loaded tools
+- Tool windows: improved layout and state handling in Side-by-Side view interactions.
+- Notifications: resolved edge cases with delivery timing and display consistency.
+- API surface: fixed issues in Power Platform API request/response handling paths.
+- MCP preview: improved stability for agent-triggered tool invocation sequences.
+- Connections: addressed minor reliability issues during repeated connection operations.
+- General UI: fixed several small behavior regressions and polish issues.
 
 ## Developer & Build
 
-- Tool registry and preload APIs now carry prerelease package support end to end
-- Terminal manager refactor expands the blocking pipeline and stdout handling internals
+- Added preview MCP Server pathway for agentic AI tool invocation in attended/unattended modes.
+- Extended internal APIs and integration points to support new Power Platform API scenarios.
+- Updated notification and tool orchestration internals to support Hub and parallel tool workflows.
+- Included incremental build and maintenance updates for release packaging and developer workflows.
 
 ## Install
 
-- Windows: Power-Platform-ToolBox-1.2.3-Setup.exe
-- macOS: Power-Platform-ToolBox-1.2.3.dmg (drag to Applications)
-- Linux: Power-Platform-ToolBox-1.2.3.AppImage (chmod +x, then run)
+- Windows: Power-Platform-ToolBox-v1.2.4-Setup.exe
+- macOS: Power-Platform-ToolBox-v1.2.4.dmg (drag to Applications)
+- Linux: Power-Platform-ToolBox-v1.2.4.AppImage (chmod +x, then run)
 
 ## Notes
 
 - No manual migration needed.
-- Tool developers using prerelease packages should confirm their package metadata is published with the expected version scope.
+- MCP Server agentic AI support is a preview feature and may evolve in upcoming releases.
 
 ## Full Changelog
 
-https://github.com/PowerPlatformToolBox/desktop-app/compare/v1.2.2...v1.2.3
+https://github.com/PowerPlatformToolBox/desktop-app/compare/v1.2.3...v1.2.4
diff --git a/buildScripts/electron-builder-win.json b/buildScripts/electron-builder-win.json
index 6a6c519d..f73908c5 100644
--- a/buildScripts/electron-builder-win.json
+++ b/buildScripts/electron-builder-win.json
@@ -14,12 +14,6 @@
                     "x64"
                 ]
             },
-            {
-                "target": "msiWrapped",
-                "arch": [
-                    "x64"
-                ]
-            },
             {
                 "target": "zip",
                 "arch": [
diff --git a/docs/INTER_TOOL_INVOCATION.md b/docs/INTER_TOOL_INVOCATION.md
index 3c9c25bc..d290a7ee 100644
--- a/docs/INTER_TOOL_INVOCATION.md
+++ b/docs/INTER_TOOL_INVOCATION.md
@@ -25,6 +25,10 @@ This document covers the **Inter-Tool Invocation** feature of Power Platform Too
         - [2.4 Tag-based capability discovery](#24-tag-based-capability-discovery)
             - [Well-known capability tags](#well-known-capability-tags)
         - [2.5 Complete caller example](#25-complete-caller-example)
+    - [Part 3 – MCP Agentic Invocation](#part-3--mcp-agentic-invocation)
+        - [3.1 Where MCP fits](#31-where-mcp-fits)
+        - [3.2 What tool authors need to do](#32-what-tool-authors-need-to-do)
+        - [3.3 Validation and rollout](#33-validation-and-rollout)
     - [End-to-End Scenario: FXS "Send To" Flyout](#end-to-end-scenario-fxs-send-to-flyout)
         - [Scenario summary](#scenario-summary)
         - [Step 1 – Callee tools declare the `"fetchxml"` capability](#step-1--callee-tools-declare-the-fetchxml-capability)
@@ -238,33 +242,6 @@ The following is a minimal but complete callee implementation for an entity-pick
 }
 ```
 
-**`index.ts`**
-
-```typescript
-async function main() {
-    const ctx = await toolboxAPI.invocation.getLaunchContext();
-
-    if (ctx) {
-        // Invoked by another tool – show a targeted picker
-        const entityName = (ctx.entityName as string) ?? "account";
-        const records = await loadRecords(entityName);
-
-        renderPicker(records, async (selected) => {
-            // Send the selection back; PPTB auto-closes this window
-            await toolboxAPI.invocation.returnData({
-                selectedId: selected.id,
-                selectedName: selected.name,
-            });
-        });
-    } else {
-        // Standalone – show the full entity browser
-        renderFullBrowser();
-    }
-}
-
-main();
-```
-
 ---
 
 ## Part 2 – Caller (the tool that launches other tools)
@@ -439,6 +416,70 @@ async function openEntityPicker(entityName: string) {
 
 ---
 
+For agent/MCP-specific invocation behavior, see [MCP Implementation](MCP_IMPLEMENTATION.md).
+
+## Part 3 – MCP Agentic Invocation
+
+### 3.1 Where MCP fits
+
+MCP agentic invocation is a separate contract from PPTB-to-PPTB tool invocation.
+
+- Inter-tool invocation uses `toolboxAPI.invocation.launchTool()`, `getLaunchContext()`, and `returnData()` between PPTB tools.
+- MCP invocation uses the built-in MCP server to expose selected tools to external agents.
+- The runtime pipeline is shared, but the caller contract and discovery metadata are different.
+
+If you are publishing a tool for external automation, read [MCP Implementation](MCP_IMPLEMENTATION.md) and the migration guide at [MCP Tool Author Migration](MCP_TOOL_AUTHOR_MIGRATION.md).
+
+### 3.2 What tool authors need to do
+
+Tool authors do not need to change the core BrowserView runtime for Phase 3–6 work. The required updates are:
+
+- Add an `agents` section to `pptb.config.json` with `invokable: true`.
+- Declare the supported MCP invocation modes in `agents.modes`.
+- Set `agents.defaultMode` when a tool should prefer one mode over another.
+- Set `agents.timeoutMS` when a tool needs a longer or shorter default timeout for two-way calls.
+- Keep `invocation.prefill` and `invocation.returnTopic` accurate so MCP input and output validation stays stable.
+
+### 3.3 Validation and rollout
+
+MCP Inspector is the recommended manual harness for validating the MCP surface in this repo. Use it to confirm:
+
+- the tool appears in `list-tools`
+- the supported mode hints are visible
+- one-way and two-way calls behave as expected
+- invalid modes and bad payloads return deterministic errors
+
+The repo does not require a dedicated automated MCP test runner for this phase.
+
+**`index.ts`**
+
+```typescript
+async function main() {
+    const ctx = await toolboxAPI.invocation.getLaunchContext();
+
+    if (ctx) {
+        // Invoked by another tool – show a targeted picker
+        const entityName = (ctx.entityName as string) ?? "account";
+        const records = await loadRecords(entityName);
+
+        renderPicker(records, async (selected) => {
+            // Send the selection back; PPTB auto-closes this window
+            await toolboxAPI.invocation.returnData({
+                selectedId: selected.id,
+                selectedName: selected.name,
+            });
+        });
+    } else {
+        // Standalone – show the full entity browser
+        renderFullBrowser();
+    }
+}
+
+main();
+```
+
+---
+
 ## End-to-End Scenario: FXS "Send To" Flyout
 
 This section illustrates a concrete real-world scenario where **FetchXML Studio (FXS)** exposes a "Send To ▾" flyout button that lets users push the current FetchXML query directly into another installed tool — such as **DRB** (Dataverse Rest Builder) or **DMS** (Data Migration Studio) — without expecting a return value.
diff --git a/docs/LOGGING_BEST_PRACTICES.md b/docs/LOGGING_BEST_PRACTICES.md
index 756587b3..9ac48286 100644
--- a/docs/LOGGING_BEST_PRACTICES.md
+++ b/docs/LOGGING_BEST_PRACTICES.md
@@ -351,6 +351,14 @@ logWarn("Connection expired", { connectionId }); // Console + Sentry always
 // Don't use captureMessage for info - it creates Issues
 ```
 
+## Invocation Log Redaction
+
+Agent invocation logs must not store raw connection identifiers or sensitive launch metadata.
+
+- Redact `connectionId`, `primaryConnectionId`, `secondaryConnectionId`, and similar fields before writing logs.
+- Redact nested prefill data fields whose names include `connection`, `token`, `secret`, `password`, `credential`, `auth`, or `refresh`.
+- Keep correlation IDs and tool names so the log still supports diagnostics without exposing secrets.
+
 ## Questions?
 
 For questions about logging:
diff --git a/docs/MCP_HEADLESS_UNATTENDED_IMPLEMENTATION.md b/docs/MCP_HEADLESS_UNATTENDED_IMPLEMENTATION.md
new file mode 100644
index 00000000..33cfbc42
--- /dev/null
+++ b/docs/MCP_HEADLESS_UNATTENDED_IMPLEMENTATION.md
@@ -0,0 +1,141 @@
+# MCP Headless Unattended Execution - Net New Change
+
+## What is New
+
+This change introduces a **headless entry path** for MCP-based tool execution so automation clients can invoke tools without opening Electron windows.
+
+## Why This Exists
+
+Current MCP integration launches windowed tool instances and depends on UI interaction. For unattended automation and CI workflows, that model is not sufficient.
+
+## Net New Components
+
+- `src/cli/index.ts`: Node.js CLI entry for headless operation.
+- `src/cli/constants.ts`: CLI defaults and exit codes.
+- `src/cli/utils.ts`: argument parsing, env loading, and command helpers.
+- `tsconfig.cli.json`: dedicated TypeScript compile target for CLI output.
+- `package.json` updates:
+    - `bin.pptb-cli` mapped to `dist/cli/index.js`
+    - `build:cli` script
+    - `build` now compiles CLI artifact after Electron build
+
+## Runtime Behavior (Current Stage)
+
+This initial implementation stage provides the CLI scaffold and build integration. Headless tool execution orchestration and MCP routing extensions are implemented in subsequent phases.
+
+## Target Behavior (Next Stages)
+
+- MCP `call-tool` accepts `executionMode: "headless"`.
+- Only tools explicitly declaring `agents.headless: true` are eligible.
+- A job-based response model returns `jobId` and status endpoint for polling.
+- Authentication supports either caller-provided token (`authToken`) or server-side resolution from saved `connectionName` (no external `connectionId` exposure).
+
+## Headless Runtime Globals
+
+Headless tool entrypoints run in Node.js and should not assume a DOM. The runtime should install a browser-compatible compatibility layer before importing the tool module so existing tool code can still reach PPTB APIs.
+
+This is additive compatibility: it does not replace or deprecate `window.toolboxAPI`, `window.dataverseAPI`, or `window.powerplatformAPI` in the browser-based tool runtime.
+
+The headless loader installs the following globals on `globalThis` — the same names used in the BrowserView preload:
+
+| Global             | Purpose                                                    |
+| ------------------ | ---------------------------------------------------------- |
+| `window`           | Alias for `globalThis` (backwards compatibility)           |
+| `toolboxAPI`       | Connections, utils, settings, terminal, events, invocation |
+| `dataverseAPI`     | All Dataverse CRUD, FetchXML, metadata, execute            |
+| `powerplatformAPI` | Power Platform admin endpoints                             |
+
+Tool authors use the **same identifiers** they already use in windowed mode. No code changes are required in an existing tool if it accesses the APIs via their top-level names.
+
+### Example: Node-safe tool entry
+
+```typescript
+export async function invokeHeadless(input: Record<string, unknown>, context: { toolId: string; toolName: string; invocationMode: "one-way" | "two-way" }) {
+    // toolboxAPI – connections, utils, settings (same name as window.toolboxAPI)
+    const connection = await toolboxAPI.connections.getActiveConnection();
+
+    // dataverseAPI – separate top-level global (same as window.dataverseAPI)
+    const result = await dataverseAPI.queryData("accounts?$select=name&$top=3");
+
+    // powerplatformAPI – separate top-level global (same as window.powerplatformAPI)
+    const envList = await powerplatformAPI.EnvironmentManagement.Get("environments?api-version=2021-04-01");
+
+    return {
+        toolId: context.toolId,
+        toolName: context.toolName,
+        connectionName: connection?.name ?? null,
+        records: result.value ?? [],
+        environments: envList,
+    };
+}
+```
+
+### Windowed tool with an opt-in headless entrypoint
+
+A tool that already has a windowed UI can add a dedicated `dist/headless.js` entry with zero changes to its main code:
+
+```typescript
+// dist/headless.ts – compiled alongside the normal browser entry
+export async function invokeHeadless(input: Record<string, unknown>, context: { toolId: string; toolName: string; invocationMode: "one-way" | "two-way" }) {
+    // dataverseAPI and toolboxAPI are available here exactly as in window context
+    const accounts = await dataverseAPI.fetchXmlQuery(`
+        <fetch top="10"><entity name="account"><attribute name="name"/></entity></fetch>
+    `);
+    return { accounts: accounts.value };
+}
+```
+
+Declare the entry in `pptb.config.json`:
+
+```json
+{
+    "agents": {
+        "headless": true,
+        "headlessEntry": "dist/headless.js"
+    }
+}
+```
+
+When the tool needs Dataverse or Power Platform access, the MCP caller must include a saved `connectionName` so the runtime can resolve the right connection before the module runs.
+
+## Reused Existing Architecture
+
+The headless implementation is designed to extend (not duplicate) existing architecture:
+
+- Tool discovery and eligibility: `agentToolRegistry`
+- Schema alignment: `schemaConverter`
+- Invocation audit trail: `agentInvocationLogger`
+- MCP protocol entrypoint: `mcpServer`
+
+## Verification Approach
+
+Testing is performed using MCP Inspector:
+
+1. Start headless entry (`pptb-cli serve ...`).
+1. Verify tool discovery includes only headless-capable tools when requested.
+1. Validate headless invocation success and failure paths.
+1. Validate timeout and progress polling contract.
+
+## Compatibility Guarantees
+
+- Existing windowed MCP/tool invocation flow remains unchanged.
+- Existing UI-driven and inter-tool invocation behavior is preserved.
+- Headless mode is opt-in per tool and does not alter non-headless tools.
+
+## Configs
+
+### Claude Desktop
+
+```json
+{
+    "mcpServers": {
+        "pptb": {
+            "command": "npx",
+            "args": ["-y", "mcp-remote", "http://127.0.0.1:7339"],
+            "env": {
+                "MCP_REMOTE_HEADERS": "{\"X-MCP-Auth-Token\":\"YOUR_TOKEN\"}"
+            }
+        }
+    }
+}
+```
diff --git a/docs/MCP_IMPLEMENTATION.md b/docs/MCP_IMPLEMENTATION.md
new file mode 100644
index 00000000..6d61c78d
--- /dev/null
+++ b/docs/MCP_IMPLEMENTATION.md
@@ -0,0 +1,226 @@
+# MCP Implementation
+
+This document covers how Power Platform ToolBox exposes tools to external automation agents through the built-in MCP server.
+
+## Table of Contents
+
+- [MCP Implementation](#mcp-implementation)
+    - [Table of Contents](#table-of-contents)
+    - [Overview](#overview)
+    - [Agent Contract](#agent-contract)
+    - [MCP Invocation Envelope](#mcp-invocation-envelope)
+    - [Mode Semantics](#mode-semantics)
+    - [Execution Mode Semantics](#execution-mode-semantics)
+    - [Tool Runtime Context](#tool-runtime-context)
+    - [Implementation Notes](#implementation-notes)
+    - [Validation and Troubleshooting](#validation-and-troubleshooting)
+
+## Overview
+
+External automation agents can invoke selected PPTB tools through the MCP server. PPTB supports windowed execution and now includes a headless execution contract for unattended flows.
+
+## Agent Contract
+
+To expose a tool to MCP, add a top-level `agents` section in `pptb.config.json`.
+
+```json
+{
+    "invocation": {
+        "version": "1.0.0",
+        "capabilities": ["entity-picker"],
+        "prefill": {
+            "properties": {
+                "entityName": { "type": "string" },
+                "allowMultiSelect": { "type": "boolean" }
+            }
+        },
+        "returnTopic": {
+            "properties": {
+                "selectedId": { "type": "string" },
+                "selectedName": { "type": "string" }
+            }
+        }
+    },
+    "agents": {
+        "version": "1.0.0",
+        "invokable": true,
+        "modes": ["one-way", "two-way"],
+        "defaultMode": "two-way",
+        "timeoutMS": 12000
+    }
+}
+```
+
+Field summary:
+
+- `agents.version`: required semantic version for the agent contract.
+- `agents.invokable`: required to expose the tool to MCP.
+- `agents.modes`: supported invocation modes.
+- `agents.defaultMode`: fallback mode when the agent does not specify one.
+- `agents.timeoutMS`: timeout hint for two-way calls.
+
+## MCP Invocation Envelope
+
+MCP callers can pass PPTB-specific invocation metadata under `arguments.__pptb`.
+
+```json
+{
+    "entityName": "account",
+    "__pptb": {
+        "mode": "two-way",
+        "timeoutMs": 60000
+    }
+}
+```
+
+Supported metadata:
+
+- `mode`: `"one-way"` or `"two-way"`.
+- `executionMode`: `"windowed"` or `"headless"`.
+- `timeoutMs`: positive number in milliseconds.
+- `authToken`: optional caller-provided token for headless execution contexts.
+- `connectionName`: optional saved PPTB connection name. MCP resolves and refreshes tokens server-side when possible.
+
+## Mode Semantics
+
+- `two-way`: MCP waits for the callee to call `returnData(...)` and validates the result against `returnTopic`.
+- `one-way`: MCP returns an immediate accepted response and does not wait for a payload from the callee.
+
+## Execution Mode Semantics
+
+- `windowed`: existing BrowserView launch behavior.
+- `headless`: MCP returns a job acknowledgement with `jobId` and `jobStatusPath`.
+
+For headless + invocation `mode`:
+
+- `headless` + `two-way`: MCP waits for job completion and returns the final tool payload directly (schema-aligned) when successful.
+- `headless` + `one-way`: MCP returns immediate acceptance metadata (`jobId`, `statusUrl`) and callers poll status endpoints as needed.
+
+Headless runtime contract:
+
+- Tool package must expose `invokeHeadless(input, context)` from a discovered entry file.
+- Entry discovery order:
+    1. `agents.headlessEntry` in `pptb.config.json`
+    2. `dist/headless.js`
+    3. `headless.js`
+    4. `package.json.main`
+- `invokeHeadless` must return a JSON object payload matching `returnTopic` when two-way semantics are expected.
+
+Example headless acceptance payload:
+
+```json
+{
+    "status": "accepted",
+    "executionMode": "headless",
+    "mode": "two-way",
+    "jobId": "f5a79f96-3d4f-4f60-a151-4d2d3069f2ef",
+    "jobStatusPath": "/mcp/jobs/f5a79f96-3d4f-4f60-a151-4d2d3069f2ef",
+    "statusUrl": "/mcp/jobs/f5a79f96-3d4f-4f60-a151-4d2d3069f2ef/status",
+    "jobStatus": "pending",
+    "timeoutMs": 120000,
+    "hasAuthToken": true,
+    "authSource": "provided-token",
+    "connectionName": "optional-when-using-connection-name"
+}
+```
+
+Job status endpoint:
+
+- `GET /mcp/jobs/{jobId}` or `GET /mcp/jobs/{jobId}/status` (requires `X-MCP-Auth-Token`)
+- Returns job state (`pending`, `in_progress`, `completed`, `failed`) and result/error fields when available.
+
+Headless `context` shape passed to `invokeHeadless`:
+
+```json
+{
+    "toolId": "tool-id",
+    "toolName": "friendly-name",
+    "invocationMode": "one-way|two-way",
+    "authToken": "optional-token",
+    "updateProgress": "function(percent, message)",
+    "logger": {
+        "info": "function(message)",
+        "error": "function(message)"
+    }
+}
+```
+
+### Headless API Access
+
+Headless tools run under Node.js, so they do not get a real browser DOM. Tool code should therefore avoid assuming that `document` exists, but it may still use PPTB APIs through a compatibility global installed by the headless runtime.
+
+This is additive compatibility, not a rename. Existing browser-based tools can continue to use `window.toolboxAPI`, `window.dataverseAPI`, and `window.powerplatformAPI` unchanged.
+
+The three PPTB globals are available on `globalThis` in headless mode, matching the same names used in browser-based tools:
+
+| Global             | Headless                      | Windowed                  | Purpose                                                    |
+| ------------------ | ----------------------------- | ------------------------- | ---------------------------------------------------------- |
+| `toolboxAPI`       | `globalThis.toolboxAPI`       | `window.toolboxAPI`       | Connections, utils, settings, terminal, events, invocation |
+| `dataverseAPI`     | `globalThis.dataverseAPI`     | `window.dataverseAPI`     | All Dataverse CRUD, FetchXML, metadata, execute            |
+| `powerplatformAPI` | `globalThis.powerplatformAPI` | `window.powerplatformAPI` | Power Platform admin endpoints                             |
+
+For headless tools that need Dataverse or Power Platform access, the MCP invocation should also carry a `connectionName` so the runtime can resolve the correct saved connection before the tool runs.
+
+Example headless entry that matches the public API surface:
+
+```typescript
+export async function invokeHeadless(input: Record<string, unknown>, context: { toolName: string; invocationMode: "one-way" | "two-way" }) {
+    // toolboxAPI – connections, utils, settings, terminal, events, invocation
+    const connection = await toolboxAPI.connections.getActiveConnection();
+
+    // dataverseAPI – exposed separately, same as window.dataverseAPI in windowed mode
+    const topAccounts = await dataverseAPI.queryData("accounts?$select=name&$top=5");
+
+    return {
+        toolName: context.toolName,
+        invocationMode: context.invocationMode,
+        connectionName: connection?.name ?? null,
+        rows: topAccounts.value ?? [],
+    };
+}
+```
+
+The globals are installed directly on `globalThis`, so tool code written for windowed execution (`window.dataverseAPI.queryData(...)`) continues to work unchanged because `window` is aliased to `globalThis` by the headless runtime.
+
+## Tool Runtime Context
+
+When a tool is launched by MCP, `toolboxAPI.invocation.getLaunchContext()` returns the prefill data. If present, invocation metadata is attached under `__pptb`.
+
+```json
+{
+    "entityName": "account",
+    "__pptb": {
+        "source": "mcp",
+        "mode": "two-way",
+        "correlationId": "mcp-...",
+        "timeoutMs": 60000,
+        "expectsResponse": true
+    }
+}
+```
+
+## Implementation Notes
+
+Current implementation points:
+
+- MCP server entry point: [src/main/mcp/mcpServer.ts](../src/main/mcp/mcpServer.ts)
+- Agent tool registry: [src/main/mcp/agentToolRegistry.ts](../src/main/mcp/agentToolRegistry.ts)
+- Invocation context bridge: [src/main/toolPreloadBridge.ts](../src/main/toolPreloadBridge.ts)
+- Logging: [src/main/mcp/agentInvocationLogger.ts](../src/main/mcp/agentInvocationLogger.ts)
+
+The runtime currently:
+
+- Validates agent eligibility from `agents`.
+- Validates input against the tool's `prefill` schema.
+- Validates output against `returnTopic` for two-way calls.
+- Logs mode, correlation id, and result outcome.
+
+## Validation and Troubleshooting
+
+- Run `pnpm run build` after changing MCP-related TypeScript or docs.
+- If a tool does not appear in MCP discovery, confirm `agents.invokable` is `true`.
+- If a call fails schema validation, compare the payload against `prefill` or `returnTopic`.
+- If a call times out, adjust `agents.timeoutMS` or the per-call `__pptb.timeoutMs` hint.
+- Use MCP Inspector as the manual test harness for this feature area.
+- Verify that `list-tools` shows the supported modes and that `call-tool` returns the expected one-way or two-way response.
+- Check that invocation logs redact connection-related identifiers and sensitive payload fields.
diff --git a/docs/MCP_TOOL_AUTHOR_MIGRATION.md b/docs/MCP_TOOL_AUTHOR_MIGRATION.md
new file mode 100644
index 00000000..8fba5d04
--- /dev/null
+++ b/docs/MCP_TOOL_AUTHOR_MIGRATION.md
@@ -0,0 +1,76 @@
+# MCP Tool Author Migration Guide
+
+This guide is for tool authors who want their PPTB tool to be callable by external MCP clients.
+
+## What changed
+
+PPTB now exposes an explicit `agents` contract in `pptb.config.json`.
+
+- `invocation` remains the contract for PPTB-to-PPTB tool launching.
+- `agents` is the contract for MCP-based external automation.
+- Both contracts can coexist in the same tool.
+
+## Minimal manifest changes
+
+Add an `agents` section next to `invocation`.
+
+```json
+{
+    "invocation": {
+        "version": "1.0.0",
+        "prefill": {
+            "properties": {
+                "entityName": { "type": "string" }
+            }
+        },
+        "returnTopic": {
+            "properties": {
+                "selectedId": { "type": "string" }
+            }
+        }
+    },
+    "agents": {
+        "version": "1.0.0",
+        "invokable": true,
+        "modes": ["one-way", "two-way"],
+        "defaultMode": "two-way",
+        "timeoutMS": 12000
+    }
+}
+```
+
+Guidance:
+
+- Set `invokable: true` only when the tool is ready to be called by external agents.
+- Use `modes` to list the invocation styles the tool can actually support.
+- Keep `defaultMode` aligned with the most reliable call path.
+- Increase `timeoutMS` for slower two-way flows.
+
+## Runtime expectations
+
+- `one-way` calls should accept the launch and complete quickly.
+- `two-way` calls should eventually return data via the normal tool return path.
+- `toolboxAPI.invocation.getLaunchContext()` should still be used for local tool state.
+- `toolboxAPI.invocation.returnData()` remains the handoff mechanism for returning values.
+
+## What to test in MCP Inspector
+
+1. Open the MCP Inspector and connect to the PPTB MCP server.
+2. Run `list-tools` and confirm the tool appears.
+3. Confirm the tool description shows supported modes and the default mode.
+4. Invoke the tool with no `__pptb` block and confirm the default mode is used.
+5. Invoke the tool with `__pptb.mode = "one-way"` and confirm the call is accepted immediately.
+6. Invoke the tool with `__pptb.mode = "two-way"` and confirm the returned payload matches the declared schema.
+7. Try an unsupported mode and confirm the server returns a deterministic error.
+
+## Common mistakes
+
+- Declaring `invokable: true` without a matching `invocation.prefill`/`returnTopic` shape.
+- Claiming support for `one-way` when the tool still needs a return payload.
+- Using `agents.timeoutMS` that is too short for a real user flow.
+- Returning fields that are not part of `returnTopic` for two-way flows.
+
+## Related docs
+
+- [MCP Implementation](MCP_IMPLEMENTATION.md)
+- [Inter-Tool Invocation](INTER_TOOL_INVOCATION.md)
diff --git a/jest.config.ts b/jest.config.ts
new file mode 100644
index 00000000..bed765ec
--- /dev/null
+++ b/jest.config.ts
@@ -0,0 +1,45 @@
+import type { Config } from "jest";
+
+const config: Config = {
+    // Test environment
+    testEnvironment: "node",
+
+    // TypeScript transformation via ts-jest
+    transform: {
+        "^.+\\.tsx?$": [
+            "ts-jest",
+            {
+                tsconfig: "tsconfig.test.json",
+                diagnostics: {
+                    // Only report errors, not warnings, to keep output clean
+                    warnOnly: false,
+                    ignoreCodes: ["TS151001"],
+                },
+            },
+        ],
+    },
+
+    // Test file discovery
+    testMatch: ["<rootDir>/tests/unit/**/*.test.ts"],
+
+    // Module name mapper — redirect Electron and electron-store to manual mocks
+    moduleNameMapper: {
+        "^electron$": "<rootDir>/tests/__mocks__/electron.ts",
+        "^electron-store$": "<rootDir>/tests/__mocks__/electron-store.ts",
+    },
+
+    // Coverage configuration
+    collectCoverageFrom: ["src/main/managers/**/*.ts", "src/common/**/*.ts", "src/renderer/utils/**/*.ts"],
+
+    coverageDirectory: "coverage",
+
+    coverageReporters: ["text", "lcov"],
+
+    // Ignore paths
+    testPathIgnorePatterns: ["/node_modules/", "/dist/", "/build/"],
+
+    // Verbose output for CI readability
+    verbose: true,
+};
+
+export default config;
diff --git a/package.json b/package.json
index ea60b0c2..c891a31f 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,25 @@
 {
   "name": "powerplatform-toolbox",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "A universal desktop app that contains multiple tools to ease the customization and configuration of Power Platform",
   "main": "dist/main/index.js",
+  "bin": {
+    "pptb-cli": "dist/cli/index.js"
+  },
   "scripts": {
     "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.renderer.json",
-    "build": "pnpm run typecheck && vite build",
+    "build": "pnpm run typecheck && vite build && pnpm run build:cli",
+    "build:cli": "tsc -p tsconfig.cli.json",
     "build:debug": "vite build --mode development",
     "dev": "vite",
     "watch": "vite build --watch",
     "lint": "eslint src --ext .ts",
+    "test": "pnpm run test:unit && pnpm run test:e2e",
+    "test:unit": "jest --config jest.config.ts",
+    "test:unit:watch": "jest --config jest.config.ts --watch",
+    "test:unit:coverage": "jest --config jest.config.ts --coverage",
+    "test:e2e": "playwright test",
+    "test:e2e:ui": "playwright test --ui",
     "start": "electron .",
     "package": "node ./buildScripts/package.js",
     "package:win": "node ./buildScripts/package.js --config=buildScripts/electron-builder-win.json",
@@ -39,6 +49,9 @@
   "license": "GPL-3.0",
   "devDependencies": {
     "@electron/notarize": "^3.1.0",
+    "@playwright/test": "1.60.0",
+    "playwright": "1.60.0",
+    "@types/jest": "29.5.14",
     "@types/node": "^20.19.21",
     "@typescript-eslint/eslint-plugin": "^6.13.0",
     "@typescript-eslint/parser": "^6.13.0",
@@ -47,8 +60,11 @@
     "electron": "^28.0.0",
     "electron-builder": "^24.9.0",
     "eslint": "^8.54.0",
+    "jest": "29.7.0",
     "rollup-plugin-visualizer": "^6.0.5",
     "sass": "^1.93.2",
+    "ts-jest": "29.4.10",
+    "ts-node": "10.9.2",
     "typescript": "^5.3.0",
     "vite": "^7.1.10",
     "vite-plugin-electron": "^0.29.0",
@@ -58,12 +74,15 @@
     "@azure/msal-node": "^3.8.0",
     "@fluentui/svg-icons": "^1.1.312",
     "@fluentui/tokens": "^1.0.0-alpha.22",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "@supabase/supabase-js": "^2.84.0",
     "@types/uuid": "^10.0.0",
     "ansi-to-html": "^0.7.2",
     "electron-store": "^8.1.0",
     "electron-updater": "^6.6.2",
     "marked": "17.0.3",
+    "pino": "^9.14.0",
+    "pino-pretty": "^13.1.3",
     "uuid": "^13.0.0"
   },
   "build": {
diff --git a/packages/bin/pptb-validate.js b/packages/bin/pptb-validate.js
deleted file mode 100644
index 71ba8b9b..00000000
--- a/packages/bin/pptb-validate.js
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/usr/bin/env node
-// @ts-check
-"use strict";
-
-/**
- * pptb-validate - CLI tool for validating Power Platform ToolBox tool packages
- *
- * Usage:
- *   pptb-validate [options] [path/to/package.json]
- *
- * Options:
- *   --skip-url-checks   Skip URL accessibility checks (faster, offline-friendly)
- *   --json              Output results as JSON
- *   --help, -h          Show help information
- */
-
-const fs = require("fs");
-const path = require("path");
-const { validatePackageJson, validatePPTBConfig, KNOWN_CAPABILITY_TAGS } = require("../lib/validate");
-
-// ANSI colour helpers – gracefully degrade when colours are unsupported
-const NO_COLOR = !process.stdout.isTTY || process.env.NO_COLOR;
-const c = {
-    red: (s) => (NO_COLOR ? s : `\x1b[31m${s}\x1b[0m`),
-    yellow: (s) => (NO_COLOR ? s : `\x1b[33m${s}\x1b[0m`),
-    green: (s) => (NO_COLOR ? s : `\x1b[32m${s}\x1b[0m`),
-    cyan: (s) => (NO_COLOR ? s : `\x1b[36m${s}\x1b[0m`),
-    bold: (s) => (NO_COLOR ? s : `\x1b[1m${s}\x1b[0m`),
-    dim: (s) => (NO_COLOR ? s : `\x1b[2m${s}\x1b[0m`),
-};
-
-function printHelp() {
-    console.log(`
-${c.bold("pptb-validate")} – Power Platform ToolBox tool validator
-
-${c.bold("USAGE")}
-  pptb-validate [options] [path/to/package.json]
-
-  When no path is given the tool looks for ${c.cyan("package.json")} in the current
-  working directory. If a ${c.cyan("pptb.config.json")} file exists in the same directory
-  it is automatically validated as well.
-
-${c.bold("OPTIONS")}
-  ${c.cyan("--skip-url-checks")}   Skip URL reachability checks (faster, works offline)
-  ${c.cyan("--json")}              Print results as a JSON object instead of human-readable text
-  ${c.cyan("--help")}, ${c.cyan("-h")}          Show this help message
-
-${c.bold("ADD TO YOUR TOOL'S package.json")}
-  ${c.dim(`"scripts": {
-    "validate": "pptb-validate"
-  }`)}
-
-  Then run: ${c.cyan("npm run validate")}
-
-${c.bold("EXAMPLES")}
-  npm run validate
-  npm run validate ./my-tool/package.json
-  npm run validate --skip-url-checks
-  npm run validate --json
-`);
-}
-
-async function main() {
-    const args = process.argv.slice(2);
-
-    if (args.includes("--help") || args.includes("-h")) {
-        printHelp();
-        process.exit(0);
-    }
-
-    const skipUrlChecks = args.includes("--skip-url-checks");
-    const jsonOutput = args.includes("--json");
-
-    // Find the package.json path from positional args (skip flags)
-    const positional = args.filter((a) => !a.startsWith("-"));
-    let packageJsonPath = positional[0] || path.join(process.cwd(), "package.json");
-
-    // Resolve to absolute path
-    if (!path.isAbsolute(packageJsonPath)) {
-        packageJsonPath = path.resolve(process.cwd(), packageJsonPath);
-    }
-
-    // Derive pptb.config.json path from the same directory as package.json
-    const toolDir = path.dirname(packageJsonPath);
-    const pptbConfigPath = path.join(toolDir, "pptb.config.json");
-
-    // --- Load package.json ---
-    if (!fs.existsSync(packageJsonPath)) {
-        if (jsonOutput) {
-            console.log(JSON.stringify({ valid: false, errors: [`package.json not found at: ${packageJsonPath}`], warnings: [] }, null, 2));
-        } else {
-            console.error(c.red(`✖ package.json not found at: ${packageJsonPath}`));
-        }
-        process.exit(1);
-    }
-
-    let packageJson;
-    try {
-        packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-    } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        if (jsonOutput) {
-            console.log(JSON.stringify({ valid: false, errors: [`Failed to parse package.json: ${message}`], warnings: [] }, null, 2));
-        } else {
-            console.error(c.red(`✖ Failed to parse package.json: ${message}`));
-        }
-        process.exit(1);
-    }
-
-    // --- Load pptb.config.json (optional) ---
-    let pptbConfig = null;
-    let pptbConfigParseError = null;
-    if (fs.existsSync(pptbConfigPath)) {
-        try {
-            pptbConfig = JSON.parse(fs.readFileSync(pptbConfigPath, "utf8"));
-        } catch (err) {
-            pptbConfigParseError = err instanceof Error ? err.message : String(err);
-        }
-    }
-
-    // --- Run validation ---
-    if (!jsonOutput) {
-        console.log();
-        console.log(c.bold("Power Platform ToolBox – Tool Validator"));
-        console.log(c.dim("─".repeat(45)));
-        console.log(c.dim(`File: ${packageJsonPath}`));
-        if (pptbConfig !== null) {
-            console.log(c.dim(`Config: ${pptbConfigPath}`));
-        }
-        if (skipUrlChecks) {
-            console.log(c.yellow("⚠  URL reachability checks are skipped"));
-        }
-        console.log();
-    }
-
-    let packageResult;
-    try {
-        packageResult = await validatePackageJson(packageJson, { skipUrlChecks });
-    } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        if (jsonOutput) {
-            console.log(JSON.stringify({ valid: false, errors: [`Unexpected validation error: ${message}`], warnings: [] }, null, 2));
-        } else {
-            console.error(c.red(`✖ Unexpected validation error: ${message}`));
-        }
-        process.exit(1);
-    }
-
-    // --- Validate pptb.config.json if present ---
-    let configResult = null;
-    if (pptbConfigParseError !== null) {
-        configResult = { valid: false, errors: [`Failed to parse pptb.config.json: ${pptbConfigParseError}`], warnings: [] };
-    } else if (pptbConfig !== null) {
-        configResult = validatePPTBConfig(pptbConfig);
-    }
-
-    // Merge results for overall pass/fail
-    const allErrors = [...packageResult.errors, ...(configResult ? configResult.errors : [])];
-    const allWarnings = [...packageResult.warnings, ...(configResult ? configResult.warnings : [])];
-    const overallValid = packageResult.valid && (configResult === null || configResult.valid);
-
-    // --- Output results ---
-    if (jsonOutput) {
-        const output = {
-            valid: overallValid,
-            errors: allErrors,
-            warnings: allWarnings,
-            packageInfo: packageResult.packageInfo,
-            configInfo: configResult ? configResult.packageInfo : undefined,
-        };
-        console.log(JSON.stringify(output, null, 2));
-        process.exit(overallValid ? 0 : 1);
-    }
-
-    // Human-readable output – package.json section
-    if (packageResult.errors.length > 0) {
-        console.log(c.bold(c.red(`package.json Errors (${packageResult.errors.length})`)));
-        packageResult.errors.forEach((e) => console.log(`  ${c.red("✖")} ${e}`));
-        console.log();
-    }
-
-    if (packageResult.warnings.length > 0) {
-        console.log(c.bold(c.yellow(`package.json Warnings (${packageResult.warnings.length})`)));
-        packageResult.warnings.forEach((w) => console.log(`  ${c.yellow("⚠")} ${w}`));
-        console.log();
-    }
-
-    // Human-readable output – pptb.config.json section
-    if (configResult !== null) {
-        if (configResult.errors.length > 0) {
-            console.log(c.bold(c.red(`pptb.config.json Errors (${configResult.errors.length})`)));
-            configResult.errors.forEach((e) => console.log(`  ${c.red("✖")} ${e}`));
-            console.log();
-        }
-
-        if (configResult.warnings.length > 0) {
-            console.log(c.bold(c.yellow(`pptb.config.json Warnings (${configResult.warnings.length})`)));
-            configResult.warnings.forEach((w) => console.log(`  ${c.yellow("⚠")} ${w}`));
-            console.log();
-        }
-    }
-
-    if (overallValid) {
-        const info = packageResult.packageInfo;
-        console.log(c.green(c.bold("✔ Validation passed")));
-        console.log();
-        console.log(c.bold("Package summary"));
-        console.log(c.dim("─".repeat(45)));
-        console.log(`  Name        : ${info.name}`);
-        console.log(`  Version     : ${info.version}`);
-        console.log(`  Display name: ${info.displayName}`);
-        console.log(`  Description : ${info.description}`);
-        console.log(`  License     : ${info.license}`);
-        console.log(`  Contributors: ${info.contributors.map((contributor) => contributor.name).join(", ")}`);
-        if (info.icon) {
-            console.log(`  Icon        : ${info.icon}`);
-        }
-        if (info.features) {
-            console.log(`  Features    : multiConnection=${info.features.multiConnection}${info.features.minAPI ? `, minAPI=${info.features.minAPI}` : ""}`);
-        }
-        if (configResult !== null && configResult.packageInfo && configResult.packageInfo.invocation) {
-            const inv = configResult.packageInfo.invocation;
-            console.log(`  Invocation  : version=${inv.version}`);
-            if (Array.isArray(inv.capabilities) && inv.capabilities.length > 0) {
-                console.log(`  Capabilities: ${inv.capabilities.join(", ")}`);
-            }
-        }
-        console.log();
-        console.log(c.dim(`Known capability tags: ${KNOWN_CAPABILITY_TAGS.join(", ")}`));
-        console.log();
-    } else {
-        console.log(c.red(c.bold("✖ Validation failed")));
-        console.log();
-        console.log(c.dim("Fix the errors listed above and re-run pptb-validate before publishing."));
-        console.log();
-    }
-
-    process.exit(overallValid ? 0 : 1);
-}
-
-main().catch((err) => {
-    console.error(c.red(`✖ Fatal error: ${err instanceof Error ? err.message : String(err)}`));
-    process.exit(1);
-});
diff --git a/packages/lib/validate.js b/packages/lib/validate.js
index 6cc60de7..c022fd04 100644
--- a/packages/lib/validate.js
+++ b/packages/lib/validate.js
@@ -9,7 +9,7 @@
 /** @typedef {{ name: string; url?: string }} Contributor */
 /** @typedef {{ "connect-src"?: string[]; "script-src"?: string[]; "style-src"?: string[]; "img-src"?: string[]; "font-src"?: string[]; "frame-src"?: string[]; "media-src"?: string[] }} CspExceptions */
 /** @typedef {{ repository?: string; website?: string; funding?: string; readmeUrl?: string }} Configurations */
-/** @typedef {{ multiConnection?: "required" | "optional" | "none"; minAPI?: string }} Features */
+/** @typedef {{ multiConnection?: "required" | "optional" | "none"; minAPI?: string; enabledForPowerPlatformAPI?: boolean }} Features */
 /**
  * @typedef {{
  *   name: string;
@@ -38,11 +38,20 @@
  * @typedef {{ properties?: Record<string, JsonSchemaProperty> }} JsonSchemaObject
  * @typedef {{
  *   version: string;
+ *   capabilities: string[];
  *   prefill?: JsonSchemaObject;
  *   returnTopic?: JsonSchemaObject;
  * }} InvocationConfig
  * @typedef {{
+ *   version: string;
+ *   invokable?: boolean;
+ *   modes?: ("one-way" | "two-way")[];
+ *   defaultMode?: "one-way" | "two-way";
+ *   timeoutMS?: number;
+ * }} AgentsConfig
+ * @typedef {{
  *   invocation?: InvocationConfig;
+ *   agents?: AgentsConfig;
  * }} PPTBConfig
  */
 
@@ -69,15 +78,7 @@ const SEMVER_REGEX = /^\d+\.\d+\.\d+(-[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?(\+[0-9a-
  * Node.js module that cannot import from the Electron/TypeScript source tree, both
  * lists must be updated together whenever a new tag is added.
  */
-const KNOWN_CAPABILITY_TAGS = [
-    "fetchxml",
-    "entity-picker",
-    "record-selector",
-    "solution-selector",
-    "webresource-editor",
-    "plugin-inspector",
-    "pcf-control-builder",
-];
+const KNOWN_CAPABILITY_TAGS = ["fetchxml", "entity-picker", "record-selector", "solution-selector", "webresource-editor", "plugin-inspector", "pcf-control-builder"];
 
 /**
  * Checks if a string is a valid URL.
@@ -311,9 +312,9 @@ async function validatePackageJson(packageJson, options = {}) {
         const features = packageJson.features;
 
         if (features === null || typeof features !== "object" || Array.isArray(features)) {
-            errors.push("features must be a non-array object with optional 'multiConnection' and 'minAPI' properties");
+            errors.push("features must be a non-array object with optional 'multiConnection', 'minAPI', and 'enabledForPowerPlatformAPI' properties");
         } else {
-            const VALID_FEATURE_KEYS = ["multiConnection", "minAPI"];
+            const VALID_FEATURE_KEYS = ["multiConnection", "minAPI", "enabledForPowerPlatformAPI"];
             const featureKeys = Object.keys(features);
             const invalidKeys = featureKeys.filter((key) => !VALID_FEATURE_KEYS.includes(key));
 
@@ -332,6 +333,12 @@ async function validatePackageJson(packageJson, options = {}) {
                     errors.push("features.minAPI must be a valid semantic version string (e.g., '1.0.0')");
                 }
             }
+
+            if (features.enabledForPowerPlatformAPI !== undefined) {
+                if (typeof features.enabledForPowerPlatformAPI !== "boolean") {
+                    errors.push("features.enabledForPowerPlatformAPI must be a boolean (true or false)");
+                }
+            }
         }
     }
 
@@ -375,7 +382,7 @@ function validatePPTBConfig(config) {
         return { valid: false, errors, warnings };
     }
 
-    const VALID_ROOT_KEYS = ["invocation"];
+    const VALID_ROOT_KEYS = ["invocation", "agents"];
     const unknownRootKeys = Object.keys(config).filter((k) => !VALID_ROOT_KEYS.includes(k));
     if (unknownRootKeys.length > 0) {
         warnings.push(`pptb.config.json contains unrecognised root keys: ${unknownRootKeys.join(", ")}`);
@@ -436,6 +443,52 @@ function validatePPTBConfig(config) {
         }
     }
 
+    if (config.agents !== undefined) {
+        const agents = config.agents;
+
+        if (agents === null || typeof agents !== "object" || Array.isArray(agents)) {
+            errors.push("agents must be a non-array object");
+        } else {
+            if (agents.version === undefined || agents.version === null) {
+                errors.push("agents.version is required");
+            } else if (typeof agents.version !== "string") {
+                errors.push("agents.version must be a string");
+            } else if (!SEMVER_REGEX.test(agents.version)) {
+                errors.push(`agents.version "${agents.version}" is not a valid semantic version string (e.g. "1.0.0")`);
+            }
+
+            if (agents.invokable !== undefined && typeof agents.invokable !== "boolean") {
+                errors.push("agents.invokable must be a boolean (true or false)");
+            }
+
+            if (agents.modes !== undefined) {
+                if (!Array.isArray(agents.modes)) {
+                    errors.push("agents.modes must be an array");
+                } else {
+                    agents.modes.forEach((mode, idx) => {
+                        if (mode !== "one-way" && mode !== "two-way") {
+                            errors.push(`agents.modes[${idx}] must be either \"one-way\" or \"two-way\"`);
+                        }
+                    });
+                }
+            }
+
+            if (agents.defaultMode !== undefined) {
+                if (agents.defaultMode !== "one-way" && agents.defaultMode !== "two-way") {
+                    errors.push('agents.defaultMode must be either "one-way" or "two-way"');
+                } else if (agents.modes !== undefined && Array.isArray(agents.modes) && !agents.modes.includes(agents.defaultMode)) {
+                    errors.push("agents.defaultMode must be included in agents.modes");
+                }
+            }
+
+            if (agents.timeoutMS !== undefined) {
+                if (typeof agents.timeoutMS !== "number" || !Number.isFinite(agents.timeoutMS) || agents.timeoutMS <= 0) {
+                    errors.push("agents.timeoutMS must be a positive number");
+                }
+            }
+        }
+    }
+
     const valid = errors.length === 0;
 
     return {
@@ -445,6 +498,7 @@ function validatePPTBConfig(config) {
         packageInfo: valid
             ? {
                   invocation: config.invocation,
+                  agents: config.agents,
               }
             : undefined,
     };
diff --git a/packages/README.md b/packages/types/README.md
similarity index 70%
rename from packages/README.md
rename to packages/types/README.md
index 4c4a7d5d..7a051cf5 100644
--- a/packages/README.md
+++ b/packages/types/README.md
@@ -8,7 +8,7 @@ TypeScript type definitions for Power Platform ToolBox APIs, plus a built-in CLI
         - [Quick start](#quick-start)
         - [CLI options](#cli-options)
         - [What is validated](#what-is-validated)
-        - [pptb.config.json (optional)](#pptbconfigjson-optional)
+            - [pptb.config.json (optional)](#pptbconfigjson-optional)
     - [Overview](#overview)
     - [Usage](#usage)
         - [Include all type definitions](#include-all-type-definitions)
@@ -19,12 +19,23 @@ TypeScript type definitions for Power Platform ToolBox APIs, plus a built-in CLI
         - [Terminal Operations](#terminal-operations)
         - [Events](#events)
         - [Inter-Tool Invocation](#inter-tool-invocation)
+            - [Caller: launching another tool with prefill data](#caller-launching-another-tool-with-prefill-data)
+            - [Caller: tag-based capability discovery](#caller-tag-based-capability-discovery)
+            - [Caller: tag-based capability discovery](#caller-tag-based-capability-discovery-1)
+            - [Callee: reading prefill data and returning a result](#callee-reading-prefill-data-and-returning-a-result)
+            - [Declaring your invocation contract](#declaring-your-invocation-contract)
     - [Dataverse API Examples](#dataverse-api-examples)
         - [CRUD Operations](#crud-operations)
         - [FetchXML Queries](#fetchxml-queries)
         - [Metadata Operations](#metadata-operations)
         - [Execute Actions/Functions](#execute-actionsfunctions)
         - [Deploy Solutions](#deploy-solutions)
+    - [Power Platform API Examples](#power-platform-api-examples)
+        - [Using Power Apps API](#using-power-apps-api)
+        - [Using Power Automate API](#using-power-automate-api)
+        - [Using Environment Management API](#using-environment-management-api)
+        - [Using Governance API](#using-governance-api)
+        - [Available Categories](#available-categories)
     - [API Reference](#api-reference)
         - [ToolBox API (`window.toolboxAPI`)](#toolbox-api-windowtoolboxapi)
             - [Connections](#connections-1)
@@ -37,6 +48,8 @@ TypeScript type definitions for Power Platform ToolBox APIs, plus a built-in CLI
             - [Query Operations](#query-operations)
             - [Metadata Operations](#metadata-operations-1)
             - [Advanced Operations](#advanced-operations)
+        - [Power Platform API (`window.powerplatformAPI`)](#power-platform-api-windowpowerplatformapi)
+            - [Category Methods](#category-methods)
         - [Security Notes](#security-notes)
     - [Publishing the package to npm](#publishing-the-package-to-npm)
     - [License](#license)
@@ -116,21 +129,26 @@ The validator checks every field that the official review pipeline inspects:
 
 In addition to `package.json`, the validator automatically checks a `pptb.config.json` file if one is present in the same directory. This file declares tool-to-tool communication contracts and other PPTB-specific metadata.
 
-| Field                                   | Required | Rules                                                                                                                     |
-| --------------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `invocation.version`                    | ✅\*\*   | Must be a valid **semantic version** string (e.g. `"1.0.0"`). Tool developers own this version and bump it when the invocation contract changes. |
-| `invocation.capabilities`               | ❌       | Array of non-empty string tags (e.g. `["entity-picker"]`). Used by callers to discover this tool via `findToolsByCapability`. |
-| `invocation.prefill`                    | ❌       | JSON-schema-style object describing data callers can pre-populate                                                         |
-| `invocation.prefill.properties`         | ❌       | Map of property names to `{ type?, enum?, items? }` descriptors                                                           |
-| `invocation.returnTopic`                | ❌       | JSON-schema-style object describing the data this tool returns to its caller                                              |
-| `invocation.returnTopic.properties`     | ❌       | Map of property names to `{ type?, enum?, items? }` descriptors                                                           |
+| Field                               | Required | Rules                                                                                                                                                       |
+| ----------------------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `invocation.version`                | ✅\*\*   | Must be a valid **semantic version** string (e.g. `"1.0.0"`). Tool developers own this version and bump it when the invocation contract changes.            |
+| `invocation.capabilities`           | ❌       | Array of non-empty string tags (e.g. `["entity-picker"]`). Used by callers to discover this tool via `findToolsByCapability`.                               |
+| `invocation.prefill`                | ❌       | JSON-schema-style object describing data callers can pre-populate                                                                                           |
+| `invocation.prefill.properties`     | ❌       | Map of property names to `{ type?, enum?, items? }` descriptors                                                                                             |
+| `invocation.returnTopic`            | ❌       | JSON-schema-style object describing the data this tool returns to its caller                                                                                |
+| `invocation.returnTopic.properties` | ❌       | Map of property names to `{ type?, enum?, items? }` descriptors                                                                                             |
+| `agents`                            | ❌       | Top-level agent contract for external automation; when present, must include `version` and may include `invokable`, `modes`, `defaultMode`, and `timeoutMS` |
+| `agents.version`                    | ✅       | Must be a valid semantic version string (e.g. `1.0.0`)                                                                                                      |
+| `agents.invokable`                  | ❌       | Boolean indicating whether an external (non-PPTB) automation agent may launch this tool programmatically                                                    |
+| `agents.modes`                      | ❌       | Array of supported invocation modes (`"one-way"`, `"two-way"`)                                                                                              |
+| `agents.defaultMode`                | ❌       | Default mode when the agent does not request one explicitly                                                                                                 |
+| `agents.timeoutMS`                  | ❌       | Optional timeout hint in milliseconds for two-way calls                                                                                                     |
 
 > \*\* Required only when the `invocation` object is present.
 
 **Example `pptb.config.json`:**
 
 ```json
-{
     "invocation": {
         "version": "1.0.0",
         "capabilities": ["entity-picker"],
@@ -147,16 +165,24 @@ In addition to `package.json`, the validator automatically checks a `pptb.config
                 "error": { "type": "string" }
             }
         }
+    },
+    "agents": {
+        "version": "1.0.0",
+        "invokable": true,
+        "modes": ["one-way", "two-way"],
+        "defaultMode": "two-way",
+        "timeoutMS": 12000
     }
 }
 ```
 
 ## Overview
 
-The `@pptb/types` package provides TypeScript definitions for two main APIs:
+The `@pptb/types` package provides TypeScript definitions for three main APIs:
 
 1. **ToolBox API** (`window.toolboxAPI`) - Core platform features (connections, utilities, terminals, events)
 2. **Dataverse API** (`window.dataverseAPI`) - Microsoft Dataverse Web API operations
+3. **Power Platform API** (`window.powerplatformAPI`) - Power Platform Admin APIs with generic HTTP methods
 
 ## Usage
 
@@ -165,9 +191,10 @@ The `@pptb/types` package provides TypeScript definitions for two main APIs:
 ```typescript
 /// <reference types="@pptb/types" />
 
-// Both APIs are now available
+// All APIs are now available
 const toolbox = window.toolboxAPI;
 const dataverse = window.dataverseAPI;
+const powerplatform = window.powerplatformAPI;
 ```
 
 ### Include specific API types
@@ -178,6 +205,9 @@ const dataverse = window.dataverseAPI;
 
 // Only Dataverse API types
 /// <reference types="@pptb/types/dataverseAPI" />
+
+// Only Power Platform API types
+/// <reference types="@pptb/types/powerplatformAPI" />
 ```
 
 ## ToolBox API Examples
@@ -299,10 +329,7 @@ Tools can launch one another and pass data between them using the `invocation` n
 ```typescript
 // Tool A – launches the entity-picker tool and waits for a selection
 // The callee automatically inherits this tool's FXS connection
-const result = await toolboxAPI.invocation.launchTool(
-    "@my-org/entity-picker",
-    { entityName: "account", allowMultiSelect: false },
-);
+const result = await toolboxAPI.invocation.launchTool("@my-org/entity-picker", { entityName: "account", allowMultiSelect: false });
 
 if (result !== null) {
     console.log("Selected record id:", (result as { selectedId: string }).selectedId);
@@ -315,6 +342,21 @@ if (result !== null) {
 
 #### Caller: tag-based capability discovery
 
+```typescript
+// Find all installed tools that declare the "entity-picker" capability
+const pickers = await toolboxAPI.invocation.findToolsByCapability("entity-picker");
+if (pickers.length > 0) {
+    const picker = pickers[0] as { id: string };
+    const result = await toolboxAPI.invocation.launchTool(picker.id, { entityName: "account" });
+} else {
+    // User dismissed the picker (closed window or clicked "Return to Caller" banner)
+}
+```
+
+> **One-at-a-time**: only one active callee per caller is supported. A second `launchTool` call while a callee is open throws `"A callee invocation is already in progress"`.
+
+#### Caller: tag-based capability discovery
+
 ```typescript
 // Find all installed tools that declare the "entity-picker" capability
 const pickers = await toolboxAPI.invocation.findToolsByCapability("entity-picker");
@@ -339,7 +381,7 @@ if (ctx) {
 }
 ```
 
-> **Tip:** A tool that was *not* launched by another tool receives `null` from `getLaunchContext()`.  
+> **Tip:** A tool that was _not_ launched by another tool receives `null` from `getLaunchContext()`.  
 > Use this to show a standalone UI or redirect accordingly.
 
 > **Auto-close**: after calling `returnData`, PPTB automatically closes the callee window. The callee does **not** need to close itself.
@@ -523,9 +565,84 @@ await waitForImport(result.ImportJobId);
 
 > **Note:** `deploySolution` automatically supplies `PublishWorkflows` and `OverwriteUnmanagedCustomizations` with a default value of `false` when you do not specify them, aligning with Dataverse's ImportSolution requirements.
 
+## Power Platform API Examples
+
+The Power Platform API provides generic HTTP methods for all Power Platform Admin API categories:
+
+### Using Power Apps API
+
+```typescript
+// Get an admin app
+const app = await powerplatformAPI.PowerApps.Get("environments/{environmentId}/apps/{app}?api-version=2024-10-01");
+
+// List all apps in an environment
+const apps = await powerplatformAPI.PowerApps.Get("environments/{environmentId}/apps?api-version=2024-10-01");
+
+// Create a new app
+await powerplatformAPI.PowerApps.Post("environments/{environmentId}/apps?api-version=2024-10-01", {
+    name: "My App",
+    environmentId: "{environmentId}",
+});
+
+// Update an app
+await powerplatformAPI.PowerApps.Patch("environments/{environmentId}/apps/{appId}?api-version=2024-10-01", {
+    name: "Updated App Name",
+});
+
+// Delete an app
+await powerplatformAPI.PowerApps.Delete("environments/{environmentId}/apps/{appId}?api-version=2024-10-01");
+```
+
+### Using Power Automate API
+
+```typescript
+// List flows
+const flows = await powerplatformAPI.PowerAutomate.Get("environments/{environmentId}/flows?api-version=2024-10-01");
+
+// Get flow details
+const flow = await powerplatformAPI.PowerAutomate.Get("environments/{environmentId}/flows/{flowId}?api-version=2024-10-01");
+```
+
+### Using Environment Management API
+
+```typescript
+// List environments
+const environments = await powerplatformAPI.EnvironmentManagement.Get("environments?api-version=2024-10-01");
+
+// Get environment details
+const env = await powerplatformAPI.EnvironmentManagement.Get("environments/{environmentId}?api-version=2024-10-01");
+```
+
+### Using Governance API
+
+```typescript
+// Get governance data
+const data = await powerplatformAPI.Governance.Get("environments/{environmentId}/governance?api-version=2024-10-01");
+```
+
+### Available Categories
+
+The Power Platform API exposes the following categories, each with `Get`, `Post`, `Put`, `Patch`, and `Delete` methods:
+
+- **Analytics** - `https://api.powerplatform.com/analytics`
+- **AppManagement** - `https://api.powerplatform.com/appmanagement`
+- **Authorization** - `https://api.powerplatform.com/authorization`
+- **Connectivity** - `https://api.powerplatform.com/connectivity`
+- **CopilotStudio** - `https://api.powerplatform.com/copilotstudio`
+- **Dynamics** - `https://api.powerplatform.com/dynamics`
+- **EnvironmentManagement** - `https://api.powerplatform.com/environmentmanagement`
+- **Governance** - `https://api.powerplatform.com/governance`
+- **Licensing** - `https://api.powerplatform.com/licensing`
+- **PowerApps** - `https://api.powerplatform.com/powerapps`
+- **PowerAutomate** - `https://api.powerplatform.com/powerautomate`
+- **PowerPages** - `https://api.powerplatform.com/powerpages`
+- **ResourceQuery** - `https://api.powerplatform.com/resourcequery`
+- **UserManagement** - `https://api.powerplatform.com/usermanagement`
+- **WorkflowAgents** - `https://api.powerplatform.com/workflowagents`
+
 ## API Reference
 
-The Power Platform ToolBox exposes two main APIs to tools:
+The Power Platform ToolBox exposes three main APIs to tools:
 
 ### ToolBox API (`window.toolboxAPI`)
 
@@ -533,8 +650,9 @@ Core platform features organized into namespaces:
 
 #### Connections
 
-- **getActiveConnection()**: Promise<DataverseConnection | null>
-    - Returns the currently active Dataverse connection or null if none is active
+- **getActiveConnection()**: Promise<Connection | null>
+    - Returns the currently active connection or null if none is active
+    - Includes `enabledForPowerPlatformAPI` so tools can decide whether to use Power Platform API
 
 #### Utils
 
@@ -568,15 +686,6 @@ Core platform features organized into namespaces:
         );
         ```
 
-- **showLoading(message?: string)**: Promise<void>
-    - Displays a loading overlay with spinner in the tool's context
-    - Optional message parameter (defaults to "Loading...")
-    - Example: `await toolboxAPI.utils.showLoading('Fetching records...');`
-
-- **hideLoading()**: Promise<void>
-    - Hides the loading overlay
-    - Should be called in a finally block to ensure it's always hidden
-
 #### Terminal
 
 - **create(options: TerminalOptions)**: Promise<Terminal>
@@ -697,6 +806,50 @@ Complete HTTP client for interacting with Microsoft Dataverse:
     - Returns import job details including progress, completion status, and error information
     - Use to track the progress of a solution deployment initiated with deploySolution
 
+### Power Platform API (`window.powerplatformAPI`)
+
+Generic HTTP client for Power Platform Admin APIs covering all categories:
+
+#### Category Methods
+
+Each category (Analytics, AppManagement, Authorization, Connectivity, CopilotStudio, Dynamics, EnvironmentManagement, Governance, Licensing, PowerApps, PowerAutomate, PowerPages, ResourceQuery, UserManagement, WorkflowAgents) exposes:
+
+- **Get(path?, connectionTarget?, headers?)**: Promise<PowerPlatformResponse>
+    - Makes a GET request to the category endpoint
+    - Example: `powerplatformAPI.PowerApps.Get('environments/{environmentId}/apps/{app}?api-version=2024-10-01')`
+
+- **Post(path?, body?, connectionTarget?, headers?)**: Promise<PowerPlatformResponse>
+    - Makes a POST request to the category endpoint
+
+- **Put(path?, body?, connectionTarget?, headers?)**: Promise<PowerPlatformResponse>
+    - Makes a PUT request to the category endpoint
+
+- **Patch(path?, body?, connectionTarget?, headers?)**: Promise<PowerPlatformResponse>
+    - Makes a PATCH request to the category endpoint
+
+- **Delete(path?, connectionTarget?, headers?, body?)**: Promise<PowerPlatformResponse>
+    - Makes a DELETE request to the category endpoint
+
+Available categories and their base URLs:
+
+| Category              | Base URL                                              |
+| --------------------- | ----------------------------------------------------- |
+| Analytics             | `https://api.powerplatform.com/analytics`             |
+| AppManagement         | `https://api.powerplatform.com/appmanagement`         |
+| Authorization         | `https://api.powerplatform.com/authorization`         |
+| Connectivity          | `https://api.powerplatform.com/connectivity`          |
+| CopilotStudio         | `https://api.powerplatform.com/copilotstudio`         |
+| Dynamics              | `https://api.powerplatform.com/dynamics`              |
+| EnvironmentManagement | `https://api.powerplatform.com/environmentmanagement` |
+| Governance            | `https://api.powerplatform.com/governance`            |
+| Licensing             | `https://api.powerplatform.com/licensing`             |
+| PowerApps             | `https://api.powerplatform.com/powerapps`             |
+| PowerAutomate         | `https://api.powerplatform.com/powerautomate`         |
+| PowerPages            | `https://api.powerplatform.com/powerpages`            |
+| ResourceQuery         | `https://api.powerplatform.com/resourcequery`         |
+| UserManagement        | `https://api.powerplatform.com/usermanagement`        |
+| WorkflowAgents        | `https://api.powerplatform.com/workflowagents`        |
+
 ### Security Notes
 
 - **Access Tokens**: Tools do NOT have direct access to access tokens. All Dataverse operations are authenticated automatically by the platform.
diff --git a/packages/types/bin/pptb-validate.js b/packages/types/bin/pptb-validate.js
new file mode 100644
index 00000000..e6a25b7a
--- /dev/null
+++ b/packages/types/bin/pptb-validate.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require("@pptb/validate/cli");
diff --git a/packages/dataverseAPI.d.ts b/packages/types/dataverseAPI.d.ts
similarity index 99%
rename from packages/dataverseAPI.d.ts
rename to packages/types/dataverseAPI.d.ts
index d510701b..5fce133d 100644
--- a/packages/dataverseAPI.d.ts
+++ b/packages/types/dataverseAPI.d.ts
@@ -1544,6 +1544,12 @@ declare global {
          */
         dataverseAPI: DataverseAPI.API;
     }
+    interface GlobalThis {
+        /**
+         * Dataverse Web API accessible to headless tools via globalThis
+         */
+        dataverseAPI: DataverseAPI.API;
+    }
 }
 
 export = DataverseAPI;
diff --git a/packages/index.d.ts b/packages/types/index.d.ts
similarity index 81%
rename from packages/index.d.ts
rename to packages/types/index.d.ts
index 74025a35..61f64e25 100644
--- a/packages/index.d.ts
+++ b/packages/types/index.d.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/triple-slash-reference */
 /**
  * Power Platform ToolBox API Type Definitions
  *
@@ -16,9 +17,11 @@
 
 /// <reference path="./toolboxAPI.d.ts" />
 /// <reference path="./dataverseAPI.d.ts" />
+/// <reference path="./powerplatformAPI.d.ts" />
 /// <reference path="./pptbConfig.d.ts" />
 
 // Re-export all namespaces for convenience
 export * from "./dataverseAPI";
-export * from "./toolboxAPI";
+export * from "./powerplatformAPI";
 export * from "./pptbConfig";
+export * from "./toolboxAPI";
diff --git a/packages/package.json b/packages/types/package.json
similarity index 87%
rename from packages/package.json
rename to packages/types/package.json
index 616b2624..b0506c23 100644
--- a/packages/package.json
+++ b/packages/types/package.json
@@ -1,9 +1,10 @@
 {
   "name": "@pptb/types",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Type definitions for Power Platform ToolBox APIs and validity checks for tool packages",
   "main": "index.d.ts",
   "types": "index.d.ts",
+  "packageManager": "pnpm@10.18.3",
   "keywords": [
     "powerplatform",
     "pptb",
@@ -22,13 +23,16 @@
   "bin": {
     "pptb-validate": "./bin/pptb-validate.js"
   },
+  "dependencies": {
+    "@pptb/validate": "^0.0.2"
+  },
   "files": [
     "index.d.ts",
     "toolboxAPI.d.ts",
     "dataverseAPI.d.ts",
+    "powerplatformAPI.d.ts",
     "pptbConfig.d.ts",
     "bin/",
-    "lib/",
     "README.md"
   ],
   "scripts": {
diff --git a/packages/types/powerplatformAPI.d.ts b/packages/types/powerplatformAPI.d.ts
new file mode 100644
index 00000000..092150ef
--- /dev/null
+++ b/packages/types/powerplatformAPI.d.ts
@@ -0,0 +1,207 @@
+/**
+ * Power Platform ToolBox - Power Platform API Type Definitions
+ *
+ * Power Platform Admin APIs exposed to tools via window.powerplatformAPI
+ * https://learn.microsoft.com/en-us/rest/api/power-platform/
+ */
+
+declare namespace PowerPlatformAPI {
+    /**
+     * Power Platform API category response type
+     */
+    export interface PowerPlatformResponse {
+        [key: string]: unknown;
+    }
+
+    /**
+     * Generic HTTP method type
+     */
+    export type HttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+
+    /**
+     * Power Platform API category client interface
+     * Provides generic HTTP methods for each API category
+     */
+    export interface CategoryClient {
+        /**
+         * Make a GET request to the category endpoint
+         * @param path Relative path after the category base URL (e.g., "environments/{environmentId}/apps/{app}?api-version=2024-10-01")
+         * @param connectionTarget Optional connection target for multi-connection tools ('primary' or 'secondary'). Defaults to 'primary'.
+         * @param headers Optional custom headers
+         */
+        Get: (path?: string, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) => Promise<PowerPlatformResponse>;
+
+        /**
+         * Make a POST request to the category endpoint
+         * @param path Relative path after the category base URL
+         * @param body Optional request body
+         * @param connectionTarget Optional connection target for multi-connection tools ('primary' or 'secondary'). Defaults to 'primary'.
+         * @param headers Optional custom headers
+         */
+        Post: (path?: string, body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) => Promise<PowerPlatformResponse>;
+
+        /**
+         * Make a PUT request to the category endpoint
+         * @param path Relative path after the category base URL
+         * @param body Optional request body
+         * @param connectionTarget Optional connection target for multi-connection tools ('primary' or 'secondary'). Defaults to 'primary'.
+         * @param headers Optional custom headers
+         */
+        Put: (path?: string, body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) => Promise<PowerPlatformResponse>;
+
+        /**
+         * Make a PATCH request to the category endpoint
+         * @param path Relative path after the category base URL
+         * @param body Optional request body
+         * @param connectionTarget Optional connection target for multi-connection tools ('primary' or 'secondary'). Defaults to 'primary'.
+         * @param headers Optional custom headers
+         */
+        Patch: (path?: string, body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) => Promise<PowerPlatformResponse>;
+
+        /**
+         * Make a DELETE request to the category endpoint
+         * @param path Relative path after the category base URL
+         * @param connectionTarget Optional connection target for multi-connection tools ('primary' or 'secondary'). Defaults to 'primary'.
+         * @param headers Optional custom headers
+         * @param body Optional request body (for DELETE with payload)
+         */
+        Delete: (path?: string, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>, body?: unknown) => Promise<PowerPlatformResponse>;
+    }
+
+    /**
+     * Power Platform Analytics API
+     * https://api.powerplatform.com/analytics
+     */
+    export interface Analytics extends CategoryClient {}
+
+    /**
+     * Power Platform App Management API
+     * https://api.powerplatform.com/appmanagement
+     */
+    export interface AppManagement extends CategoryClient {}
+
+    /**
+     * Power Platform Authorization API
+     * https://api.powerplatform.com/authorization
+     */
+    export interface Authorization extends CategoryClient {}
+
+    /**
+     * Power Platform Connectivity API
+     * https://api.powerplatform.com/connectivity
+     */
+    export interface Connectivity extends CategoryClient {}
+
+    /**
+     * Power Platform Copilot Studio API
+     * https://api.powerplatform.com/copilotstudio
+     */
+    export interface CopilotStudio extends CategoryClient {}
+
+    /**
+     * Power Platform Dynamics API
+     * https://api.powerplatform.com/dynamics
+     */
+    export interface Dynamics extends CategoryClient {}
+
+    /**
+     * Power Platform Environment Management API
+     * https://api.powerplatform.com/environmentmanagement
+     */
+    export interface EnvironmentManagement extends CategoryClient {}
+
+    /**
+     * Power Platform Governance API
+     * https://api.powerplatform.com/governance
+     */
+    export interface Governance extends CategoryClient {}
+
+    /**
+     * Power Platform Licensing API
+     * https://api.powerplatform.com/licensing
+     */
+    export interface Licensing extends CategoryClient {}
+
+    /**
+     * Power Platform Power Apps API
+     * https://api.powerplatform.com/powerapps
+     */
+    export interface PowerApps extends CategoryClient {}
+
+    /**
+     * Power Platform Power Automate API
+     * https://api.powerplatform.com/powerautomate
+     */
+    export interface PowerAutomate extends CategoryClient {}
+
+    /**
+     * Power Platform Power Pages API
+     * https://api.powerplatform.com/powerpages
+     */
+    export interface PowerPages extends CategoryClient {}
+
+    /**
+     * Power Platform Resource Query API
+     * https://api.powerplatform.com/resourcequery
+     */
+    export interface ResourceQuery extends CategoryClient {}
+
+    /**
+     * Power Platform User Management API
+     * https://api.powerplatform.com/usermanagement
+     */
+    export interface UserManagement extends CategoryClient {}
+
+    /**
+     * Power Platform Workflow Agents API
+     * https://api.powerplatform.com/workflowagents
+     */
+    export interface WorkflowAgents extends CategoryClient {}
+
+    /**
+     * Main Power Platform API interface
+     * Each category exposes generic HTTP methods (Get, Post, Put, Patch, Delete)
+     */
+    export interface API {
+        Analytics: Analytics;
+        AppManagement: AppManagement;
+        Authorization: Authorization;
+        Connectivity: Connectivity;
+        CopilotStudio: CopilotStudio;
+        Dynamics: Dynamics;
+        EnvironmentManagement: EnvironmentManagement;
+        Governance: Governance;
+        Licensing: Licensing;
+        PowerApps: PowerApps;
+        PowerAutomate: PowerAutomate;
+        PowerPages: PowerPages;
+        ResourceQuery: ResourceQuery;
+        UserManagement: UserManagement;
+        WorkflowAgents: WorkflowAgents;
+    }
+}
+
+/**
+ * Global window interface extension for Power Platform API
+ */
+declare global {
+    interface GlobalThis {
+        /**
+         * Power Platform Admin API accessible to headless tools
+         */
+        powerplatformAPI: PowerPlatformAPI.API;
+    }
+
+    interface Window {
+        /**
+         * Power Platform Admin API accessible to tools
+         * @example
+         * // Get admin app from Power Apps
+         * const app = await powerplatformAPI.PowerApps.Get('environments/{environmentId}/apps/{app}?api-version=2024-10-01');
+         */
+        powerplatformAPI: PowerPlatformAPI.API;
+    }
+}
+
+export = PowerPlatformAPI;
+export as namespace PowerPlatformAPI;
diff --git a/packages/pptbConfig.d.ts b/packages/types/pptbConfig.d.ts
similarity index 78%
rename from packages/pptbConfig.d.ts
rename to packages/types/pptbConfig.d.ts
index 334a54cd..42887d59 100644
--- a/packages/pptbConfig.d.ts
+++ b/packages/types/pptbConfig.d.ts
@@ -25,6 +25,13 @@
  *         "error": { "type": "string" }
  *       }
  *     }
+ *   },
+ *   "agents": {
+ *     "version": "1.0.0",
+ *     "invokable": true,
+ *     "modes": ["one-way", "two-way"],
+ *     "defaultMode": "two-way",
+ *     "timeoutMS": 12000
  *   }
  * }
  * ```
@@ -49,14 +56,7 @@
  * | `plugin-inspector`   | Inspect or manage plugins and assemblies              |
  * | `pcf-control-builder`| Build or scaffold PCF controls                        |
  */
-export type KnownCapabilityTag =
-    | "fetchxml"
-    | "entity-picker"
-    | "record-selector"
-    | "solution-selector"
-    | "webresource-editor"
-    | "plugin-inspector"
-    | "pcf-control-builder";
+export type KnownCapabilityTag = "fetchxml" | "entity-picker" | "record-selector" | "solution-selector" | "webresource-editor" | "plugin-inspector" | "pcf-control-builder";
 
 /**
  * A capability tag string accepted by `invocation.capabilities` and
@@ -72,7 +72,7 @@ export type KnownCapabilityTag =
  * { "invocation": { "version": "1.0.0", "capabilities": ["fetchxml", "entity-picker"] } }
  * ```
  */
-export type CapabilityTag = KnownCapabilityTag | (string & {});
+export type CapabilityTag = KnownCapabilityTag | string;
 
 /** A JSON-schema-style property descriptor used inside invocation definitions. */
 export interface JsonSchemaProperty {
@@ -101,6 +101,30 @@ export interface JsonSchemaObject {
  * - `returnTopic` describes the data this tool will resolve back to its caller
  *   when it finishes.
  */
+export type AgentInvocationMode = "one-way" | "two-way";
+
+/**
+ * Agent-specific launch contract for external automation callers.
+ *
+ * - `version`: semantic version for the agent-facing contract.
+ * - `invokable`: opt-in flag that exposes the tool to the MCP server.
+ * - `modes`: supported MCP invocation modes for this tool.
+ * - `defaultMode`: fallback mode when the caller does not specify one.
+ * - `timeoutMS`: optional timeout hint, in milliseconds, for two-way calls.
+ */
+export interface AgentsConfig {
+    /** Semantic version of this agent contract. */
+    version: string;
+    /** Whether the tool may be invoked by an external agent. */
+    invokable?: boolean;
+    /** Invocation modes supported by the tool when called by an agent. */
+    modes?: AgentInvocationMode[];
+    /** Default mode used when an agent does not request a mode explicitly. */
+    defaultMode?: AgentInvocationMode;
+    /** Optional timeout hint, in milliseconds, for agent-driven two-way calls. */
+    timeoutMS?: number;
+}
+
 export interface InvocationConfig {
     /**
      * Semantic version of this invocation contract (e.g. "1.0.0").
@@ -142,4 +166,6 @@ export interface InvocationConfig {
 export interface PPTBConfig {
     /** Invocation contract – how this tool can be called by other tools. */
     invocation?: InvocationConfig;
+    /** Agent contract – how this tool can be called by external automation. */
+    agents?: AgentsConfig;
 }
diff --git a/packages/toolboxAPI.d.ts b/packages/types/toolboxAPI.d.ts
similarity index 90%
rename from packages/toolboxAPI.d.ts
rename to packages/types/toolboxAPI.d.ts
index 1036b4da..a967e63b 100644
--- a/packages/toolboxAPI.d.ts
+++ b/packages/types/toolboxAPI.d.ts
@@ -16,6 +16,18 @@ declare namespace ToolBoxAPI {
         connectionId?: string | null;
         secondaryConnectionUrl?: string | null;
         secondaryConnectionId?: string | null;
+        /**
+         * Invocation metadata injected by PPTB when the tool is launched by another
+         * tool or by the MCP server. Tools should treat this as optional and
+         * branch on `source`/`mode` rather than assuming it is always present.
+         */
+        invocationContext?: {
+            source?: "tool" | "mcp";
+            mode?: "one-way" | "two-way";
+            correlationId?: string;
+            timeoutMs?: number;
+            expectsResponse?: boolean;
+        };
     }
 
     /**
@@ -75,9 +87,9 @@ declare namespace ToolBoxAPI {
     }
 
     /**
-     * Dataverse connection configuration
+     * Power Platform ToolBox connection configuration
      */
-    export interface DataverseConnection {
+    export interface Connection {
         id: string;
         name: string;
         url: string;
@@ -85,6 +97,8 @@ declare namespace ToolBoxAPI {
         category?: string;
         environmentColor?: string;
         categoryColor?: string;
+        enabledForPowerPlatformAPI?: boolean;
+        scopesForPowerPlatformAPI?: string[];
         createdAt?: string;
         lastUsedAt?: string;
         /**
@@ -95,6 +109,11 @@ declare namespace ToolBoxAPI {
         isActive?: boolean;
     }
 
+    /**
+     * @deprecated Use Connection instead.
+     */
+    export type DataverseConnection = Connection;
+
     /**
      * Tool information
      */
@@ -150,12 +169,12 @@ declare namespace ToolBoxAPI {
         /**
          * Get the currently active Dataverse connection
          */
-        getActiveConnection: () => Promise<DataverseConnection | null>;
+        getActiveConnection: () => Promise<Connection | null>;
 
         /**
          * Get the secondary connection for multi-connection tools
          */
-        getSecondaryConnection: () => Promise<DataverseConnection | null>;
+        getSecondaryConnection: () => Promise<Connection | null>;
     }
 
     /**
@@ -455,16 +474,15 @@ declare namespace ToolBoxAPI {
         getLaunchContext: () => Promise<Record<string, unknown> | null>;
 
         /**
-         * Returns data back to the caller tool that launched this tool.
+         * Return data back to the tool that launched this one. If the tool was not
+         * launched by another tool, this is a no-op.
          *
-         * The value resolves the `Promise` returned by the caller's
-         * `invocation.launchTool()` call.  **After calling `returnData`, PPTB
-         * automatically closes the callee window** — the callee does not need to
-         * close itself.
-         *
-         * If this tool was not launched by another tool, the call is a no-op.
+         * For MCP launches, one-way mode may omit a payload entirely from the
+         * caller's response lifecycle, but the tool can still call `returnData()` to
+         * complete a local flow if it wants to.
          *
          * @param returnData The data to pass back to the caller
+         * @returns Promise that resolves when the data has been handed off
          */
         returnData: (returnData: Record<string, unknown>) => Promise<void>;
 
@@ -498,7 +516,11 @@ declare namespace ToolBoxAPI {
          * @param prefillData  Data to pre-populate the target tool's state
          * @param options      Optional connection overrides and launch flags
          */
-        launchTool: (targetToolId: string, prefillData?: Record<string, unknown>, options?: { primaryConnectionId?: string | null; secondaryConnectionId?: string | null; noReturn?: boolean }) => Promise<unknown>;
+        launchTool: (
+            targetToolId: string,
+            prefillData?: Record<string, unknown>,
+            options?: { primaryConnectionId?: string | null; secondaryConnectionId?: string | null; noReturn?: boolean },
+        ) => Promise<unknown>;
 
         /**
          * Find installed tools that declare a given capability tag in their
@@ -547,6 +569,19 @@ declare namespace ToolBoxAPI {
  * Global window interface extension for ToolBox tools
  */
 declare global {
+    interface GlobalThis {
+        /**
+         * The organized ToolBox API for headless tools.
+         * Windowed tools should continue to use window.toolboxAPI.
+         */
+        toolboxAPI: ToolBoxAPI.API;
+
+        /**
+         * Tool context available at startup
+         */
+        TOOLBOX_CONTEXT?: ToolBoxAPI.ToolContext;
+    }
+
     interface Window {
         /**
          * The organized ToolBox API for tools
diff --git a/packages/validation/package.json b/packages/validation/package.json
new file mode 100644
index 00000000..49b8f931
--- /dev/null
+++ b/packages/validation/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "@pptb/validate",
+  "version": "1.0.0",
+  "description": "Validation utilities for Power Platform ToolBox tool packages",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "keywords": [
+    "powerplatform",
+    "pptb",
+    "toolbox",
+    "validate",
+    "typescript",
+    "dataverse"
+  ],
+  "author": "Power Platform ToolBox",
+  "license": "GPL-3.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/PowerPlatformToolBox/desktop-app.git",
+    "directory": "packages"
+  },
+  "packageManager": "pnpm@10.18.3",
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./cli": "./dist/cli.js",
+    "./npm": {
+      "default": "./dist/npm.js",
+      "types": "./dist/npm.d.ts"
+    }
+  },
+  "bin": {
+    "pptb-validate": "./dist/cli.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build",
+    "version:beta": "pnpm version prerelease --preid beta --no-git-tag-version",
+    "version:stable": "pnpm version patch --no-git-tag-version",
+    "publish:stable": "pnpm publish --access public --tag latest --no-git-checks",
+    "publish:beta": "pnpm publish --access public --tag beta --no-git-checks"
+  },
+  "devDependencies": {
+    "@types/node": "^20.19.21",
+    "@types/tar": "^7.0.87",
+    "typescript": "^5.4.0"
+  },
+  "dependencies": {
+    "tar": "^7.5.16"
+  }
+}
\ No newline at end of file
diff --git a/packages/validation/src/cli.ts b/packages/validation/src/cli.ts
new file mode 100644
index 00000000..230d30b2
--- /dev/null
+++ b/packages/validation/src/cli.ts
@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+
+import * as fs from "fs";
+import * as path from "path";
+import { validatePackageJson, validatePPTBConfig } from "./validate";
+
+async function main(): Promise<void> {
+    const cwd = process.cwd();
+
+    // Print the pptb-validate version from package.json
+    const cliPackageJsonPath = path.join(__dirname, "..", "package.json");
+    if (fs.existsSync(cliPackageJsonPath)) {
+        const cliPackageJson = JSON.parse(fs.readFileSync(cliPackageJsonPath, "utf-8"));
+        process.stdout.write(`pptb-validate version ${cliPackageJson.version}\n`);
+    }
+
+    const packageJsonPath = path.join(cwd, "package.json");
+    if (!fs.existsSync(packageJsonPath)) {
+        process.stderr.write("No package.json found in current directory\n");
+        process.exit(1);
+    }
+
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+    const packageResult = await validatePackageJson(packageJson, { skipUrlChecks: false });
+
+    console.log("\n📦 package.json validation");
+    printResult(packageResult);
+
+    const pptbConfigPath = path.join(cwd, "pptb.config.json");
+    if (fs.existsSync(pptbConfigPath)) {
+        const pptbConfig = JSON.parse(fs.readFileSync(pptbConfigPath, "utf-8"));
+        const configResult = validatePPTBConfig(pptbConfig);
+        console.log("\n⚙️  pptb.config.json validation");
+        printResult(configResult);
+
+        if (!configResult.valid) process.exit(1);
+    } else {
+        console.log("\nℹ️  No pptb.config.json found (optional)");
+    }
+
+    if (!packageResult.valid) process.exit(1);
+}
+
+function printResult(result: { valid: boolean; errors: string[]; warnings: string[] }): void {
+    if (result.errors.length === 0 && result.warnings.length === 0) {
+        console.log("  ✅ All checks passed");
+        return;
+    }
+    result.errors.forEach((e) => console.error(`  ❌ ${e}`));
+    result.warnings.forEach((w) => console.warn(`  ⚠️  ${w}`));
+    if (result.valid) console.log("  ✅ Valid (with warnings)");
+}
+
+main().catch((err) => {
+    console.error("Unexpected error:", err);
+    process.exit(1);
+});
diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.ts
new file mode 100644
index 00000000..478360d1
--- /dev/null
+++ b/packages/validation/src/index.ts
@@ -0,0 +1,5 @@
+// Public API — validation only.
+// npm.ts is intentionally not re-exported here; import it directly when needed.
+export { APPROVED_LICENSES, isValidUrl, KNOWN_CAPABILITY_TAGS, VALID_MULTI_CONNECTION_VALUES, validatePackageJson, validatePPTBConfig } from "./validate";
+
+export type { Configurations, Contributor, CspExceptions, Features, InvocationConfig, PPTBConfig, ToolPackageJson, ValidatePackageJsonOptions, ValidationResult } from "./validate";
diff --git a/packages/validation/src/npm.ts b/packages/validation/src/npm.ts
new file mode 100644
index 00000000..af7e2ad0
--- /dev/null
+++ b/packages/validation/src/npm.ts
@@ -0,0 +1,119 @@
+// Node-only helpers — npm registry + tarball inspection.
+// Not imported by validate.ts so web consumers that only need validation
+// don't pull in Node-specific modules.
+
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import * as tar from "tar";
+import { ToolPackageJson } from "./validate";
+
+// export interface NpmPackageInfo {
+//     name: string;
+//     version: string;
+//     description?: string;
+//     license?: string;
+//     displayName?: string;
+// }
+
+interface NpmRegistryVersionData {
+    name: string;
+    version: string;
+    description?: string;
+    license?: string;
+    displayName?: string;
+    dist: { tarball: string };
+}
+
+export async function fetchNpmPackageMetadata(
+    packageName: string,
+): Promise<{ success: true; data: { packageInfo: ToolPackageJson; versionData: NpmRegistryVersionData; latestVersion: string; tarballUrl: string } } | { success: false; error: string }> {
+    try {
+        const response = await fetch(`https://registry.npmjs.org/${encodeURIComponent(packageName)}`, { headers: { Accept: "application/json" } });
+        if (!response.ok) {
+            return response.status === 404 ? { success: false, error: `Package "${packageName}" not found on npm` } : { success: false, error: `Failed to fetch package: HTTP ${response.status}` };
+        }
+        const packageData: any = await response.json();
+        const latestVersion = packageData["dist-tags"]?.latest;
+        if (!latestVersion) {
+            return { success: false, error: `Package "${packageName}" has no latest version` };
+        }
+        const versionData = packageData.versions?.[latestVersion];
+        if (!versionData) {
+            return { success: false, error: `Could not find version data for ${latestVersion}` };
+        }
+        const tarballUrl = versionData.dist?.tarball;
+        if (!tarballUrl) {
+            return { success: false, error: "Could not find tarball URL" };
+        }
+        const packageInfo: ToolPackageJson = {
+            name: versionData.name,
+            version: versionData.version,
+            description: versionData.description,
+            license: versionData.license,
+            displayName: versionData.displayName,
+            contributors: versionData.contributors,
+            cspExceptions: versionData.cspExceptions,
+            configurations: versionData.configurations,
+            features: versionData.features,
+            icon: versionData.icon,
+        };
+        return { success: true, data: { packageInfo, versionData, latestVersion, tarballUrl } };
+    } catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : "Unknown error fetching package metadata",
+        };
+    }
+}
+
+export interface PackageStructureCheck {
+    hasNpmShrinkwrap: boolean;
+    hasDistFolder: boolean;
+    hasDistIndexHtml: boolean;
+}
+
+export async function validatePackageStructure(packageName: string): Promise<{ success: true; data: PackageStructureCheck } | { success: false; error: string }> {
+    const metadataResult = await fetchNpmPackageMetadata(packageName);
+    if (!metadataResult.success) return metadataResult;
+
+    const tarballResponse = await fetch(metadataResult.data.tarballUrl);
+    if (!tarballResponse.ok) {
+        return { success: false, error: `Failed to download tarball: HTTP ${tarballResponse.status}` };
+    }
+
+    const tarballBuffer = await tarballResponse.arrayBuffer();
+    const tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "pptb-validate-"));
+
+    try {
+        const tarballPath = path.join(tmpDir, "package.tgz");
+        await fs.promises.writeFile(tarballPath, Buffer.from(tarballBuffer));
+        const extractDir = path.join(tmpDir, "extracted");
+        await fs.promises.mkdir(extractDir, { recursive: true });
+        await tar.x({ file: tarballPath, cwd: extractDir });
+
+        const packageDir = path.join(extractDir, "package");
+
+        const check = async (p: string, isDir = false): Promise<boolean> => {
+            try {
+                const stat = await fs.promises.stat(p);
+                return isDir ? stat.isDirectory() : stat.isFile();
+            } catch {
+                return false;
+            }
+        };
+
+        const hasDistFolder = await check(path.join(packageDir, "dist"), true);
+
+        return {
+            success: true,
+            data: {
+                hasNpmShrinkwrap: await check(path.join(packageDir, "npm-shrinkwrap.json")),
+                hasDistFolder,
+                hasDistIndexHtml: hasDistFolder ? await check(path.join(packageDir, "dist", "index.html")) : false,
+            },
+        };
+    } finally {
+        await fs.promises.rm(tmpDir, { recursive: true, force: true });
+    }
+}
diff --git a/packages/validation/src/validate.ts b/packages/validation/src/validate.ts
new file mode 100644
index 00000000..b8c0bc4f
--- /dev/null
+++ b/packages/validation/src/validate.ts
@@ -0,0 +1,499 @@
+// @pptb/validate — core validation logic
+// Single source of truth for both the pptb-validate CLI and the web intake platform.
+
+export interface Contributor {
+    name: string;
+    url?: string;
+}
+
+export interface CspExceptions {
+    "connect-src"?: string[];
+    "script-src"?: string[];
+    "style-src"?: string[];
+    "img-src"?: string[];
+    "font-src"?: string[];
+    "frame-src"?: string[];
+    "media-src"?: string[]; // present in CLI package, was missing from web
+}
+
+export interface Configurations {
+    repository?: string;
+    website?: string;
+    funding?: string;
+    readmeUrl?: string;
+}
+
+export interface Features {
+    multiConnection?: "required" | "optional" | "none";
+    minAPI?: string;
+    enabledForPowerPlatformAPI?: boolean;
+}
+
+export interface ToolPackageJson {
+    name: string;
+    version: string;
+    displayName?: string;
+    description?: string;
+    contributors?: Contributor[];
+    cspExceptions?: CspExceptions;
+    license?: string;
+    icon?: string;
+    configurations?: Configurations;
+    features?: Features;
+}
+
+export interface ValidationResult {
+    valid: boolean;
+    errors: string[];
+    warnings: string[];
+    packageInfo?: ToolPackageJson | PPTBConfig; // present when valid, used for passing info from package.json validation to CLI for pptb.config.json validation
+}
+
+export interface ValidatePackageJsonOptions {
+    skipUrlChecks?: boolean; // present in CLI package, was missing from web
+}
+
+export type JsonSchemaProperty = {
+    type?: string;
+    enum?: string[];
+    items?: object;
+};
+
+export type JsonSchemaObject = {
+    properties?: Record<string, JsonSchemaProperty>;
+};
+
+export type AgentInvocationMode = "one-way" | "two-way";
+
+export interface AgentsConfig {
+    version: string;
+    invokable?: boolean;
+    modes?: AgentInvocationMode[];
+    defaultMode?: AgentInvocationMode;
+    timeoutMS?: number;
+}
+
+export interface InvocationConfig {
+    version: string;
+    prefill?: JsonSchemaObject;
+    returnTopic?: JsonSchemaObject;
+    capabilities?: string[];
+}
+
+export interface PPTBConfig {
+    invocation?: InvocationConfig;
+    agents?: AgentsConfig;
+}
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+export const APPROVED_LICENSES = ["MIT", "Apache-2.0", "BSD-2-Clause", "BSD-3-Clause", "GPL-2.0", "GPL-3.0", "LGPL-3.0", "ISC", "AGPL-3.0-only"];
+
+export const VALID_MULTI_CONNECTION_VALUES = ["required", "optional", "none"] as const;
+
+/**
+ * Keep in sync with BUILT_IN_CAPABILITY_TAGS in
+ * src/main/managers/toolRegistryManager.ts in the desktop app.
+ */
+export const KNOWN_CAPABILITY_TAGS = ["fetchxml", "entity-picker", "record-selector", "solution-selector", "webresource-editor", "plugin-inspector", "pcf-control-builder"];
+
+const SEMVER_REGEX = /^\d+\.\d+\.\d+(-[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;
+
+const VALID_CSP_DIRECTIVES = [
+    "connect-src",
+    "script-src",
+    "style-src",
+    "img-src",
+    "font-src",
+    "frame-src",
+    "media-src", // present in CLI package, was missing from web
+];
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+export function isValidUrl(url: string): boolean {
+    try {
+        new URL(url);
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+function isGithubDomain(url: string): boolean {
+    try {
+        const hostname = new URL(url).hostname.toLowerCase();
+        return hostname === "github.com" || hostname.endsWith(".github.com");
+    } catch {
+        return false;
+    }
+}
+
+function validateIconPath(fieldName: string, iconPath: string, errors: string[]): void {
+    if (iconPath.startsWith("http://") || iconPath.startsWith("https://")) {
+        errors.push(`${fieldName} cannot be an HTTP(S) URL - icons must be bundled under dist`);
+        return;
+    }
+    if (iconPath.startsWith("/")) {
+        errors.push(`${fieldName} must be a relative path (e.g., 'icon.svg' or 'icons/icon.svg')`);
+        return;
+    }
+    // Windows absolute paths — present in CLI package, was missing from web
+    if (/^[a-zA-Z]:/.test(iconPath)) {
+        errors.push(`${fieldName} must be a relative path (e.g., 'icon.svg' or 'icons/icon.svg')`);
+        return;
+    }
+    // Backslashes — present in CLI package, was missing from web
+    if (iconPath.includes("\\")) {
+        errors.push(`${fieldName} must use forward slashes, not backslashes (e.g., 'icons/icon.svg')`);
+        return;
+    }
+    if (iconPath.includes("..")) {
+        errors.push(`${fieldName} cannot contain '..' (path traversal not allowed)`);
+        return;
+    }
+    if (!iconPath.toLowerCase().endsWith(".svg")) {
+        errors.push(`${fieldName} must be an SVG file with .svg extension`);
+    }
+}
+
+async function isUrlAccessible(url: string): Promise<boolean> {
+    try {
+        const response = await fetch(url, { method: "HEAD", redirect: "follow" });
+        return response.ok;
+    } catch {
+        return false;
+    }
+}
+
+function validateJsonSchemaProperties(fieldName: string, properties: unknown, errors: string[]): void {
+    if (properties === null || typeof properties !== "object" || Array.isArray(properties)) {
+        errors.push(`${fieldName}.properties must be a non-array object`);
+        return;
+    }
+
+    for (const [key, value] of Object.entries(properties as Record<string, unknown>)) {
+        if (value === null || typeof value !== "object" || Array.isArray(value)) {
+            errors.push(`${fieldName}.properties.${key} must be an object`);
+            continue;
+        }
+        const prop = value as Record<string, unknown>;
+        if (prop.type !== undefined && typeof prop.type !== "string") {
+            errors.push(`${fieldName}.properties.${key}.type must be a string`);
+        }
+        if (prop.enum !== undefined) {
+            if (!Array.isArray(prop.enum)) {
+                errors.push(`${fieldName}.properties.${key}.enum must be an array`);
+            } else if (prop.enum.length === 0) {
+                errors.push(`${fieldName}.properties.${key}.enum must not be empty`);
+            }
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// validatePackageJson
+// ---------------------------------------------------------------------------
+
+export async function validatePackageJson(packageJson: ToolPackageJson, options: ValidatePackageJsonOptions = {}): Promise<ValidationResult> {
+    const { skipUrlChecks = false } = options;
+    const errors: string[] = [];
+    const warnings: string[] = [];
+
+    if (!packageJson.name || typeof packageJson.name !== "string") {
+        errors.push("Package name is required and must be a string");
+    }
+    if (!packageJson.version || typeof packageJson.version !== "string") {
+        errors.push("Package version is required and must be a string");
+    }
+    if (!packageJson.displayName || typeof packageJson.displayName !== "string") {
+        errors.push("displayName is required and must be a string");
+    }
+    if (!packageJson.description || typeof packageJson.description !== "string") {
+        errors.push("description is required and must be a string");
+    }
+
+    // License
+    if (!packageJson.license) {
+        errors.push("license is required");
+    } else if (!APPROVED_LICENSES.includes(packageJson.license)) {
+        errors.push(`License "${packageJson.license}" is not in the approved list. Approved licenses: ${APPROVED_LICENSES.join(", ")}`);
+    }
+
+    // Icon — warn when absent (present in CLI package, was missing from web)
+    if (packageJson.icon === undefined || packageJson.icon === null) {
+        warnings.push("icon is not set; consider adding a bundled SVG icon so your tool displays properly in the marketplace");
+    } else if (typeof packageJson.icon !== "string") {
+        errors.push("icon must be a string (relative path to bundled SVG under dist)");
+    } else {
+        validateIconPath("icon", packageJson.icon, errors);
+    }
+
+    // Contributors
+    if (!packageJson.contributors || !Array.isArray(packageJson.contributors)) {
+        errors.push("contributors is required and must be an array");
+    } else if (packageJson.contributors.length === 0) {
+        errors.push("At least one contributor is required");
+    } else {
+        packageJson.contributors.forEach((contributor, index) => {
+            if (!contributor.name || typeof contributor.name !== "string") {
+                errors.push(`Contributor at index ${index} must have a name`);
+            }
+            if (contributor.url && !isValidUrl(contributor.url)) {
+                warnings.push(`Contributor "${contributor.name}" has an invalid URL`);
+            }
+        });
+    }
+
+    // Configurations
+    if (!packageJson.configurations || typeof packageJson.configurations !== "object") {
+        errors.push("configurations is required and must include repository and readmeUrl");
+    } else {
+        const configs = packageJson.configurations;
+
+        if ((configs as Record<string, unknown>).iconUrl !== undefined) {
+            errors.push("configurations.iconUrl is no longer supported; use top-level 'icon' for bundled SVG path");
+        }
+
+        if (!configs.repository || typeof configs.repository !== "string") {
+            errors.push("configurations.repository is required and must be a URL");
+        } else if (!isValidUrl(configs.repository)) {
+            errors.push("configurations.repository has an invalid URL format");
+        } else if (!skipUrlChecks) {
+            if (!(await isUrlAccessible(configs.repository))) {
+                errors.push("configurations.repository URL is not accessible");
+            }
+        }
+
+        if (!configs.website) {
+            warnings.push("configurations.website is not set; consider adding a URL where users can learn more about your tool");
+        } else if (!isValidUrl(configs.website)) {
+            warnings.push("configurations.website has an invalid URL format");
+        } else if (!skipUrlChecks) {
+            if (!(await isUrlAccessible(configs.website))) {
+                warnings.push("configurations.website URL is not accessible");
+            }
+        }
+
+        if (configs.funding) {
+            if (!isValidUrl(configs.funding)) {
+                warnings.push("configurations.funding has an invalid URL format");
+            } else if (!skipUrlChecks) {
+                if (!(await isUrlAccessible(configs.funding))) {
+                    warnings.push("configurations.funding URL is not accessible");
+                }
+            }
+        }
+
+        if (!configs.readmeUrl || typeof configs.readmeUrl !== "string") {
+            errors.push("configurations.readmeUrl is required and must be a URL");
+        } else if (!isValidUrl(configs.readmeUrl)) {
+            errors.push("configurations.readmeUrl has an invalid URL format");
+        } else if (isGithubDomain(configs.readmeUrl)) {
+            errors.push("configurations.readmeUrl cannot be hosted on github.com; use raw.githubusercontent.com or another domain");
+        } else if (!skipUrlChecks) {
+            if (!(await isUrlAccessible(configs.readmeUrl))) {
+                errors.push("configurations.readmeUrl is not accessible");
+            }
+        }
+    }
+
+    // CSP exceptions
+    if (packageJson.cspExceptions) {
+        const csp = packageJson.cspExceptions;
+        if (typeof csp !== "object" || csp === null || Array.isArray(csp)) {
+            errors.push("cspExceptions must be an object mapping CSP directives to arrays of strings");
+        } else {
+            if (Object.keys(csp).length === 0) {
+                errors.push("cspExceptions cannot be empty. If CSP exceptions are not needed, remove the cspExceptions field");
+            }
+            for (const directive of Object.keys(csp)) {
+                if (!VALID_CSP_DIRECTIVES.includes(directive)) {
+                    warnings.push(`Unknown CSP directive: ${directive}`);
+                }
+                const values = csp[directive as keyof CspExceptions];
+                if (values && !Array.isArray(values)) {
+                    errors.push(`CSP directive "${directive}" must be an array of strings`);
+                } else if (values && values.length === 0) {
+                    errors.push(`CSP directive "${directive}" cannot be an empty array`);
+                }
+            }
+        }
+    }
+
+    // Features
+    if (packageJson.features !== undefined) {
+        const features = packageJson.features;
+        if (features === null || typeof features !== "object" || Array.isArray(features)) {
+            errors.push("features must be a non-array object with optional 'multiConnection', 'minAPI', and 'enabledForPowerPlatformAPI' properties");
+        } else {
+            const VALID_FEATURE_KEYS = ["multiConnection", "minAPI", "enabledForPowerPlatformAPI"];
+            const invalidKeys = Object.keys(features).filter((k) => !VALID_FEATURE_KEYS.includes(k));
+            if (invalidKeys.length > 0) {
+                errors.push(`features can only contain ${VALID_FEATURE_KEYS.map((k) => `'${k}'`).join(", ")} properties. Invalid properties: ${invalidKeys.join(", ")}`);
+            }
+            if (features.multiConnection === undefined) {
+                errors.push("features.multiConnection is required when features object is provided");
+            } else if (!(VALID_MULTI_CONNECTION_VALUES as readonly string[]).includes(features.multiConnection)) {
+                errors.push(`features.multiConnection must be one of: ${VALID_MULTI_CONNECTION_VALUES.join(", ")}`);
+            }
+            if (features.minAPI !== undefined) {
+                if (typeof features.minAPI !== "string" || !SEMVER_REGEX.test(features.minAPI)) {
+                    errors.push("features.minAPI must be a valid semantic version string (e.g., '1.0.0')");
+                }
+            }
+            if (features.enabledForPowerPlatformAPI !== undefined) {
+                if (typeof features.enabledForPowerPlatformAPI !== "boolean") {
+                    errors.push("features.enabledForPowerPlatformAPI must be a boolean (true or false)");
+                }
+            }
+        }
+    }
+
+    const valid = errors.length === 0;
+    return {
+        valid,
+        errors,
+        warnings,
+        packageInfo: valid
+            ? {
+                  name: packageJson.name,
+                  version: packageJson.version,
+                  displayName: packageJson.displayName,
+                  description: packageJson.description,
+                  license: packageJson.license,
+                  contributors: packageJson.contributors,
+                  cspExceptions: packageJson.cspExceptions,
+                  icon: packageJson.icon,
+                  configurations: packageJson.configurations,
+                  features: packageJson.features,
+              }
+            : undefined,
+    };
+}
+
+// ---------------------------------------------------------------------------
+// validatePPTBConfig
+// ---------------------------------------------------------------------------
+
+export function validatePPTBConfig(config: PPTBConfig): ValidationResult {
+    const errors: string[] = [];
+    const warnings: string[] = [];
+
+    if (config === null || typeof config !== "object" || Array.isArray(config)) {
+        errors.push("pptb.config.json must be a JSON object");
+        return { valid: false, errors, warnings };
+    }
+
+    const VALID_ROOT_KEYS = ["invocation", "agents"];
+    const unknownRootKeys = Object.keys(config).filter((k) => !VALID_ROOT_KEYS.includes(k));
+    if (unknownRootKeys.length > 0) {
+        warnings.push(`pptb.config.json contains unrecognised root keys: ${unknownRootKeys.join(", ")}`);
+    }
+
+    if (config.invocation !== undefined) {
+        const inv = config.invocation;
+        if (inv === null || typeof inv !== "object" || Array.isArray(inv)) {
+            errors.push("invocation must be a non-array object");
+        } else {
+            if (inv.version === undefined || inv.version === null) {
+                errors.push("invocation.version is required");
+            } else if (typeof inv.version !== "string") {
+                errors.push("invocation.version must be a string");
+            } else if (!SEMVER_REGEX.test(inv.version)) {
+                errors.push(`invocation.version "${inv.version}" is not a valid semantic version string (e.g. "1.0.0")`);
+            }
+
+            if (inv.prefill !== undefined) {
+                if (inv.prefill === null || typeof inv.prefill !== "object" || Array.isArray(inv.prefill)) {
+                    errors.push("invocation.prefill must be a non-array object");
+                } else if (inv.prefill.properties !== undefined) {
+                    validateJsonSchemaProperties("invocation.prefill", inv.prefill.properties, errors);
+                }
+            }
+
+            if (inv.returnTopic !== undefined) {
+                if (inv.returnTopic === null || typeof inv.returnTopic !== "object" || Array.isArray(inv.returnTopic)) {
+                    errors.push("invocation.returnTopic must be a non-array object");
+                } else if (inv.returnTopic.properties !== undefined) {
+                    validateJsonSchemaProperties("invocation.returnTopic", inv.returnTopic.properties, errors);
+                }
+            }
+
+            if (inv.capabilities !== undefined) {
+                if (!Array.isArray(inv.capabilities)) {
+                    errors.push("invocation.capabilities must be an array");
+                } else {
+                    inv.capabilities.forEach((cap, idx) => {
+                        if (typeof cap !== "string" || cap.trim().length === 0) {
+                            errors.push(`invocation.capabilities[${idx}] must be a non-empty string`);
+                        } else if (!KNOWN_CAPABILITY_TAGS.includes(cap.trim())) {
+                            warnings.push(
+                                `invocation.capabilities[${idx}] "${cap}" is not a recognised capability tag. ` +
+                                    `Known tags: ${KNOWN_CAPABILITY_TAGS.join(", ")}. ` +
+                                    "If this is a new tag, ensure it has been added to the capability registry.",
+                            );
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    if (config.agents !== undefined) {
+        const agents = config.agents;
+        if (agents === null || typeof agents !== "object" || Array.isArray(agents)) {
+            errors.push("agents must be a non-array object");
+        } else {
+            if (agents.version === undefined || agents.version === null) {
+                errors.push("agents.version is required");
+            } else if (typeof agents.version !== "string") {
+                errors.push("agents.version must be a string");
+            } else if (!SEMVER_REGEX.test(agents.version)) {
+                errors.push(`agents.version "${agents.version}" is not a valid semantic version string (e.g. "1.0.0")`);
+            }
+
+            if (agents.invokable !== undefined && typeof agents.invokable !== "boolean") {
+                errors.push("agents.invokable must be a boolean (true or false)");
+            }
+
+            if (agents.modes !== undefined) {
+                if (!Array.isArray(agents.modes)) {
+                    errors.push("agents.modes must be an array");
+                } else {
+                    agents.modes.forEach((mode, idx) => {
+                        if (mode !== "one-way" && mode !== "two-way") {
+                            errors.push(`agents.modes[${idx}] must be either \"one-way\" or \"two-way\"`);
+                        }
+                    });
+                }
+            }
+
+            if (agents.defaultMode !== undefined) {
+                if (agents.defaultMode !== "one-way" && agents.defaultMode !== "two-way") {
+                    errors.push('agents.defaultMode must be either "one-way" or "two-way"');
+                } else if (agents.modes !== undefined && Array.isArray(agents.modes) && !agents.modes.includes(agents.defaultMode)) {
+                    errors.push("agents.defaultMode must be included in agents.modes");
+                }
+            }
+
+            if (agents.timeoutMS !== undefined) {
+                if (typeof agents.timeoutMS !== "number" || !Number.isFinite(agents.timeoutMS) || agents.timeoutMS <= 0) {
+                    errors.push("agents.timeoutMS must be a positive number");
+                }
+            }
+        }
+    }
+
+    const valid = errors.length === 0;
+    return {
+        valid,
+        errors,
+        warnings,
+        packageInfo: valid ? { invocation: config.invocation, agents: config.agents } : undefined,
+    };
+}
diff --git a/packages/validation/tsconfig.json b/packages/validation/tsconfig.json
new file mode 100644
index 00000000..c1b06e18
--- /dev/null
+++ b/packages/validation/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "target": "ES2020",
+        "module": "Node16",
+        "lib": ["ES2020"],
+        "outDir": "./dist",
+        "rootDir": "./src",
+        "types": ["node"],
+        "strict": true,
+        "declaration": true,
+        "declarationMap": true,
+        "sourceMap": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "moduleResolution": "node16",
+        "allowSyntheticDefaultImports": true
+    },
+    "include": ["src"]
+}
diff --git a/playwright.config.ts b/playwright.config.ts
new file mode 100644
index 00000000..60ef5e1f
--- /dev/null
+++ b/playwright.config.ts
@@ -0,0 +1,47 @@
+import { defineConfig } from "@playwright/test";
+import path from "path";
+
+export default defineConfig({
+    // E2e test location
+    testDir: "./tests/e2e",
+
+    // Global timeout per test
+    timeout: 60_000,
+
+    // Run tests in parallel (one worker per test file keeps Electron instances isolated)
+    workers: 1,
+
+    // Retry on CI
+    retries: process.env.CI ? 1 : 0,
+
+    // Reporters
+    reporter: process.env.CI ? [["github"], ["list"]] : [["list"]],
+
+    use: {
+        // Screenshot on failure
+        screenshot: "only-on-failure",
+
+        // Path to the built Electron app (must be built before running e2e)
+        // Playwright's electron launch picks up dist/main/index.js
+    },
+
+    // Output folder for test artifacts
+    outputDir: "test-results",
+
+    // Project configuration — single "electron" project
+    projects: [
+        {
+            name: "electron",
+            use: {
+                // Electron main entry point (requires `pnpm run build` first)
+                // Passed via test fixture; see tests/e2e/fixtures.ts
+            },
+        },
+    ],
+
+    // Shared metadata
+    metadata: {
+        app: "PowerPlatform ToolBox",
+        mainEntry: path.resolve(__dirname, "dist/main/index.js"),
+    },
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8f87e224..b7080042 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17,6 +17,9 @@ importers:
       '@fluentui/tokens':
         specifier: ^1.0.0-alpha.22
         version: 1.0.0-alpha.22
+      '@modelcontextprotocol/sdk':
+        specifier: ^1.29.0
+        version: 1.29.0(zod@4.4.3)
       '@supabase/supabase-js':
         specifier: ^2.84.0
         version: 2.89.0
@@ -35,6 +38,12 @@ importers:
       marked:
         specifier: 17.0.3
         version: 17.0.3
+      pino:
+        specifier: ^9.14.0
+        version: 9.14.0
+      pino-pretty:
+        specifier: ^13.1.3
+        version: 13.1.3
       uuid:
         specifier: ^13.0.0
         version: 13.0.0
@@ -42,6 +51,12 @@ importers:
       '@electron/notarize':
         specifier: ^3.1.0
         version: 3.1.1
+      '@playwright/test':
+        specifier: 1.60.0
+        version: 1.60.0
+      '@types/jest':
+        specifier: 29.5.14
+        version: 29.5.14
       '@types/node':
         specifier: ^20.19.21
         version: 20.19.27
@@ -66,12 +81,24 @@ importers:
       eslint:
         specifier: ^8.54.0
         version: 8.57.1
+      jest:
+        specifier: 29.7.0
+        version: 29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      playwright:
+        specifier: 1.60.0
+        version: 1.60.0
       rollup-plugin-visualizer:
         specifier: ^6.0.5
         version: 6.0.5(rollup@4.55.1)
       sass:
         specifier: ^1.93.2
         version: 1.97.2
+      ts-jest:
+        specifier: 29.4.10
+        version: 29.4.10(@babel/core@7.29.7)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.29.7))(jest-util@29.7.0)(jest@29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3)))(typescript@5.9.3)
+      ts-node:
+        specifier: 10.9.2
+        version: 10.9.2(@types/node@20.19.27)(typescript@5.9.3)
       typescript:
         specifier: ^5.3.0
         version: 5.9.3
@@ -85,6 +112,28 @@ importers:
         specifier: ^0.14.6
         version: 0.14.6
 
+  packages/types:
+    dependencies:
+      '@pptb/validate':
+        specifier: ^0.0.2
+        version: 0.0.2
+
+  packages/validation:
+    dependencies:
+      tar:
+        specifier: ^7.5.16
+        version: 7.5.16
+    devDependencies:
+      '@types/node':
+        specifier: ^20.19.21
+        version: 20.19.27
+      '@types/tar':
+        specifier: ^7.0.87
+        version: 7.0.87
+      typescript:
+        specifier: ^5.4.0
+        version: 5.9.3
+
 packages:
 
   7zip-bin@5.2.0:
@@ -98,10 +147,179 @@ packages:
     resolution: {integrity: sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==}
     engines: {node: '>=16'}
 
+  '@babel/code-frame@7.29.7':
+    resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.29.7':
+    resolution: {integrity: sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.29.7':
+    resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.29.7':
+    resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-compilation-targets@7.29.7':
+    resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-globals@7.29.7':
+    resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-imports@7.29.7':
+    resolution: {integrity: sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-transforms@7.29.7':
+    resolution: {integrity: sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-plugin-utils@7.29.7':
+    resolution: {integrity: sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.29.7':
+    resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.29.7':
+    resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-option@7.29.7':
+    resolution: {integrity: sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.29.7':
+    resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/parser@7.29.7':
+    resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-syntax-async-generators@7.8.4':
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-bigint@7.8.3':
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-class-properties@7.12.13':
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-class-static-block@7.14.5':
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-attributes@7.29.7':
+    resolution: {integrity: sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-meta@7.10.4':
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-json-strings@7.8.3':
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-jsx@7.29.7':
+    resolution: {integrity: sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4':
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3':
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-numeric-separator@7.10.4':
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3':
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3':
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-optional-chaining@7.8.3':
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-private-property-in-object@7.14.5':
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-top-level-await@7.14.5':
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-typescript@7.29.7':
+    resolution: {integrity: sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/runtime@7.28.4':
     resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.29.7':
+    resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.29.7':
+    resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.29.7':
+    resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==}
+    engines: {node: '>=6.9.0'}
+
+  '@bcoe/v8-coverage@0.2.3':
+    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+
+  '@cspotcode/source-map-support@0.8.1':
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    engines: {node: '>=12'}
+
   '@develar/schema-utils@2.6.5':
     resolution: {integrity: sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==}
     engines: {node: '>= 8.9.0'}
@@ -312,6 +530,12 @@ packages:
   '@fluentui/tokens@1.0.0-alpha.22':
     resolution: {integrity: sha512-i9fgYyyCWFRdUi+vQwnV6hp7wpLGK4p09B+O/f2u71GBXzPuniubPYvrIJYtl444DD6shLjYToJhQ1S6XTFwLg==}
 
+  '@hono/node-server@1.19.14':
+    resolution: {integrity: sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==}
+    engines: {node: '>=18.14.1'}
+    peerDependencies:
+      hono: ^4
+
   '@humanwhocodes/config-array@0.13.0':
     resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
     engines: {node: '>=10.10.0'}
@@ -329,6 +553,103 @@ packages:
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
     engines: {node: '>=12'}
 
+  '@isaacs/fs-minipass@4.0.1':
+    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
+    engines: {node: '>=18.0.0'}
+
+  '@istanbuljs/load-nyc-config@1.1.0':
+    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
+    engines: {node: '>=8'}
+
+  '@istanbuljs/schema@0.1.6':
+    resolution: {integrity: sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==}
+    engines: {node: '>=8'}
+
+  '@jest/console@29.7.0':
+    resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/core@29.7.0':
+    resolution: {integrity: sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  '@jest/environment@29.7.0':
+    resolution: {integrity: sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/expect-utils@29.7.0':
+    resolution: {integrity: sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/expect@29.7.0':
+    resolution: {integrity: sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/fake-timers@29.7.0':
+    resolution: {integrity: sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/globals@29.7.0':
+    resolution: {integrity: sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/reporters@29.7.0':
+    resolution: {integrity: sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  '@jest/schemas@29.6.3':
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/source-map@29.6.3':
+    resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/test-result@29.7.0':
+    resolution: {integrity: sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/test-sequencer@29.7.0':
+    resolution: {integrity: sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/transform@29.7.0':
+    resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/types@29.6.3':
+    resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jridgewell/gen-mapping@0.3.13':
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
+
+  '@jridgewell/remapping@2.3.5':
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
+
+  '@jridgewell/trace-mapping@0.3.9':
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+
   '@malept/cross-spawn-promise@1.1.1':
     resolution: {integrity: sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==}
     engines: {node: '>= 10'}
@@ -337,6 +658,16 @@ packages:
     resolution: {integrity: sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==}
     engines: {node: '>= 10.0.0'}
 
+  '@modelcontextprotocol/sdk@1.29.0':
+    resolution: {integrity: sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@cfworker/json-schema': ^4.1.1
+      zod: ^3.25 || ^4.0
+    peerDependenciesMeta:
+      '@cfworker/json-schema':
+        optional: true
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -431,10 +762,22 @@ packages:
     resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
     engines: {node: '>= 10.0.0'}
 
+  '@pinojs/redact@0.4.0':
+    resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==}
+
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
+  '@playwright/test@1.60.0':
+    resolution: {integrity: sha512-O71yZIbAh/PxDMNGns37GHBIfrVkEVyn+AXyIa5dOTfb4/xNvRWV+Vv/NMbNCtODB/pO7vLlF2OTmMVLhmr7Ag==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@pptb/validate@0.0.2':
+    resolution: {integrity: sha512-QsuimcuDgEbblqC4uAeXE+ONm5KJ5twKbGFh9d8e4leF2jsISgVpVzYPgivSLUA9iomDGmMnXcklHPgb4jEf1A==}
+    hasBin: true
+
   '@rollup/rollup-android-arm-eabi@4.55.1':
     resolution: {integrity: sha512-9R0DM/ykwfGIlNu6+2U09ga0WXeZ9MRC2Ter8jnz8415VbuIykVuc6bhdrbORFZANDmTDvq26mJrEVTl8TdnDg==}
     cpu: [arm]
@@ -560,10 +903,19 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@sinclair/typebox@0.27.10':
+    resolution: {integrity: sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==}
+
   '@sindresorhus/is@4.6.0':
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
 
+  '@sinonjs/commons@3.0.1':
+    resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
+
+  '@sinonjs/fake-timers@10.3.0':
+    resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
+
   '@supabase/auth-js@2.89.0':
     resolution: {integrity: sha512-wiWZdz8WMad8LQdJMWYDZ2SJtZP5MwMqzQq3ehtW2ngiI3UTgbKiFrvMUUS3KADiVlk4LiGfODB2mrYx7w2f8w==}
     engines: {node: '>=20.0.0'}
@@ -599,6 +951,30 @@ packages:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
 
+  '@tsconfig/node10@1.0.12':
+    resolution: {integrity: sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==}
+
+  '@tsconfig/node12@1.0.11':
+    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
+
+  '@tsconfig/node14@1.0.3':
+    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
+
+  '@tsconfig/node16@1.0.4':
+    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
+
+  '@types/babel__core@7.20.5':
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
+
+  '@types/babel__generator@7.27.0':
+    resolution: {integrity: sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==}
+
+  '@types/babel__template@7.4.4':
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
+
+  '@types/babel__traverse@7.28.0':
+    resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
+
   '@types/cacheable-request@6.0.3':
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
 
@@ -611,9 +987,24 @@ packages:
   '@types/fs-extra@9.0.13':
     resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
 
+  '@types/graceful-fs@4.1.9':
+    resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
+
   '@types/http-cache-semantics@4.0.4':
     resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
 
+  '@types/istanbul-lib-coverage@2.0.6':
+    resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==}
+
+  '@types/istanbul-lib-report@3.0.3':
+    resolution: {integrity: sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==}
+
+  '@types/istanbul-reports@3.0.4':
+    resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
+
+  '@types/jest@29.5.14':
+    resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==}
+
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
@@ -641,6 +1032,13 @@ packages:
   '@types/semver@7.7.1':
     resolution: {integrity: sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==}
 
+  '@types/stack-utils@2.0.3':
+    resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
+
+  '@types/tar@7.0.87':
+    resolution: {integrity: sha512-3IxNBV8LeY5oi2ZFpvAhOtW1+mHswkzM7BuisVrwJgPv67GBO2rkLPQlEKtzfHuLdhDDczhkCZeT+RuizMay4A==}
+    deprecated: This is a stub types definition. tar provides its own type definitions, so you do not need this installed.
+
   '@types/uuid@10.0.0':
     resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
 
@@ -650,6 +1048,12 @@ packages:
   '@types/ws@8.18.1':
     resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
 
+  '@types/yargs-parser@21.0.3':
+    resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==}
+
+  '@types/yargs@17.0.35':
+    resolution: {integrity: sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==}
+
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
@@ -719,11 +1123,19 @@ packages:
     engines: {node: '>=10.0.0'}
     deprecated: this version has critical issues, please update to the latest version
 
+  accepts@2.0.0:
+    resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
+    engines: {node: '>= 0.6'}
+
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
+  acorn-walk@8.3.5:
+    resolution: {integrity: sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==}
+    engines: {node: '>=0.4.0'}
+
   acorn@8.15.0:
     resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
     engines: {node: '>=0.4.0'}
@@ -741,6 +1153,14 @@ packages:
       ajv:
         optional: true
 
+  ajv-formats@3.0.1:
+    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
   ajv-keywords@3.5.2:
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
@@ -773,6 +1193,10 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
   ansi-styles@6.2.3:
     resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
     engines: {node: '>=12'}
@@ -782,6 +1206,10 @@ packages:
     engines: {node: '>=8.0.0'}
     hasBin: true
 
+  anymatch@3.1.3:
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
+
   app-builder-bin@4.0.0:
     resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==}
 
@@ -804,6 +1232,12 @@ packages:
     resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
     engines: {node: '>= 10'}
 
+  arg@4.1.3:
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
@@ -833,6 +1267,10 @@ packages:
     resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
     engines: {node: '>= 4.0.0'}
 
+  atomic-sleep@1.0.0:
+    resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
+    engines: {node: '>=8.0.0'}
+
   atomically@1.7.0:
     resolution: {integrity: sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==}
     engines: {node: '>=10.12.0'}
@@ -842,12 +1280,42 @@ packages:
     engines: {node: '>=8.3'}
     hasBin: true
 
+  babel-jest@29.7.0:
+    resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+
+  babel-plugin-istanbul@6.1.1:
+    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
+    engines: {node: '>=8'}
+
+  babel-plugin-jest-hoist@29.6.3:
+    resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  babel-preset-current-node-syntax@1.2.0:
+    resolution: {integrity: sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0 || ^8.0.0-0
+
+  babel-preset-jest@29.6.3:
+    resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
+  baseline-browser-mapping@2.10.38:
+    resolution: {integrity: sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
@@ -857,6 +1325,10 @@ packages:
   bluebird@3.7.2:
     resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
 
+  body-parser@2.3.0:
+    resolution: {integrity: sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==}
+    engines: {node: '>=18'}
+
   boolean@3.2.0:
     resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==}
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
@@ -874,6 +1346,18 @@ packages:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
+  browserslist@4.28.4:
+    resolution: {integrity: sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  bs-logger@0.2.6:
+    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
+    engines: {node: '>= 6'}
+
+  bser@2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+
   buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
 
@@ -901,6 +1385,10 @@ packages:
   builder-util@24.13.1:
     resolution: {integrity: sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==}
 
+  bytes@3.1.2:
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
+
   cacheable-lookup@5.0.4:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
@@ -913,6 +1401,10 @@ packages:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
 
+  call-bound@1.0.4:
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
+
   callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -921,10 +1413,21 @@ packages:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
 
+  camelcase@6.3.0:
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
+
+  caniuse-lite@1.0.30001799:
+    resolution: {integrity: sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==}
+
   chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
 
+  char-regex@1.0.2:
+    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
+    engines: {node: '>=10'}
+
   chardet@0.7.0:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
 
@@ -936,6 +1439,10 @@ packages:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
 
+  chownr@3.0.0:
+    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
+    engines: {node: '>=18'}
+
   chromium-pickle-js@0.2.0:
     resolution: {integrity: sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==}
 
@@ -943,6 +1450,9 @@ packages:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
+  cjs-module-lexer@1.4.3:
+    resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==}
+
   cli-cursor@3.1.0:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
     engines: {node: '>=8'}
@@ -965,6 +1475,13 @@ packages:
   clone-response@1.0.3:
     resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
 
+  co@4.6.0:
+    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
+    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
+
+  collect-v8-coverage@1.0.3:
+    resolution: {integrity: sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==}
+
   color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
@@ -972,6 +1489,9 @@ packages:
   color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+
   combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
@@ -1002,12 +1522,39 @@ packages:
   config-file-ts@0.2.6:
     resolution: {integrity: sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==}
 
+  content-disposition@1.1.0:
+    resolution: {integrity: sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==}
+    engines: {node: '>=18'}
+
+  content-type@1.0.5:
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
+
+  content-type@2.0.0:
+    resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==}
+    engines: {node: '>=18'}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  cookie-signature@1.2.2:
+    resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
+    engines: {node: '>=6.6.0'}
+
+  cookie@0.7.2:
+    resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
+    engines: {node: '>= 0.6'}
+
   core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
 
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
+  cors@2.8.6:
+    resolution: {integrity: sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==}
+    engines: {node: '>= 0.10'}
+
   crc-32@1.2.2:
     resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
     engines: {node: '>=0.8'}
@@ -1020,10 +1567,21 @@ packages:
   crc@3.8.0:
     resolution: {integrity: sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==}
 
+  create-jest@29.7.0:
+    resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+
+  create-require@1.1.1:
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+
   cross-spawn@7.0.6:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
+  dateformat@4.6.3:
+    resolution: {integrity: sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==}
+
   debounce-fn@4.0.0:
     resolution: {integrity: sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==}
     engines: {node: '>=10'}
@@ -1045,9 +1603,21 @@ packages:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
 
+  dedent@1.7.2:
+    resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==}
+    peerDependencies:
+      babel-plugin-macros: ^3.1.0
+    peerDependenciesMeta:
+      babel-plugin-macros:
+        optional: true
+
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
+  deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+
   defer-to-connect@2.0.1:
     resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
     engines: {node: '>=10'}
@@ -1068,17 +1638,33 @@ packages:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
 
+  depd@2.0.0:
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
+
   detect-libc@1.0.3:
     resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
     engines: {node: '>=0.10'}
     hasBin: true
 
+  detect-newline@3.1.0:
+    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
+    engines: {node: '>=8'}
+
   detect-node@2.1.0:
     resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
 
   didyoumean@1.2.2:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
+  diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  diff@4.0.4:
+    resolution: {integrity: sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==}
+    engines: {node: '>=0.3.1'}
+
   dir-compare@3.3.0:
     resolution: {integrity: sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==}
 
@@ -1120,6 +1706,9 @@ packages:
   ecdsa-sig-formatter@1.0.11:
     resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
 
+  ee-first@1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+
   ejs@3.1.10:
     resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
     engines: {node: '>=0.10.0'}
@@ -1139,6 +1728,9 @@ packages:
   electron-store@8.2.0:
     resolution: {integrity: sha512-ukLL5Bevdil6oieAOXz3CMy+OgaItMiVBg701MNlG6W5RaC0AHN7rvlqTCmeb6O7jP0Qa1KKYTE0xV0xbhF4Hw==}
 
+  electron-to-chromium@1.5.378:
+    resolution: {integrity: sha512-VinvOAuuPmdD1guEgGv5f2Qp7/vlfqOrUOMYNnOD4wj3pit8kRsQHzfIf6teyUGWo15Tg5+bOJaRunvyltpVWQ==}
+
   electron-updater@6.7.3:
     resolution: {integrity: sha512-EgkT8Z9noqXKbwc3u5FkJA+r48jwZ5DTUiOkJMOTEEH//n5Am6wfQGz7nvSFEA2oIAMv9jRzn5JKTyWeSKOPgg==}
 
@@ -1147,12 +1739,20 @@ packages:
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
+  emittery@0.13.1:
+    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
+    engines: {node: '>=12'}
+
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
   emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
+  encodeurl@2.0.0:
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
+
   end-of-stream@1.4.5:
     resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
 
@@ -1166,6 +1766,9 @@ packages:
   err-code@2.0.3:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
 
+  error-ex@1.3.4:
+    resolution: {integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==}
+
   es-define-property@1.0.1:
     resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
     engines: {node: '>= 0.4'}
@@ -1194,10 +1797,17 @@ packages:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
 
+  escape-html@1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+
   escape-string-regexp@1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
 
+  escape-string-regexp@2.0.0:
+    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
+    engines: {node: '>=8'}
+
   escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
@@ -1220,6 +1830,11 @@ packages:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
   esquery@1.7.0:
     resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
     engines: {node: '>=0.10'}
@@ -1236,19 +1851,56 @@ packages:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
 
-  external-editor@3.1.0:
-    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: '>=4'}
+  etag@1.8.1:
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
 
-  extract-zip@2.0.1:
-    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
-    engines: {node: '>= 10.17.0'}
-    hasBin: true
+  eventsource-parser@3.1.0:
+    resolution: {integrity: sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg==}
+    engines: {node: '>=18.0.0'}
 
-  extsprintf@1.4.1:
+  eventsource@3.0.7:
+    resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}
+    engines: {node: '>=18.0.0'}
+
+  execa@5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+
+  exit@0.1.2:
+    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
+    engines: {node: '>= 0.8.0'}
+
+  expect@29.7.0:
+    resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  express-rate-limit@8.5.2:
+    resolution: {integrity: sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      express: '>= 4.11'
+
+  express@5.2.1:
+    resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==}
+    engines: {node: '>= 18'}
+
+  external-editor@3.1.0:
+    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
+    engines: {node: '>=4'}
+
+  extract-zip@2.0.1:
+    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
+    engines: {node: '>= 10.17.0'}
+    hasBin: true
+
+  extsprintf@1.4.1:
     resolution: {integrity: sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==}
     engines: {'0': node >=0.6.0}
 
+  fast-copy@4.0.3:
+    resolution: {integrity: sha512-58apWr0GUiDFM8+3afrO6eYwJBn9ZAhDOzG3L+/9llab/haCARS2UIfffmOurYLwbgDRs8n0rfr6qAAPEAuAQw==}
+
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -1262,12 +1914,18 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
+  fast-safe-stringify@2.1.1:
+    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
+
   fast-uri@3.1.0:
     resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
 
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
 
+  fb-watchman@2.0.2:
+    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+
   fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
 
@@ -1295,6 +1953,10 @@ packages:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
+  finalhandler@2.1.1:
+    resolution: {integrity: sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==}
+    engines: {node: '>= 18.0.0'}
+
   find-up@3.0.0:
     resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
     engines: {node: '>=6'}
@@ -1322,6 +1984,14 @@ packages:
     resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
     engines: {node: '>= 6'}
 
+  forwarded@0.2.0:
+    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
+    engines: {node: '>= 0.6'}
+
+  fresh@2.0.0:
+    resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
+    engines: {node: '>= 0.8'}
+
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
@@ -1344,6 +2014,11 @@ packages:
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -1352,6 +2027,10 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
   get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
@@ -1360,6 +2039,10 @@ packages:
     resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
     engines: {node: '>= 0.4'}
 
+  get-package-type@0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+
   get-proto@1.0.1:
     resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
     engines: {node: '>= 0.4'}
@@ -1368,6 +2051,10 @@ packages:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
 
+  get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -1439,13 +2126,31 @@ packages:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
 
+  hasown@2.0.4:
+    resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
+    engines: {node: '>= 0.4'}
+
+  help-me@5.0.0:
+    resolution: {integrity: sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==}
+
+  hono@4.12.26:
+    resolution: {integrity: sha512-uyZtpnYxM9CmQ7QsQknM4zN8EftNqhON1qYeIKM0Se67CCEe2c44xyGURwB0axX2fBDu1dqHrHAc1hmNT8ITkw==}
+    engines: {node: '>=16.9.0'}
+
   hosted-git-info@4.1.0:
     resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
     engines: {node: '>=10'}
 
+  html-escaper@2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+
   http-cache-semantics@4.2.0:
     resolution: {integrity: sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==}
 
+  http-errors@2.0.1:
+    resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
+    engines: {node: '>= 0.8'}
+
   http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
     engines: {node: '>= 6'}
@@ -1458,6 +2163,10 @@ packages:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
+  human-signals@2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
+
   iceberg-js@0.8.1:
     resolution: {integrity: sha512-1dhVQZXhcHje7798IVM+xoo/1ZdVfzOMIc8/rgVSijRK38EDqOJoGula9N/8ZI5RD8QTxNQtK/Gozpr+qUqRRA==}
     engines: {node: '>=20.0.0'}
@@ -1475,6 +2184,10 @@ packages:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
 
+  iconv-lite@0.7.2:
+    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
+    engines: {node: '>=0.10.0'}
+
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
@@ -1497,6 +2210,11 @@ packages:
     resolution: {integrity: sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==}
     engines: {node: '>=8'}
 
+  import-local@3.2.0:
+    resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
@@ -1512,10 +2230,25 @@ packages:
     resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==}
     engines: {node: '>=8.0.0'}
 
+  ip-address@10.2.0:
+    resolution: {integrity: sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==}
+    engines: {node: '>= 12'}
+
+  ipaddr.js@1.9.1:
+    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
+    engines: {node: '>= 0.10'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
   is-ci@3.0.1:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
 
+  is-core-module@2.16.2:
+    resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==}
+    engines: {node: '>= 0.4'}
+
   is-docker@2.2.1:
     resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
     engines: {node: '>=8'}
@@ -1529,6 +2262,10 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
+  is-generator-fn@2.1.0:
+    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
+    engines: {node: '>=6'}
+
   is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -1545,6 +2282,13 @@ packages:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
 
+  is-promise@4.0.0:
+    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
+
+  is-stream@2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
   is-wsl@2.2.0:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
     engines: {node: '>=8'}
@@ -1563,6 +2307,30 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
+  istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-instrument@5.2.1:
+    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-instrument@6.0.3:
+    resolution: {integrity: sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==}
+    engines: {node: '>=10'}
+
+  istanbul-lib-report@3.0.1:
+    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
+    engines: {node: '>=10'}
+
+  istanbul-lib-source-maps@4.0.1:
+    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
+    engines: {node: '>=10'}
+
+  istanbul-reports@3.2.0:
+    resolution: {integrity: sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==}
+    engines: {node: '>=8'}
+
   jackspeak@3.4.3:
     resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
 
@@ -1571,10 +2339,158 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  jest-changed-files@29.7.0:
+    resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-circus@29.7.0:
+    resolution: {integrity: sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-cli@29.7.0:
+    resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  jest-config@29.7.0:
+    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@types/node': '*'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      ts-node:
+        optional: true
+
+  jest-diff@29.7.0:
+    resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-docblock@29.7.0:
+    resolution: {integrity: sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-each@29.7.0:
+    resolution: {integrity: sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-environment-node@29.7.0:
+    resolution: {integrity: sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-get-type@29.6.3:
+    resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-haste-map@29.7.0:
+    resolution: {integrity: sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-leak-detector@29.7.0:
+    resolution: {integrity: sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-matcher-utils@29.7.0:
+    resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-message-util@29.7.0:
+    resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-mock@29.7.0:
+    resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-pnp-resolver@1.2.3:
+    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      jest-resolve: '*'
+    peerDependenciesMeta:
+      jest-resolve:
+        optional: true
+
+  jest-regex-util@29.6.3:
+    resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-resolve-dependencies@29.7.0:
+    resolution: {integrity: sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-resolve@29.7.0:
+    resolution: {integrity: sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-runner@29.7.0:
+    resolution: {integrity: sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-runtime@29.7.0:
+    resolution: {integrity: sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-snapshot@29.7.0:
+    resolution: {integrity: sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-util@29.7.0:
+    resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-validate@29.7.0:
+    resolution: {integrity: sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-watcher@29.7.0:
+    resolution: {integrity: sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-worker@29.7.0:
+    resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest@29.7.0:
+    resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  jose@6.2.3:
+    resolution: {integrity: sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==}
+
+  joycon@3.1.1:
+    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+    engines: {node: '>=10'}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@3.14.2:
+    resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
+    hasBin: true
+
   js-yaml@4.1.1:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
 
+  jsesc@3.1.0:
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
@@ -1582,6 +2498,9 @@ packages:
     resolution: {integrity: sha512-TuDuZ5KrgyjoCIppdPXBMqiGfota55+odM+j2cQ5rt/XKyKmqGB3Whz1F8SN8+60yYGy/Nu5lbRZ+rx8kBIvBw==}
     engines: {node: '>=10'}
 
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
   json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
@@ -1591,6 +2510,9 @@ packages:
   json-schema-typed@7.0.3:
     resolution: {integrity: sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==}
 
+  json-schema-typed@8.0.2:
+    resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
+
   json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
@@ -1621,6 +2543,10 @@ packages:
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
+  kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+
   lazy-val@1.0.5:
     resolution: {integrity: sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==}
 
@@ -1628,10 +2554,17 @@ packages:
     resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
     engines: {node: '>= 0.6.3'}
 
+  leven@3.1.0:
+    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
+    engines: {node: '>=6'}
+
   levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
 
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
   locate-path@3.0.0:
     resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
     engines: {node: '>=6'}
@@ -1678,6 +2611,9 @@ packages:
   lodash.isstring@4.0.1:
     resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
 
+  lodash.memoize@4.1.2:
+    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
+
   lodash.merge@4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
@@ -1697,10 +2633,23 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+
   lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
 
+  make-dir@4.0.0:
+    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
+    engines: {node: '>=10'}
+
+  make-error@1.3.6:
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+
+  makeerror@1.0.12:
+    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+
   marked@17.0.3:
     resolution: {integrity: sha512-jt1v2ObpyOKR8p4XaUJVk3YWRJ5n+i4+rjQopxvV32rSndTJXvIzuUdWWIy/1pFQMkQmvTXawzDNqOH/CUmx6A==}
     engines: {node: '>= 20'}
@@ -1714,6 +2663,17 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
+  media-typer@1.1.0:
+    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
+    engines: {node: '>= 0.8'}
+
+  merge-descriptors@2.0.0:
+    resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==}
+    engines: {node: '>=18'}
+
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
   merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
@@ -1726,10 +2686,18 @@ packages:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  mime-db@1.54.0:
+    resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
+    engines: {node: '>= 0.6'}
+
   mime-types@2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
 
+  mime-types@3.0.2:
+    resolution: {integrity: sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==}
+    engines: {node: '>=18'}
+
   mime@2.6.0:
     resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
     engines: {node: '>=4.0.0'}
@@ -1789,6 +2757,10 @@ packages:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
 
+  minizlib@3.1.0:
+    resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
+    engines: {node: '>= 18'}
+
   mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
@@ -1808,6 +2780,10 @@ packages:
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
+  negotiator@1.0.0:
+    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
+    engines: {node: '>= 0.6'}
+
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
@@ -1826,6 +2802,13 @@ packages:
       encoding:
         optional: true
 
+  node-int64@0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+
+  node-releases@2.0.49:
+    resolution: {integrity: sha512-f06bl1D+8ZDkn2oOQQKAh5/otFWqVnM1Q5oerA8Pex7UfT66Tx4IPHIqVVFKqFT3FUtaDstdgkM7yT7JWhqxfw==}
+    engines: {node: '>=18'}
+
   normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
@@ -1834,10 +2817,30 @@ packages:
     resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
     engines: {node: '>=10'}
 
+  npm-run-path@4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
   object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
 
+  on-exit-leak-free@2.1.2:
+    resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==}
+    engines: {node: '>=14.0.0'}
+
+  on-finished@2.4.1:
+    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
+    engines: {node: '>= 0.8'}
+
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
@@ -1897,6 +2900,14 @@ packages:
     engines: {node: '>= 0.10'}
     hasBin: true
 
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  parseurl@1.3.3:
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
+    engines: {node: '>= 0.8'}
+
   path-exists@3.0.0:
     resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
     engines: {node: '>=4'}
@@ -1913,10 +2924,16 @@ packages:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
   path-scurry@1.11.1:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
 
+  path-to-regexp@8.4.2:
+    resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
+
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
@@ -1944,10 +2961,49 @@ packages:
     resolution: {integrity: sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==}
     engines: {node: '>=10'}
 
+  pino-abstract-transport@2.0.0:
+    resolution: {integrity: sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==}
+
+  pino-abstract-transport@3.0.0:
+    resolution: {integrity: sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg==}
+
+  pino-pretty@13.1.3:
+    resolution: {integrity: sha512-ttXRkkOz6WWC95KeY9+xxWL6AtImwbyMHrL1mSwqwW9u+vLp/WIElvHvCSDg0xO/Dzrggz1zv3rN5ovTRVowKg==}
+    hasBin: true
+
+  pino-std-serializers@7.1.0:
+    resolution: {integrity: sha512-BndPH67/JxGExRgiX1dX0w1FvZck5Wa4aal9198SrRhZjH3GxKQUKIBnYJTdj2HDN3UQAS06HlfcSbQj2OHmaw==}
+
+  pino@9.14.0:
+    resolution: {integrity: sha512-8OEwKp5juEvb/MjpIc4hjqfgCNysrS94RIOMXYvpYCdm/jglrKEiAYmiumbmGhCvs+IcInsphYDFwqrjr7398w==}
+    hasBin: true
+
+  pirates@4.0.7:
+    resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
+    engines: {node: '>= 6'}
+
+  pkce-challenge@5.0.1:
+    resolution: {integrity: sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==}
+    engines: {node: '>=16.20.0'}
+
+  pkg-dir@4.2.0:
+    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
+    engines: {node: '>=8'}
+
   pkg-up@3.1.0:
     resolution: {integrity: sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==}
     engines: {node: '>=8'}
 
+  playwright-core@1.60.0:
+    resolution: {integrity: sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.60.0:
+    resolution: {integrity: sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   plist@3.1.0:
     resolution: {integrity: sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==}
     engines: {node: '>=10.4.0'}
@@ -1965,9 +3021,16 @@ packages:
     engines: {node: '>=10.13.0'}
     hasBin: true
 
+  pretty-format@29.7.0:
+    resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
+  process-warning@5.0.0:
+    resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==}
+
   progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
@@ -1976,6 +3039,14 @@ packages:
     resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
     engines: {node: '>=10'}
 
+  prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+
+  proxy-addr@2.0.7:
+    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
+    engines: {node: '>= 0.10'}
+
   pump@3.0.3:
     resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
 
@@ -1983,13 +3054,34 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
+  pure-rand@6.1.0:
+    resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}
+
+  qs@6.15.2:
+    resolution: {integrity: sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==}
+    engines: {node: '>=0.6'}
+
   queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
+  quick-format-unescaped@4.0.4:
+    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
+
   quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
 
+  range-parser@1.2.1:
+    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
+    engines: {node: '>= 0.6'}
+
+  raw-body@3.0.2:
+    resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
+    engines: {node: '>= 0.10'}
+
+  react-is@18.3.1:
+    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
+
   read-config-file@6.3.2:
     resolution: {integrity: sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==}
     engines: {node: '>=12.0.0'}
@@ -2008,6 +3100,10 @@ packages:
     resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
     engines: {node: '>= 14.18.0'}
 
+  real-require@0.2.0:
+    resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
+    engines: {node: '>= 12.13.0'}
+
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -2022,6 +3118,10 @@ packages:
   resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
 
+  resolve-cwd@3.0.0:
+    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
+    engines: {node: '>=8'}
+
   resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
@@ -2030,6 +3130,15 @@ packages:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
     engines: {node: '>=8'}
 
+  resolve.exports@2.0.3:
+    resolution: {integrity: sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==}
+    engines: {node: '>=10'}
+
+  resolve@1.22.12:
+    resolution: {integrity: sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==}
+    engines: {node: '>= 0.4'}
+    hasBin: true
+
   responselike@2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
 
@@ -2072,6 +3181,10 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
+  router@2.2.0:
+    resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==}
+    engines: {node: '>= 18'}
+
   run-async@2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
     engines: {node: '>=0.12.0'}
@@ -2089,6 +3202,10 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
+  safe-stable-stringify@2.5.0:
+    resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
+    engines: {node: '>=10'}
+
   safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
@@ -2103,6 +3220,9 @@ packages:
   sax@1.4.3:
     resolution: {integrity: sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==}
 
+  secure-json-parse@4.1.0:
+    resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==}
+
   semver-compare@1.0.0:
     resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==}
 
@@ -2115,13 +3235,29 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.8.5:
+    resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  send@1.2.1:
+    resolution: {integrity: sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==}
+    engines: {node: '>= 18'}
+
   serialize-error@7.0.1:
     resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==}
     engines: {node: '>=10'}
 
+  serve-static@2.2.1:
+    resolution: {integrity: sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==}
+    engines: {node: '>= 18'}
+
   set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
+  setprototypeof@1.2.0:
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -2130,6 +3266,22 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
+  side-channel-list@1.0.1:
+    resolution: {integrity: sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
+  side-channel@1.1.1:
+    resolution: {integrity: sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==}
+    engines: {node: '>= 0.4'}
+
   signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
@@ -2141,6 +3293,9 @@ packages:
     resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
     engines: {node: '>=10'}
 
+  sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
   slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -2153,10 +3308,16 @@ packages:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
 
+  sonic-boom@4.2.1:
+    resolution: {integrity: sha512-w6AxtubXa2wTXAUsZMMWERrsIRAdrK0Sc+FUytWvYAhBJLyuI4llrMIC1DtlNSdI99EI86KZum2MMq3EAZlF9Q==}
+
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
 
+  source-map-support@0.5.13:
+    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
+
   source-map-support@0.5.21:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
 
@@ -2168,13 +3329,32 @@ packages:
     resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
     engines: {node: '>= 12'}
 
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
   sprintf-js@1.1.3:
     resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
 
+  stack-utils@2.0.6:
+    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
+    engines: {node: '>=10'}
+
   stat-mode@1.0.0:
     resolution: {integrity: sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==}
     engines: {node: '>= 6'}
 
+  statuses@2.0.2:
+    resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
+    engines: {node: '>= 0.8'}
+
+  string-length@4.0.2:
+    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
+    engines: {node: '>=10'}
+
   string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
@@ -2197,10 +3377,22 @@ packages:
     resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==}
     engines: {node: '>=12'}
 
+  strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+
+  strip-final-newline@2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
   strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
+  strip-json-comments@5.0.3:
+    resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
+    engines: {node: '>=14.16'}
+
   sumchecker@3.0.1:
     resolution: {integrity: sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==}
     engines: {node: '>= 8.0'}
@@ -2209,6 +3401,14 @@ packages:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
 
+  supports-color@8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
   tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
@@ -2218,12 +3418,23 @@ packages:
     engines: {node: '>=10'}
     deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
+  tar@7.5.16:
+    resolution: {integrity: sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==}
+    engines: {node: '>=18'}
+
   temp-file@3.4.0:
     resolution: {integrity: sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==}
 
+  test-exclude@6.0.0:
+    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
+    engines: {node: '>=8'}
+
   text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
+  thread-stream@3.2.0:
+    resolution: {integrity: sha512-zLBvqpwr4Esa0kRjcrzGU6zL25lePWaCLMx0RQFrmteozIfeNdaMLpG5U7PeHzvlFkAWaRKA9/KVW4F60iB+qw==}
+
   through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
 
@@ -2245,10 +3456,17 @@ packages:
     resolution: {integrity: sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==}
     engines: {node: '>=14.14'}
 
+  tmpl@1.0.5:
+    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
 
+  toidentifier@1.0.1:
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
+
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
@@ -2261,7 +3479,48 @@ packages:
     peerDependencies:
       typescript: '>=4.2.0'
 
-  tslib@1.14.1:
+  ts-jest@29.4.10:
+    resolution: {integrity: sha512-vMTlTTtvz5aKZgzOoc7DQ5TzAL2fCzl8JnG1+ZpwjQa/g0xLlwE44yQ+1Cao9ZP1xVv9y5g34IFXEiqGOGFBUA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@jest/transform': ^29.0.0 || ^30.0.0
+      '@jest/types': ^29.0.0 || ^30.0.0
+      babel-jest: ^29.0.0 || ^30.0.0
+      esbuild: '*'
+      jest: ^29.0.0 || ^30.0.0
+      jest-util: ^29.0.0 || ^30.0.0
+      typescript: '>=4.3 <7'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@jest/transform':
+        optional: true
+      '@jest/types':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+      jest-util:
+        optional: true
+
+  ts-node@10.9.2:
+    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+
+  tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
 
   tslib@2.8.1:
@@ -2271,6 +3530,10 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
+  type-detect@4.0.8:
+    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
+    engines: {node: '>=4'}
+
   type-fest@0.13.1:
     resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
     engines: {node: '>=10'}
@@ -2287,6 +3550,14 @@ packages:
     resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
     engines: {node: '>=12.20'}
 
+  type-fest@4.41.0:
+    resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
+    engines: {node: '>=16'}
+
+  type-is@2.1.0:
+    resolution: {integrity: sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==}
+    engines: {node: '>= 18'}
+
   typescript@5.9.3:
     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
     engines: {node: '>=14.17'}
@@ -2311,6 +3582,16 @@ packages:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
     engines: {node: '>= 10.0.0'}
 
+  unpipe@1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
+
+  update-browserslist-db@1.2.3:
+    resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
@@ -2326,8 +3607,20 @@ packages:
 
   uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
+  v8-compile-cache-lib@3.0.1:
+    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+
+  v8-to-istanbul@9.3.0:
+    resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==}
+    engines: {node: '>=10.12.0'}
+
+  vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
+
   verror@1.10.1:
     resolution: {integrity: sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==}
     engines: {node: '>=0.6.0'}
@@ -2383,6 +3676,9 @@ packages:
       yaml:
         optional: true
 
+  walker@1.0.8:
+    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
+
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
@@ -2419,6 +3715,10 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
+  write-file-atomic@4.0.2:
+    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+
   ws@8.19.0:
     resolution: {integrity: sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==}
     engines: {node: '>=10.0.0'}
@@ -2442,9 +3742,16 @@ packages:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
 
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+
   yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
+  yallist@5.0.0:
+    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
+    engines: {node: '>=18'}
+
   yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
     engines: {node: '>=6'}
@@ -2464,6 +3771,10 @@ packages:
   yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
 
+  yn@3.1.1:
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    engines: {node: '>=6'}
+
   yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
@@ -2472,6 +3783,14 @@ packages:
     resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
     engines: {node: '>= 10'}
 
+  zod-to-json-schema@3.25.2:
+    resolution: {integrity: sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==}
+    peerDependencies:
+      zod: ^3.25.28 || ^4
+
+  zod@4.4.3:
+    resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}
+
 snapshots:
 
   7zip-bin@5.2.0: {}
@@ -2484,8 +3803,201 @@ snapshots:
       jsonwebtoken: 9.0.3
       uuid: 8.3.2
 
+  '@babel/code-frame@7.29.7':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.29.7
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
+  '@babel/compat-data@7.29.7': {}
+
+  '@babel/core@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helpers': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+      '@jridgewell/remapping': 2.3.5
+      convert-source-map: 2.0.0
+      debug: 4.4.3
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/generator@7.29.7':
+    dependencies:
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
+  '@babel/helper-compilation-targets@7.29.7':
+    dependencies:
+      '@babel/compat-data': 7.29.7
+      '@babel/helper-validator-option': 7.29.7
+      browserslist: 4.28.4
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
+  '@babel/helper-globals@7.29.7': {}
+
+  '@babel/helper-module-imports@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-module-imports': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-plugin-utils@7.29.7': {}
+
+  '@babel/helper-string-parser@7.29.7': {}
+
+  '@babel/helper-validator-identifier@7.29.7': {}
+
+  '@babel/helper-validator-option@7.29.7': {}
+
+  '@babel/helpers@7.29.7':
+    dependencies:
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+
+  '@babel/parser@7.29.7':
+    dependencies:
+      '@babel/types': 7.29.7
+
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-import-attributes@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
   '@babel/runtime@7.28.4': {}
 
+  '@babel/template@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+
+  '@babel/traverse@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/types@7.29.7':
+    dependencies:
+      '@babel/helper-string-parser': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+
+  '@bcoe/v8-coverage@0.2.3': {}
+
+  '@cspotcode/source-map-support@0.8.1':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.9
+
   '@develar/schema-utils@2.6.5':
     dependencies:
       ajv: 6.12.6
@@ -2656,6 +4168,10 @@ snapshots:
     dependencies:
       '@swc/helpers': 0.5.18
 
+  '@hono/node-server@1.19.14(hono@4.12.26)':
+    dependencies:
+      hono: 4.12.26
+
   '@humanwhocodes/config-array@0.13.0':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
@@ -2677,6 +4193,206 @@ snapshots:
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: wrap-ansi@7.0.0
 
+  '@isaacs/fs-minipass@4.0.1':
+    dependencies:
+      minipass: 7.1.2
+
+  '@istanbuljs/load-nyc-config@1.1.0':
+    dependencies:
+      camelcase: 5.3.1
+      find-up: 4.1.0
+      get-package-type: 0.1.0
+      js-yaml: 3.14.2
+      resolve-from: 5.0.0
+
+  '@istanbuljs/schema@0.1.6': {}
+
+  '@jest/console@29.7.0':
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      chalk: 4.1.2
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      slash: 3.0.0
+
+  '@jest/core@29.7.0(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  '@jest/environment@29.7.0':
+    dependencies:
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      jest-mock: 29.7.0
+
+  '@jest/expect-utils@29.7.0':
+    dependencies:
+      jest-get-type: 29.6.3
+
+  '@jest/expect@29.7.0':
+    dependencies:
+      expect: 29.7.0
+      jest-snapshot: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/fake-timers@29.7.0':
+    dependencies:
+      '@jest/types': 29.6.3
+      '@sinonjs/fake-timers': 10.3.0
+      '@types/node': 20.19.27
+      jest-message-util: 29.7.0
+      jest-mock: 29.7.0
+      jest-util: 29.7.0
+
+  '@jest/globals@29.7.0':
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/expect': 29.7.0
+      '@jest/types': 29.6.3
+      jest-mock: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/reporters@29.7.0':
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.31
+      '@types/node': 20.19.27
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.3
+      exit: 0.1.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-instrument: 6.0.3
+      istanbul-lib-report: 3.0.1
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.2.0
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      jest-worker: 29.7.0
+      slash: 3.0.0
+      string-length: 4.0.2
+      strip-ansi: 6.0.1
+      v8-to-istanbul: 9.3.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/schemas@29.6.3':
+    dependencies:
+      '@sinclair/typebox': 0.27.10
+
+  '@jest/source-map@29.6.3':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.31
+      callsites: 3.1.0
+      graceful-fs: 4.2.11
+
+  '@jest/test-result@29.7.0':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.6
+      collect-v8-coverage: 1.0.3
+
+  '@jest/test-sequencer@29.7.0':
+    dependencies:
+      '@jest/test-result': 29.7.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      slash: 3.0.0
+
+  '@jest/transform@29.7.0':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.31
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 2.0.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-util: 29.7.0
+      micromatch: 4.0.8
+      pirates: 4.0.7
+      slash: 3.0.0
+      write-file-atomic: 4.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/types@29.6.3':
+    dependencies:
+      '@jest/schemas': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-reports': 3.0.4
+      '@types/node': 20.19.27
+      '@types/yargs': 17.0.35
+      chalk: 4.1.2
+
+  '@jridgewell/gen-mapping@0.3.13':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/remapping@2.3.5':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  '@jridgewell/trace-mapping@0.3.9':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
   '@malept/cross-spawn-promise@1.1.1':
     dependencies:
       cross-spawn: 7.0.6
@@ -2690,6 +4406,28 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@modelcontextprotocol/sdk@1.29.0(zod@4.4.3)':
+    dependencies:
+      '@hono/node-server': 1.19.14(hono@4.12.26)
+      ajv: 8.17.1
+      ajv-formats: 3.0.1(ajv@8.17.1)
+      content-type: 1.0.5
+      cors: 2.8.6
+      cross-spawn: 7.0.6
+      eventsource: 3.0.7
+      eventsource-parser: 3.1.0
+      express: 5.2.1
+      express-rate-limit: 8.5.2(express@5.2.1)
+      hono: 4.12.26
+      jose: 6.2.3
+      json-schema-typed: 8.0.2
+      pkce-challenge: 5.0.1
+      raw-body: 3.0.2
+      zod: 4.4.3
+      zod-to-json-schema: 3.25.2(zod@4.4.3)
+    transitivePeerDependencies:
+      - supports-color
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -2763,9 +4501,19 @@ snapshots:
       '@parcel/watcher-win32-x64': 2.5.1
     optional: true
 
+  '@pinojs/redact@0.4.0': {}
+
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
+  '@playwright/test@1.60.0':
+    dependencies:
+      playwright: 1.60.0
+
+  '@pptb/validate@0.0.2':
+    dependencies:
+      tar: 7.5.16
+
   '@rollup/rollup-android-arm-eabi@4.55.1':
     optional: true
 
@@ -2841,8 +4589,18 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.55.1':
     optional: true
 
+  '@sinclair/typebox@0.27.10': {}
+
   '@sindresorhus/is@4.6.0': {}
 
+  '@sinonjs/commons@3.0.1':
+    dependencies:
+      type-detect: 4.0.8
+
+  '@sinonjs/fake-timers@10.3.0':
+    dependencies:
+      '@sinonjs/commons': 3.0.1
+
   '@supabase/auth-js@2.89.0':
     dependencies:
       tslib: 2.8.1
@@ -2891,6 +4649,35 @@ snapshots:
 
   '@tootallnate/once@2.0.0': {}
 
+  '@tsconfig/node10@1.0.12': {}
+
+  '@tsconfig/node12@1.0.11': {}
+
+  '@tsconfig/node14@1.0.3': {}
+
+  '@tsconfig/node16@1.0.4': {}
+
+  '@types/babel__core@7.20.5':
+    dependencies:
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+      '@types/babel__generator': 7.27.0
+      '@types/babel__template': 7.4.4
+      '@types/babel__traverse': 7.28.0
+
+  '@types/babel__generator@7.27.0':
+    dependencies:
+      '@babel/types': 7.29.7
+
+  '@types/babel__template@7.4.4':
+    dependencies:
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+
+  '@types/babel__traverse@7.28.0':
+    dependencies:
+      '@babel/types': 7.29.7
+
   '@types/cacheable-request@6.0.3':
     dependencies:
       '@types/http-cache-semantics': 4.0.4
@@ -2908,8 +4695,27 @@ snapshots:
     dependencies:
       '@types/node': 20.19.27
 
+  '@types/graceful-fs@4.1.9':
+    dependencies:
+      '@types/node': 20.19.27
+
   '@types/http-cache-semantics@4.0.4': {}
 
+  '@types/istanbul-lib-coverage@2.0.6': {}
+
+  '@types/istanbul-lib-report@3.0.3':
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.6
+
+  '@types/istanbul-reports@3.0.4':
+    dependencies:
+      '@types/istanbul-lib-report': 3.0.3
+
+  '@types/jest@29.5.14':
+    dependencies:
+      expect: 29.7.0
+      pretty-format: 29.7.0
+
   '@types/json-schema@7.0.15': {}
 
   '@types/keyv@3.1.4':
@@ -2940,6 +4746,12 @@ snapshots:
 
   '@types/semver@7.7.1': {}
 
+  '@types/stack-utils@2.0.3': {}
+
+  '@types/tar@7.0.87':
+    dependencies:
+      tar: 7.5.16
+
   '@types/uuid@10.0.0': {}
 
   '@types/verror@1.10.11':
@@ -2949,6 +4761,12 @@ snapshots:
     dependencies:
       '@types/node': 20.19.27
 
+  '@types/yargs-parser@21.0.3': {}
+
+  '@types/yargs@17.0.35':
+    dependencies:
+      '@types/yargs-parser': 21.0.3
+
   '@types/yauzl@2.10.3':
     dependencies:
       '@types/node': 20.19.27
@@ -3044,10 +4862,19 @@ snapshots:
 
   '@xmldom/xmldom@0.8.12': {}
 
+  accepts@2.0.0:
+    dependencies:
+      mime-types: 3.0.2
+      negotiator: 1.0.0
+
   acorn-jsx@5.3.2(acorn@8.15.0):
     dependencies:
       acorn: 8.15.0
 
+  acorn-walk@8.3.5:
+    dependencies:
+      acorn: 8.15.0
+
   acorn@8.15.0: {}
 
   agent-base@6.0.2:
@@ -3060,6 +4887,10 @@ snapshots:
     optionalDependencies:
       ajv: 8.17.1
 
+  ajv-formats@3.0.1(ajv@8.17.1):
+    optionalDependencies:
+      ajv: 8.17.1
+
   ajv-keywords@3.5.2(ajv@6.12.6):
     dependencies:
       ajv: 6.12.6
@@ -3107,12 +4938,19 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
+  ansi-styles@5.2.0: {}
+
   ansi-styles@6.2.3: {}
 
   ansi-to-html@0.7.2:
     dependencies:
       entities: 2.2.0
 
+  anymatch@3.1.3:
+    dependencies:
+      normalize-path: 3.0.0
+      picomatch: 2.3.1
+
   app-builder-bin@4.0.0: {}
 
   app-builder-lib@24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3):
@@ -3185,6 +5023,12 @@ snapshots:
       tar-stream: 2.2.0
       zip-stream: 4.1.1
 
+  arg@4.1.3: {}
+
+  argparse@1.0.10:
+    dependencies:
+      sprintf-js: 1.0.3
+
   argparse@2.0.1: {}
 
   array-union@2.1.0: {}
@@ -3203,6 +5047,8 @@ snapshots:
 
   at-least-node@1.0.0: {}
 
+  atomic-sleep@1.0.0: {}
+
   atomically@1.7.0: {}
 
   auto-changelog@2.5.0:
@@ -3216,10 +5062,67 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
+  babel-jest@29.7.0(@babel/core@7.29.7):
+    dependencies:
+      '@babel/core': 7.29.7
+      '@jest/transform': 29.7.0
+      '@types/babel__core': 7.20.5
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 29.6.3(@babel/core@7.29.7)
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-istanbul@6.1.1:
+    dependencies:
+      '@babel/helper-plugin-utils': 7.29.7
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.6
+      istanbul-lib-instrument: 5.2.1
+      test-exclude: 6.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-jest-hoist@29.6.3:
+    dependencies:
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      '@types/babel__core': 7.20.5
+      '@types/babel__traverse': 7.28.0
+
+  babel-preset-current-node-syntax@1.2.0(@babel/core@7.29.7):
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.29.7)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-attributes': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.7)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.7)
+
+  babel-preset-jest@29.6.3(@babel/core@7.29.7):
+    dependencies:
+      '@babel/core': 7.29.7
+      babel-plugin-jest-hoist: 29.6.3
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7)
+
   balanced-match@1.0.2: {}
 
   base64-js@1.5.1: {}
 
+  baseline-browser-mapping@2.10.38: {}
+
   bl@4.1.0:
     dependencies:
       buffer: 5.7.1
@@ -3232,6 +5135,20 @@ snapshots:
 
   bluebird@3.7.2: {}
 
+  body-parser@2.3.0:
+    dependencies:
+      bytes: 3.1.2
+      content-type: 2.0.0
+      debug: 4.4.3
+      http-errors: 2.0.1
+      iconv-lite: 0.7.2
+      on-finished: 2.4.1
+      qs: 6.15.2
+      raw-body: 3.0.2
+      type-is: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
+
   boolean@3.2.0:
     optional: true
 
@@ -3252,6 +5169,22 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
+  browserslist@4.28.4:
+    dependencies:
+      baseline-browser-mapping: 2.10.38
+      caniuse-lite: 1.0.30001799
+      electron-to-chromium: 1.5.378
+      node-releases: 2.0.49
+      update-browserslist-db: 1.2.3(browserslist@4.28.4)
+
+  bs-logger@0.2.6:
+    dependencies:
+      fast-json-stable-stringify: 2.1.0
+
+  bser@2.1.1:
+    dependencies:
+      node-int64: 0.4.0
+
   buffer-crc32@0.2.13: {}
 
   buffer-equal-constant-time@1.0.1: {}
@@ -3300,6 +5233,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  bytes@3.1.2: {}
+
   cacheable-lookup@5.0.4: {}
 
   cacheable-request@7.0.4:
@@ -3317,15 +5252,26 @@ snapshots:
       es-errors: 1.3.0
       function-bind: 1.1.2
 
+  call-bound@1.0.4:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.3.0
+
   callsites@3.1.0: {}
 
   camelcase@5.3.1: {}
 
+  camelcase@6.3.0: {}
+
+  caniuse-lite@1.0.30001799: {}
+
   chalk@4.1.2:
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
+  char-regex@1.0.2: {}
+
   chardet@0.7.0: {}
 
   chokidar@4.0.3:
@@ -3334,10 +5280,14 @@ snapshots:
 
   chownr@2.0.0: {}
 
+  chownr@3.0.0: {}
+
   chromium-pickle-js@0.2.0: {}
 
   ci-info@3.9.0: {}
 
+  cjs-module-lexer@1.4.3: {}
+
   cli-cursor@3.1.0:
     dependencies:
       restore-cursor: 3.1.0
@@ -3366,12 +5316,18 @@ snapshots:
     dependencies:
       mimic-response: 1.0.1
 
+  co@4.6.0: {}
+
+  collect-v8-coverage@1.0.3: {}
+
   color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
 
   color-name@1.1.4: {}
 
+  colorette@2.0.20: {}
+
   combined-stream@1.0.8:
     dependencies:
       delayed-stream: 1.0.0
@@ -3409,11 +5365,28 @@ snapshots:
       glob: 10.5.0
       typescript: 5.9.3
 
+  content-disposition@1.1.0: {}
+
+  content-type@1.0.5: {}
+
+  content-type@2.0.0: {}
+
+  convert-source-map@2.0.0: {}
+
+  cookie-signature@1.2.2: {}
+
+  cookie@0.7.2: {}
+
   core-util-is@1.0.2:
     optional: true
 
   core-util-is@1.0.3: {}
 
+  cors@2.8.6:
+    dependencies:
+      object-assign: 4.1.1
+      vary: 1.1.2
+
   crc-32@1.2.2: {}
 
   crc32-stream@4.0.3:
@@ -3426,12 +5399,31 @@ snapshots:
       buffer: 5.7.1
     optional: true
 
+  create-jest@29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3)):
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      jest-util: 29.7.0
+      prompts: 2.4.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  create-require@1.1.1: {}
+
   cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
       which: 2.0.2
 
+  dateformat@4.6.3: {}
+
   debounce-fn@4.0.0:
     dependencies:
       mimic-fn: 3.1.0
@@ -3446,8 +5438,12 @@ snapshots:
     dependencies:
       mimic-response: 3.1.0
 
+  dedent@1.7.2: {}
+
   deep-is@0.1.4: {}
 
+  deepmerge@4.3.1: {}
+
   defer-to-connect@2.0.1: {}
 
   define-data-property@1.1.4:
@@ -3468,14 +5464,22 @@ snapshots:
 
   delayed-stream@1.0.0: {}
 
+  depd@2.0.0: {}
+
   detect-libc@1.0.3:
     optional: true
 
+  detect-newline@3.1.0: {}
+
   detect-node@2.1.0:
     optional: true
 
   didyoumean@1.2.2: {}
 
+  diff-sequences@29.6.3: {}
+
+  diff@4.0.4: {}
+
   dir-compare@3.3.0:
     dependencies:
       buffer-equal: 1.0.1
@@ -3535,6 +5539,8 @@ snapshots:
     dependencies:
       safe-buffer: 5.2.1
 
+  ee-first@1.1.1: {}
+
   ejs@3.1.10:
     dependencies:
       jake: 10.9.4
@@ -3583,6 +5589,8 @@ snapshots:
       conf: 10.2.0
       type-fest: 2.19.0
 
+  electron-to-chromium@1.5.378: {}
+
   electron-updater@6.7.3:
     dependencies:
       builder-util-runtime: 9.5.1
@@ -3604,10 +5612,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  emittery@0.13.1: {}
+
   emoji-regex@8.0.0: {}
 
   emoji-regex@9.2.2: {}
 
+  encodeurl@2.0.0: {}
+
   end-of-stream@1.4.5:
     dependencies:
       once: 1.4.0
@@ -3618,6 +5630,10 @@ snapshots:
 
   err-code@2.0.3: {}
 
+  error-ex@1.3.4:
+    dependencies:
+      is-arrayish: 0.2.1
+
   es-define-property@1.0.1: {}
 
   es-errors@1.3.0: {}
@@ -3667,8 +5683,12 @@ snapshots:
 
   escalade@3.2.0: {}
 
+  escape-html@1.0.3: {}
+
   escape-string-regexp@1.0.5: {}
 
+  escape-string-regexp@2.0.0: {}
+
   escape-string-regexp@4.0.0: {}
 
   eslint-scope@7.2.2:
@@ -3727,6 +5747,8 @@ snapshots:
       acorn-jsx: 5.3.2(acorn@8.15.0)
       eslint-visitor-keys: 3.4.3
 
+  esprima@4.0.1: {}
+
   esquery@1.7.0:
     dependencies:
       estraverse: 5.3.0
@@ -3739,6 +5761,74 @@ snapshots:
 
   esutils@2.0.3: {}
 
+  etag@1.8.1: {}
+
+  eventsource-parser@3.1.0: {}
+
+  eventsource@3.0.7:
+    dependencies:
+      eventsource-parser: 3.1.0
+
+  execa@5.1.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 6.0.1
+      human-signals: 2.1.0
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  exit@0.1.2: {}
+
+  expect@29.7.0:
+    dependencies:
+      '@jest/expect-utils': 29.7.0
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+
+  express-rate-limit@8.5.2(express@5.2.1):
+    dependencies:
+      express: 5.2.1
+      ip-address: 10.2.0
+
+  express@5.2.1:
+    dependencies:
+      accepts: 2.0.0
+      body-parser: 2.3.0
+      content-disposition: 1.1.0
+      content-type: 1.0.5
+      cookie: 0.7.2
+      cookie-signature: 1.2.2
+      debug: 4.4.3
+      depd: 2.0.0
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      finalhandler: 2.1.1
+      fresh: 2.0.0
+      http-errors: 2.0.1
+      merge-descriptors: 2.0.0
+      mime-types: 3.0.2
+      on-finished: 2.4.1
+      once: 1.4.0
+      parseurl: 1.3.3
+      proxy-addr: 2.0.7
+      qs: 6.15.2
+      range-parser: 1.2.1
+      router: 2.2.0
+      send: 1.2.1
+      serve-static: 2.2.1
+      statuses: 2.0.2
+      type-is: 2.1.0
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+
   external-editor@3.1.0:
     dependencies:
       chardet: 0.7.0
@@ -3758,6 +5848,8 @@ snapshots:
   extsprintf@1.4.1:
     optional: true
 
+  fast-copy@4.0.3: {}
+
   fast-deep-equal@3.1.3: {}
 
   fast-glob@3.3.3:
@@ -3772,12 +5864,18 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
+  fast-safe-stringify@2.1.1: {}
+
   fast-uri@3.1.0: {}
 
   fastq@1.20.1:
     dependencies:
       reusify: 1.1.0
 
+  fb-watchman@2.0.2:
+    dependencies:
+      bser: 2.1.1
+
   fd-slicer@1.1.0:
     dependencies:
       pend: 1.2.0
@@ -3802,6 +5900,17 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
+  finalhandler@2.1.1:
+    dependencies:
+      debug: 4.4.3
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      on-finished: 2.4.1
+      parseurl: 1.3.3
+      statuses: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
+
   find-up@3.0.0:
     dependencies:
       locate-path: 3.0.0
@@ -3837,6 +5946,10 @@ snapshots:
       hasown: 2.0.2
       mime-types: 2.1.35
 
+  forwarded@0.2.0: {}
+
+  fresh@2.0.0: {}
+
   fs-constants@1.0.0: {}
 
   fs-extra@10.1.0:
@@ -3864,11 +5977,16 @@ snapshots:
 
   fs.realpath@1.0.0: {}
 
+  fsevents@2.3.2:
+    optional: true
+
   fsevents@2.3.3:
     optional: true
 
   function-bind@1.1.2: {}
 
+  gensync@1.0.0-beta.2: {}
+
   get-caller-file@2.0.5: {}
 
   get-intrinsic@1.3.0:
@@ -3884,6 +6002,8 @@ snapshots:
       hasown: 2.0.2
       math-intrinsics: 1.1.0
 
+  get-package-type@0.1.0: {}
+
   get-proto@1.0.1:
     dependencies:
       dunder-proto: 1.0.1
@@ -3893,6 +6013,8 @@ snapshots:
     dependencies:
       pump: 3.0.3
 
+  get-stream@6.0.1: {}
+
   glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
@@ -3994,12 +6116,30 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
+  hasown@2.0.4:
+    dependencies:
+      function-bind: 1.1.2
+
+  help-me@5.0.0: {}
+
+  hono@4.12.26: {}
+
   hosted-git-info@4.1.0:
     dependencies:
       lru-cache: 6.0.0
 
+  html-escaper@2.0.2: {}
+
   http-cache-semantics@4.2.0: {}
 
+  http-errors@2.0.1:
+    dependencies:
+      depd: 2.0.0
+      inherits: 2.0.4
+      setprototypeof: 1.2.0
+      statuses: 2.0.2
+      toidentifier: 1.0.1
+
   http-proxy-agent@5.0.0:
     dependencies:
       '@tootallnate/once': 2.0.0
@@ -4020,6 +6160,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  human-signals@2.1.0: {}
+
   iceberg-js@0.8.1: {}
 
   iconv-corefoundation@1.1.7:
@@ -4036,6 +6178,10 @@ snapshots:
     dependencies:
       safer-buffer: 2.1.2
 
+  iconv-lite@0.7.2:
+    dependencies:
+      safer-buffer: 2.1.2
+
   ieee754@1.2.1: {}
 
   ignore@5.3.2: {}
@@ -4055,6 +6201,11 @@ snapshots:
     dependencies:
       resolve-from: 5.0.0
 
+  import-local@3.2.0:
+    dependencies:
+      pkg-dir: 4.2.0
+      resolve-cwd: 3.0.0
+
   imurmurhash@0.1.4: {}
 
   inflight@1.0.6:
@@ -4080,54 +6231,433 @@ snapshots:
       strip-ansi: 6.0.1
       through: 2.3.8
 
+  ip-address@10.2.0: {}
+
+  ipaddr.js@1.9.1: {}
+
+  is-arrayish@0.2.1: {}
+
   is-ci@3.0.1:
     dependencies:
-      ci-info: 3.9.0
+      ci-info: 3.9.0
+
+  is-core-module@2.16.2:
+    dependencies:
+      hasown: 2.0.4
+
+  is-docker@2.2.1: {}
+
+  is-extglob@2.1.1: {}
+
+  is-fullwidth-code-point@3.0.0: {}
+
+  is-generator-fn@2.1.0: {}
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-number@7.0.0: {}
+
+  is-obj@2.0.0: {}
+
+  is-path-inside@3.0.3: {}
+
+  is-promise@4.0.0: {}
+
+  is-stream@2.0.1: {}
+
+  is-wsl@2.2.0:
+    dependencies:
+      is-docker: 2.2.1
+
+  isarray@1.0.0: {}
+
+  isbinaryfile@4.0.10: {}
+
+  isbinaryfile@5.0.7: {}
+
+  isexe@2.0.0: {}
+
+  istanbul-lib-coverage@3.2.2: {}
+
+  istanbul-lib-instrument@5.2.1:
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/parser': 7.29.7
+      '@istanbuljs/schema': 0.1.6
+      istanbul-lib-coverage: 3.2.2
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-lib-instrument@6.0.3:
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/parser': 7.29.7
+      '@istanbuljs/schema': 0.1.6
+      istanbul-lib-coverage: 3.2.2
+      semver: 7.7.3
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-lib-report@3.0.1:
+    dependencies:
+      istanbul-lib-coverage: 3.2.2
+      make-dir: 4.0.0
+      supports-color: 7.2.0
+
+  istanbul-lib-source-maps@4.0.1:
+    dependencies:
+      debug: 4.4.3
+      istanbul-lib-coverage: 3.2.2
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-reports@3.2.0:
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.1
+
+  jackspeak@3.4.3:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
+  jake@10.9.4:
+    dependencies:
+      async: 3.2.6
+      filelist: 1.0.4
+      picocolors: 1.1.1
+
+  jest-changed-files@29.7.0:
+    dependencies:
+      execa: 5.1.1
+      jest-util: 29.7.0
+      p-limit: 3.1.0
+
+  jest-circus@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/expect': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 1.7.2
+      is-generator-fn: 2.1.0
+      jest-each: 29.7.0
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      p-limit: 3.1.0
+      pretty-format: 29.7.0
+      pure-rand: 6.1.0
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-cli@29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3)):
+    dependencies:
+      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  jest-config@29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3)):
+    dependencies:
+      '@babel/core': 7.29.7
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.29.7)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.8
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 20.19.27
+      ts-node: 10.9.2(@types/node@20.19.27)(typescript@5.9.3)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-diff@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 29.6.3
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-docblock@29.7.0:
+    dependencies:
+      detect-newline: 3.1.0
+
+  jest-each@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      jest-get-type: 29.6.3
+      jest-util: 29.7.0
+      pretty-format: 29.7.0
+
+  jest-environment-node@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      jest-mock: 29.7.0
+      jest-util: 29.7.0
+
+  jest-get-type@29.6.3: {}
+
+  jest-haste-map@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/graceful-fs': 4.1.9
+      '@types/node': 20.19.27
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.11
+      jest-regex-util: 29.6.3
+      jest-util: 29.7.0
+      jest-worker: 29.7.0
+      micromatch: 4.0.8
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  jest-leak-detector@29.7.0:
+    dependencies:
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-matcher-utils@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 29.7.0
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-message-util@29.7.0:
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@jest/types': 29.6.3
+      '@types/stack-utils': 2.0.3
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      stack-utils: 2.0.6
+
+  jest-mock@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      jest-util: 29.7.0
 
-  is-docker@2.2.1: {}
+  jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
+    optionalDependencies:
+      jest-resolve: 29.7.0
 
-  is-extglob@2.1.1: {}
+  jest-regex-util@29.6.3: {}
 
-  is-fullwidth-code-point@3.0.0: {}
+  jest-resolve-dependencies@29.7.0:
+    dependencies:
+      jest-regex-util: 29.6.3
+      jest-snapshot: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
 
-  is-glob@4.0.3:
+  jest-resolve@29.7.0:
     dependencies:
-      is-extglob: 2.1.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-pnp-resolver: 1.2.3(jest-resolve@29.7.0)
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      resolve: 1.22.12
+      resolve.exports: 2.0.3
+      slash: 3.0.0
 
-  is-number@7.0.0: {}
+  jest-runner@29.7.0:
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/environment': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      chalk: 4.1.2
+      emittery: 0.13.1
+      graceful-fs: 4.2.11
+      jest-docblock: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-haste-map: 29.7.0
+      jest-leak-detector: 29.7.0
+      jest-message-util: 29.7.0
+      jest-resolve: 29.7.0
+      jest-runtime: 29.7.0
+      jest-util: 29.7.0
+      jest-watcher: 29.7.0
+      jest-worker: 29.7.0
+      p-limit: 3.1.0
+      source-map-support: 0.5.13
+    transitivePeerDependencies:
+      - supports-color
 
-  is-obj@2.0.0: {}
+  jest-runtime@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/fake-timers': 29.7.0
+      '@jest/globals': 29.7.0
+      '@jest/source-map': 29.6.3
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      chalk: 4.1.2
+      cjs-module-lexer: 1.4.3
+      collect-v8-coverage: 1.0.3
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-mock: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
 
-  is-path-inside@3.0.3: {}
+  jest-snapshot@29.7.0:
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7)
+      '@babel/types': 7.29.7
+      '@jest/expect-utils': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7)
+      chalk: 4.1.2
+      expect: 29.7.0
+      graceful-fs: 4.2.11
+      jest-diff: 29.7.0
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      natural-compare: 1.4.0
+      pretty-format: 29.7.0
+      semver: 7.7.3
+    transitivePeerDependencies:
+      - supports-color
 
-  is-wsl@2.2.0:
+  jest-util@29.7.0:
     dependencies:
-      is-docker: 2.2.1
-
-  isarray@1.0.0: {}
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      graceful-fs: 4.2.11
+      picomatch: 2.3.1
 
-  isbinaryfile@4.0.10: {}
+  jest-validate@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 29.6.3
+      leven: 3.1.0
+      pretty-format: 29.7.0
 
-  isbinaryfile@5.0.7: {}
+  jest-watcher@29.7.0:
+    dependencies:
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.27
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.13.1
+      jest-util: 29.7.0
+      string-length: 4.0.2
 
-  isexe@2.0.0: {}
+  jest-worker@29.7.0:
+    dependencies:
+      '@types/node': 20.19.27
+      jest-util: 29.7.0
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
 
-  jackspeak@3.4.3:
+  jest@29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3)):
     dependencies:
-      '@isaacs/cliui': 8.0.2
-    optionalDependencies:
-      '@pkgjs/parseargs': 0.11.0
+      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
 
-  jake@10.9.4:
+  jose@6.2.3: {}
+
+  joycon@3.1.1: {}
+
+  js-tokens@4.0.0: {}
+
+  js-yaml@3.14.2:
     dependencies:
-      async: 3.2.6
-      filelist: 1.0.4
-      picocolors: 1.1.1
+      argparse: 1.0.10
+      esprima: 4.0.1
 
   js-yaml@4.1.1:
     dependencies:
       argparse: 2.0.1
 
+  jsesc@3.1.0: {}
+
   json-buffer@3.0.1: {}
 
   json-fixer@1.6.15:
@@ -4136,12 +6666,16 @@ snapshots:
       chalk: 4.1.2
       pegjs: 0.10.0
 
+  json-parse-even-better-errors@2.3.1: {}
+
   json-schema-traverse@0.4.1: {}
 
   json-schema-traverse@1.0.0: {}
 
   json-schema-typed@7.0.3: {}
 
+  json-schema-typed@8.0.2: {}
+
   json-stable-stringify-without-jsonify@1.0.1: {}
 
   json-stringify-safe@5.0.1:
@@ -4187,17 +6721,23 @@ snapshots:
     dependencies:
       json-buffer: 3.0.1
 
+  kleur@3.0.3: {}
+
   lazy-val@1.0.5: {}
 
   lazystream@1.0.1:
     dependencies:
       readable-stream: 2.3.8
 
+  leven@3.1.0: {}
+
   levn@0.4.1:
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
+  lines-and-columns@1.2.4: {}
+
   locate-path@3.0.0:
     dependencies:
       p-locate: 3.0.0
@@ -4233,6 +6773,8 @@ snapshots:
 
   lodash.isstring@4.0.1: {}
 
+  lodash.memoize@4.1.2: {}
+
   lodash.merge@4.6.2: {}
 
   lodash.once@4.1.1: {}
@@ -4245,10 +6787,24 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
+  lru-cache@5.1.1:
+    dependencies:
+      yallist: 3.1.1
+
   lru-cache@6.0.0:
     dependencies:
       yallist: 4.0.0
 
+  make-dir@4.0.0:
+    dependencies:
+      semver: 7.7.3
+
+  make-error@1.3.6: {}
+
+  makeerror@1.0.12:
+    dependencies:
+      tmpl: 1.0.5
+
   marked@17.0.3: {}
 
   matcher@3.0.0:
@@ -4258,6 +6814,12 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
+  media-typer@1.1.0: {}
+
+  merge-descriptors@2.0.0: {}
+
+  merge-stream@2.0.0: {}
+
   merge2@1.4.1: {}
 
   micromatch@4.0.8:
@@ -4267,10 +6829,16 @@ snapshots:
 
   mime-db@1.52.0: {}
 
+  mime-db@1.54.0: {}
+
   mime-types@2.1.35:
     dependencies:
       mime-db: 1.52.0
 
+  mime-types@3.0.2:
+    dependencies:
+      mime-db: 1.54.0
+
   mime@2.6.0: {}
 
   mimic-fn@2.1.0: {}
@@ -4316,6 +6884,10 @@ snapshots:
       minipass: 3.3.6
       yallist: 4.0.0
 
+  minizlib@3.1.0:
+    dependencies:
+      minipass: 7.1.2
+
   mkdirp@1.0.4: {}
 
   ms@2.1.3: {}
@@ -4326,6 +6898,8 @@ snapshots:
 
   natural-compare@1.4.0: {}
 
+  negotiator@1.0.0: {}
+
   neo-async@2.6.2: {}
 
   node-addon-api@1.7.2:
@@ -4338,13 +6912,31 @@ snapshots:
     dependencies:
       whatwg-url: 5.0.0
 
+  node-int64@0.4.0: {}
+
+  node-releases@2.0.49: {}
+
   normalize-path@3.0.0: {}
 
   normalize-url@6.1.0: {}
 
+  npm-run-path@4.0.1:
+    dependencies:
+      path-key: 3.1.1
+
+  object-assign@4.1.1: {}
+
+  object-inspect@1.13.4: {}
+
   object-keys@1.1.1:
     optional: true
 
+  on-exit-leak-free@2.1.2: {}
+
+  on-finished@2.4.1:
+    dependencies:
+      ee-first: 1.1.1
+
   once@1.4.0:
     dependencies:
       wrappy: 1.0.2
@@ -4402,6 +6994,15 @@ snapshots:
 
   parse-github-url@1.0.3: {}
 
+  parse-json@5.2.0:
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      error-ex: 1.3.4
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+
+  parseurl@1.3.3: {}
+
   path-exists@3.0.0: {}
 
   path-exists@4.0.0: {}
@@ -4410,11 +7011,15 @@ snapshots:
 
   path-key@3.1.1: {}
 
+  path-parse@1.0.7: {}
+
   path-scurry@1.11.1:
     dependencies:
       lru-cache: 10.4.3
       minipass: 7.1.2
 
+  path-to-regexp@8.4.2: {}
+
   path-type@4.0.0: {}
 
   pegjs@0.10.0: {}
@@ -4429,10 +7034,66 @@ snapshots:
 
   pify@5.0.0: {}
 
+  pino-abstract-transport@2.0.0:
+    dependencies:
+      split2: 4.2.0
+
+  pino-abstract-transport@3.0.0:
+    dependencies:
+      split2: 4.2.0
+
+  pino-pretty@13.1.3:
+    dependencies:
+      colorette: 2.0.20
+      dateformat: 4.6.3
+      fast-copy: 4.0.3
+      fast-safe-stringify: 2.1.1
+      help-me: 5.0.0
+      joycon: 3.1.1
+      minimist: 1.2.8
+      on-exit-leak-free: 2.1.2
+      pino-abstract-transport: 3.0.0
+      pump: 3.0.3
+      secure-json-parse: 4.1.0
+      sonic-boom: 4.2.1
+      strip-json-comments: 5.0.3
+
+  pino-std-serializers@7.1.0: {}
+
+  pino@9.14.0:
+    dependencies:
+      '@pinojs/redact': 0.4.0
+      atomic-sleep: 1.0.0
+      on-exit-leak-free: 2.1.2
+      pino-abstract-transport: 2.0.0
+      pino-std-serializers: 7.1.0
+      process-warning: 5.0.0
+      quick-format-unescaped: 4.0.4
+      real-require: 0.2.0
+      safe-stable-stringify: 2.5.0
+      sonic-boom: 4.2.1
+      thread-stream: 3.2.0
+
+  pirates@4.0.7: {}
+
+  pkce-challenge@5.0.1: {}
+
+  pkg-dir@4.2.0:
+    dependencies:
+      find-up: 4.1.0
+
   pkg-up@3.1.0:
     dependencies:
       find-up: 3.0.0
 
+  playwright-core@1.60.0: {}
+
+  playwright@1.60.0:
+    dependencies:
+      playwright-core: 1.60.0
+    optionalDependencies:
+      fsevents: 2.3.2
+
   plist@3.1.0:
     dependencies:
       '@xmldom/xmldom': 0.8.12
@@ -4450,8 +7111,16 @@ snapshots:
   prettier@2.8.8:
     optional: true
 
+  pretty-format@29.7.0:
+    dependencies:
+      '@jest/schemas': 29.6.3
+      ansi-styles: 5.2.0
+      react-is: 18.3.1
+
   process-nextick-args@2.0.1: {}
 
+  process-warning@5.0.0: {}
+
   progress@2.0.3: {}
 
   promise-retry@2.0.1:
@@ -4459,6 +7128,16 @@ snapshots:
       err-code: 2.0.3
       retry: 0.12.0
 
+  prompts@2.4.2:
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
+  proxy-addr@2.0.7:
+    dependencies:
+      forwarded: 0.2.0
+      ipaddr.js: 1.9.1
+
   pump@3.0.3:
     dependencies:
       end-of-stream: 1.4.5
@@ -4466,10 +7145,29 @@ snapshots:
 
   punycode@2.3.1: {}
 
+  pure-rand@6.1.0: {}
+
+  qs@6.15.2:
+    dependencies:
+      side-channel: 1.1.1
+
   queue-microtask@1.2.3: {}
 
+  quick-format-unescaped@4.0.4: {}
+
   quick-lru@5.1.1: {}
 
+  range-parser@1.2.1: {}
+
+  raw-body@3.0.2:
+    dependencies:
+      bytes: 3.1.2
+      http-errors: 2.0.1
+      iconv-lite: 0.7.2
+      unpipe: 1.0.0
+
+  react-is@18.3.1: {}
+
   read-config-file@6.3.2:
     dependencies:
       config-file-ts: 0.2.6
@@ -4501,6 +7199,8 @@ snapshots:
 
   readdirp@4.1.2: {}
 
+  real-require@0.2.0: {}
+
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -4509,10 +7209,23 @@ snapshots:
 
   resolve-alpn@1.2.1: {}
 
+  resolve-cwd@3.0.0:
+    dependencies:
+      resolve-from: 5.0.0
+
   resolve-from@4.0.0: {}
 
   resolve-from@5.0.0: {}
 
+  resolve.exports@2.0.3: {}
+
+  resolve@1.22.12:
+    dependencies:
+      es-errors: 1.3.0
+      is-core-module: 2.16.2
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
   responselike@2.0.1:
     dependencies:
       lowercase-keys: 2.0.0
@@ -4580,6 +7293,16 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.55.1
       fsevents: 2.3.3
 
+  router@2.2.0:
+    dependencies:
+      debug: 4.4.3
+      depd: 2.0.0
+      is-promise: 4.0.0
+      parseurl: 1.3.3
+      path-to-regexp: 8.4.2
+    transitivePeerDependencies:
+      - supports-color
+
   run-async@2.4.1: {}
 
   run-parallel@1.2.0:
@@ -4594,6 +7317,8 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
+  safe-stable-stringify@2.5.0: {}
+
   safer-buffer@2.1.2: {}
 
   sanitize-filename@1.6.3:
@@ -4610,6 +7335,8 @@ snapshots:
 
   sax@1.4.3: {}
 
+  secure-json-parse@4.1.0: {}
+
   semver-compare@1.0.0:
     optional: true
 
@@ -4617,19 +7344,76 @@ snapshots:
 
   semver@7.7.3: {}
 
+  semver@7.8.5: {}
+
+  send@1.2.1:
+    dependencies:
+      debug: 4.4.3
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      fresh: 2.0.0
+      http-errors: 2.0.1
+      mime-types: 3.0.2
+      ms: 2.1.3
+      on-finished: 2.4.1
+      range-parser: 1.2.1
+      statuses: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
+
   serialize-error@7.0.1:
     dependencies:
       type-fest: 0.13.1
     optional: true
 
+  serve-static@2.2.1:
+    dependencies:
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      parseurl: 1.3.3
+      send: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+
   set-blocking@2.0.0: {}
 
+  setprototypeof@1.2.0: {}
+
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
 
   shebang-regex@3.0.0: {}
 
+  side-channel-list@1.0.1:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-map@1.0.1:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-weakmap@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-map: 1.0.1
+
+  side-channel@1.1.1:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-list: 1.0.1
+      side-channel-map: 1.0.1
+      side-channel-weakmap: 1.0.2
+
   signal-exit@3.0.7: {}
 
   signal-exit@4.1.0: {}
@@ -4638,6 +7422,8 @@ snapshots:
     dependencies:
       semver: 7.7.3
 
+  sisteransi@1.0.5: {}
+
   slash@3.0.0: {}
 
   slice-ansi@3.0.0:
@@ -4650,8 +7436,17 @@ snapshots:
   smart-buffer@4.2.0:
     optional: true
 
+  sonic-boom@4.2.1:
+    dependencies:
+      atomic-sleep: 1.0.0
+
   source-map-js@1.2.1: {}
 
+  source-map-support@0.5.13:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
   source-map-support@0.5.21:
     dependencies:
       buffer-from: 1.1.2
@@ -4661,11 +7456,26 @@ snapshots:
 
   source-map@0.7.6: {}
 
+  split2@4.2.0: {}
+
+  sprintf-js@1.0.3: {}
+
   sprintf-js@1.1.3:
     optional: true
 
+  stack-utils@2.0.6:
+    dependencies:
+      escape-string-regexp: 2.0.0
+
   stat-mode@1.0.0: {}
 
+  statuses@2.0.2: {}
+
+  string-length@4.0.2:
+    dependencies:
+      char-regex: 1.0.2
+      strip-ansi: 6.0.1
+
   string-width@4.2.3:
     dependencies:
       emoji-regex: 8.0.0
@@ -4694,8 +7504,14 @@ snapshots:
     dependencies:
       ansi-regex: 6.2.2
 
+  strip-bom@4.0.0: {}
+
+  strip-final-newline@2.0.0: {}
+
   strip-json-comments@3.1.1: {}
 
+  strip-json-comments@5.0.3: {}
+
   sumchecker@3.0.1:
     dependencies:
       debug: 4.4.3
@@ -4706,6 +7522,12 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
+  supports-color@8.1.1:
+    dependencies:
+      has-flag: 4.0.0
+
+  supports-preserve-symlinks-flag@1.0.0: {}
+
   tar-stream@2.2.0:
     dependencies:
       bl: 4.1.0
@@ -4723,13 +7545,31 @@ snapshots:
       mkdirp: 1.0.4
       yallist: 4.0.0
 
+  tar@7.5.16:
+    dependencies:
+      '@isaacs/fs-minipass': 4.0.1
+      chownr: 3.0.0
+      minipass: 7.1.2
+      minizlib: 3.1.0
+      yallist: 5.0.0
+
   temp-file@3.4.0:
     dependencies:
       async-exit-hook: 2.0.1
       fs-extra: 10.1.0
 
+  test-exclude@6.0.0:
+    dependencies:
+      '@istanbuljs/schema': 0.1.6
+      glob: 7.2.3
+      minimatch: 3.1.2
+
   text-table@0.2.0: {}
 
+  thread-stream@3.2.0:
+    dependencies:
+      real-require: 0.2.0
+
   through@2.3.8: {}
 
   tiny-typed-emitter@2.1.0: {}
@@ -4749,10 +7589,14 @@ snapshots:
 
   tmp@0.2.5: {}
 
+  tmpl@1.0.5: {}
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
 
+  toidentifier@1.0.1: {}
+
   tr46@0.0.3: {}
 
   truncate-utf8-bytes@1.0.2:
@@ -4763,6 +7607,44 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
+  ts-jest@29.4.10(@babel/core@7.29.7)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.29.7))(jest-util@29.7.0)(jest@29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3)))(typescript@5.9.3):
+    dependencies:
+      bs-logger: 0.2.6
+      fast-json-stable-stringify: 2.1.0
+      handlebars: 4.7.9
+      jest: 29.7.0(@types/node@20.19.27)(ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3))
+      json5: 2.2.3
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.8.5
+      type-fest: 4.41.0
+      typescript: 5.9.3
+      yargs-parser: 21.1.1
+    optionalDependencies:
+      '@babel/core': 7.29.7
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.29.7)
+      jest-util: 29.7.0
+
+  ts-node@10.9.2(@types/node@20.19.27)(typescript@5.9.3):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.12
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 20.19.27
+      acorn: 8.15.0
+      acorn-walk: 8.3.5
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.4
+      make-error: 1.3.6
+      typescript: 5.9.3
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+
   tslib@1.14.1: {}
 
   tslib@2.8.1: {}
@@ -4771,6 +7653,8 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
+  type-detect@4.0.8: {}
+
   type-fest@0.13.1:
     optional: true
 
@@ -4780,6 +7664,14 @@ snapshots:
 
   type-fest@2.19.0: {}
 
+  type-fest@4.41.0: {}
+
+  type-is@2.1.0:
+    dependencies:
+      content-type: 2.0.0
+      media-typer: 1.1.0
+      mime-types: 3.0.2
+
   typescript@5.9.3: {}
 
   uglify-js@3.19.3:
@@ -4793,6 +7685,14 @@ snapshots:
 
   universalify@2.0.1: {}
 
+  unpipe@1.0.0: {}
+
+  update-browserslist-db@1.2.3(browserslist@4.28.4):
+    dependencies:
+      browserslist: 4.28.4
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
   uri-js@4.4.1:
     dependencies:
       punycode: 2.3.1
@@ -4805,6 +7705,16 @@ snapshots:
 
   uuid@8.3.2: {}
 
+  v8-compile-cache-lib@3.0.1: {}
+
+  v8-to-istanbul@9.3.0:
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.31
+      '@types/istanbul-lib-coverage': 2.0.6
+      convert-source-map: 2.0.0
+
+  vary@1.1.2: {}
+
   verror@1.10.1:
     dependencies:
       assert-plus: 1.0.0
@@ -4831,6 +7741,10 @@ snapshots:
       fsevents: 2.3.3
       sass: 1.97.2
 
+  walker@1.0.8:
+    dependencies:
+      makeerror: 1.0.12
+
   webidl-conversions@3.0.1: {}
 
   whatwg-url@5.0.0:
@@ -4868,6 +7782,11 @@ snapshots:
 
   wrappy@1.0.2: {}
 
+  write-file-atomic@4.0.2:
+    dependencies:
+      imurmurhash: 0.1.4
+      signal-exit: 3.0.7
+
   ws@8.19.0: {}
 
   xmlbuilder@15.1.1: {}
@@ -4876,8 +7795,12 @@ snapshots:
 
   y18n@5.0.8: {}
 
+  yallist@3.1.1: {}
+
   yallist@4.0.0: {}
 
+  yallist@5.0.0: {}
+
   yargs-parser@18.1.3:
     dependencies:
       camelcase: 5.3.1
@@ -4914,6 +7837,8 @@ snapshots:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
 
+  yn@3.1.1: {}
+
   yocto-queue@0.1.0: {}
 
   zip-stream@4.1.1:
@@ -4921,3 +7846,9 @@ snapshots:
       archiver-utils: 3.0.4
       compress-commons: 4.1.2
       readable-stream: 3.6.2
+
+  zod-to-json-schema@3.25.2(zod@4.4.3):
+    dependencies:
+      zod: 4.4.3
+
+  zod@4.4.3: {}
diff --git a/src/cli/constants.ts b/src/cli/constants.ts
new file mode 100644
index 00000000..1001b2c8
--- /dev/null
+++ b/src/cli/constants.ts
@@ -0,0 +1,70 @@
+/**
+ * CLI-specific constants for headless operation mode
+ */
+
+export const CLI_CONSTANTS = {
+    /**
+     * Default port for headless MCP server
+     */
+    DEFAULT_MCP_PORT: 7340,
+
+    /**
+     * Default hostname for headless MCP server
+     */
+    DEFAULT_MCP_HOST: "127.0.0.1",
+
+    /**
+     * Default timeout for headless tool invocation (in milliseconds)
+     */
+    DEFAULT_TOOL_TIMEOUT_MS: 300000, // 5 minutes
+
+    /**
+     * Default job cleanup TTL (in milliseconds) - how long to keep completed jobs
+     */
+    DEFAULT_JOB_CLEANUP_TTL_MS: 3600000, // 1 hour
+
+    /**
+     * Job polling check interval (in milliseconds)
+     */
+    JOB_CLEANUP_CHECK_INTERVAL_MS: 60000, // 1 minute
+
+    /**
+     * Maximum number of concurrent job executions
+     */
+    MAX_CONCURRENT_JOBS: 10,
+
+    /**
+     * Log levels for CLI
+     */
+    LOG_LEVELS: {
+        DEBUG: "debug",
+        INFO: "info",
+        WARN: "warn",
+        ERROR: "error",
+    } as const,
+};
+
+/**
+ * CLI Exit codes for error handling
+ */
+export const EXIT_CODES = {
+    SUCCESS: 0,
+    GENERAL_ERROR: 1,
+    INVALID_ARGUMENTS: 2,
+    AUTHENTICATION_FAILED: 3,
+    TOOL_NOT_FOUND: 4,
+    HEADLESS_NOT_SUPPORTED: 5,
+    TOOL_EXECUTION_FAILED: 6,
+} as const;
+
+/**
+ * CLI command definitions
+ */
+export const CLI_COMMANDS = {
+    SERVE: "serve",
+    INVOKE: "invoke",
+    JOB_STATUS: "job-status",
+    CONFIG: "config",
+    HELP: "help",
+    VERSION: "version",
+} as const;
diff --git a/src/cli/index.ts b/src/cli/index.ts
new file mode 100644
index 00000000..72fd24b4
--- /dev/null
+++ b/src/cli/index.ts
@@ -0,0 +1,144 @@
+#!/usr/bin/env node
+
+/**
+ * Power Platform ToolBox CLI - Headless MCP Tool Execution
+ *
+ * This entry point provides a pure Node.js CLI for running tools in headless mode
+ * without requiring Electron GUI. It initializes the core managers needed for:
+ * - Tool registry and discovery
+ * - MCP server (for external agent invocation)
+ * - Tool execution (headless mode)
+ * - Connection and authentication management
+ * - Invocation logging and job tracking
+ *
+ * Usage:
+ *   pptb-cli serve --port 7340
+ *   pptb-cli invoke <toolId> --input '{"key":"value"}' --token <token>
+ *   pptb-cli job-status <jobId> --token <token>
+ */
+
+import { CLI_COMMANDS, CLI_CONSTANTS, EXIT_CODES } from "./constants";
+import { CliError, createLogger, formatErrorMessage, loadEnvironmentConfig, parseArguments, printHelp, printVersion } from "./utils";
+
+/**
+ * Entry point for CLI application
+ */
+async function main(): Promise<void> {
+    try {
+        // Load environment configuration
+        const env = loadEnvironmentConfig();
+
+        // Parse command line arguments
+        const argv = process.argv.slice(2);
+        const { command, options } = parseArguments(argv);
+
+        // Create logger based on log level
+        const logLevel = (options["log-level"] as string) || CLI_CONSTANTS.LOG_LEVELS.INFO;
+        const logger = createLogger(logLevel);
+
+        logger.info(`[CLI] Power Platform ToolBox CLI starting in headless mode`);
+        logger.debug(`[CLI] Command: ${command}`);
+        logger.debug(`[CLI] Options: ${JSON.stringify(options)}`);
+
+        // Handle help and version commands
+        if (command === CLI_COMMANDS.HELP || options.help) {
+            printHelp();
+            process.exit(EXIT_CODES.SUCCESS);
+        }
+
+        if (command === CLI_COMMANDS.VERSION || options.version) {
+            printVersion();
+            process.exit(EXIT_CODES.SUCCESS);
+        }
+
+        // Route to appropriate command handler
+        switch (command) {
+            case CLI_COMMANDS.SERVE:
+                await handleServeCommand(options, env, logger);
+                break;
+
+            case CLI_COMMANDS.INVOKE:
+                await handleInvokeCommand(options, env, logger);
+                break;
+
+            case CLI_COMMANDS.JOB_STATUS:
+                await handleJobStatusCommand(options, env, logger);
+                break;
+
+            case CLI_COMMANDS.CONFIG:
+                await handleConfigCommand(options, env, logger);
+                break;
+
+            default:
+                logger.error(`Unknown command: ${command}`);
+                printHelp();
+                process.exit(EXIT_CODES.INVALID_ARGUMENTS);
+        }
+    } catch (error) {
+        const exitCode = error instanceof CliError ? error.exitCode : EXIT_CODES.GENERAL_ERROR;
+        const message = formatErrorMessage(error);
+        process.stderr.write(`${message}\n`);
+        process.exit(exitCode);
+    }
+}
+
+/**
+ * Handle 'serve' command - start MCP server in headless mode
+ */
+async function handleServeCommand(options: Record<string, string | boolean | number>, _env: Record<string, string>, logger: any): Promise<void> {
+    const port = (options.port as number) || CLI_CONSTANTS.DEFAULT_MCP_PORT;
+    const host = (options.host as string) || CLI_CONSTANTS.DEFAULT_MCP_HOST;
+
+    logger.info(`[CLI] Starting MCP server on ${host}:${port}`);
+
+    // TODO: Phase 2 - Initialize managers and start MCP server
+    // For now, just log that we would start the server
+    logger.info(`[CLI] MCP server would be started here (implementation in Phase 2)`);
+    logger.info(`[CLI] Server listening on http://${host}:${port}`);
+
+    // Keep the process alive
+    await new Promise(() => {
+        // Never resolves - server runs indefinitely
+    });
+}
+
+/**
+ * Handle 'invoke' command - invoke a headless tool
+ */
+async function handleInvokeCommand(_options: Record<string, string | boolean | number>, _env: Record<string, string>, logger: any): Promise<void> {
+    // Get toolId from positional argument
+    // Note: options.args is not provided in this simplified version
+    // Will be enhanced in Phase 7
+
+    logger.info(`[CLI] Invoking headless tool`);
+    logger.info(`[CLI] Tool invocation would be handled here (implementation in Phase 3)`);
+
+    throw new CliError("Tool invocation not yet implemented", EXIT_CODES.GENERAL_ERROR);
+}
+
+/**
+ * Handle 'job-status' command - get status of a tool invocation job
+ */
+async function handleJobStatusCommand(_options: Record<string, string | boolean | number>, _env: Record<string, string>, logger: any): Promise<void> {
+    logger.info(`[CLI] Checking job status`);
+    logger.info(`[CLI] Job status polling would be handled here (implementation in Phase 5)`);
+
+    throw new CliError("Job status polling not yet implemented", EXIT_CODES.GENERAL_ERROR);
+}
+
+/**
+ * Handle 'config' command - manage CLI configuration
+ */
+async function handleConfigCommand(_options: Record<string, string | boolean | number>, _env: Record<string, string>, logger: any): Promise<void> {
+    logger.info(`[CLI] Managing configuration`);
+    logger.info(`[CLI] Configuration management would be handled here (implementation in Phase 7)`);
+
+    throw new CliError("Configuration management not yet implemented", EXIT_CODES.GENERAL_ERROR);
+}
+
+// Run the CLI
+main().catch((error) => {
+    const exitCode = error instanceof CliError ? error.exitCode : EXIT_CODES.GENERAL_ERROR;
+    process.stderr.write(`${formatErrorMessage(error)}\n`);
+    process.exit(exitCode);
+});
diff --git a/src/cli/utils.ts b/src/cli/utils.ts
new file mode 100644
index 00000000..c34f8681
--- /dev/null
+++ b/src/cli/utils.ts
@@ -0,0 +1,226 @@
+/**
+ * CLI Utility functions for argument parsing, logging, and error handling
+ */
+
+import * as fs from "fs";
+import * as path from "path";
+import pino from "pino";
+import { CLI_CONSTANTS, EXIT_CODES } from "./constants";
+
+/**
+ * Simple argument parser for CLI commands
+ */
+export interface ParsedArgs {
+    command: string;
+    args: string[];
+    options: Record<string, string | boolean | number>;
+}
+
+/**
+ * Parse command line arguments
+ * @param argv Command line arguments (process.argv.slice(2))
+ * @returns Parsed command, args, and options
+ */
+export function parseArguments(argv: string[]): ParsedArgs {
+    const command = argv[0] || "help";
+    const args: string[] = [];
+    const options: Record<string, string | boolean | number> = {};
+
+    for (let i = 1; i < argv.length; i++) {
+        const arg = argv[i];
+
+        if (arg.startsWith("--")) {
+            const [key, ...valueParts] = arg.slice(2).split("=");
+            const value = valueParts.join("=");
+
+            if (value) {
+                // Try to parse as number
+                options[key] = isNaN(Number(value)) ? value : Number(value);
+            } else {
+                options[key] = true;
+            }
+        } else if (arg.startsWith("-")) {
+            // Short options like -p 7340
+            const key = arg.slice(1);
+            if (i + 1 < argv.length && !argv[i + 1].startsWith("-")) {
+                const value = argv[++i];
+                options[key] = isNaN(Number(value)) ? value : Number(value);
+            } else {
+                options[key] = true;
+            }
+        } else {
+            args.push(arg);
+        }
+    }
+
+    return { command, args, options };
+}
+
+/**
+ * Create a logger instance for CLI output
+ * @param level Log level (default: info)
+ * @returns Pino logger instance
+ */
+export function createLogger(level: string = CLI_CONSTANTS.LOG_LEVELS.INFO) {
+    return pino({ level });
+}
+
+/**
+ * Custom error class for CLI operations
+ */
+export class CliError extends Error {
+    constructor(
+        message: string,
+        public readonly exitCode: number = EXIT_CODES.GENERAL_ERROR,
+        public readonly context?: Record<string, unknown>,
+    ) {
+        super(message);
+        this.name = "CliError";
+    }
+}
+
+/**
+ * Validate and load environment configuration
+ * @param envPath Path to .env file (optional)
+ * @returns Environment configuration object
+ */
+export function loadEnvironmentConfig(envPath?: string): Record<string, string> {
+    const config: Record<string, string> = {};
+
+    // Use provided path or default to project root
+    const dotenvPath = envPath || path.join(process.cwd(), ".env");
+
+    try {
+        if (fs.existsSync(dotenvPath)) {
+            const content = fs.readFileSync(dotenvPath, "utf-8");
+            content.split("\n").forEach((line) => {
+                const trimmed = line.trim();
+                if (trimmed && !trimmed.startsWith("#")) {
+                    const [key, ...valueParts] = trimmed.split("=");
+                    const value = valueParts.join("=").replace(/^["']|["']$/g, "");
+                    if (key) {
+                        config[key] = value;
+                    }
+                }
+            });
+        }
+    } catch (error) {
+        // Ignore if .env doesn't exist, use process.env fallback
+    }
+
+    // Merge with process.env (process.env takes precedence)
+    Object.entries(process.env).forEach(([key, value]) => {
+        if (typeof value === "string") {
+            config[key] = value;
+        }
+    });
+
+    return config;
+}
+
+/**
+ * Validate that required environment variables are set
+ * @param requiredVars Array of required environment variable names
+ * @param env Environment object (default: process.env)
+ * @throws CliError if any required variable is missing
+ */
+export function validateRequiredEnv(requiredVars: string[], env: Record<string, string>): void {
+    const missing = requiredVars.filter((varName) => !env[varName]);
+
+    if (missing.length > 0) {
+        throw new CliError(`Missing required environment variables: ${missing.join(", ")}`, EXIT_CODES.INVALID_ARGUMENTS, { missing });
+    }
+}
+
+/**
+ * Get user data directory path for the application
+ * @returns Path to user data directory
+ */
+export function getUserDataPath(): string {
+    const homeDir = process.env.HOME || process.env.USERPROFILE || process.cwd();
+    const appDataPath = path.join(homeDir, ".pptb");
+
+    // Ensure directory exists
+    if (!fs.existsSync(appDataPath)) {
+        fs.mkdirSync(appDataPath, { recursive: true });
+    }
+
+    return appDataPath;
+}
+
+/**
+ * Print help message
+ */
+export function printHelp(): void {
+    process.stdout.write(`
+Power Platform ToolBox CLI - Headless Tool Execution
+
+Usage: pptb-cli [command] [options]
+
+Commands:
+  serve [options]           Start MCP server in headless mode
+    --port <number>         MCP server port (default: 7340)
+    --host <string>         MCP server host (default: 127.0.0.1)
+    --log-level <level>     Log level: debug, info, warn, error (default: info)
+
+  invoke <toolId> [options] Invoke a headless tool
+    --input <json>          Tool input as JSON string
+    --token <string>        Authentication token
+    --timeout <ms>          Timeout in milliseconds (default: 300000)
+
+  job-status <jobId>        Get status of a tool invocation job
+    --token <string>        Authentication token
+
+  config <action> [key] [value]
+    set <key> <value>       Set configuration value
+    get <key>               Get configuration value
+
+  help                      Show this help message
+  version                   Show version information
+
+Options:
+  --help, -h                Show this help message
+  --version, -v             Show version information
+  --verbose                 Enable verbose logging
+
+Examples:
+  # Start headless MCP server
+  pptb-cli serve --port 7340
+
+  # Invoke a tool
+  pptb-cli invoke my-tool --input '{"param":"value"}' --token <token>
+
+  # Check job status
+  pptb-cli job-status <jobId> --token <token>
+`);
+}
+
+/**
+ * Print version information
+ */
+export function printVersion(): void {
+    try {
+        const packageJsonPath = path.join(__dirname, "../../package.json");
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+        process.stdout.write(`Power Platform ToolBox CLI v${packageJson.version}\n`);
+    } catch {
+        process.stdout.write("Power Platform ToolBox CLI (version unknown)\n");
+    }
+}
+
+/**
+ * Format error message for display
+ * @param error Error object or message string
+ * @returns Formatted error message
+ */
+export function formatErrorMessage(error: unknown): string {
+    if (error instanceof CliError) {
+        return `Error: ${error.message}${error.context ? `\n${JSON.stringify(error.context, null, 2)}` : ""}`;
+    }
+
+    if (error instanceof Error) {
+        return `Error: ${error.message}`;
+    }
+
+    return `Error: ${String(error)}`;
+}
diff --git a/src/common/ipc/channels.ts b/src/common/ipc/channels.ts
index 0233eedd..5b488210 100644
--- a/src/common/ipc/channels.ts
+++ b/src/common/ipc/channels.ts
@@ -37,6 +37,7 @@ export const SETTINGS_CHANNELS = {
     ADD_LAST_USED_TOOL: "add-last-used-tool",
     GET_LAST_USED_TOOLS: "get-last-used-tools",
     CLEAR_LAST_USED_TOOLS: "clear-last-used-tools",
+    GET_MCP_ACCESS_TOKEN: "get-mcp-access-token",
 } as const;
 
 // Connection-related IPC channels
@@ -53,6 +54,7 @@ export const CONNECTION_CHANNELS = {
     REFRESH_TOKEN: "refresh-connection-token",
     CHECK_BROWSER_INSTALLED: "check-browser-installed",
     GET_BROWSER_PROFILES: "get-browser-profiles",
+    CONFIGURE_APP_REGISTRATION: "configure-app-registration",
     EXPORT_CONNECTIONS: "export-connections",
     IMPORT_CONNECTIONS: "import-connections",
 } as const;
@@ -231,11 +233,30 @@ export const DATAVERSE_CHANNELS = {
     GET_CSDL_DOCUMENT: "dataverse.getCSDLDocument",
 } as const;
 
+// Power Platform API-related IPC channels
+export const POWERPLATFORM_CHANNELS = {
+    REQUEST: "powerplatform.request",
+} as const;
+
 // Protocol handler-related IPC channels
 export const PROTOCOL_CHANNELS = {
     PROTOCOL_INSTALL_TOOL: "protocol:install-tool",
 } as const;
 
+// Agent Invocation Logging channels
+export const AGENT_INVOCATION_CHANNELS = {
+    GET_LOGS: "agent-invocation:get-logs",
+} as const;
+
+// MCP server status/details channels
+export const MCP_SERVER_CHANNELS = {
+    GET_DETAILS: "mcp-server:get-details",
+    START: "mcp-server:start",
+    STOP: "mcp-server:stop",
+    CONFIGURE_CLAUDE_DESKTOP: "mcp-server:configure-claude-desktop",
+    CONFIGURE_VSCODE: "mcp-server:configure-vscode",
+} as const;
+
 // Event-related IPC channels (from main to renderer)
 export const EVENT_CHANNELS = {
     TOOLBOX_EVENT: "toolbox-event",
@@ -267,5 +288,21 @@ export const MODAL_WINDOW_CHANNELS = {
     RENDERER_MESSAGE: "modal-window:renderer-message",
 } as const;
 
+// Split layout channels
+export const SPLIT_LAYOUT_CHANNELS = {
+    ACTIVATE: "split-layout:activate",
+    DEACTIVATE: "split-layout:deactivate",
+    SET_RATIO: "split-layout:set-ratio",
+    GET_STATE: "split-layout:get-state",
+    /** setActiveInPane(pane, instanceId) — make a group member the visible tool in its pane */
+    SWITCH_PANE: "split-layout:switch-pane",
+    /** moveToPane(instanceId, targetPane) — move a tab from one group to another */
+    MOVE_TO_PANE: "split-layout:move-to-pane",
+    /** setFocusedPane(pane) — set which pane receives newly opened tools */
+    FOCUS_PANE: "split-layout:focus-pane",
+    /** Pushed from main to renderer when split state changes */
+    STATE_CHANGED: "split-layout:state-changed",
+} as const;
+
 // Type helper to extract channel names
 export type ChannelName<T> = T[keyof T];
diff --git a/src/common/types/api.ts b/src/common/types/api.ts
index 36faed94..cfcf52d3 100644
--- a/src/common/types/api.ts
+++ b/src/common/types/api.ts
@@ -5,7 +5,7 @@
 
 import { FileDialogFilter, ModalWindowMessagePayload, ModalWindowOptions, NativeContextMenuRequest, SelectPathOptions, Theme } from "./common";
 import { CommunityLinksCollection } from "./communityLinks";
-import { DataverseConnection } from "./connection";
+import { Connection } from "./connection";
 import { DataverseExecuteRequest } from "./dataverse";
 import { CspConsentRecord, LastUsedToolEntry, LastUsedToolUpdate, UserSettings } from "./settings";
 import { Terminal, TerminalOptions } from "./terminal";
@@ -15,16 +15,16 @@ import { CapabilityTagEntry, Tool, ToolContext, ToolSettings } from "./tool";
  * Connections API namespace
  */
 export interface ConnectionsAPI {
-    add: (connection: DataverseConnection) => Promise<void>;
-    update: (id: string, updates: Partial<DataverseConnection>) => Promise<void>;
+    add: (connection: Connection) => Promise<void>;
+    update: (id: string, updates: Partial<Connection>) => Promise<void>;
     delete: (id: string) => Promise<void>;
-    getAll: () => Promise<DataverseConnection[]>;
-    getById: (connectionId: string) => Promise<DataverseConnection | null>;
-    test: (connection: DataverseConnection) => Promise<{ success: boolean; error?: string }>;
+    getAll: () => Promise<Connection[]>;
+    getById: (connectionId: string) => Promise<Connection | null>;
+    test: (connection: Connection) => Promise<{ success: boolean; error?: string }>;
     isTokenExpired: (connectionId: string) => Promise<boolean>;
     refreshToken: (connectionId: string) => Promise<{ success: boolean }>;
     authenticate: (connectionId: string) => Promise<void>;
-    exportConnections: (ids?: string[]) => Promise<{ version: 1; exportedAt: string; connections: Partial<DataverseConnection>[] }>;
+    exportConnections: (ids?: string[]) => Promise<{ version: 1; exportedAt: string; connections: Partial<Connection>[] }>;
     importConnections: (data: unknown) => Promise<{ imported: number; skipped: number; warnings: string[] }>;
 }
 
@@ -79,6 +79,56 @@ export interface EventsAPI {
     off: (callback: (event: unknown, payload: unknown) => void) => void;
 }
 
+/**
+ * Agent Invocation Log Entry
+ */
+export interface AgentInvocationLogEntry {
+    timestamp: string;
+    toolId: string;
+    toolName: string;
+    connectionId: string | null;
+    prefillSummary: string;
+    outcome: "completed" | "no-result" | "rejected";
+    invocationMode?: "one-way" | "two-way";
+    correlationId?: string;
+    error?: string;
+}
+
+/**
+ * Agent Invocation API namespace
+ */
+export interface AgentInvocationAPI {
+    getLogs: () => Promise<AgentInvocationLogEntry[]>;
+}
+
+/**
+ * MCP server details shown in the renderer UI
+ */
+export interface McpServerDetails {
+    address: string;
+    authHeaderName: string;
+    authHeaderValue: string;
+    isRunning: boolean;
+}
+
+export interface McpClientConfigWriteResult {
+    client: "claude-desktop" | "vscode";
+    os: "macos" | "windows" | "linux";
+    filePath: string;
+    serverName: string;
+}
+
+/**
+ * MCP server API namespace
+ */
+export interface McpServerAPI {
+    getDetails: () => Promise<McpServerDetails>;
+    start: () => Promise<McpServerDetails>;
+    stop: () => Promise<McpServerDetails>;
+    configureClaudeDesktop: () => Promise<McpClientConfigWriteResult>;
+    configureVSCode: () => Promise<McpClientConfigWriteResult>;
+}
+
 /**
  * Troubleshooting API namespace
  */
@@ -111,6 +161,41 @@ export interface DataverseAPI {
     getEntitySetName: (entityLogicalName: string) => Promise<string>;
 }
 
+/**
+ * Split layout state returned by the main process
+ */
+export interface SplitLayoutState {
+    isActive: boolean;
+    /** Ordered list of instanceIds assigned to the left pane. */
+    leftGroup: string[];
+    /** Ordered list of instanceIds assigned to the right pane. */
+    rightGroup: string[];
+    /** The currently visible (active) tool in the left pane. */
+    activeLeftInstanceId: string | null;
+    /** The currently visible (active) tool in the right pane. */
+    activeRightInstanceId: string | null;
+    /** Which pane receives newly opened tools. */
+    focusedPane: "left" | "right";
+    ratio: number;
+}
+
+/**
+ * Split Layout API namespace
+ */
+export interface SplitLayoutAPI {
+    activate: (leftInstanceId: string, rightInstanceId: string) => Promise<boolean>;
+    deactivate: () => Promise<boolean>;
+    setRatio: (ratio: number) => Promise<void>;
+    getState: () => Promise<SplitLayoutState>;
+    /** Make instanceId the active (visible) tool in its pane. Also focuses that pane. */
+    switchPane: (pane: "left" | "right", instanceId: string) => Promise<boolean>;
+    /** Move instanceId from its current group to targetPane. Collapses split if source becomes empty. */
+    moveToPane: (instanceId: string, targetPane: "left" | "right") => Promise<boolean>;
+    /** Set which pane receives newly opened tools. */
+    focusPane: (pane: "left" | "right") => Promise<void>;
+    onStateChanged: (callback: (state: SplitLayoutState) => void) => void;
+}
+
 /**
  * Main ToolboxAPI interface
  */
@@ -119,6 +204,7 @@ export interface ToolboxAPI {
     updateUserSettings: (settings: Partial<UserSettings>) => Promise<void>;
     getSetting: (key: string) => Promise<unknown>;
     setSetting: (key: string, value: unknown) => Promise<void>;
+    getMcpAccessToken: () => Promise<string>;
 
     // Connections namespace
     connections: ConnectionsAPI;
@@ -178,7 +264,9 @@ export interface ToolboxAPI {
      * Subscribe to callee-tool-opened events. Fired once the callee BrowserView is ready
      * so the renderer can create a dedicated tab for the callee instance.
      */
-    onCalleeToolOpened: (callback: (data: { calleeInstanceId: string; callerInstanceId: string; tool: Tool; primaryConnectionId: string | null; secondaryConnectionId: string | null }) => void) => void;
+    onCalleeToolOpened: (
+        callback: (data: { calleeInstanceId: string; callerInstanceId: string; tool: Tool; primaryConnectionId: string | null; secondaryConnectionId: string | null }) => void,
+    ) => void;
     /**
      * Subscribe to callee-tool-closed events. Fired after the callee is auto-closed by
      * the main process so the renderer can remove the callee tab and return focus to the caller.
@@ -225,6 +313,9 @@ export interface ToolboxAPI {
     /** Install the beta (pre-release) npm package for a registry tool and return the loaded Tool. */
     installPrereleaseToolFromNpm: (npmPackageName: string) => Promise<Tool>;
 
+    // Split layout namespace
+    splitLayout: SplitLayoutAPI;
+
     // Utils namespace
     utils: UtilsAPI;
 
@@ -291,4 +382,10 @@ export interface ToolboxAPI {
 
     // Dataverse namespace
     dataverse: DataverseAPI;
+
+    // Agent Invocation namespace
+    agentInvocation: AgentInvocationAPI;
+
+    // MCP server namespace
+    mcpServer: McpServerAPI;
 }
diff --git a/src/common/types/connection.ts b/src/common/types/connection.ts
index 5e1922ae..43a0eeb4 100644
--- a/src/common/types/connection.ts
+++ b/src/common/types/connection.ts
@@ -15,13 +15,13 @@ export type AuthenticationType = "interactive" | "clientSecret" | "usernamePassw
 export type BrowserType = "default" | "chrome" | "edge";
 
 /**
- * Dataverse connection configuration
+ * Power Platform ToolBox connection configuration
  *
  * Note: This interface represents the persisted connection data.
  * UI-level properties like 'isActive' are NOT part of this type and should be
  * added transiently when needed for rendering (e.g., in modals or lists).
  */
-export interface DataverseConnection {
+export interface Connection {
     id: string;
     name: string;
     url: string;
@@ -49,12 +49,20 @@ export interface DataverseConnection {
     categoryColor?: string;
     // Import state: true when the connection was imported but is missing required secrets/credentials
     hasIncompleteCredentials?: boolean;
+    // Whether this connection can be used for Power Platform API operations
+    enabledForPowerPlatformAPI?: boolean;
+    // Granted scopes for Power Platform API authentication
+    scopesForPowerPlatformAPI?: string[];
+    // Separate access token for Power Platform API (https://api.powerplatform.com scope)
+    powerPlatformAccessToken?: string;
+    // Expiry for the Power Platform access token
+    powerPlatformTokenExpiry?: string;
 }
 
 /**
- * Type guard to check if an object is a valid DataverseConnection
+ * Type guard to check if an object is a valid Connection
  */
-export function isDataverseConnection(obj: unknown): obj is DataverseConnection {
+export function isConnection(obj: unknown): obj is Connection {
     if (!obj || typeof obj !== "object") return false;
     const conn = obj as Record<string, unknown>;
     return (
@@ -67,14 +75,14 @@ export function isDataverseConnection(obj: unknown): obj is DataverseConnection
 }
 
 /**
- * UI-level connection data that extends DataverseConnection with display properties
+ * UI-level connection data that extends Connection with display properties
  * Use this type when rendering connections in lists, modals, or other UI components
  */
 export interface UIConnectionData {
     id: string;
     name: string;
     url: string;
-    environment: DataverseConnection["environment"];
+    environment: Connection["environment"];
     authenticationType: AuthenticationType;
     isActive: boolean;
     lastUsedAt?: string;
@@ -86,6 +94,7 @@ export interface UIConnectionData {
     environmentColor?: string;
     categoryColor?: string;
     hasIncompleteCredentials?: boolean;
+    enabledForPowerPlatformAPI?: boolean;
 }
 
 /**
@@ -100,7 +109,7 @@ export interface UIConnectionData {
  * @param connectionString The connection string to parse
  * @returns Parsed connection properties or null if invalid
  */
-export function parseConnectionString(connectionString: string): Partial<DataverseConnection> | null {
+export function parseConnectionString(connectionString: string): Partial<Connection> | null {
     if (!connectionString || typeof connectionString !== "string") {
         return null;
     }
@@ -124,7 +133,7 @@ export function parseConnectionString(connectionString: string): Partial<Dataver
         return null;
     }
 
-    const result: Partial<DataverseConnection> = {
+    const result: Partial<Connection> = {
         url: url,
     };
 
diff --git a/src/common/types/settings.ts b/src/common/types/settings.ts
index b7596d56..9d7faf43 100644
--- a/src/common/types/settings.ts
+++ b/src/common/types/settings.ts
@@ -3,7 +3,7 @@
  */
 
 import { Theme } from "./common";
-import { DataverseConnection } from "./connection";
+import { Connection } from "./connection";
 
 /**
  * Sort options for installed tools
@@ -30,10 +30,44 @@ export type DeprecatedToolsVisibility = "hide-all" | "show-all" | "show-installe
  */
 export type ToolDisplayMode = "standard" | "compact";
 
+export const PREVIEW_FEATURE_IDS = {
+    MCP_SERVER: "mcp-server",
+} as const;
+
+export type PreviewFeatureId = (typeof PREVIEW_FEATURE_IDS)[keyof typeof PREVIEW_FEATURE_IDS];
+export type PreviewFeatureFlags = Partial<Record<PreviewFeatureId, boolean>>;
+
+export const PREVIEW_FEATURE_DEFAULTS: Record<PreviewFeatureId, boolean> = {
+    [PREVIEW_FEATURE_IDS.MCP_SERVER]: false,
+};
+
+/**
+ * Returns a normalized preview-feature map that always includes all known feature IDs.
+ * If an override value is missing for a feature, the legacy fallback (when provided)
+ * is used first, then the feature's default value.
+ */
+export function buildPreviewFeatureFlags(overrides?: PreviewFeatureFlags, legacyFallback?: boolean): Record<PreviewFeatureId, boolean> {
+    const normalized = { ...PREVIEW_FEATURE_DEFAULTS };
+
+    (Object.keys(PREVIEW_FEATURE_DEFAULTS) as PreviewFeatureId[]).forEach((featureId) => {
+        const overrideValue = overrides?.[featureId];
+        if (typeof overrideValue === "boolean") {
+            normalized[featureId] = overrideValue;
+            return;
+        }
+
+        if (typeof legacyFallback === "boolean") {
+            normalized[featureId] = legacyFallback;
+        }
+    });
+
+    return normalized;
+}
+
 export interface LastUsedToolConnectionInfo {
     id: string | null;
     name?: string;
-    environment?: DataverseConnection["environment"];
+    environment?: Connection["environment"];
     url?: string;
 }
 
@@ -75,7 +109,7 @@ export interface UserSettings {
     deprecatedToolsVisibility?: DeprecatedToolsVisibility;
     toolDisplayMode?: ToolDisplayMode;
     lastUsedTools: LastUsedToolEntry[];
-    connections: DataverseConnection[];
+    connections: Connection[];
     installedTools: string[]; // List of installed tool package names
     favoriteTools: string[]; // List of favorite tool IDs
     cspConsents: { [toolId: string]: CspConsentRecord }; // CSP consent records per tool
@@ -94,4 +128,8 @@ export interface UserSettings {
     showEnvironmentColor?: boolean; // Show/hide the environment color border around the tool panel
     categoryColorThickness?: number; // Thickness in pixels of the category color border under the tab
     environmentColorThickness?: number; // Thickness in pixels of the environment color border around the tool panel
+    mcpAccessToken?: string; // Access token for local MCP server authentication
+    splitDividerRatio?: number; // Persisted position of the split-pane divider (0.15–0.85)
+    enablePreviewFeatures?: boolean; // Show preview/experimental features in the UI
+    previewFeatures?: PreviewFeatureFlags; // Per-feature preview toggles keyed by preview feature ID
 }
diff --git a/src/common/types/tool.ts b/src/common/types/tool.ts
index e1b5a2fc..9aa4b299 100644
--- a/src/common/types/tool.ts
+++ b/src/common/types/tool.ts
@@ -35,6 +35,12 @@ export interface ToolFeatures {
      * @example "1.0.12"
      */
     minAPI?: string;
+    /**
+     * Whether this tool requires connections enabled for Power Platform API
+     * When true, only connections with Client ID/Secret authentication and
+     * enabledForPowerPlatformAPI=true will be shown in the connection selection modal.
+     */
+    enabledForPowerPlatformAPI?: boolean;
 }
 
 /**
@@ -66,6 +72,7 @@ export interface Tool {
     minAPI?: string; // Minimum ToolBox API version required
     maxAPI?: string; // Maximum ToolBox API version tested
     isSupported?: boolean; // Whether this tool is compatible with current ToolBox version
+    mcpHeadlessEnabled?: boolean; // Whether this tool supports MCP headless execution
     /** Invocation capability tags declared in pptb.config.json (e.g. ["entity-picker"]). */
     capabilities?: string[];
 }
@@ -130,6 +137,7 @@ export interface ToolManifest {
     createdAt?: string;
     minAPI?: string; // Minimum ToolBox API version required (from features.minAPI)
     maxAPI?: string; // Maximum ToolBox API version tested (from npm-shrinkwrap @pptb/types version)
+    mcpHeadlessEnabled?: boolean; // Whether this tool supports MCP headless execution
     /** Invocation capability tags declared in pptb.config.json (e.g. ["entity-picker"]). */
     capabilities?: string[];
 }
diff --git a/src/main/constants.ts b/src/main/constants.ts
index b07890f7..ba1c7849 100644
--- a/src/main/constants.ts
+++ b/src/main/constants.ts
@@ -69,6 +69,14 @@ export const BLOCKED_TERMINAL_COMMANDS = new Set([
     "powershell.exe",
     "pwsh",
     "pwsh.exe",
+    // Runtime interpreters/hosts that can evaluate arbitrary code or spawn child processes
+    "node",
+    "node.exe",
+    "nodejs",
+    "dotnet",
+    "dotnet.exe",
+    "csi",
+    "csi.exe",
     // Privilege escalation
     "sudo",
     "su",
@@ -133,6 +141,9 @@ export const BLOCKED_TERMINAL_COMMANDS = new Set([
     "schtasks.exe",
     "vssadmin.exe",
     "wevtutil.exe",
+    "conhost",
+    "conhost.exe",
+    "start",
     // macOS-specific
     "osascript",
     "open",
diff --git a/src/main/index.ts b/src/main/index.ts
index 389470a8..a548ad82 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,3 +1,4 @@
+import { spawn } from "child_process";
 import { app, BrowserWindow, dialog, ipcMain, Menu, MenuItemConstructorOptions, nativeTheme, shell } from "electron";
 import * as fs from "fs";
 import { createWriteStream } from "fs";
@@ -5,11 +6,14 @@ import * as http from "http";
 import * as https from "https";
 import * as path from "path";
 import {
+    AGENT_INVOCATION_CHANNELS,
     CONNECTION_CHANNELS,
     DATAVERSE_CHANNELS,
     EVENT_CHANNELS,
     FILESYSTEM_CHANNELS,
+    MCP_SERVER_CHANNELS,
     MODAL_WINDOW_CHANNELS,
+    POWERPLATFORM_CHANNELS,
     SETTINGS_CHANNELS,
     TERMINAL_CHANNELS,
     TOOL_CHANNELS,
@@ -36,9 +40,11 @@ import { ConnectionsManager } from "./managers/connectionsManager";
 import { DataverseManager } from "./managers/dataverseManager";
 import { InstallIdManager } from "./managers/installIdManager";
 import { ModalWindowManager } from "./managers/modalWindowManager";
-import { NotificationWindowManager } from "./managers/notificationWindowManager";
+import { NotificationHistoryWindowManager, NotificationWindowManager } from "./managers/notificationWindowManager";
+import { PowerPlatformManager } from "./managers/powerplatformManager";
 import { ProtocolHandlerManager } from "./managers/protocolHandlerManager";
 import { SettingsManager } from "./managers/settingsManager";
+import { SplitLayoutManager } from "./managers/splitLayoutManager";
 import { TerminalManager } from "./managers/terminalManager";
 import { ToolBoxUtilityManager } from "./managers/toolboxUtilityManager";
 import { ToolFileSystemAccessManager } from "./managers/toolFileSystemAccessManager";
@@ -46,6 +52,8 @@ import { ToolManager } from "./managers/toolsManager";
 import { ToolWindowManager } from "./managers/toolWindowManager";
 import { TrayManager } from "./managers/trayManager";
 import { VersionManager } from "./managers/versionManager";
+import { readLogEntries } from "./mcp/agentInvocationLogger";
+import { McpServerManager } from "./mcp/mcpServer";
 import { ActiveToolInfo, buildToolBoxFeedbackUrl, buildToolFeedbackUrl, getEnvironmentDiagnostics, resolveActiveToolInfo } from "./utilities";
 
 // Constants
@@ -72,7 +80,9 @@ class ToolBoxApp {
     private browserviewProtocolManager: BrowserviewProtocolManager;
     private protocolHandlerManager: ProtocolHandlerManager;
     private toolWindowManager: ToolWindowManager | null = null;
+    private splitLayoutManager: SplitLayoutManager | null = null;
     private notificationWindowManager: NotificationWindowManager | null = null;
+    private notificationHistoryWindowManager: NotificationHistoryWindowManager | null = null;
     private modalWindowManager: ModalWindowManager | null = null;
     private trayManager: TrayManager | null = null;
     private api: ToolBoxUtilityManager;
@@ -81,11 +91,14 @@ class ToolBoxApp {
     private authManager: AuthManager;
     private terminalManager: TerminalManager;
     private dataverseManager: DataverseManager;
+    private powerPlatformManager: PowerPlatformManager;
     private toolFilesystemAccessManager: ToolFileSystemAccessManager;
+    private mcpServerManager: McpServerManager;
     private tokenExpiryCheckInterval: NodeJS.Timeout | null = null;
     private notifiedExpiredTokens: Set<string> = new Set(); // Track notified expired tokens
     private menuCreationTimeout: NodeJS.Timeout | null = null; // Debounce timer for menu recreation
     private isQuitting = false; // True once the user explicitly quits (e.g. tray "Quit" or Cmd+Q)
+    private shouldFocusAfterWindowCreation = false; // Tracks a relaunch request before main window exists
 
     /**
      * Resolve the application icon for the current release channel.
@@ -127,10 +140,30 @@ class ToolBoxApp {
             this.authManager = new AuthManager(this.browserManager);
             this.terminalManager = new TerminalManager();
             this.dataverseManager = new DataverseManager(this.connectionsManager, this.authManager);
+            this.powerPlatformManager = new PowerPlatformManager(this.connectionsManager, this.authManager);
             this.toolFilesystemAccessManager = new ToolFileSystemAccessManager();
+            this.mcpServerManager = new McpServerManager(7339, "127.0.0.1", this.settingsManager, this.toolManager.getRegistryManager(), this.toolManager);
+            this.mcpServerManager.setConnectionAuthManagers(this.connectionsManager, this.authManager);
             this.trayManager = new TrayManager(
                 () => this.mainWindow,
                 () => this.createWindow(),
+                () => this.mcpServerManager.isRunning(),
+                async () => {
+                    if (this.mcpServerManager.isRunning()) {
+                        await this.mcpServerManager.stop();
+
+                        // If the app is currently hidden to tray and MCP has just been
+                        // stopped, there is no background workload left to keep alive.
+                        // Quit so we only remain in background while MCP is running.
+                        if (this.mainWindow && !this.mainWindow.isVisible()) {
+                            app.quit();
+                        }
+
+                        return;
+                    }
+
+                    await this.mcpServerManager.start();
+                },
             );
 
             this.setupEventListeners();
@@ -264,6 +297,7 @@ class ToolBoxApp {
         ipcMain.removeHandler(SETTINGS_CHANNELS.GET_FAVORITE_TOOLS);
         ipcMain.removeHandler(SETTINGS_CHANNELS.IS_FAVORITE_TOOL);
         ipcMain.removeHandler(SETTINGS_CHANNELS.TOGGLE_FAVORITE_TOOL);
+        ipcMain.removeHandler(SETTINGS_CHANNELS.GET_MCP_ACCESS_TOKEN);
 
         // Connection handlers
         ipcMain.removeHandler(CONNECTION_CHANNELS.ADD_CONNECTION);
@@ -278,6 +312,7 @@ class ToolBoxApp {
         ipcMain.removeHandler(CONNECTION_CHANNELS.REFRESH_TOKEN);
         ipcMain.removeHandler(CONNECTION_CHANNELS.CHECK_BROWSER_INSTALLED);
         ipcMain.removeHandler(CONNECTION_CHANNELS.GET_BROWSER_PROFILES);
+        ipcMain.removeHandler(CONNECTION_CHANNELS.CONFIGURE_APP_REGISTRATION);
         ipcMain.removeHandler(CONNECTION_CHANNELS.EXPORT_CONNECTIONS);
         ipcMain.removeHandler(CONNECTION_CHANNELS.IMPORT_CONNECTIONS);
 
@@ -417,6 +452,19 @@ class ToolBoxApp {
         ipcMain.removeHandler(DATAVERSE_CHANNELS.UPDATE_OPTION_VALUE);
         ipcMain.removeHandler(DATAVERSE_CHANNELS.DELETE_OPTION_VALUE);
         ipcMain.removeHandler(DATAVERSE_CHANNELS.ORDER_OPTION);
+
+        // Power Platform handlers
+        ipcMain.removeHandler(POWERPLATFORM_CHANNELS.REQUEST);
+
+        // Agent invocation logging handlers
+        ipcMain.removeHandler(AGENT_INVOCATION_CHANNELS.GET_LOGS);
+
+        // MCP server handlers
+        ipcMain.removeHandler(MCP_SERVER_CHANNELS.GET_DETAILS);
+        ipcMain.removeHandler(MCP_SERVER_CHANNELS.START);
+        ipcMain.removeHandler(MCP_SERVER_CHANNELS.STOP);
+        ipcMain.removeHandler(MCP_SERVER_CHANNELS.CONFIGURE_CLAUDE_DESKTOP);
+        ipcMain.removeHandler(MCP_SERVER_CHANNELS.CONFIGURE_VSCODE);
     }
 
     /**
@@ -467,11 +515,45 @@ class ToolBoxApp {
             this.settingsManager.setSetting(key, value);
         });
 
+        // MCP access token handler
+        ipcMain.handle(SETTINGS_CHANNELS.GET_MCP_ACCESS_TOKEN, () => {
+            return this.settingsManager.getMcpAccessToken();
+        });
+
         // Favorite tools
         ipcMain.handle(SETTINGS_CHANNELS.ADD_FAVORITE_TOOL, (_, toolId) => {
             return this.settingsManager.addFavoriteTool(toolId);
         });
 
+        // Agent invocation logs (main UI only)
+        ipcMain.handle(AGENT_INVOCATION_CHANNELS.GET_LOGS, () => {
+            return readLogEntries();
+        });
+
+        ipcMain.handle(MCP_SERVER_CHANNELS.GET_DETAILS, () => {
+            return this.mcpServerManager.getServerDetails();
+        });
+
+        ipcMain.handle(MCP_SERVER_CHANNELS.START, async () => {
+            await this.mcpServerManager.start();
+            this.trayManager?.refreshContextMenu();
+            return this.mcpServerManager.getServerDetails();
+        });
+
+        ipcMain.handle(MCP_SERVER_CHANNELS.STOP, async () => {
+            await this.mcpServerManager.stop();
+            this.trayManager?.refreshContextMenu();
+            return this.mcpServerManager.getServerDetails();
+        });
+
+        ipcMain.handle(MCP_SERVER_CHANNELS.CONFIGURE_CLAUDE_DESKTOP, async () => {
+            return await this.mcpServerManager.configureClient("claude-desktop");
+        });
+
+        ipcMain.handle(MCP_SERVER_CHANNELS.CONFIGURE_VSCODE, async () => {
+            return await this.mcpServerManager.configureClient("vscode");
+        });
+
         ipcMain.handle(SETTINGS_CHANNELS.REMOVE_FAVORITE_TOOL, (_, toolId) => {
             return this.settingsManager.removeFavoriteTool(toolId);
         });
@@ -774,6 +856,64 @@ class ToolBoxApp {
             return this.browserManager.getBrowserProfiles(browserType);
         });
 
+        ipcMain.handle(CONNECTION_CHANNELS.CONFIGURE_APP_REGISTRATION, async (_, requestRaw: unknown) => {
+            let clientId = "";
+            let includePowerPlatformPermissions = true;
+            let generateOnly = false;
+
+            if (typeof requestRaw === "string") {
+                clientId = requestRaw.trim();
+            } else if (requestRaw && typeof requestRaw === "object") {
+                const request = requestRaw as { clientId?: unknown; includePowerPlatformPermissions?: unknown; generateOnly?: unknown };
+                clientId = typeof request.clientId === "string" ? request.clientId.trim() : "";
+                includePowerPlatformPermissions = request.includePowerPlatformPermissions === true;
+                generateOnly = request.generateOnly === true;
+            }
+
+            if (!clientId) {
+                return {
+                    success: false,
+                    message: "Client ID is required before app registration can be configured.",
+                    script: this.buildConfigureAppRegistrationScript("[your-client-id]", includePowerPlatformPermissions),
+                };
+            }
+
+            if (!/^[0-9a-fA-F-]{32,36}$/.test(clientId)) {
+                return {
+                    success: false,
+                    message: "Client ID format is invalid. Provide a valid Entra application (client) ID.",
+                    script: this.buildConfigureAppRegistrationScript(clientId, includePowerPlatformPermissions),
+                };
+            }
+
+            const script = this.buildConfigureAppRegistrationScript(clientId, includePowerPlatformPermissions);
+            if (generateOnly) {
+                return {
+                    success: true,
+                    message: "App registration script generated successfully.",
+                    script,
+                };
+            }
+
+            const result = await this.executePowerShellScript(script);
+
+            if (result.success) {
+                return {
+                    success: true,
+                    message: "App registration was configured successfully.",
+                    script,
+                };
+            }
+
+            return {
+                success: false,
+                message: result.errorMessage,
+                script,
+                stdout: result.stdout,
+                stderr: result.stderr,
+            };
+        });
+
         // Export connections handler
         ipcMain.handle(CONNECTION_CHANNELS.EXPORT_CONNECTIONS, (_, ids?: string[]) => {
             return this.connectionsManager.exportConnections(ids);
@@ -1247,9 +1387,7 @@ class ToolBoxApp {
 
             // Resolve the connection linked to the calling tool window
             const isSecondary = connectionTarget === "secondary";
-            const connectionId = isSecondary
-                ? this.toolWindowManager?.getSecondaryConnectionIdByWebContents(event.sender.id)
-                : this.toolWindowManager?.getConnectionIdByWebContents(event.sender.id);
+            const connectionId = isSecondary ? this.toolWindowManager?.getSecondaryConnectionIdByWebContents(event.sender.id) : this.toolWindowManager?.getConnectionIdByWebContents(event.sender.id);
 
             const connection = connectionId ? this.connectionsManager.getConnectionById(connectionId) : null;
 
@@ -1433,6 +1571,51 @@ class ToolBoxApp {
             };
         });
 
+        // Power Platform API handlers
+        ipcMain.handle(
+            POWERPLATFORM_CHANNELS.REQUEST,
+            async (
+                event,
+                category:
+                    | "Analytics"
+                    | "AppManagement"
+                    | "Authorization"
+                    | "Connectivity"
+                    | "CopilotStudio"
+                    | "Dynamics"
+                    | "EnvironmentManagement"
+                    | "Governance"
+                    | "Licensing"
+                    | "PowerApps"
+                    | "PowerAutomate"
+                    | "PowerPages"
+                    | "ResourceQuery"
+                    | "UserManagement"
+                    | "WorkflowAgents",
+                method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE",
+                relativePath = "",
+                body?: unknown,
+                customHeaders?: Record<string, string>,
+                connectionTarget?: "primary" | "secondary",
+            ) => {
+                try {
+                    const connectionId =
+                        connectionTarget === "secondary"
+                            ? this.toolWindowManager?.getSecondaryConnectionIdByWebContents(event.sender.id)
+                            : this.toolWindowManager?.getConnectionIdByWebContents(event.sender.id);
+
+                    if (!connectionId) {
+                        const targetMsg = connectionTarget === "secondary" ? "secondary connection" : "connection";
+                        throw new Error(`No ${targetMsg} found for this tool instance. Please ensure the tool is connected to an environment.`);
+                    }
+
+                    return await this.powerPlatformManager.request(connectionId, category, method, relativePath, body, customHeaders);
+                } catch (error) {
+                    throw new Error(`Power Platform request failed: ${(error as Error).message}`);
+                }
+            },
+        );
+
         // Dataverse API handlers
         // All handlers automatically get the connectionId from the calling tool's WebContents
         // For multi-connection tools, an optional connectionTarget parameter can be passed to specify "primary" or "secondary"
@@ -2170,6 +2353,131 @@ class ToolBoxApp {
             }
         });
     }
+
+    private buildConfigureAppRegistrationScript(clientId: string, includePowerPlatformPermissions: boolean): string {
+        const safeClientId = clientId.replace(/'/g, "''");
+        const requiredPermissions = ["Connectivity.Connections.Read", "EnvironmentManagement.Environments.Read", "PowerApps.Apps.Read", "PowerAutomate.Flows.Read", "ResourceQuery.Resources.Read"];
+
+        const permissionsArray = requiredPermissions.map((permission) => `    '${permission}'`).join("\n");
+
+        const scriptLines = [
+            "$ErrorActionPreference = 'Stop'",
+            `$clientId = '${safeClientId}'`,
+            '$requiredRedirectUris = @("msal${clientId}://auth", "http://localhost")',
+            "",
+            "if (-not (Get-Module -ListAvailable -Name Microsoft.Graph.Authentication)) {",
+            "    Install-Module Microsoft.Graph.Authentication -Scope CurrentUser -Force -AllowClobber",
+            "}",
+            "if (-not (Get-Module -ListAvailable -Name Microsoft.Graph.Applications)) {",
+            "    Install-Module Microsoft.Graph.Applications -Scope CurrentUser -Force -AllowClobber",
+            "}",
+            "Import-Module Microsoft.Graph.Authentication",
+            "Import-Module Microsoft.Graph.Applications",
+            "Connect-MgGraph -Scopes 'Application.ReadWrite.All' -NoWelcome",
+            "",
+            "$app = Get-MgApplication -Filter \"appId eq '$clientId'\"",
+            "if (-not $app) { throw \"Application with Client ID '$clientId' was not found.\" }",
+            "",
+            "$existingPublicRedirectUris = @()",
+            "if ($app.PublicClient -and $app.PublicClient.RedirectUris) { $existingPublicRedirectUris = @($app.PublicClient.RedirectUris) }",
+            "foreach ($requiredRedirectUri in $requiredRedirectUris) {",
+            "    if ($existingPublicRedirectUris -notcontains $requiredRedirectUri) {",
+            "        $existingPublicRedirectUris += $requiredRedirectUri",
+            "    }",
+            "}",
+        ];
+
+        if (includePowerPlatformPermissions) {
+            scriptLines.push(
+                "$requiredPermissions = @(",
+                permissionsArray,
+                ")",
+                "",
+                "$powerPlatformSp = Get-MgServicePrincipal -Filter \"displayName eq 'Power Platform API'\"",
+                'if (-not $powerPlatformSp) { throw "Power Platform API service principal was not found in this tenant." }',
+                "",
+                "$resourceAccess = @()",
+                "foreach ($permissionName in $requiredPermissions) {",
+                "    $scope = $powerPlatformSp.Oauth2PermissionScopes | Where-Object { $_.Value -eq $permissionName } | Select-Object -First 1",
+                "    if (-not $scope) { throw \"Permission '$permissionName' was not found on Power Platform API service principal.\" }",
+                "    $resourceAccess += @{ Id = $scope.Id; Type = 'Scope' }",
+                "}",
+                "",
+                "$existingRequired = @()",
+                "if ($app.RequiredResourceAccess) {",
+                "    foreach ($item in $app.RequiredResourceAccess) {",
+                "        $existingRequired += @{ ResourceAppId = $item.ResourceAppId; ResourceAccess = @($item.ResourceAccess | ForEach-Object { @{ Id = $_.Id; Type = $_.Type } }) }",
+                "    }",
+                "}",
+                "",
+                "$existingPowerPlatform = $existingRequired | Where-Object { $_.ResourceAppId -eq $powerPlatformSp.AppId } | Select-Object -First 1",
+                "if ($existingPowerPlatform) {",
+                "    $existingIds = @($existingPowerPlatform.ResourceAccess | ForEach-Object { $_.Id.ToString() })",
+                "    foreach ($entry in $resourceAccess) {",
+                "        if ($existingIds -notcontains $entry.Id.ToString()) {",
+                "            $existingPowerPlatform.ResourceAccess += $entry",
+                "        }",
+                "    }",
+                "} else {",
+                "    $existingRequired += @{ ResourceAppId = $powerPlatformSp.AppId; ResourceAccess = $resourceAccess }",
+                "}",
+                "",
+                "Update-MgApplication -ApplicationId $app.Id -PublicClient @{ RedirectUris = $existingPublicRedirectUris } -RequiredResourceAccess $existingRequired",
+            );
+        } else {
+            scriptLines.push("Update-MgApplication -ApplicationId $app.Id -PublicClient @{ RedirectUris = $existingPublicRedirectUris }");
+        }
+
+        scriptLines.push("Disconnect-MgGraph | Out-Null", "Write-Host 'App registration updated successfully.'");
+        return scriptLines.join("\n");
+    }
+
+    private executePowerShellScript(script: string): Promise<{ success: boolean; errorMessage: string; stdout: string; stderr: string }> {
+        return new Promise((resolve) => {
+            const psArgs = ["-NoLogo", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", script];
+            const process = spawn("pwsh", psArgs, { windowsHide: true });
+
+            let stdout = "";
+            let stderr = "";
+
+            process.stdout.on("data", (chunk: Buffer) => {
+                stdout += chunk.toString();
+            });
+
+            process.stderr.on("data", (chunk: Buffer) => {
+                stderr += chunk.toString();
+            });
+
+            process.on("error", (error) => {
+                resolve({
+                    success: false,
+                    errorMessage: `Failed to launch PowerShell: ${error.message}`,
+                    stdout,
+                    stderr,
+                });
+            });
+
+            process.on("close", (exitCode) => {
+                if (exitCode === 0) {
+                    resolve({
+                        success: true,
+                        errorMessage: "",
+                        stdout,
+                        stderr,
+                    });
+                    return;
+                }
+
+                const errorMessage = stderr.trim() || stdout.trim() || "PowerShell script failed to execute.";
+                resolve({
+                    success: false,
+                    errorMessage,
+                    stdout,
+                    stderr,
+                });
+            });
+        });
+    }
     /**
      * Create application menu
      */
@@ -2541,6 +2849,36 @@ class ToolBoxApp {
         }
     }
 
+    /**
+     * Bring the main window to the foreground, creating it when needed.
+     * Used when the app is already running in the tray and receives a re-launch.
+     */
+    private showAndFocusMainWindow(): void {
+        if (!this.mainWindow) {
+            this.createWindow();
+            return;
+        }
+
+        if (this.mainWindow.isMinimized()) {
+            this.mainWindow.restore();
+        }
+
+        this.mainWindow.show();
+        this.mainWindow.focus();
+    }
+
+    /**
+     * Handle a second launch attempt by foregrounding the existing instance.
+     * If the window is still being created, defer focusing until creation completes.
+     */
+    public handleSecondInstanceLaunch(): void {
+        if (!this.mainWindow) {
+            this.shouldFocusAfterWindowCreation = true;
+        }
+
+        this.showAndFocusMainWindow();
+    }
+
     /**
      * Register custom pptb-webview protocol for loading tool content
      * This provides isolation and CSP control for tool execution
@@ -2576,13 +2914,22 @@ class ToolBoxApp {
             this.toolFilesystemAccessManager,
         );
 
+        this.mcpServerManager.setToolWindowManager(this.toolWindowManager);
+
+        // Initialize SplitLayoutManager — depends on the shared toolViews map from ToolWindowManager
+        this.splitLayoutManager = new SplitLayoutManager(this.mainWindow, this.settingsManager, this.toolWindowManager.getToolViews());
+        this.toolWindowManager.setSplitLayoutManager(this.splitLayoutManager);
+
         // Set up callback to rebuild menu when active tool changes (debounced to prevent excessive recreation)
         this.toolWindowManager.setOnActiveToolChanged(() => {
             this.debouncedCreateMenu();
         });
 
         // Initialize NotificationWindowManager for overlay notifications
-        this.notificationWindowManager = new NotificationWindowManager(this.mainWindow);
+        this.notificationWindowManager = new NotificationWindowManager(this.mainWindow, this.settingsManager);
+        // Initialize NotificationHistoryWindowManager for the bell-icon history panel
+        this.notificationHistoryWindowManager = new NotificationHistoryWindowManager(this.mainWindow, this.settingsManager);
+        this.notificationWindowManager.setHistoryManager(this.notificationHistoryWindowManager);
         // Initialize BrowserWindow-based modal manager
         this.modalWindowManager = new ModalWindowManager(this.mainWindow);
 
@@ -2605,13 +2952,34 @@ class ToolBoxApp {
             this.mainWindow.webContents.openDevTools({ mode: "detach" });
         }
 
+        this.mainWindow.on("close", (event) => {
+            if (this.isQuitting) {
+                return;
+            }
+
+            if (!this.mcpServerManager.isRunning()) {
+                // No MCP background workload: closing the window should terminate app.
+                this.isQuitting = true;
+                return;
+            }
+
+            event.preventDefault();
+            this.mainWindow?.hide();
+        });
+
         this.mainWindow.on("closed", () => {
             this.toolWindowManager?.destroy();
             this.toolWindowManager = null;
             this.notificationWindowManager = null;
+            this.notificationHistoryWindowManager = null;
             this.modalWindowManager = null;
             this.mainWindow = null;
         });
+
+        if (this.shouldFocusAfterWindowCreation) {
+            this.shouldFocusAfterWindowCreation = false;
+            this.showAndFocusMainWindow();
+        }
     }
 
     /**
@@ -3060,12 +3428,7 @@ class ToolBoxApp {
                 logInfo(`[ProtocolHandler] Received ${action} request for tool: ${params.toolId}`);
 
                 // Bring app window to focus
-                if (this.mainWindow) {
-                    if (this.mainWindow.isMinimized()) {
-                        this.mainWindow.restore();
-                    }
-                    this.mainWindow.focus();
-                }
+                this.showAndFocusMainWindow();
 
                 // Deliver the IPC event to the renderer.  If the renderer is still
                 // loading (e.g. cold launch via protocol URL), defer until it finishes.
@@ -3111,15 +3474,7 @@ class ToolBoxApp {
                 // On macOS the app stays alive after the window is closed.
                 // When the user clicks the Dock icon (or the tray "Open" item),
                 // restore the existing window if it still exists, otherwise create a new one.
-                if (this.mainWindow) {
-                    if (this.mainWindow.isMinimized()) {
-                        this.mainWindow.restore();
-                    }
-                    this.mainWindow.show();
-                    this.mainWindow.focus();
-                } else {
-                    this.createWindow();
-                }
+                this.showAndFocusMainWindow();
             });
 
             app.on("window-all-closed", () => {
@@ -3132,11 +3487,13 @@ class ToolBoxApp {
                 }
             });
 
-            app.on("before-quit", () => {
+            app.on("before-quit", async () => {
                 this.isQuitting = true;
                 logCheckpoint("Application shutting down");
                 // Clean up tray icon before quitting
                 this.trayManager?.destroy();
+                // Clean up MCP server
+                await this.mcpServerManager.stop();
                 // Clean up update checks
                 this.autoUpdateManager.disableAutoUpdateChecks();
                 // Clean up token expiry checks
@@ -3157,8 +3514,19 @@ class ToolBoxApp {
     }
 }
 
-// Create and initialize the application
-const toolboxApp = new ToolBoxApp();
-toolboxApp.initialize().catch((error) => {
-    logError(error instanceof Error ? error : new Error(String(error)));
-});
+// Enforce single-instance behavior for all channels and launch modes.
+const gotSingleInstanceLock = app.requestSingleInstanceLock();
+if (!gotSingleInstanceLock) {
+    app.quit();
+} else {
+    const toolboxApp = new ToolBoxApp();
+
+    app.on("second-instance", () => {
+        toolboxApp.handleSecondInstanceLaunch();
+    });
+
+    // Create and initialize the application
+    toolboxApp.initialize().catch((error) => {
+        logError(error instanceof Error ? error : new Error(String(error)));
+    });
+}
diff --git a/src/main/managers/authManager.ts b/src/main/managers/authManager.ts
index 78c07fc2..acff5f7c 100644
--- a/src/main/managers/authManager.ts
+++ b/src/main/managers/authManager.ts
@@ -3,10 +3,10 @@ import { BrowserWindow } from "electron";
 import * as http from "http";
 import * as https from "https";
 import { EVENT_CHANNELS } from "../../common/ipc/channels";
-import { DataverseConnection } from "../../common/types";
+import { logError, logInfo, logWarn } from "../../common/logger";
+import { Connection } from "../../common/types";
 import { DATAVERSE_API_VERSION } from "../constants";
 import { BrowserManager } from "./browserManager";
-import { logInfo, logWarn, logError } from "../../common/logger";
 
 /**
  * Manages authentication for Power Platform connections
@@ -112,7 +112,7 @@ export class AuthManager {
     /**
      * Authenticate using interactive Microsoft login with Authorization Code Flow
      */
-    async authenticateInteractive(connection: DataverseConnection): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string }> {
+    async authenticateInteractive(connection: Connection): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string; scopes?: string[] }> {
         const clientId = connection.clientId || "51f81489-12ee-4a9e-aaae-a2591f45987d"; // Default Azure CLI client ID
         const tenantId = connection.tenantId || "organizations"; // Use 'organizations' for work/school accounts only
         const msalApp = this.getMsalApp(connection.id, clientId, tenantId);
@@ -142,7 +142,9 @@ export class AuthManager {
             const authCodeUrl = await msalApp.getAuthCodeUrl(authCodeUrlParameters);
 
             // Start local HTTP server and wait for auth code, then validate before showing success
-            const authResult = await this.listenForAuthCodeAndValidate(port, authCodeUrl, connection, scopes, redirectUri, msalApp);
+            const authResult = await this.listenForAuthCodeAndValidate(port, authCodeUrl, connection, scopes, redirectUri, msalApp, async (accessToken) => {
+                await this.validateEnvironmentAccess(connection, accessToken);
+            });
 
             return authResult;
         } catch (error) {
@@ -249,16 +251,17 @@ export class AuthManager {
     private async listenForAuthCodeAndValidate(
         port: number,
         authCodeUrl: string,
-        connection: DataverseConnection,
+        connection: Connection,
         scopes: string[],
         redirectUri: string,
         msalApp: PublicClientApplication,
-    ): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string }> {
+        postTokenValidation?: (accessToken: string) => Promise<void>,
+    ): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string; scopes?: string[] }> {
         // Close any existing server before starting a new one
         await this.closeActiveServer();
 
         return new Promise((resolve, reject) => {
-            const cleanupAndResolve = (authResult: { accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string }) => {
+            const cleanupAndResolve = (authResult: { accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string; scopes?: string[] }) => {
                 this.performImmediateCleanup("Authentication server closed after successful auth");
                 resolve(authResult);
             };
@@ -292,13 +295,13 @@ export class AuthManager {
                 }
 
                 if (code) {
-                    // Show a "Validating..." message while we check environment access
+                    // Show a status message while we complete sign-in and optional validation
                     res.writeHead(200, { "Content-Type": "text/html" });
                     res.write(`
             <html>
               <body style="font-family: system-ui; text-align: center; padding: 50px;">
-                <h1 style="color: #0078d4;">Validating Access...</h1>
-                <p>Please wait while we verify your permissions.</p>
+                                <h1 style="color: #0078d4;">Completing Sign-In...</h1>
+                                <p>Please wait while we finalize authentication.</p>
               </body>
             </html>
           `);
@@ -322,11 +325,13 @@ export class AuthManager {
                             refreshToken: undefined, // MSAL handles refresh internally via cache
                             expiresOn: response.expiresOn || new Date(Date.now() + 3600 * 1000),
                             msalAccountId: response.account.homeAccountId,
+                            scopes: Array.isArray(response.scopes) ? response.scopes : scopes,
                         };
 
-                        // Validate user has access to the environment by performing a WhoAmI check
-                        // This happens BEFORE showing the success message
-                        await this.validateEnvironmentAccess(connection, authResult.accessToken);
+                        if (postTokenValidation) {
+                            // Optional validation before confirming success (used for Dataverse env access checks)
+                            await postTokenValidation(authResult.accessToken);
+                        }
 
                         // Validation successful - now show success page
                         res.write(`
@@ -404,23 +409,45 @@ export class AuthManager {
         }
     }
 
+    private isInteractionRequiredError(error: unknown): boolean {
+        if (!error || typeof error !== "object") {
+            return false;
+        }
+
+        const errorObj = error as { errorCode?: string; errorMessage?: string; message?: string };
+        const haystack = `${errorObj.errorCode || ""} ${errorObj.errorMessage || ""} ${errorObj.message || ""}`.toLowerCase();
+
+        return (
+            haystack.includes("interaction_required") ||
+            haystack.includes("consent_required") ||
+            haystack.includes("login_required") ||
+            haystack.includes("aadsts65001") ||
+            haystack.includes("aadsts50058")
+        );
+    }
+
     /**
      * Authenticate using client ID and secret with automatic token caching
      * Uses ConfidentialClientApplication which handles token refresh automatically
+     * @param scopes Optional array of scopes to request. Defaults to `${connection.url}/.default`
      */
-    async authenticateClientSecret(connection: DataverseConnection): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date }> {
+    async authenticateClientSecret(
+        connection: Connection,
+        scopes?: string[],
+        skipValidateEnvAccess: boolean = false,
+    ): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; scopes?: string[] }> {
         if (!connection.clientId || !connection.clientSecret || !connection.tenantId) {
             throw new Error("Client ID, Client Secret, and Tenant ID are required for client secret authentication");
         }
 
         const confidentialApp = this.getConfidentialApp(connection.id, connection.clientId, connection.clientSecret, connection.tenantId);
-        const scopes = [`${connection.url}/.default`];
+        const requestedScopes = scopes || [`${connection.url}/.default`];
 
         try {
             // MSAL ConfidentialClientApplication automatically caches tokens
             // and only acquires new ones when expired
             const response = await confidentialApp.acquireTokenByClientCredential({
-                scopes: scopes,
+                scopes: requestedScopes,
             });
 
             if (!response) {
@@ -431,10 +458,13 @@ export class AuthManager {
                 accessToken: response.accessToken,
                 refreshToken: undefined, // Client credentials flow doesn't provide refresh tokens
                 expiresOn: response.expiresOn || new Date(Date.now() + 3600 * 1000),
+                scopes: Array.isArray(response.scopes) ? response.scopes : requestedScopes,
             };
 
-            // Validate user has access to the environment by performing a WhoAmI check
-            await this.validateEnvironmentAccess(connection, authResult.accessToken);
+            if (!skipValidateEnvAccess) {
+                // Validate user has access to the environment by performing a WhoAmI check
+                await this.validateEnvironmentAccess(connection, authResult.accessToken);
+            }
 
             return authResult;
         } catch (error) {
@@ -455,7 +485,7 @@ export class AuthManager {
      * Note: This flow is not recommended and may not work with MFA-enabled accounts
      * Note: Only delegated access is supported - uses user_impersonation scope
      */
-    async authenticateUsernamePassword(connection: DataverseConnection): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string }> {
+    async authenticateUsernamePassword(connection: Connection): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string; scopes?: string[] }> {
         if (!connection.username || !connection.password) {
             throw new Error("Username and password are required for password authentication");
         }
@@ -489,6 +519,7 @@ export class AuthManager {
                 refreshToken: undefined, // MSAL handles refresh internally via cache
                 expiresOn: response.expiresOn || new Date(Date.now() + 3600 * 1000),
                 msalAccountId: response.account?.homeAccountId, // Store for silent token acquisition
+                scopes: Array.isArray(response.scopes) ? response.scopes : scopes,
             };
         } catch (error) {
             logError("Username/password authentication failed", error);
@@ -532,7 +563,7 @@ export class AuthManager {
     /**
      * Test connection by verifying the URL and attempting a simple authenticated request
      */
-    async testConnection(connection: DataverseConnection): Promise<boolean> {
+    async testConnection(connection: Connection): Promise<boolean> {
         try {
             // First, validate the URL format
             if (!connection.url || !connection.url.startsWith("https://")) {
@@ -669,7 +700,7 @@ export class AuthManager {
      * @param accessToken The access token to use for the WhoAmI call
      * @throws Error if the user does not have access to the environment
      */
-    private async validateEnvironmentAccess(connection: DataverseConnection, accessToken: string): Promise<void> {
+    private async validateEnvironmentAccess(connection: Connection, accessToken: string): Promise<void> {
         try {
             const whoAmIUrl = `${connection.url}/api/data/${DATAVERSE_API_VERSION}/WhoAmI`;
             const response = await this.makeAuthenticatedRequest(whoAmIUrl, accessToken);
@@ -696,7 +727,7 @@ export class AuthManager {
      * @param connection The connection to find account for
      * @returns Promise with the account or undefined if not found
      */
-    private async findMsalAccount(connection: DataverseConnection): Promise<AccountInfo | undefined> {
+    private async findMsalAccount(connection: Connection): Promise<AccountInfo | undefined> {
         try {
             const clientId = connection.clientId || "51f81489-12ee-4a9e-aaae-a2591f45987d";
             const tenantId = connection.tenantId || "organizations";
@@ -714,7 +745,7 @@ export class AuthManager {
      * @param connection The connection to check
      * @returns Promise<boolean> true if account exists in cache, false otherwise
      */
-    async hasAccountInCache(connection: DataverseConnection): Promise<boolean> {
+    async hasAccountInCache(connection: Connection): Promise<boolean> {
         const account = await this.findMsalAccount(connection);
         return account !== undefined;
     }
@@ -725,7 +756,7 @@ export class AuthManager {
      * @param connection The connection to acquire token for
      * @returns Promise with access token (MSAL handles refresh internally)
      */
-    async acquireTokenSilently(connection: DataverseConnection): Promise<{ accessToken: string; expiresOn: Date }> {
+    async acquireTokenSilently(connection: Connection): Promise<{ accessToken: string; expiresOn: Date }> {
         const clientId = connection.clientId || "51f81489-12ee-4a9e-aaae-a2591f45987d";
         const tenantId = connection.tenantId || "organizations"; // Use 'organizations' for work/school accounts only
         const msalApp = this.getMsalApp(connection.id, clientId, tenantId);
@@ -761,15 +792,77 @@ export class AuthManager {
         }
     }
 
+    /**
+     * Acquire access token for Power Platform API with scope https://api.powerplatform.com/.default
+     * This method should only be invoked when using Power Platform API methods
+     * @param connection The connection to acquire token for
+     * @returns Promise with access token (MSAL handles refresh internally)
+     */
+    async acquirePowerPlatformToken(connection: Connection): Promise<{ accessToken: string; expiresOn: Date; scopes?: string[] }> {
+        const clientId = connection.clientId || "51f81489-12ee-4a9e-aaae-a2591f45987d";
+        const tenantId = connection.tenantId || "organizations"; // Use 'organizations' for work/school accounts only
+        const msalApp = this.getMsalApp(connection.id, clientId, tenantId);
+        const scope = "https://api.powerplatform.com/.default";
+
+        // Get the account from MSAL cache
+        const account = await this.findMsalAccount(connection);
+
+        if (!account) {
+            throw new Error("No cached account found. Please authenticate again.");
+        }
+
+        try {
+            const response = await msalApp.acquireTokenSilent({
+                account: account,
+                scopes: [scope],
+            });
+
+            return {
+                accessToken: response.accessToken,
+                expiresOn: response.expiresOn || new Date(Date.now() + 3600 * 1000),
+                scopes: Array.isArray(response.scopes) ? response.scopes : [scope],
+            };
+        } catch (error) {
+            if (this.isInteractionRequiredError(error)) {
+                logInfo("Power Platform token requires interactive consent/sign-in; starting interactive flow");
+                return await this.acquirePowerPlatformTokenInteractive(connection, msalApp);
+            }
+
+            logWarn("Power Platform token silent acquisition failed - re-authentication required");
+            throw new Error("Token refresh failed. Please authenticate again.");
+        }
+    }
+
+    private async acquirePowerPlatformTokenInteractive(connection: Connection, msalApp: PublicClientApplication): Promise<{ accessToken: string; expiresOn: Date; scopes?: string[] }> {
+        const port = await this.findAvailablePort();
+        const redirectUri = `http://localhost:${port}`;
+        const scopes = ["https://api.powerplatform.com/.default"];
+
+        const authCodeUrl = await msalApp.getAuthCodeUrl({
+            scopes,
+            redirectUri,
+            loginHint: connection.username,
+        });
+
+        const authResult = await this.listenForAuthCodeAndValidate(port, authCodeUrl, connection, scopes, redirectUri, msalApp);
+
+        return {
+            accessToken: authResult.accessToken,
+            expiresOn: authResult.expiresOn,
+            scopes: authResult.scopes,
+        };
+    }
+
     /**
      * Refresh an access token using a refresh token
      * This is used for username/password flow and legacy interactive connections
      * For modern interactive connections, use acquireTokenSilently() instead
+     * @param scopes Optional array of scopes to request. Defaults to `${connection.url}/.default`
      */
-    async refreshAccessToken(connection: DataverseConnection, refreshToken: string): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date }> {
+    async refreshAccessToken(connection: Connection, refreshToken: string, scopes?: string[]): Promise<{ accessToken: string; refreshToken?: string; expiresOn: Date; scopes?: string[] }> {
         const clientId = connection.clientId || "51f81489-12ee-4a9e-aaae-a2591f45987d";
         const tokenEndpoint = `https://login.microsoftonline.com/organizations/oauth2/v2.0/token`;
-        const scope = `${connection.url}/.default`;
+        const scope = scopes ? scopes.join(" ") : `${connection.url}/.default`;
 
         const postData = new URLSearchParams({
             client_id: clientId,
@@ -790,6 +883,7 @@ export class AuthManager {
                 accessToken: data.access_token,
                 refreshToken: data.refresh_token || refreshToken,
                 expiresOn: new Date(Date.now() + data.expires_in * 1000),
+                scopes: typeof data.scope === "string" ? data.scope.split(" ").filter((scope: string) => scope.length > 0) : scopes,
             };
         } catch (error) {
             logError("Token refresh failed", error);
diff --git a/src/main/managers/autoUpdateManager.ts b/src/main/managers/autoUpdateManager.ts
index 585ef30f..099b2364 100644
--- a/src/main/managers/autoUpdateManager.ts
+++ b/src/main/managers/autoUpdateManager.ts
@@ -1,7 +1,10 @@
-import { BrowserWindow } from "electron";
+import { app, BrowserWindow } from "electron";
 import { autoUpdater } from "electron-updater";
 import { EventEmitter } from "events";
+import * as fs from "fs";
+import * as path from "path";
 import { EVENT_CHANNELS } from "../../common/ipc/channels";
+import { logWarn } from "../../common/logger";
 
 /**
  * Manages application auto-updates using electron-updater
@@ -10,6 +13,7 @@ export class AutoUpdateManager extends EventEmitter {
     private mainWindow: BrowserWindow | null = null;
     private updateCheckInterval: NodeJS.Timeout | null = null;
     private isChecking = false;
+    private readonly appUpdateConfigPath = path.join(process.resourcesPath, "app-update.yml");
 
     constructor() {
         super();
@@ -92,6 +96,39 @@ export class AutoUpdateManager extends EventEmitter {
         }
     }
 
+    /**
+     * Determine whether the installed app has the updater metadata electron-updater needs.
+     */
+    private canCheckForUpdates(): boolean {
+        if (!app.isPackaged) {
+            return false;
+        }
+
+        return fs.existsSync(this.appUpdateConfigPath);
+    }
+
+    /**
+     * Report that auto-updates are unavailable for the current installation.
+     */
+    private reportAutoUpdateUnavailable(action: string): void {
+        let message = "Automatic updates are unavailable for this installation.";
+
+        if (!app.isPackaged) {
+            message = "Automatic updates are only available in packaged releases.";
+            logWarn(`Skipping auto-update ${action}: app is not packaged`);
+        } else if (process.platform === "win32") {
+            message = "Automatic updates are only supported for the Windows NSIS (.exe) installer. If this app was installed via MSI, download the latest release manually from GitHub Releases.";
+            logWarn(`Skipping auto-update ${action}: ${this.appUpdateConfigPath} not found (likely non-NSIS Windows install)`);
+        } else {
+            message = "Automatic updates are unavailable because updater metadata is missing from this installation.";
+            logWarn(`Skipping auto-update ${action}: ${this.appUpdateConfigPath} not found`);
+        }
+
+        this.isChecking = false;
+        this.emit("update-error", new Error(message));
+        this.sendToRenderer(EVENT_CHANNELS.UPDATE_ERROR, message);
+    }
+
     /**
      * Check for updates manually
      */
@@ -100,6 +137,11 @@ export class AutoUpdateManager extends EventEmitter {
             return;
         }
 
+        if (!this.canCheckForUpdates()) {
+            this.reportAutoUpdateUnavailable("check");
+            return;
+        }
+
         try {
             await autoUpdater.checkForUpdates();
         } catch (error) {
@@ -112,6 +154,11 @@ export class AutoUpdateManager extends EventEmitter {
      * Download the available update
      */
     async downloadUpdate(): Promise<void> {
+        if (!this.canCheckForUpdates()) {
+            this.reportAutoUpdateUnavailable("download");
+            return;
+        }
+
         try {
             await autoUpdater.downloadUpdate();
         } catch (error) {
@@ -134,6 +181,11 @@ export class AutoUpdateManager extends EventEmitter {
         // Clear existing interval if any
         this.disableAutoUpdateChecks();
 
+        if (!this.canCheckForUpdates()) {
+            this.reportAutoUpdateUnavailable("scheduled check");
+            return;
+        }
+
         // Check for updates now
         this.checkForUpdates();
 
diff --git a/src/main/managers/browserManager.ts b/src/main/managers/browserManager.ts
index 0f07d6c7..6f3d141a 100644
--- a/src/main/managers/browserManager.ts
+++ b/src/main/managers/browserManager.ts
@@ -1,10 +1,10 @@
-import { spawn, execSync } from "child_process";
+import { execSync, spawn } from "child_process";
+import { shell } from "electron";
 import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
-import { shell } from "electron";
-import { DataverseConnection } from "../../common/types";
 import { logInfo, logWarn } from "../../common/logger";
+import { Connection } from "../../common/types";
 
 /**
  * Manages browser detection, profile enumeration, and browser launching
@@ -284,7 +284,7 @@ export class BrowserManager {
      * Open URL in browser with optional profile support
      * Falls back to default browser if profile browser is not found
      */
-    public async openBrowserWithProfile(url: string, connection: DataverseConnection): Promise<void> {
+    public async openBrowserWithProfile(url: string, connection: Connection): Promise<void> {
         const browserType = connection.browserType || "default";
         const profileName = connection.browserProfile;
 
diff --git a/src/main/managers/connectionsManager.ts b/src/main/managers/connectionsManager.ts
index 1f9bdbe0..40ea2e85 100644
--- a/src/main/managers/connectionsManager.ts
+++ b/src/main/managers/connectionsManager.ts
@@ -1,23 +1,32 @@
 import { randomUUID } from "crypto";
 import Store from "electron-store";
-import { DataverseConnection } from "../../common/types";
-import { EncryptionManager } from "./encryptionManager";
 import { logInfo } from "../../common/logger";
+import { Connection } from "../../common/types";
+import { EncryptionManager } from "./encryptionManager";
 
 /**
  * Sensitive fields that should be encrypted in DataverseConnection objects
  */
-const SENSITIVE_CONNECTION_FIELDS: (keyof DataverseConnection)[] = ["clientId", "clientSecret", "accessToken", "refreshToken", "password"];
+const SENSITIVE_CONNECTION_FIELDS: (keyof Connection)[] = ["clientId", "clientSecret", "accessToken", "refreshToken", "password", "powerPlatformAccessToken"];
 
 /**
  * Fields that must NOT be included in connection exports (secrets/tokens)
  */
-const EXPORT_EXCLUDED_FIELDS: (keyof DataverseConnection)[] = ["clientSecret", "password", "accessToken", "refreshToken", "tokenExpiry", "msalAccountId"];
+const EXPORT_EXCLUDED_FIELDS: (keyof Connection)[] = [
+    "clientSecret",
+    "password",
+    "accessToken",
+    "refreshToken",
+    "tokenExpiry",
+    "msalAccountId",
+    "powerPlatformAccessToken",
+    "powerPlatformTokenExpiry",
+];
 
 /**
  * Fields required for a valid importable connection
  */
-const REQUIRED_IMPORT_FIELDS: (keyof DataverseConnection)[] = ["name", "url", "environment", "authenticationType"];
+const REQUIRED_IMPORT_FIELDS: (keyof Connection)[] = ["name", "url", "environment", "authenticationType"];
 
 const VALID_ENVIRONMENTS = new Set(["Dev", "Test", "UAT", "Production"]);
 const VALID_AUTH_TYPES = new Set(["interactive", "clientSecret", "usernamePassword", "connectionString"]);
@@ -26,13 +35,13 @@ const VALID_AUTH_TYPES = new Set(["interactive", "clientSecret", "usernamePasswo
  * Manages Dataverse connections with encryption for sensitive data
  */
 export class ConnectionsManager {
-    private store: Store<{ connections: DataverseConnection[] }>;
+    private store: Store<{ connections: Connection[] }>;
     private encryptionManager: EncryptionManager;
 
     constructor() {
         this.encryptionManager = new EncryptionManager();
 
-        this.store = new Store<{ connections: DataverseConnection[] }>({
+        this.store = new Store<{ connections: Connection[] }>({
             name: "connections",
             defaults: {
                 connections: [],
@@ -43,55 +52,46 @@ export class ConnectionsManager {
         this.migrateConnectionsToEncrypted();
     }
 
+    /**
+     * Normalize a connection before persisting it.
+     * Values may come from the UI as plaintext or from IPC/storage as encrypted,
+     * so decrypt first and then encrypt for storage.
+     */
+    private normalizeConnectionForStorage(connection: Connection): Connection {
+        const decrypted = this.encryptionManager.decryptFields(connection, SENSITIVE_CONNECTION_FIELDS);
+        return this.encryptionManager.encryptFields(decrypted, SENSITIVE_CONNECTION_FIELDS);
+    }
+
     /**
      * Migrate existing plain-text connections to encrypted storage
-     * This is safe to call multiple times - it will only encrypt unencrypted data
+     * This is safe to call multiple times - it will not double-encrypt existing data.
      */
     private migrateConnectionsToEncrypted(): void {
         const connections = this.store.get("connections");
         let needsMigration = false;
 
-        // Check if any connection has unencrypted sensitive data
-        // We can detect this by checking if encryption is available and the data looks like plain text
         if (this.encryptionManager.isEncryptionAvailable()) {
-            for (const conn of connections) {
-                // If clientSecret exists and looks like plain text (not base64), it needs migration
-                if (conn.clientSecret && !this.isLikelyEncrypted(conn.clientSecret)) {
-                    needsMigration = true;
-                    break;
-                }
-                if (conn.accessToken && !this.isLikelyEncrypted(conn.accessToken)) {
-                    needsMigration = true;
-                    break;
-                }
-            }
+            const decryptedConnections = connections.map((conn) => this.encryptionManager.decryptFields(conn, SENSITIVE_CONNECTION_FIELDS));
+            const encryptedConnections = decryptedConnections.map((conn) => this.encryptionManager.encryptFields(conn, SENSITIVE_CONNECTION_FIELDS));
+
+            needsMigration = encryptedConnections.some((encryptedConnection, index) => SENSITIVE_CONNECTION_FIELDS.some((field) => encryptedConnection[field] !== connections[index][field]));
         }
 
         if (needsMigration) {
             logInfo("Migrating connections to encrypted storage...");
-            const encryptedConnections = connections.map((conn) => this.encryptionManager.encryptFields(conn, SENSITIVE_CONNECTION_FIELDS));
+            const encryptedConnections = connections.map((conn) => this.normalizeConnectionForStorage(conn));
             this.store.set("connections", encryptedConnections);
             logInfo("Connection migration complete");
         }
     }
 
-    /**
-     * Check if a string is likely to be encrypted (base64 encoded)
-     */
-    private isLikelyEncrypted(value: string): boolean {
-        // Base64 strings are typically much longer and contain only certain characters
-        // This is a heuristic, not perfect, but good enough for migration detection
-        return /^[A-Za-z0-9+/]+=*$/.test(value) && value.length > 100;
-    }
-
     /**
      * Add a Dataverse connection with encrypted sensitive fields
      */
-    addConnection(connection: DataverseConnection): void {
+    addConnection(connection: Connection): void {
         const connections = this.store.get("connections");
 
-        // Encrypt sensitive fields before storing
-        const encryptedConnection = this.encryptionManager.encryptFields(connection, SENSITIVE_CONNECTION_FIELDS);
+        const encryptedConnection = this.normalizeConnectionForStorage(connection);
 
         connections.push(encryptedConnection);
         this.store.set("connections", connections);
@@ -100,14 +100,15 @@ export class ConnectionsManager {
     /**
      * Update a Dataverse connection with encryption for sensitive fields
      */
-    updateConnection(id: string, updates: Partial<DataverseConnection>): void {
+    updateConnection(id: string, updates: Partial<Connection>): void {
         const connections = this.store.get("connections");
         const index = connections.findIndex((c) => c.id === id);
         if (index !== -1) {
-            // Encrypt any sensitive fields in the updates
-            const encryptedUpdates = this.encryptionManager.encryptFields(updates as DataverseConnection, SENSITIVE_CONNECTION_FIELDS);
+            const existingConnection = this.encryptionManager.decryptFields(connections[index], SENSITIVE_CONNECTION_FIELDS);
+            const decryptedUpdates = this.encryptionManager.decryptFields(updates as Connection, SENSITIVE_CONNECTION_FIELDS);
+            const mergedConnection = { ...existingConnection, ...decryptedUpdates };
 
-            connections[index] = { ...connections[index], ...encryptedUpdates };
+            connections[index] = this.normalizeConnectionForStorage(mergedConnection);
             this.store.set("connections", connections);
         }
     }
@@ -124,7 +125,7 @@ export class ConnectionsManager {
     /**
      * Get all connections with decrypted sensitive fields
      */
-    getConnections(): DataverseConnection[] {
+    getConnections(): Connection[] {
         const connections = this.store.get("connections");
 
         // Decrypt sensitive fields for each connection
@@ -170,14 +171,19 @@ export class ConnectionsManager {
             throw new Error("Connection not found");
         }
 
-        // Clear all authentication tokens
+        this.clearTokensForConnection(connection);
+        this.store.set("connections", connections);
+        logInfo(`[ConnectionsManager] Cleared tokens for connection: ${connection.name}`);
+    }
+
+    private clearTokensForConnection(connection: Connection): void {
         connection.accessToken = undefined;
         connection.refreshToken = undefined;
         connection.tokenExpiry = undefined;
         connection.msalAccountId = undefined;
-
-        this.store.set("connections", connections);
-        logInfo(`[ConnectionsManager] Cleared tokens for connection: ${connection.name}`);
+        connection.powerPlatformAccessToken = undefined;
+        connection.powerPlatformTokenExpiry = undefined;
+        connection.scopesForPowerPlatformAPI = undefined;
     }
 
     /**
@@ -188,21 +194,72 @@ export class ConnectionsManager {
         const connections = this.store.get("connections");
 
         for (const connection of connections) {
-            // Clear all authentication tokens
-            connection.accessToken = undefined;
-            connection.refreshToken = undefined;
-            connection.tokenExpiry = undefined;
-            connection.msalAccountId = undefined;
+            this.clearTokensForConnection(connection);
         }
 
         this.store.set("connections", connections);
         logInfo(`[ConnectionsManager] Cleared tokens for all connections`);
     }
 
+    /**
+     * Update Power Platform API tokens with encryption (called after Power Platform auth/refresh)
+     */
+    updatePowerPlatformTokens(id: string, authTokens: { accessToken: string; expiresOn: Date; scopesForPowerPlatformAPI?: string[] }): void {
+        const connections = this.store.get("connections");
+        const connection = connections.find((c) => c.id === id);
+
+        if (!connection) {
+            throw new Error("Connection not found");
+        }
+
+        connection.lastUsedAt = new Date().toISOString();
+        connection.powerPlatformAccessToken = this.encryptionManager.encrypt(authTokens.accessToken);
+        connection.powerPlatformTokenExpiry = authTokens.expiresOn.toISOString();
+        connection.scopesForPowerPlatformAPI =
+            Array.isArray(authTokens.scopesForPowerPlatformAPI) && authTokens.scopesForPowerPlatformAPI.every((scope) => typeof scope === "string") ? authTokens.scopesForPowerPlatformAPI : undefined;
+
+        this.store.set("connections", connections);
+    }
+
+    /**
+     * Clear Power Platform API tokens for a connection
+     */
+    clearPowerPlatformTokens(id: string): void {
+        const connections = this.store.get("connections");
+        const connection = connections.find((c) => c.id === id);
+
+        if (!connection) {
+            throw new Error("Connection not found");
+        }
+
+        connection.powerPlatformAccessToken = undefined;
+        connection.powerPlatformTokenExpiry = undefined;
+        connection.scopesForPowerPlatformAPI = undefined;
+
+        this.store.set("connections", connections);
+    }
+
+    /**
+     * Check if a connection's Power Platform token is expired
+     */
+    isPowerPlatformTokenExpired(connectionId: string): boolean {
+        const connections = this.store.get("connections");
+        const connection = connections.find((c) => c.id === connectionId);
+
+        if (!connection || !connection.powerPlatformTokenExpiry) {
+            return false;
+        }
+
+        const expiryDate = new Date(connection.powerPlatformTokenExpiry);
+        const now = new Date();
+
+        return expiryDate.getTime() <= now.getTime();
+    }
+
     /**
      * Get connection by ID with decrypted sensitive fields
      */
-    getConnectionById(id: string): DataverseConnection | null {
+    getConnectionById(id: string): Connection | null {
         const connections = this.store.get("connections");
         const connection = connections.find((c) => c.id === id);
 
@@ -236,12 +293,12 @@ export class ConnectionsManager {
      * @param ids Optional array of connection IDs to export. If omitted, all connections are exported.
      * @returns A JSON-serializable export payload.
      */
-    exportConnections(ids?: string[]): { version: 1; exportedAt: string; connections: Partial<DataverseConnection>[] } {
+    exportConnections(ids?: string[]): { version: 1; exportedAt: string; connections: Partial<Connection>[] } {
         const decrypted = this.getConnections();
         const toExport = ids && ids.length > 0 ? decrypted.filter((c) => ids.includes(c.id)) : decrypted;
 
         const sanitized = toExport.map((conn) => {
-            const sanitizedConn = { ...conn } as Partial<DataverseConnection>;
+            const sanitizedConn = { ...conn } as Partial<Connection>;
             for (const field of EXPORT_EXCLUDED_FIELDS) {
                 delete sanitizedConn[field];
             }
@@ -349,25 +406,26 @@ export class ConnectionsManager {
             }
             existingIds.add(newId);
 
-            const newConnection: DataverseConnection = {
+            const newConnection: Connection = {
                 id: newId,
                 name: entry.name as string,
                 url: entry.url as string,
-                environment: entry.environment as DataverseConnection["environment"],
-                authenticationType: entry.authenticationType as DataverseConnection["authenticationType"],
+                environment: entry.environment as Connection["environment"],
+                authenticationType: entry.authenticationType as Connection["authenticationType"],
                 createdAt: typeof entry.createdAt === "string" ? entry.createdAt : new Date().toISOString(),
                 clientId: typeof entry.clientId === "string" ? entry.clientId : undefined,
                 clientSecret: typeof entry.clientSecret === "string" ? entry.clientSecret : undefined,
                 tenantId: typeof entry.tenantId === "string" ? entry.tenantId : undefined,
                 username: typeof entry.username === "string" ? entry.username : undefined,
                 password: typeof entry.password === "string" ? entry.password : undefined,
-                browserType: typeof entry.browserType === "string" ? (entry.browserType as DataverseConnection["browserType"]) : undefined,
+                browserType: typeof entry.browserType === "string" ? (entry.browserType as Connection["browserType"]) : undefined,
                 browserProfile: typeof entry.browserProfile === "string" ? entry.browserProfile : undefined,
                 browserProfileName: typeof entry.browserProfileName === "string" ? entry.browserProfileName : undefined,
                 category: typeof entry.category === "string" ? entry.category : undefined,
                 environmentColor: typeof entry.environmentColor === "string" ? entry.environmentColor : undefined,
                 categoryColor: typeof entry.categoryColor === "string" ? entry.categoryColor : undefined,
                 hasIncompleteCredentials,
+                enabledForPowerPlatformAPI: typeof entry.enabledForPowerPlatformAPI === "boolean" ? entry.enabledForPowerPlatformAPI : false,
             };
 
             // Encrypt sensitive fields and persist
diff --git a/src/main/managers/dataverseManager.ts b/src/main/managers/dataverseManager.ts
index 7123ea57..6f08790f 100644
--- a/src/main/managers/dataverseManager.ts
+++ b/src/main/managers/dataverseManager.ts
@@ -1,17 +1,17 @@
 import * as https from "https";
-import * as zlib from "zlib";
 import { promisify } from "util";
+import * as zlib from "zlib";
+import { logError, logWarn } from "../../common/logger";
 import {
-    DataverseConnection,
+    AttributeMetadataType,
+    Connection,
     ENTITY_RELATED_METADATA_BASE_PATHS,
     EntityRelatedMetadataPath,
     EntityRelatedMetadataResponse,
-    AttributeMetadataType,
     Label,
     LocalizedLabel,
     MetadataOperationOptions,
 } from "../../common/types";
-import { logWarn, logError } from "../../common/logger";
 import { DATAVERSE_API_VERSION } from "../constants";
 import { AuthManager } from "./authManager";
 import { ConnectionsManager } from "./connectionsManager";
@@ -172,7 +172,7 @@ export class DataverseManager {
      * Build a properly formatted API URL by combining base URL and path
      * Ensures no double slashes between base URL and path
      */
-    private buildApiUrl(connection: DataverseConnection, path: string): string {
+    private buildApiUrl(connection: Connection, path: string): string {
         // Ensure base URL doesn't end with slash and path doesn't start with slash
         const baseUrl = connection.url.replace(/\/$/, "");
         const cleanPath = path.replace(/^\//, "");
@@ -186,7 +186,7 @@ export class DataverseManager {
      * @param errorMessage The error message to throw if cache is invalid
      * @throws Error if MSAL cache is empty (tokens are cleared before throwing)
      */
-    private async ensureMsalCacheOrClearTokens(connection: DataverseConnection, connectionId: string, errorMessage: string): Promise<void> {
+    private async ensureMsalCacheOrClearTokens(connection: Connection, connectionId: string, errorMessage: string): Promise<void> {
         const hasAccount = await this.authManager.hasAccountInCache(connection);
         if (!hasAccount) {
             // MSAL cache is empty (e.g., after app restart), clear stored tokens to force re-authentication
@@ -201,7 +201,7 @@ export class DataverseManager {
      * Uses MSAL's automatic token refresh - no manual expiry checking needed
      * @param connectionId The ID of the connection to use
      */
-    private async getConnectionWithToken(connectionId: string): Promise<{ connection: DataverseConnection; accessToken: string }> {
+    private async getConnectionWithToken(connectionId: string): Promise<{ connection: Connection; accessToken: string }> {
         const connection = this.connectionsManager.getConnectionById(connectionId);
         if (!connection) {
             throw new Error(`Connection ${connectionId} not found. Please ensure the connection exists.`);
@@ -587,20 +587,15 @@ export class DataverseManager {
 
         // Build URL based on operation type
         if (request.entityName) {
-            
             const entitySetName = this.getEntitySetName(request.entityName);
-            if(request.entityId)
-            {
+            if (request.entityId) {
                 // Bound operation - Entity
                 url += `${entitySetName}(${request.entityId})/Microsoft.Dynamics.CRM.${request.operationName}`;
-            }else{
-
+            } else {
                 // Bound operation - Entity Collection
                 url += `${entitySetName}/Microsoft.Dynamics.CRM.${request.operationName}`;
             }
-            
-        } 
-        else {
+        } else {
             // Unbound operation
             url += request.operationName;
         }
diff --git a/src/main/managers/encryptionManager.ts b/src/main/managers/encryptionManager.ts
index c8b49ca3..47b1560b 100644
--- a/src/main/managers/encryptionManager.ts
+++ b/src/main/managers/encryptionManager.ts
@@ -6,6 +6,26 @@ import { logError, logWarn } from "../../common/logger";
  * This uses the OS's secure storage mechanisms (Keychain on macOS, DPAPI on Windows, etc.)
  */
 export class EncryptionManager {
+    /**
+     * Detect whether a value looks like canonical base64.
+     * This prevents accidental decryption attempts on plaintext inputs.
+     */
+    private isCanonicalBase64(value: string): boolean {
+        if (!value || value.length % 4 !== 0) {
+            return false;
+        }
+
+        if (!/^[A-Za-z0-9+/]+={0,2}$/.test(value)) {
+            return false;
+        }
+
+        try {
+            return Buffer.from(value, "base64").toString("base64") === value;
+        } catch {
+            return false;
+        }
+    }
+
     /**
      * Check if encryption is available on this platform
      */
@@ -44,6 +64,11 @@ export class EncryptionManager {
             return encrypted;
         }
 
+        // Values can legitimately be plaintext during migration/import paths.
+        if (!this.isCanonicalBase64(encrypted)) {
+            return encrypted;
+        }
+
         try {
             const buffer = Buffer.from(encrypted, "base64");
             return safeStorage.decryptString(buffer);
diff --git a/src/main/managers/headlessToolInvocationManager.ts b/src/main/managers/headlessToolInvocationManager.ts
new file mode 100644
index 00000000..f157f46f
--- /dev/null
+++ b/src/main/managers/headlessToolInvocationManager.ts
@@ -0,0 +1,174 @@
+import { randomUUID } from "crypto";
+
+export type HeadlessJobStatus = "pending" | "in_progress" | "completed" | "failed";
+
+export interface HeadlessJobRecord {
+    jobId: string;
+    toolId: string;
+    toolName: string;
+    status: HeadlessJobStatus;
+    createdAt: string;
+    startedAt?: string;
+    completedAt?: string;
+    timeoutMs: number;
+    progress?: {
+        percent: number;
+        message?: string;
+    };
+    result?: Record<string, unknown>;
+    error?: string;
+}
+
+interface StartJobOptions {
+    toolId: string;
+    toolName: string;
+    timeoutMs: number;
+    execute: (jobId: string) => Promise<Record<string, unknown>>;
+}
+
+const DEFAULT_CLEANUP_TTL_MS = 60 * 60 * 1000;
+
+export class HeadlessToolInvocationManager {
+    private readonly jobs = new Map<string, HeadlessJobRecord>();
+    private readonly cleanupTimer: NodeJS.Timeout;
+
+    constructor(private readonly completedJobTtlMs = DEFAULT_CLEANUP_TTL_MS) {
+        this.cleanupTimer = setInterval(() => this.cleanupExpiredJobs(), 60_000);
+        this.cleanupTimer.unref();
+    }
+
+    public dispose(): void {
+        clearInterval(this.cleanupTimer);
+    }
+
+    public async startJob(options: StartJobOptions): Promise<HeadlessJobRecord> {
+        const nowIso = new Date().toISOString();
+        const jobId = randomUUID();
+
+        const initialRecord: HeadlessJobRecord = {
+            jobId,
+            toolId: options.toolId,
+            toolName: options.toolName,
+            status: "pending",
+            createdAt: nowIso,
+            timeoutMs: options.timeoutMs,
+            progress: {
+                percent: 0,
+                message: "queued",
+            },
+        };
+
+        this.jobs.set(jobId, initialRecord);
+
+        void this.runJob(jobId, options.execute, options.timeoutMs);
+
+        return { ...initialRecord };
+    }
+
+    public getJob(jobId: string): HeadlessJobRecord | null {
+        const job = this.jobs.get(jobId);
+        return job ? { ...job } : null;
+    }
+
+    public updateProgress(jobId: string, percent: number, message?: string): void {
+        const job = this.jobs.get(jobId);
+        if (!job || (job.status !== "pending" && job.status !== "in_progress")) {
+            return;
+        }
+
+        const clamped = Math.max(0, Math.min(100, Math.floor(percent)));
+        job.progress = {
+            percent: clamped,
+            ...(message ? { message } : {}),
+        };
+        this.jobs.set(jobId, job);
+    }
+
+    private async runJob(jobId: string, execute: (jobId: string) => Promise<Record<string, unknown>>, timeoutMs: number): Promise<void> {
+        const existing = this.jobs.get(jobId);
+        if (!existing) {
+            return;
+        }
+
+        existing.status = "in_progress";
+        existing.startedAt = new Date().toISOString();
+        existing.progress = {
+            percent: 5,
+            message: "running",
+        };
+        this.jobs.set(jobId, existing);
+
+        try {
+            const result = await this.withTimeout(execute(jobId), timeoutMs);
+            const completed = this.jobs.get(jobId);
+            if (!completed) {
+                return;
+            }
+
+            completed.status = "completed";
+            completed.completedAt = new Date().toISOString();
+            completed.progress = {
+                percent: 100,
+                message: "completed",
+            };
+            completed.result = result;
+            this.jobs.set(jobId, completed);
+        } catch (error) {
+            const failed = this.jobs.get(jobId);
+            if (!failed) {
+                return;
+            }
+
+            failed.status = "failed";
+            failed.completedAt = new Date().toISOString();
+            failed.progress = {
+                percent: failed.progress?.percent ?? 0,
+                message: "failed",
+            };
+            failed.error = error instanceof Error ? error.message : String(error);
+            this.jobs.set(jobId, failed);
+        }
+    }
+
+    private withTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T> {
+        let timeoutHandle: NodeJS.Timeout | undefined;
+
+        const timeoutPromise = new Promise<T>((_, reject) => {
+            timeoutHandle = setTimeout(() => {
+                timeoutHandle = undefined;
+                reject(new Error(`Headless execution timed out after ${timeoutMs} ms`));
+            }, timeoutMs);
+        });
+
+        return Promise.race([
+            promise.then(
+                (value) => {
+                    if (timeoutHandle) {
+                        clearTimeout(timeoutHandle);
+                    }
+                    return value;
+                },
+                (error) => {
+                    if (timeoutHandle) {
+                        clearTimeout(timeoutHandle);
+                    }
+                    throw error;
+                },
+            ),
+            timeoutPromise,
+        ]);
+    }
+
+    private cleanupExpiredJobs(): void {
+        const now = Date.now();
+
+        for (const [jobId, job] of this.jobs.entries()) {
+            if ((job.status === "completed" || job.status === "failed") && job.completedAt) {
+                const completedAt = new Date(job.completedAt).getTime();
+                if (now - completedAt > this.completedJobTtlMs) {
+                    this.jobs.delete(jobId);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/managers/notificationWindowManager.ts b/src/main/managers/notificationWindowManager.ts
index bcd7054c..a42c58f1 100644
--- a/src/main/managers/notificationWindowManager.ts
+++ b/src/main/managers/notificationWindowManager.ts
@@ -1,5 +1,7 @@
 import { BrowserWindow, ipcMain } from "electron";
 import * as path from "path";
+import { resolveTheme } from "../utilities/theme";
+import { SettingsManager } from "./settingsManager";
 
 interface NotificationOptions {
     title: string;
@@ -9,6 +11,463 @@ interface NotificationOptions {
     actions?: Array<{ label: string; callback: string }>;
 }
 
+/** A single entry stored in the persistent notification history. */
+export interface NotificationHistoryEntry {
+    title: string;
+    body: string;
+    type: "info" | "success" | "warning" | "error";
+    /** ISO-8601 timestamp string (serialisable across process boundaries). */
+    timestamp: string;
+}
+
+const HISTORY_MAX_SIZE = 100;
+const HISTORY_WINDOW_TITLE = "Notification History";
+
+/**
+ * NotificationHistoryWindowManager
+ *
+ * Manages an always-on-top frameless BrowserWindow that displays the
+ * persistent notification history.  The window is created lazily when the
+ * user first clicks the bell button, then shown/hidden on subsequent clicks.
+ *
+ * History data is owned by the main process so the window is always in sync
+ * regardless of renderer reloads.
+ */
+export class NotificationHistoryWindowManager {
+    private historyWindow: BrowserWindow | null = null;
+    private mainWindow: BrowserWindow;
+    private settingsManager: SettingsManager;
+    private history: NotificationHistoryEntry[] = [];
+    private unreadCount: number = 0;
+    private isPanelOpen: boolean = false;
+
+    private readonly WINDOW_WIDTH = 380;
+    private readonly WINDOW_HEIGHT = 480;
+    /** Horizontal gap between the right edge of the history window and the right edge of the main window */
+    private readonly HORIZONTAL_MARGIN = 12;
+    /** Vertical offset from the bottom of the main window to the bottom of the history window (accounts for footer height) */
+    private readonly FOOTER_OFFSET = 40;
+
+    constructor(mainWindow: BrowserWindow, settingsManager: SettingsManager) {
+        this.mainWindow = mainWindow;
+        this.settingsManager = settingsManager;
+        this.setupIpcHandlers();
+        this.setupMainWindowListeners();
+    }
+
+    private isDarkTheme(): boolean {
+        const theme = this.settingsManager.getSetting("theme") ?? "system";
+        return resolveTheme(theme) === "dark";
+    }
+
+    /**
+     * Called by NotificationWindowManager whenever a new notification is shown
+     * so the history window can track all notifications.
+     */
+    addNotification(options: { title: string; body: string; type?: string }): void {
+        const VALID_TYPES: ReadonlyArray<NotificationHistoryEntry["type"]> = ["info", "success", "warning", "error"];
+        const rawType = options.type;
+        const type = (rawType && (VALID_TYPES as readonly string[]).includes(rawType) ? rawType : "info") as NotificationHistoryEntry["type"];
+
+        this.history.unshift({ title: options.title, body: options.body, type, timestamp: new Date().toISOString() });
+        if (this.history.length > HISTORY_MAX_SIZE) {
+            this.history.pop();
+        }
+        this.unreadCount++;
+        this.sendBadgeUpdate();
+    }
+
+    private setupIpcHandlers(): void {
+        this.removeIpcHandlers();
+        ipcMain.on("notification-history:open", () => this.openHistoryPanel());
+        ipcMain.on("notification-history:close", () => this.closeHistoryPanel());
+        ipcMain.on("notification-history:clear", () => this.clearHistory());
+    }
+
+    private removeIpcHandlers(): void {
+        ipcMain.removeAllListeners("notification-history:open");
+        ipcMain.removeAllListeners("notification-history:close");
+        ipcMain.removeAllListeners("notification-history:clear");
+    }
+
+    private setupMainWindowListeners(): void {
+        this.mainWindow.on("move", () => this.updateWindowPosition());
+        this.mainWindow.on("resize", () => this.updateWindowPosition());
+        this.mainWindow.on("minimize", () => {
+            if (this.isPanelOpen) this.closeHistoryPanel();
+        });
+        this.mainWindow.on("closed", () => this.destroy());
+    }
+
+    private openHistoryPanel(): void {
+        if (!this.historyWindow) {
+            this.createHistoryWindow();
+        }
+
+        this.isPanelOpen = true;
+        this.unreadCount = 0;
+        this.sendBadgeUpdate();
+        this.updateWindowContent();
+        this.updateWindowPosition();
+        this.historyWindow!.show();
+
+        // Tell the renderer the panel is now open so it can update aria-pressed.
+        this.mainWindow.webContents.send("notification-history:opened");
+    }
+
+    private closeHistoryPanel(): void {
+        this.isPanelOpen = false;
+        this.historyWindow?.hide();
+        // Tell the renderer the panel closed (triggered by blur, Escape, or explicit close).
+        this.mainWindow.webContents.send("notification-history:closed");
+    }
+
+    private clearHistory(): void {
+        this.history = [];
+        this.unreadCount = 0;
+        this.sendBadgeUpdate();
+        if (this.isPanelOpen) {
+            this.updateWindowContent();
+        }
+    }
+
+    private sendBadgeUpdate(): void {
+        this.mainWindow.webContents.send("notification:badge-update", this.unreadCount);
+    }
+
+    private createHistoryWindow(): void {
+        this.historyWindow = new BrowserWindow({
+            width: this.WINDOW_WIDTH,
+            height: this.WINDOW_HEIGHT,
+            title: HISTORY_WINDOW_TITLE,
+            frame: false,
+            transparent: false,
+            alwaysOnTop: true,
+            skipTaskbar: true,
+            resizable: false,
+            movable: false,
+            minimizable: false,
+            maximizable: false,
+            closable: false,
+            focusable: true,
+            show: false,
+            webPreferences: {
+                nodeIntegration: false,
+                contextIsolation: true,
+                sandbox: false,
+                preload: path.join(__dirname, "notificationPreload.js"),
+            },
+        });
+
+        this.historyWindow.setParentWindow(this.mainWindow);
+
+        // Close the panel when the window loses OS focus (user clicked elsewhere).
+        this.historyWindow.on("blur", () => {
+            if (this.isPanelOpen) this.closeHistoryPanel();
+        });
+
+        this.historyWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(this.generateHistoryHTML())}`);
+    }
+
+    private updateWindowContent(): void {
+        if (!this.historyWindow) return;
+        this.historyWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(this.generateHistoryHTML())}`);
+    }
+
+    private updateWindowPosition(): void {
+        if (!this.historyWindow) return;
+        const mainBounds = this.mainWindow.getBounds();
+        const x = mainBounds.x + mainBounds.width - this.WINDOW_WIDTH - this.HORIZONTAL_MARGIN;
+        const y = mainBounds.y + mainBounds.height - this.WINDOW_HEIGHT - this.FOOTER_OFFSET;
+        this.historyWindow.setBounds({ x, y, width: this.WINDOW_WIDTH, height: this.WINDOW_HEIGHT });
+    }
+
+    private formatTimestamp(isoString: string): string {
+        const date = new Date(isoString);
+        const now = new Date();
+        const isToday = date.toDateString() === now.toDateString();
+        if (isToday) {
+            return date.toLocaleTimeString(undefined, { hour: "numeric", minute: "2-digit" });
+        }
+        return date.toLocaleDateString(undefined, { month: "short", day: "numeric" }) + ", " + date.toLocaleTimeString(undefined, { hour: "numeric", minute: "2-digit" });
+    }
+
+    private escapeHtml(text: string): string {
+        return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+    }
+
+    private generateHistoryHTML(): string {
+        const dark = this.isDarkTheme();
+
+        const icons: Record<NotificationHistoryEntry["type"], string> = {
+            info: '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true"><path d="M8.568 1.031A6.8 6.8 0 0 1 12.76 3.05a7.06 7.06 0 0 1 .46 9.39 6.85 6.85 0 0 1-8.58 1.74 7 7 0 0 1-3.12-3.5 7.12 7.12 0 0 1-.23-4.71 7 7 0 0 1 2.77-3.79 6.8 6.8 0 0 1 4.508-1.149zM9.04 13.88a5.89 5.89 0 0 0 3.18-2.630 6.07 6.07 0 0 0 .29-5.12 5.94 5.94 0 0 0-2.23-2.8 5.82 5.82 0 0 0-4.59-.61 6 6 0 0 0-3.7 3.17 6.1 6.1 0 0 0 .24 5.58 5.93 5.93 0 0 0 3.39 2.78 5.82 5.82 0 0 0 3.42-.37z"/><path d="M7.5 6h1v3h-1V6z"/><path d="M8 10.5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1z"/></svg>',
+            success:
+                '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true"><path d="M8 1a7 7 0 1 1 0 14A7 7 0 0 1 8 1zm3.844 4.844a.75.75 0 0 0-1.188-.918l-3.7 4.79-1.649-1.833a.75.75 0 1 0-1.114 1.004l2.25 2.5a.75.75 0 0 0 1.15-.043l4.25-5.5z"/></svg>',
+            warning:
+                '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true"><path d="M8.568 1.031A6.8 6.8 0 0 1 12.76 3.05a7.06 7.06 0 0 1 .46 9.39 6.85 6.85 0 0 1-8.58 1.74 7 7 0 0 1-3.12-3.5 7.12 7.12 0 0 1-.23-4.71 7 7 0 0 1 2.77-3.79 6.8 6.8 0 0 1 4.508-1.149zM9.04 13.88a5.89 5.89 0 0 0 3.18-2.630 6.07 6.07 0 0 0 .29-5.12 5.94 5.94 0 0 0-2.23-2.8 5.82 5.82 0 0 0-4.59-.61 6 6 0 0 0-3.7 3.17 6.1 6.1 0 0 0 .24 5.58 5.93 5.93 0 0 0 3.39 2.78 5.82 5.82 0 0 0 3.42-.37z"/><path d="M7.5 4h1v4h-1V4z"/><path d="M8 11a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1z"/></svg>',
+            error: '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true"><path d="M8 1a7 7 0 1 1 0 14A7 7 0 0 1 8 1zM4.646 4.646a.5.5 0 0 0 0 .708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646a.5.5 0 0 0-.708 0z"/></svg>',
+        };
+
+        const hasHistory = this.history.length > 0;
+        const listHTML = hasHistory
+            ? this.history
+                  .map(
+                      (entry) => `
+                <div class="notification-history-entry notification-history-entry--${entry.type}" role="listitem">
+                    <span class="notification-history-entry__icon">${icons[entry.type]}</span>
+                    <div class="notification-history-entry__body">
+                        <div class="notification-history-entry__title" title="${this.escapeHtml(entry.title)}">${this.escapeHtml(entry.title)}</div>
+                        <div class="notification-history-entry__message" title="${this.escapeHtml(entry.body)}">${this.escapeHtml(entry.body)}</div>
+                    </div>
+                    <div class="notification-history-entry__meta">
+                        <span class="notification-history-entry__time">${this.formatTimestamp(entry.timestamp)}</span>
+                        <button type="button" class="notification-history-entry__copy" aria-label="Copy notification">Copy</button>
+                    </div>
+                </div>`,
+                  )
+                  .join("")
+            : "";
+
+        return `<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'; script-src 'unsafe-inline';">
+    <title>${HISTORY_WINDOW_TITLE}</title>
+    <style>
+        * { margin: 0; padding: 0; box-sizing: border-box; }
+        :root { color-scheme: ${dark ? "dark" : "light"}; }
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+            background: ${dark ? "#1e1e1e" : "#ffffff"};
+            color: ${dark ? "#cccccc" : "#1f1f1f"};
+            overflow: hidden;
+            height: 100vh;
+            display: flex;
+            flex-direction: column;
+        }
+        #notification-history-panel {
+            display: flex;
+            flex-direction: column;
+            height: 100%;
+            border: 1px solid ${dark ? "#3c3c3c" : "#e0e0e0"};
+            border-radius: 6px;
+            overflow: hidden;
+        }
+        .notification-history-header {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 8px 12px;
+            border-bottom: 1px solid ${dark ? "#3c3c3c" : "#e0e0e0"};
+            flex-shrink: 0;
+            background: ${dark ? "#252526" : "#f5f5f5"};
+        }
+        .notification-history-title {
+            font-size: 12px;
+            font-weight: 600;
+            color: ${dark ? "#d4d4d4" : "#1f1f1f"};
+            text-transform: uppercase;
+            letter-spacing: 0.04em;
+        }
+        #notification-clear-all-btn {
+            font-size: 11px;
+            color: ${dark ? "#9d9d9d" : "#616161"};
+            background: transparent;
+            border: none;
+            cursor: pointer;
+            padding: 2px 6px;
+            border-radius: 3px;
+            transition: color 0.15s ease, background 0.15s ease;
+        }
+        #notification-clear-all-btn:hover { color: ${dark ? "#d4d4d4" : "#1f1f1f"}; background: ${dark ? "rgba(255,255,255,0.08)" : "rgba(0,0,0,0.06)"}; }
+        #notification-history-list {
+            flex: 1;
+            overflow-y: auto;
+            padding: 4px 0;
+        }
+        #notification-history-empty {
+            padding: 24px 16px;
+            text-align: center;
+            font-size: 12px;
+            color: ${dark ? "#9d9d9d" : "#9e9e9e"};
+        }
+        .notification-history-entry {
+            display: flex;
+            align-items: flex-start;
+            gap: 8px;
+            padding: 8px 12px;
+            border-left: 3px solid transparent;
+            transition: background 0.12s ease;
+        }
+        .notification-history-entry:hover { background: ${dark ? "rgba(255,255,255,0.05)" : "rgba(0,0,0,0.04)"}; }
+        .notification-history-entry + .notification-history-entry { border-top: 1px solid ${dark ? "#3c3c3c" : "#eeeeee"}; }
+        .notification-history-entry--info    { border-left-color: #0078d4; }
+        .notification-history-entry--success { border-left-color: #107c10; }
+        .notification-history-entry--warning { border-left-color: #c17a00; }
+        .notification-history-entry--error   { border-left-color: #d13438; }
+        .notification-history-entry__icon { flex-shrink: 0; margin-top: 2px; }
+        .notification-history-entry--info    .notification-history-entry__icon { color: #0078d4; }
+        .notification-history-entry--success .notification-history-entry__icon { color: #107c10; }
+        .notification-history-entry--warning .notification-history-entry__icon { color: #c17a00; }
+        .notification-history-entry--error   .notification-history-entry__icon { color: #d13438; }
+        .notification-history-entry__body { flex: 1; min-width: 0; }
+        .notification-history-entry__title {
+            font-size: 12px;
+            font-weight: 600;
+            color: ${dark ? "#d4d4d4" : "#1f1f1f"};
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-bottom: 2px;
+        }
+        .notification-history-entry__message {
+            font-size: 11px;
+            color: ${dark ? "#9d9d9d" : "#616161"};
+            line-height: 1.4;
+            overflow: hidden;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+        }
+        .notification-history-entry__meta {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
+            gap: 6px;
+            flex-shrink: 0;
+            margin-top: 2px;
+        }
+        .notification-history-entry__time {
+            font-size: 10px;
+            color: ${dark ? "#6b6b6b" : "#9e9e9e"};
+            white-space: nowrap;
+        }
+        .notification-history-entry__copy {
+            font-size: 10px;
+            color: ${dark ? "#9d9d9d" : "#616161"};
+            background: transparent;
+            border: 1px solid ${dark ? "#4a4a4a" : "#bdbdbd"};
+            border-radius: 3px;
+            padding: 1px 6px;
+            cursor: pointer;
+            transition: color 0.15s ease, background 0.15s ease, border-color 0.15s ease;
+        }
+        .notification-history-entry__copy:hover {
+            color: ${dark ? "#d4d4d4" : "#1f1f1f"};
+            background: ${dark ? "rgba(255,255,255,0.08)" : "rgba(0,0,0,0.06)"};
+            border-color: ${dark ? "#6a6a6a" : "#9e9e9e"};
+        }
+        .notification-history-entry__copy.is-copied {
+            color: ${dark ? "#9cdcfe" : "#0078d4"};
+            border-color: #0078d4;
+        }
+    </style>
+</head>
+<body>
+    <div id="notification-history-panel">
+        <div class="notification-history-header">
+            <span class="notification-history-title">Notifications</span>
+            <button type="button" id="notification-clear-all-btn">Clear All</button>
+        </div>
+        <div id="notification-history-list" role="list">${listHTML}</div>
+        <div id="notification-history-empty"${hasHistory ? ' style="display:none"' : ""}>No notifications yet</div>
+    </div>
+    <script>
+        function copyTextWithFallback(text) {
+            if (navigator.clipboard && window.isSecureContext) {
+                return navigator.clipboard.writeText(text);
+            }
+
+            return new Promise(function(resolve, reject) {
+                try {
+                    var textarea = document.createElement("textarea");
+                    textarea.value = text;
+                    textarea.setAttribute("readonly", "");
+                    textarea.style.position = "fixed";
+                    textarea.style.top = "-1000px";
+                    textarea.style.left = "-1000px";
+                    document.body.appendChild(textarea);
+                    textarea.focus();
+                    textarea.select();
+                    var copied = document.execCommand("copy");
+                    document.body.removeChild(textarea);
+                    if (copied) {
+                        resolve();
+                    } else {
+                        reject(new Error("Copy command failed"));
+                    }
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        }
+
+        document.getElementById("notification-clear-all-btn").addEventListener("click", function() {
+            window.electron.clearHistory();
+        });
+
+        document.getElementById("notification-history-list").addEventListener("click", function(e) {
+            var eventTarget = e.target;
+            if (!(eventTarget instanceof Element)) {
+                return;
+            }
+
+            var target = eventTarget.closest(".notification-history-entry__copy");
+            if (!(target instanceof HTMLButtonElement)) {
+                return;
+            }
+
+            var entry = target.closest(".notification-history-entry");
+            if (!entry) return;
+
+            var titleElement = entry.querySelector(".notification-history-entry__title");
+            var messageElement = entry.querySelector(".notification-history-entry__message");
+            var timeElement = entry.querySelector(".notification-history-entry__time");
+
+            var title = titleElement ? titleElement.textContent.trim() : "";
+            var message = messageElement ? messageElement.textContent.trim() : "";
+            var time = timeElement ? timeElement.textContent.trim() : "";
+
+            var clipboardText = "Notification" + "\\n" + "Title: " + title + "\\n" + "Message: " + message + "\\n" + "Time: " + time;
+
+            copyTextWithFallback(clipboardText)
+                .then(function() {
+                    target.textContent = "Copied";
+                    target.classList.add("is-copied");
+                    window.setTimeout(function() {
+                        target.textContent = "Copy";
+                        target.classList.remove("is-copied");
+                    }, 1200);
+                })
+                .catch(function() {
+                    target.textContent = "Failed";
+                    window.setTimeout(function() {
+                        target.textContent = "Copy";
+                    }, 1200);
+                });
+        });
+
+        document.addEventListener("keydown", function(e) {
+            if (e.key === "Escape") { window.electron.closeHistoryPanel(); }
+        });
+    </script>
+</body>
+</html>`;
+    }
+
+    destroy(): void {
+        this.removeIpcHandlers();
+        if (this.historyWindow) {
+            this.historyWindow.destroy();
+            this.historyWindow = null;
+        }
+        this.history = [];
+        this.unreadCount = 0;
+        this.isPanelOpen = false;
+    }
+}
+
 /**
  * NotificationWindowManager
  *
@@ -22,19 +481,32 @@ interface NotificationOptions {
 export class NotificationWindowManager {
     private notificationWindow: BrowserWindow | null = null;
     private mainWindow: BrowserWindow;
+    private settingsManager: SettingsManager;
     private notifications: NotificationOptions[] = [];
+    private historyManager: NotificationHistoryWindowManager | null = null;
     private readonly MAX_NOTIFICATIONS = 3;
     private readonly WINDOW_WIDTH = 400;
     private readonly NOTIFICATION_HEIGHT = 100;
     private readonly PADDING = 16;
 
-    constructor(mainWindow: BrowserWindow) {
+    constructor(mainWindow: BrowserWindow, settingsManager: SettingsManager) {
         this.mainWindow = mainWindow;
+        this.settingsManager = settingsManager;
         this.createNotificationWindow();
         this.setupIpcHandlers();
         this.setupMainWindowListeners();
     }
 
+    private isDarkTheme(): boolean {
+        const theme = this.settingsManager.getSetting("theme") ?? "system";
+        return resolveTheme(theme) === "dark";
+    }
+
+    /** Wire up the history manager so each shown notification is also recorded. */
+    setHistoryManager(manager: NotificationHistoryWindowManager): void {
+        this.historyManager = manager;
+    }
+
     /**
      * Create the notification window
      */
@@ -130,6 +602,7 @@ export class NotificationWindowManager {
 
         ipcMain.handle("notification:show", async (event, options: NotificationOptions) => {
             this.showNotification(options);
+            this.historyManager?.addNotification(options);
         });
 
         ipcMain.on("notification:dismiss", (event, index: number) => {
@@ -222,6 +695,8 @@ export class NotificationWindowManager {
      * Generate HTML for the notification window
      */
     private generateHTML(): string {
+        const dark = this.isDarkTheme();
+
         const icons = {
             info: '<svg viewBox="0 0 16 16" fill="currentColor"><path d="M8.568 1.031A6.8 6.8 0 0 1 12.76 3.05a7.06 7.06 0 0 1 .46 9.39 6.85 6.85 0 0 1-8.58 1.74 7 7 0 0 1-3.12-3.5 7.12 7.12 0 0 1-.23-4.71 7 7 0 0 1 2.77-3.79 6.8 6.8 0 0 1 4.508-1.149zM9.04 13.88a5.89 5.89 0 0 0 3.18-2.630 6.07 6.07 0 0 0 .29-5.12 5.94 5.94 0 0 0-2.23-2.8 5.82 5.82 0 0 0-4.59-.61 6 6 0 0 0-3.7 3.17 6.1 6.1 0 0 0 .24 5.58 5.93 5.93 0 0 0 3.39 2.78 5.82 5.82 0 0 0 3.42-.37z"/><path d="M7.5 6h1v3h-1V6z"/><path d="M8 10.5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1z"/></svg>',
             success:
@@ -270,6 +745,8 @@ export class NotificationWindowManager {
             box-sizing: border-box;
         }
 
+        :root { color-scheme: ${dark ? "dark" : "light"}; }
+
         body {
             font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
             background: transparent;
@@ -278,7 +755,7 @@ export class NotificationWindowManager {
         }
 
         .notification {
-            background: #2d2d2d;
+            background: ${dark ? "#2d2d2d" : "#ffffff"};
             border-left: 3px solid;
             border-radius: 4px;
             padding: 12px;
@@ -286,8 +763,8 @@ export class NotificationWindowManager {
             display: flex;
             align-items: flex-start;
             gap: 12px;
-            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4);
-            color: #cccccc;
+            box-shadow: 0 4px 12px rgba(0, 0, 0, ${dark ? "0.4" : "0.15"});
+            color: ${dark ? "#cccccc" : "#1f1f1f"};
         }
 
         .notification.info { border-left-color: #007acc; }
@@ -321,13 +798,13 @@ export class NotificationWindowManager {
             font-weight: 600;
             font-size: 13px;
             margin-bottom: 4px;
-            color: #ffffff;
+            color: ${dark ? "#ffffff" : "#000000"};
         }
 
         .notification-message {
             font-size: 12px;
             line-height: 1.4;
-            color: #cccccc;
+            color: ${dark ? "#cccccc" : "#444444"};
         }
 
         .notification-actions {
@@ -354,7 +831,7 @@ export class NotificationWindowManager {
         .notification-close {
             background: none;
             border: none;
-            color: #999999;
+            color: ${dark ? "#999999" : "#666666"};
             font-size: 20px;
             line-height: 1;
             cursor: pointer;
@@ -366,7 +843,7 @@ export class NotificationWindowManager {
         }
 
         .notification-close:hover {
-            color: #ffffff;
+            color: ${dark ? "#ffffff" : "#000000"};
         }
 
         @keyframes slideIn {
diff --git a/src/main/managers/powerplatformManager.ts b/src/main/managers/powerplatformManager.ts
new file mode 100644
index 00000000..d23ccc88
--- /dev/null
+++ b/src/main/managers/powerplatformManager.ts
@@ -0,0 +1,310 @@
+import * as https from "https";
+import { logError, logWarn } from "../../common/logger";
+import { Connection } from "../../common/types";
+import { AuthManager } from "./authManager";
+import { ConnectionsManager } from "./connectionsManager";
+
+interface PowerPlatformError {
+    error?: {
+        code?: string;
+        message?: string;
+    };
+    message?: string;
+}
+
+export type PowerPlatformCategory =
+    | "Analytics"
+    | "AppManagement"
+    | "Authorization"
+    | "Connectivity"
+    | "CopilotStudio"
+    | "Dynamics"
+    | "EnvironmentManagement"
+    | "Governance"
+    | "Licensing"
+    | "PowerApps"
+    | "PowerAutomate"
+    | "PowerPages"
+    | "ResourceQuery"
+    | "UserManagement"
+    | "WorkflowAgents";
+
+type PowerPlatformMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+
+const POWER_PLATFORM_CATEGORY_PATHS: Record<PowerPlatformCategory, string> = {
+    Analytics: "analytics",
+    AppManagement: "appmanagement",
+    Authorization: "authorization",
+    Connectivity: "connectivity",
+    CopilotStudio: "copilotstudio",
+    Dynamics: "dynamics",
+    EnvironmentManagement: "environmentmanagement",
+    Governance: "governance",
+    Licensing: "licensing",
+    PowerApps: "powerapps",
+    PowerAutomate: "powerautomate",
+    PowerPages: "powerpages",
+    ResourceQuery: "resourcequery",
+    UserManagement: "usermanagement",
+    WorkflowAgents: "workflowagents",
+};
+
+const ALLOWED_METHODS: ReadonlySet<PowerPlatformMethod> = new Set<PowerPlatformMethod>(["GET", "POST", "PUT", "PATCH", "DELETE"]);
+
+export class PowerPlatformManager {
+    private connectionsManager: ConnectionsManager;
+    private authManager: AuthManager;
+
+    constructor(connectionsManager: ConnectionsManager, authManager: AuthManager) {
+        this.connectionsManager = connectionsManager;
+        this.authManager = authManager;
+    }
+
+    async request(connectionId: string, category: PowerPlatformCategory, method: string, relativePath = "", body?: unknown, customHeaders?: Record<string, string>): Promise<unknown> {
+        const normalizedMethod = method.toUpperCase() as PowerPlatformMethod;
+
+        if (!ALLOWED_METHODS.has(normalizedMethod)) {
+            throw new Error(`Invalid Power Platform method '${method}'. Allowed methods: GET, POST, PUT, PATCH, DELETE.`);
+        }
+
+        if (!(category in POWER_PLATFORM_CATEGORY_PATHS)) {
+            throw new Error(`Invalid Power Platform category '${category}'.`);
+        }
+
+        const { accessToken } = await this.getConnectionWithToken(connectionId);
+        const url = this.buildApiUrl(category, relativePath);
+
+        return await this.makeHttpRequest(url, normalizedMethod, accessToken, body, customHeaders);
+    }
+
+    private buildApiUrl(category: PowerPlatformCategory, relativePath: string): string {
+        const baseUrl = `https://api.powerplatform.com/${POWER_PLATFORM_CATEGORY_PATHS[category]}`;
+        const cleanPath = relativePath.trim();
+
+        if (!cleanPath) {
+            return baseUrl;
+        }
+
+        if (cleanPath.startsWith("?")) {
+            return `${baseUrl}${cleanPath}`;
+        }
+
+        return `${baseUrl}/${cleanPath.replace(/^\/+/, "")}`;
+    }
+
+    private async ensureMsalCacheOrClearTokens(connection: Connection, connectionId: string, errorMessage: string): Promise<void> {
+        const hasAccount = await this.authManager.hasAccountInCache(connection);
+        if (!hasAccount) {
+            this.connectionsManager.clearConnectionTokens(connectionId);
+            logWarn("MSAL account not found in cache - tokens cleared");
+            throw new Error(errorMessage);
+        }
+    }
+
+    private async getConnectionWithToken(connectionId: string): Promise<{ connection: Connection; accessToken: string }> {
+        const connection = this.connectionsManager.getConnectionById(connectionId);
+        if (!connection) {
+            throw new Error(`Connection ${connectionId} not found. Please ensure the connection exists.`);
+        }
+
+        const getScopes = (): string[] => ["https://api.powerplatform.com/.default"];
+
+        if (connection.authenticationType === "interactive" && connection.msalAccountId) {
+            await this.ensureMsalCacheOrClearTokens(connection, connectionId, `Authentication expired for connection '${connection.name}'. Please reconnect to continue.`);
+
+            try {
+                const tokenResult = await this.authManager.acquirePowerPlatformToken(connection);
+
+                connection.powerPlatformAccessToken = tokenResult.accessToken;
+                connection.powerPlatformTokenExpiry = tokenResult.expiresOn.toISOString();
+                this.connectionsManager.updatePowerPlatformTokens(connection.id, {
+                    accessToken: tokenResult.accessToken,
+                    expiresOn: tokenResult.expiresOn,
+                    scopesForPowerPlatformAPI: tokenResult.scopes,
+                });
+
+                return { connection, accessToken: tokenResult.accessToken };
+            } catch (error) {
+                logError("MSAL silent Power Platform token acquisition failed", error);
+                throw new Error(`Authentication expired for connection '${connection.name}'. Please reconnect to continue.`);
+            }
+        }
+
+        if (connection.authenticationType === "clientSecret") {
+            const needsRefresh = this.connectionsManager.isPowerPlatformTokenExpired(connectionId) || this.isTokenExpiringWithin(connection.powerPlatformTokenExpiry, 5 * 60 * 1000);
+
+            if (needsRefresh || !connection.powerPlatformAccessToken) {
+                try {
+                    const scopes = getScopes();
+                    const authResult = await this.authManager.authenticateClientSecret(connection, scopes, true);
+
+                    connection.powerPlatformAccessToken = authResult.accessToken;
+                    connection.powerPlatformTokenExpiry = authResult.expiresOn.toISOString();
+                    this.connectionsManager.updatePowerPlatformTokens(connection.id, {
+                        accessToken: authResult.accessToken,
+                        expiresOn: authResult.expiresOn,
+                        scopesForPowerPlatformAPI: authResult.scopes,
+                    });
+
+                    return { connection, accessToken: authResult.accessToken };
+                } catch (error) {
+                    logError("Client secret authentication failed", error);
+                    throw new Error(`Client secret authentication failed for '${connection.name}'. Please verify your credentials.`);
+                }
+            }
+        }
+
+        if (connection.authenticationType === "usernamePassword") {
+            if (connection.msalAccountId) {
+                await this.ensureMsalCacheOrClearTokens(connection, connectionId, `Token refresh failed for '${connection.name}'. Please re-enter your credentials.`);
+
+                try {
+                    const authResult = await this.authManager.acquirePowerPlatformToken(connection);
+
+                    this.connectionsManager.updatePowerPlatformTokens(connection.id, {
+                        accessToken: authResult.accessToken,
+                        expiresOn: authResult.expiresOn,
+                        scopesForPowerPlatformAPI: authResult.scopes,
+                    });
+
+                    return { connection, accessToken: authResult.accessToken };
+                } catch (error) {
+                    logError("Username/password silent token acquisition failed", error);
+                    throw new Error(`Token refresh failed for '${connection.name}'. Please re-enter your credentials.`);
+                }
+            }
+
+            const needsRefresh = this.connectionsManager.isPowerPlatformTokenExpired(connectionId) || this.isTokenExpiringWithin(connection.powerPlatformTokenExpiry, 5 * 60 * 1000);
+            if (needsRefresh && connection.refreshToken) {
+                try {
+                    const authResult = await this.authManager.refreshAccessToken(connection, connection.refreshToken, getScopes());
+
+                    this.connectionsManager.updatePowerPlatformTokens(connection.id, {
+                        accessToken: authResult.accessToken,
+                        expiresOn: authResult.expiresOn,
+                        scopesForPowerPlatformAPI: authResult.scopes,
+                    });
+
+                    return { connection, accessToken: authResult.accessToken };
+                } catch (error) {
+                    logError("Username/password token refresh failed", error);
+                    throw new Error(`Token refresh failed for '${connection.name}'. Please re-enter your credentials.`);
+                }
+            }
+        }
+
+        if (connection.authenticationType === "interactive" && !connection.msalAccountId && connection.refreshToken) {
+            const needsRefresh = this.connectionsManager.isPowerPlatformTokenExpired(connectionId) || this.isTokenExpiringWithin(connection.powerPlatformTokenExpiry, 5 * 60 * 1000);
+
+            if (needsRefresh) {
+                try {
+                    const authResult = await this.authManager.refreshAccessToken(connection, connection.refreshToken, getScopes());
+
+                    this.connectionsManager.updatePowerPlatformTokens(connectionId, {
+                        accessToken: authResult.accessToken,
+                        expiresOn: authResult.expiresOn,
+                        scopesForPowerPlatformAPI: authResult.scopes,
+                    });
+
+                    return { connection, accessToken: authResult.accessToken };
+                } catch {
+                    logWarn("Legacy interactive token refresh failed");
+                    throw new Error(`Token refresh failed for '${connection.name}'. Please sign in again.`);
+                }
+            }
+        }
+
+        if (!connection.powerPlatformAccessToken) {
+            throw new Error(`No access token found for '${connection.name}'. Please reconnect to the environment.`);
+        }
+
+        return { connection, accessToken: connection.powerPlatformAccessToken };
+    }
+
+    private isTokenExpiringWithin(tokenExpiry: string | undefined, milliseconds: number): boolean {
+        if (!tokenExpiry) {
+            return false;
+        }
+
+        const expiryDate = new Date(tokenExpiry);
+        const now = new Date();
+        return expiryDate.getTime() - now.getTime() < milliseconds;
+    }
+
+    private makeHttpRequest(url: string, method: PowerPlatformMethod, accessToken: string, body?: unknown, customHeaders?: Record<string, string>): Promise<unknown> {
+        return new Promise((resolve, reject) => {
+            const urlObj = new URL(url);
+            const hasBody = body !== undefined && body !== null;
+            const bodyData = hasBody ? JSON.stringify(body) : undefined;
+
+            const headers: Record<string, string | number> = {
+                ...(customHeaders || {}),
+                Authorization: `Bearer ${accessToken}`,
+                Accept: "application/json",
+                "Content-Type": "application/json; charset=utf-8",
+            };
+
+            if (hasBody && bodyData) {
+                headers["Content-Length"] = Buffer.byteLength(bodyData);
+            }
+
+            const options: https.RequestOptions = {
+                hostname: urlObj.hostname,
+                port: 443,
+                path: urlObj.pathname + urlObj.search,
+                method,
+                headers,
+            };
+
+            const req = https.request(options, (res) => {
+                let data = "";
+
+                res.on("data", (chunk) => {
+                    data += chunk;
+                });
+
+                res.on("end", () => {
+                    if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                        if (!data.trim()) {
+                            resolve({});
+                            return;
+                        }
+
+                        try {
+                            resolve(JSON.parse(data));
+                        } catch {
+                            resolve(data);
+                        }
+                        return;
+                    }
+
+                    let errorMessage = `HTTP ${res.statusCode}`;
+                    try {
+                        const errorData = JSON.parse(data) as PowerPlatformError;
+                        if (errorData.error?.message) {
+                            errorMessage = errorData.error.code ? `${errorData.error.code}: ${errorData.error.message}` : errorData.error.message;
+                        } else if (errorData.message) {
+                            errorMessage = errorData.message;
+                        }
+                    } catch {
+                        if (data) {
+                            errorMessage = `${errorMessage}: ${data}`;
+                        }
+                    }
+
+                    reject(new Error(errorMessage));
+                });
+            });
+
+            req.on("error", (error) => {
+                reject(new Error(`Request failed: ${error.message}`));
+            });
+
+            if (bodyData) {
+                req.write(bodyData);
+            }
+
+            req.end();
+        });
+    }
+}
diff --git a/src/main/managers/protocolHandlerManager.ts b/src/main/managers/protocolHandlerManager.ts
index fb0bfc8c..873d8055 100644
--- a/src/main/managers/protocolHandlerManager.ts
+++ b/src/main/managers/protocolHandlerManager.ts
@@ -1,4 +1,4 @@
-import { app, dialog } from "electron";
+import { app } from "electron";
 import { logError, logInfo, logWarn } from "../../common/logger";
 
 /**
@@ -99,30 +99,12 @@ export class ProtocolHandlerManager {
 
     /**
      * Initialize early protocol listeners - must be called BEFORE app.whenReady().
-     * For stable packaged builds (protocolEnabled), acquires the single-instance lock
-     * to prevent duplicate stable instances and registers open-url / second-instance
-     * event handlers so no deep link is lost before the main window exists.
-     *
-     * Insider and dev builds skip both the single-instance lock and the protocol
-     * event listeners so they can run alongside a stable installation without
-     * interfering with it.
+     * Protocol-specific listeners (open-url and protocol URL forwarding) are only
+     * registered when protocol handling is enabled for this channel/build.
      */
     initialize(): void {
-        // Insider and dev builds must not acquire the single-instance lock so that
-        // they can run alongside a stable installation on the same machine.
         if (!this.protocolEnabled) {
-            logInfo("[ProtocolHandler] pptb:// protocol disabled (local/dev run or insider build); skipping single-instance lock and protocol event listeners");
-            return;
-        }
-
-        // Stable packaged builds: acquire the single-instance lock to prevent a
-        // second stable instance from starting and to receive protocol URLs forwarded
-        // via the second-instance event.
-        const gotTheLock = app.requestSingleInstanceLock();
-        if (!gotTheLock) {
-            logInfo("[ProtocolHandler] Another stable instance is already running, quitting this instance");
-            dialog.showErrorBox("Power Platform ToolBox is already running", "Only one instance of Power Platform ToolBox can be open at a time.\n\nPlease switch to the existing window.");
-            app.quit();
+            logInfo("[ProtocolHandler] pptb:// protocol disabled (local/dev run or insider build); skipping protocol event listeners");
             return;
         }
 
diff --git a/src/main/managers/settingsManager.ts b/src/main/managers/settingsManager.ts
index e7268c5f..3b5efa50 100644
--- a/src/main/managers/settingsManager.ts
+++ b/src/main/managers/settingsManager.ts
@@ -1,5 +1,15 @@
+import { randomBytes } from "crypto";
 import Store from "electron-store";
 import { CspConsentRecord, LastUsedToolConnectionInfo, LastUsedToolEntry, LastUsedToolUpdate, ToolSettings, UserSettings } from "../../common/types";
+import { buildPreviewFeatureFlags } from "../../common/types/settings";
+
+/**
+ * Generates a random authentication token for MCP server access
+ * Returns a 32-character hex string
+ */
+function generateMcpAccessToken(): string {
+    return randomBytes(16).toString("hex");
+}
 
 /**
  * Manages user settings using electron-store
@@ -29,15 +39,34 @@ export class SettingsManager {
                 toolSecondaryConnections: {}, // Map of toolId to secondary connectionId
                 connectionsSort: "last-used",
                 restoreSessionOnStartup: true, // Reopen previously open tools on app start
+                enablePreviewFeatures: false, // Show preview/experimental features in the UI
+                previewFeatures: buildPreviewFeatureFlags(), // Per-feature preview toggles
             },
         });
 
+        this.migratePreviewFeatureSettings();
+
         this.toolSettingsStore = new Store<{ [toolId: string]: ToolSettings }>({
             name: "tool-settings",
             defaults: {},
         });
     }
 
+    /**
+     * Migrate legacy global preview toggle into per-feature flags while preserving
+     * existing per-feature settings for users already on newer versions.
+     */
+    private migratePreviewFeatureSettings(): void {
+        const legacyEnablePreviewFeatures = this.store.get("enablePreviewFeatures");
+        const currentPreviewFeatures = this.store.get("previewFeatures");
+        const normalizedPreviewFeatures = buildPreviewFeatureFlags(currentPreviewFeatures, typeof legacyEnablePreviewFeatures === "boolean" ? legacyEnablePreviewFeatures : undefined);
+
+        this.store.set("previewFeatures", normalizedPreviewFeatures);
+
+        const hasAnyPreviewFeatureEnabled = Object.values(normalizedPreviewFeatures).some((enabled) => enabled === true);
+        this.store.set("enablePreviewFeatures", hasAnyPreviewFeatureEnabled);
+    }
+
     /**
      * Get all user settings
      */
@@ -317,6 +346,18 @@ export class SettingsManager {
         return stored.map((entry) => this.normalizeLastUsedToolEntry(entry)).filter((entry): entry is LastUsedToolEntry => entry !== null);
     }
 
+    /**
+     * Get the MCP access token, generating one if it doesn't exist
+     */
+    getMcpAccessToken(): string {
+        let token = this.store.get("mcpAccessToken");
+        if (!token) {
+            token = generateMcpAccessToken();
+            this.store.set("mcpAccessToken", token);
+        }
+        return token;
+    }
+
     /**
      * Clear the recently used tools list
      */
diff --git a/src/main/managers/splitLayoutManager.ts b/src/main/managers/splitLayoutManager.ts
new file mode 100644
index 00000000..0b4751ba
--- /dev/null
+++ b/src/main/managers/splitLayoutManager.ts
@@ -0,0 +1,441 @@
+import { BrowserView, BrowserWindow, ipcMain } from "electron";
+import { SPLIT_LAYOUT_CHANNELS } from "../../common/ipc/channels";
+import { logError, logInfo, logWarn } from "../../common/logger";
+import { SplitLayoutState } from "../../common/types/api";
+import { SettingsManager } from "./settingsManager";
+
+/** Pixel width of the gap kept between the two pane BrowserViews for the divider. */
+export const SPLIT_DIVIDER_WIDTH = 4;
+
+const DEFAULT_RATIO = 0.5;
+const MIN_RATIO = 0.15;
+const MAX_RATIO = 0.85;
+
+/**
+ * SplitLayoutManager
+ *
+ * Manages a VS Code-style split-pane layout.  Each pane is a *group* of tool
+ * instances (tabs); only one tool per pane is visible at a time (the active one).
+ *
+ * Design constraints:
+ *  - Does NOT create or destroy BrowserViews — that is ToolWindowManager's job.
+ *  - Does NOT touch the inter-tool invocation / return flow.
+ *  - Is purely a display concern: it repositions existing BrowserViews using
+ *    `addBrowserView` so both active pane views are visible simultaneously.
+ */
+export class SplitLayoutManager {
+    private mainWindow: BrowserWindow;
+    private settingsManager: SettingsManager;
+    /** Shared reference to ToolWindowManager's internal view map (live reference). */
+    private toolViews: Map<string, BrowserView>;
+
+    private _isActive = false;
+    /** Ordered list of instanceIds in the left pane group. */
+    private leftGroup: string[] = [];
+    /** Ordered list of instanceIds in the right pane group. */
+    private rightGroup: string[] = [];
+    /** Currently visible (active) tool in the left pane. */
+    private activeLeftId: string | null = null;
+    /** Currently visible (active) tool in the right pane. */
+    private activeRightId: string | null = null;
+    /** Which pane receives newly opened tools. */
+    private _focusedPane: "left" | "right" = "left";
+    private ratio: number = DEFAULT_RATIO;
+
+    /** Last full bounds received from the renderer, used to re-apply on ratio / pane changes. */
+    private lastKnownFullBounds: { x: number; y: number; width: number; height: number } | null = null;
+
+    constructor(mainWindow: BrowserWindow, settingsManager: SettingsManager, toolViews: Map<string, BrowserView>) {
+        this.mainWindow = mainWindow;
+        this.settingsManager = settingsManager;
+        this.toolViews = toolViews;
+
+        // Restore persisted divider ratio
+        const savedRatio = settingsManager.getSetting("splitDividerRatio");
+        if (typeof savedRatio === "number" && savedRatio >= MIN_RATIO && savedRatio <= MAX_RATIO) {
+            this.ratio = savedRatio;
+        }
+
+        this.setupIpcHandlers();
+    }
+
+    // ─── Public Getters ───────────────────────────────────────────────────────
+
+    get isActive(): boolean {
+        return this._isActive;
+    }
+
+    get focusedPane(): "left" | "right" {
+        return this._focusedPane;
+    }
+
+    // ─── IPC ─────────────────────────────────────────────────────────────────
+
+    private removeIpcHandlers(): void {
+        ipcMain.removeHandler(SPLIT_LAYOUT_CHANNELS.ACTIVATE);
+        ipcMain.removeHandler(SPLIT_LAYOUT_CHANNELS.DEACTIVATE);
+        ipcMain.removeHandler(SPLIT_LAYOUT_CHANNELS.SET_RATIO);
+        ipcMain.removeHandler(SPLIT_LAYOUT_CHANNELS.GET_STATE);
+        ipcMain.removeHandler(SPLIT_LAYOUT_CHANNELS.SWITCH_PANE);
+        ipcMain.removeHandler(SPLIT_LAYOUT_CHANNELS.MOVE_TO_PANE);
+        ipcMain.removeHandler(SPLIT_LAYOUT_CHANNELS.FOCUS_PANE);
+    }
+
+    private setupIpcHandlers(): void {
+        this.removeIpcHandlers();
+
+        ipcMain.handle(SPLIT_LAYOUT_CHANNELS.ACTIVATE, async (_event, leftInstanceId: string, rightInstanceId: string) => {
+            return this.activate(leftInstanceId, rightInstanceId);
+        });
+
+        ipcMain.handle(SPLIT_LAYOUT_CHANNELS.DEACTIVATE, async () => {
+            return this.deactivate();
+        });
+
+        ipcMain.handle(SPLIT_LAYOUT_CHANNELS.SET_RATIO, async (_event, ratio: number) => {
+            return this.setRatio(ratio);
+        });
+
+        ipcMain.handle(SPLIT_LAYOUT_CHANNELS.GET_STATE, async () => {
+            return this.getState();
+        });
+
+        ipcMain.handle(SPLIT_LAYOUT_CHANNELS.SWITCH_PANE, async (_event, pane: "left" | "right", instanceId: string) => {
+            return this.setActiveInPane(pane, instanceId);
+        });
+
+        ipcMain.handle(SPLIT_LAYOUT_CHANNELS.MOVE_TO_PANE, async (_event, instanceId: string, targetPane: "left" | "right") => {
+            return this.moveToPane(instanceId, targetPane);
+        });
+
+        ipcMain.handle(SPLIT_LAYOUT_CHANNELS.FOCUS_PANE, async (_event, pane: "left" | "right") => {
+            this.setFocusedPane(pane);
+        });
+    }
+
+    // ─── Public API ───────────────────────────────────────────────────────────
+
+    getState(): SplitLayoutState {
+        return {
+            isActive: this._isActive,
+            leftGroup: [...this.leftGroup],
+            rightGroup: [...this.rightGroup],
+            activeLeftInstanceId: this.activeLeftId,
+            activeRightInstanceId: this.activeRightId,
+            focusedPane: this._focusedPane,
+            ratio: this.ratio,
+        };
+    }
+
+    /** Returns which pane the instance belongs to, or null if not in split. */
+    getPaneForInstance(instanceId: string): "left" | "right" | null {
+        if (!this._isActive) return null;
+        if (this.leftGroup.includes(instanceId)) return "left";
+        if (this.rightGroup.includes(instanceId)) return "right";
+        return null;
+    }
+
+    /** Returns true if the given instanceId is in either pane group (backward compat). */
+    isInstanceInSplit(instanceId: string): boolean {
+        return this.getPaneForInstance(instanceId) !== null;
+    }
+
+    /**
+     * Activate split mode with one tool per pane to start.
+     * Each instance becomes a one-entry group; both BrowserViews shown immediately.
+     */
+    activate(leftInstanceId: string, rightInstanceId: string): boolean {
+        if (leftInstanceId === rightInstanceId) {
+            logWarn("[SplitLayoutManager] Cannot split the same instance into both panes");
+            return false;
+        }
+
+        this._isActive = true;
+        this.leftGroup = [leftInstanceId];
+        this.rightGroup = [rightInstanceId];
+        this.activeLeftId = leftInstanceId;
+        this.activeRightId = rightInstanceId;
+        this._focusedPane = "left";
+
+        logInfo(`[SplitLayoutManager] Activated: left=${leftInstanceId}, right=${rightInstanceId}, ratio=${this.ratio}`);
+
+        if (this.lastKnownFullBounds) {
+            this.applyLayout(this.lastKnownFullBounds);
+        }
+
+        this.notifyRenderer();
+        return true;
+    }
+
+    /**
+     * Deactivate split mode.  All BrowserViews are cleared;
+     * ToolWindowManager restores the surviving tool via the STATE_CHANGED path.
+     */
+    deactivate(): boolean {
+        if (!this._isActive) return false;
+
+        this._isActive = false;
+        this.leftGroup = [];
+        this.rightGroup = [];
+        this.activeLeftId = null;
+        this.activeRightId = null;
+        this._focusedPane = "left";
+
+        // Clear all BrowserViews so ToolWindowManager can re-attach via setBrowserView()
+        this.clearAllBrowserViews();
+
+        logInfo("[SplitLayoutManager] Deactivated");
+        this.notifyRenderer();
+        return true;
+    }
+
+    /** Update the divider ratio and reposition both panes. Persisted to settings. */
+    setRatio(ratio: number): void {
+        const clamped = Math.max(MIN_RATIO, Math.min(MAX_RATIO, ratio));
+        this.ratio = clamped;
+        this.settingsManager.setSetting("splitDividerRatio", clamped);
+
+        if (this._isActive && this.lastKnownFullBounds) {
+            this.applyLayout(this.lastKnownFullBounds);
+        }
+
+        this.notifyRenderer();
+    }
+
+    /**
+     * Make instanceId the active (visible) tool in the given pane.
+     * The instance must already be in that pane's group.
+     * Also updates focusedPane so future tools open to this pane.
+     */
+    setActiveInPane(pane: "left" | "right", instanceId: string): boolean {
+        const group = pane === "left" ? this.leftGroup : this.rightGroup;
+        if (!group.includes(instanceId)) {
+            logWarn(`[SplitLayoutManager] setActiveInPane: ${instanceId} not in ${pane} group`);
+            return false;
+        }
+        if (pane === "left") {
+            this.activeLeftId = instanceId;
+        } else {
+            this.activeRightId = instanceId;
+        }
+        this._focusedPane = pane;
+
+        if (this.lastKnownFullBounds) {
+            this.applyLayout(this.lastKnownFullBounds);
+        }
+        this.notifyRenderer();
+        return true;
+    }
+
+    /**
+     * Add a new tool to the focused pane and make it active there.
+     * Called by ToolWindowManager when a new tool opens while split is active.
+     */
+    addToolToFocusedPane(instanceId: string): void {
+        if (!this._isActive) return;
+
+        if (this._focusedPane === "left") {
+            if (!this.leftGroup.includes(instanceId)) {
+                this.leftGroup.push(instanceId);
+            }
+            this.activeLeftId = instanceId;
+        } else {
+            if (!this.rightGroup.includes(instanceId)) {
+                this.rightGroup.push(instanceId);
+            }
+            this.activeRightId = instanceId;
+        }
+
+        logInfo(`[SplitLayoutManager] Added ${instanceId} to focused ${this._focusedPane} pane`);
+        if (this.lastKnownFullBounds) {
+            this.applyLayout(this.lastKnownFullBounds);
+        }
+        this.notifyRenderer();
+    }
+
+    /**
+     * Move instanceId from its current group to targetPane.
+     * If the source group becomes empty, split is collapsed.
+     */
+    moveToPane(instanceId: string, targetPane: "left" | "right"): boolean {
+        const sourcePane = this.getPaneForInstance(instanceId);
+        if (!sourcePane) {
+            logWarn(`[SplitLayoutManager] moveToPane: ${instanceId} not in any group`);
+            return false;
+        }
+        if (sourcePane === targetPane) return true;
+
+        // Remove from source group
+        if (sourcePane === "left") {
+            this.leftGroup = this.leftGroup.filter((id) => id !== instanceId);
+            if (this.activeLeftId === instanceId) {
+                this.activeLeftId = this.leftGroup[this.leftGroup.length - 1] ?? null;
+            }
+        } else {
+            this.rightGroup = this.rightGroup.filter((id) => id !== instanceId);
+            if (this.activeRightId === instanceId) {
+                this.activeRightId = this.rightGroup[this.rightGroup.length - 1] ?? null;
+            }
+        }
+
+        // Add to target group and make it active
+        if (targetPane === "left") {
+            this.leftGroup.push(instanceId);
+            this.activeLeftId = instanceId;
+        } else {
+            this.rightGroup.push(instanceId);
+            this.activeRightId = instanceId;
+        }
+        this._focusedPane = targetPane;
+
+        // If the source group is now empty, collapse to single-pane
+        const sourceEmpty = sourcePane === "left" ? this.leftGroup.length === 0 : this.rightGroup.length === 0;
+        if (sourceEmpty) {
+            logInfo(`[SplitLayoutManager] Source pane (${sourcePane}) empty after move — collapsing`);
+            this.deactivate();
+            return true;
+        }
+
+        logInfo(`[SplitLayoutManager] Moved ${instanceId}: ${sourcePane} → ${targetPane}`);
+        if (this.lastKnownFullBounds) {
+            this.applyLayout(this.lastKnownFullBounds);
+        }
+        this.notifyRenderer();
+        return true;
+    }
+
+    /** Set which pane receives newly opened tools. */
+    setFocusedPane(pane: "left" | "right"): void {
+        this._focusedPane = pane;
+        this.notifyRenderer();
+    }
+
+    /**
+     * Called by ToolWindowManager when any tool closes.
+     * Removes from its group; collapses split if the group becomes empty.
+     */
+    handleToolClosed(instanceId: string): void {
+        if (!this._isActive) return;
+
+        const inLeft = this.leftGroup.includes(instanceId);
+        const inRight = this.rightGroup.includes(instanceId);
+        if (!inLeft && !inRight) return;
+
+        if (inLeft) {
+            this.leftGroup = this.leftGroup.filter((id) => id !== instanceId);
+            if (this.activeLeftId === instanceId) {
+                this.activeLeftId = this.leftGroup[this.leftGroup.length - 1] ?? null;
+            }
+        } else {
+            this.rightGroup = this.rightGroup.filter((id) => id !== instanceId);
+            if (this.activeRightId === instanceId) {
+                this.activeRightId = this.rightGroup[this.rightGroup.length - 1] ?? null;
+            }
+        }
+
+        if (this.leftGroup.length === 0 || this.rightGroup.length === 0) {
+            logInfo(`[SplitLayoutManager] Pane group empty after closing ${instanceId} — collapsing`);
+            this.deactivate();
+        } else {
+            if (this.lastKnownFullBounds) {
+                this.applyLayout(this.lastKnownFullBounds);
+            }
+            this.notifyRenderer();
+        }
+    }
+
+    /**
+     * Apply the side-by-side layout using the currently active tools for each pane.
+     * Hides all inactive BrowserViews so only the two active ones are visible.
+     * @param fullBounds The full content bounds of the tool-panel-content element
+     *                   as reported by the renderer (CSS pixels, window-relative).
+     */
+    applyLayout(fullBounds: { x: number; y: number; width: number; height: number }): void {
+        if (!this._isActive || !this.activeLeftId || !this.activeRightId) return;
+
+        this.lastKnownFullBounds = fullBounds;
+
+        const leftView = this.toolViews.get(this.activeLeftId);
+        const rightView = this.toolViews.get(this.activeRightId);
+
+        if (!leftView || !rightView) {
+            logWarn("[SplitLayoutManager] Active BrowserViews not found — cannot apply layout");
+            return;
+        }
+
+        if (leftView.webContents.isDestroyed() || rightView.webContents.isDestroyed()) {
+            logWarn("[SplitLayoutManager] Active BrowserViews are destroyed — skipping layout");
+            return;
+        }
+
+        try {
+            const totalWidth = fullBounds.width;
+            const halfDivider = Math.floor(SPLIT_DIVIDER_WIDTH / 2);
+            const splitPoint = Math.floor(totalWidth * this.ratio);
+
+            const leftWidth = Math.max(1, splitPoint - halfDivider);
+            const rightStartX = fullBounds.x + splitPoint + (SPLIT_DIVIDER_WIDTH - halfDivider);
+            const rightWidth = Math.max(1, totalWidth - splitPoint - (SPLIT_DIVIDER_WIDTH - halfDivider));
+
+            // addBrowserView is additive — both active views are shown simultaneously.
+            this.mainWindow.addBrowserView(leftView);
+            this.mainWindow.addBrowserView(rightView);
+
+            leftView.setBounds({
+                x: fullBounds.x,
+                y: fullBounds.y,
+                width: leftWidth,
+                height: Math.max(1, fullBounds.height),
+            });
+
+            rightView.setBounds({
+                x: rightStartX,
+                y: fullBounds.y,
+                width: rightWidth,
+                height: Math.max(1, fullBounds.height),
+            });
+
+            // Hide all inactive BrowserViews (tools not currently the active pane view)
+            for (const [id, view] of this.toolViews) {
+                if (id !== this.activeLeftId && id !== this.activeRightId) {
+                    try {
+                        this.mainWindow.removeBrowserView(view);
+                    } catch {
+                        // ignore individual removal errors
+                    }
+                }
+            }
+
+            logInfo(`[SplitLayoutManager] Layout: left=${this.activeLeftId}(w=${leftWidth}), right=${this.activeRightId}(x=${rightStartX},w=${rightWidth}), ratio=${this.ratio}`);
+        } catch (err) {
+            logError("[SplitLayoutManager] Error applying layout", err);
+        }
+    }
+
+    // ─── Private helpers ─────────────────────────────────────────────────────
+
+    private clearAllBrowserViews(): void {
+        try {
+            const views = this.mainWindow.getBrowserViews?.() ?? [];
+            for (const view of views) {
+                try {
+                    this.mainWindow.removeBrowserView(view);
+                } catch {
+                    // ignore individual removal errors
+                }
+            }
+        } catch (err) {
+            logWarn("[SplitLayoutManager] Error clearing BrowserViews", err);
+        }
+    }
+
+    private notifyRenderer(): void {
+        try {
+            if (!this.mainWindow.isDestroyed()) {
+                this.mainWindow.webContents.send(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, this.getState());
+            }
+        } catch (err) {
+            logWarn("[SplitLayoutManager] Error sending state to renderer", err);
+        }
+    }
+}
diff --git a/src/main/managers/terminalManager.ts b/src/main/managers/terminalManager.ts
index 0b4bb32b..3f631913 100644
--- a/src/main/managers/terminalManager.ts
+++ b/src/main/managers/terminalManager.ts
@@ -34,6 +34,20 @@ interface SanitizedTerminalEnv {
     strippedKeys: string[];
 }
 
+function getNormalizedExecutableCandidates(rawExecutable: string): Set<string> {
+    const lowerRaw = rawExecutable.toLowerCase();
+    const pathSegments = lowerRaw.split(/[/\\]/);
+    const base = (pathSegments[pathSegments.length - 1] || lowerRaw).trim();
+    const baseWithoutExe = base.replace(/\.exe$/, "");
+
+    const candidates = new Set<string>([lowerRaw, base, baseWithoutExe]);
+    if (baseWithoutExe && !baseWithoutExe.endsWith(".exe")) {
+        candidates.add(`${baseWithoutExe}.exe`);
+    }
+
+    return candidates;
+}
+
 function sanitizeTerminalEnv(env?: Record<string, string>): SanitizedTerminalEnv {
     if (!env) {
         return { strippedKeys: [] };
@@ -238,12 +252,13 @@ function validateCommandSegment(segment: string): void {
 
     const rawExecutable = tokens[0];
     const executable = rawExecutable.toLowerCase();
+    const normalizedExecutableCandidates = getNormalizedExecutableCandidates(rawExecutable);
 
     if (/[;&|<>]/.test(rawExecutable)) {
         throw new Error(`Terminal command executable "${rawExecutable}" contains shell metacharacters.`);
     }
 
-    if (BLOCKED_TERMINAL_COMMANDS.has(executable)) {
+    if ([...normalizedExecutableCandidates].some((candidate) => BLOCKED_TERMINAL_COMMANDS.has(candidate))) {
         throw new Error(`Blocked unsafe terminal command "${rawExecutable}". Shell interpreters and privilege-escalation tools are not allowed.`);
     }
 
@@ -281,6 +296,13 @@ function parseTerminalCommand(command: string): ParsedTerminalCommand {
     };
 }
 
+// Test-only helpers used by unit tests to validate command hardening behavior without spawning a shell process.
+export const terminalManagerTestUtils = {
+    parseTerminalCommand,
+    validateCommandSegment,
+    getNormalizedExecutableCandidates,
+};
+
 function getShellType(shell: string): ShellType {
     const name = basename(shell)
         .toLowerCase()
diff --git a/src/main/managers/toolRegistryManager.ts b/src/main/managers/toolRegistryManager.ts
index 6d19d87a..c066f708 100644
--- a/src/main/managers/toolRegistryManager.ts
+++ b/src/main/managers/toolRegistryManager.ts
@@ -6,10 +6,10 @@ import * as http from "http";
 import * as https from "https";
 import * as path from "path";
 import { pipeline } from "stream/promises";
-import { CapabilityTagEntry, CspExceptions, ToolManifest, ToolRegistryEntry, CommunityLinksCollection, CommunityLinksGroup, CommunityLinksItem } from "../../common/types";
+import { logError, logInfo, logWarn } from "../../common/logger";
+import { CapabilityTagEntry, CommunityLinksCollection, CommunityLinksGroup, CommunityLinksItem, CspExceptions, ToolManifest, ToolRegistryEntry } from "../../common/types";
 import { AZURE_BLOB_BASE_URL, SUPABASE_ANON_KEY, SUPABASE_URL } from "../constants";
 import { InstallIdManager } from "./installIdManager";
-import { logInfo, logWarn, logError } from "../../common/logger";
 
 /**
  * Supabase database types
@@ -665,6 +665,7 @@ export class ToolRegistryManager extends EventEmitter {
 
         // Read optional pptb.config.json for invocation capabilities
         let capabilities: string[] | undefined;
+        let mcpHeadlessEnabled = false;
         const pptbConfigPath = path.join(toolPath, "pptb.config.json");
         if (fs.existsSync(pptbConfigPath)) {
             try {
@@ -673,6 +674,17 @@ export class ToolRegistryManager extends EventEmitter {
                 if (Array.isArray(caps) && caps.length > 0) {
                     capabilities = (caps as unknown[]).filter((c): c is string => typeof c === "string" && c.trim().length > 0);
                 }
+
+                const agentsConfig = pptbConfig?.agents;
+                if (agentsConfig && typeof agentsConfig === "object" && !Array.isArray(agentsConfig)) {
+                    const agentsRecord = agentsConfig as Record<string, unknown>;
+                    const invokable = agentsRecord.invokable === true;
+                    const supportsHeadlessFlag = agentsRecord.headless === true;
+                    const executionModes = agentsRecord.executionModes;
+                    const supportsHeadlessExecutionMode = Array.isArray(executionModes) && executionModes.some((mode) => mode === "headless");
+
+                    mcpHeadlessEnabled = invokable && (supportsHeadlessFlag || supportsHeadlessExecutionMode);
+                }
             } catch (err) {
                 logWarn(`[ToolRegistry] Could not read pptb.config.json for ${toolId}`, err);
             }
@@ -733,6 +745,7 @@ export class ToolRegistryManager extends EventEmitter {
             publishedAt: tool.publishedAt,
             minAPI, // Minimum API version required
             maxAPI, // Maximum API version tested (from @pptb/types)
+            mcpHeadlessEnabled,
             capabilities, // Invocation capability tags from pptb.config.json
         };
 
@@ -760,7 +773,7 @@ export class ToolRegistryManager extends EventEmitter {
         }
 
         // Remove tool directory
-        if (fs.existsSync(manifest.installPath)) {
+        if (fs.existsSync(manifest.installPath) && (manifest.source === "registry" || manifest.source === "npm")) {
             fs.rmSync(manifest.installPath, { recursive: true, force: true });
         }
 
@@ -843,6 +856,7 @@ export class ToolRegistryManager extends EventEmitter {
             createdAt: manifestEntry.createdAt,
             minAPI: manifestEntry.minAPI,
             maxAPI: manifestEntry.maxAPI,
+            mcpHeadlessEnabled: manifestEntry.mcpHeadlessEnabled,
         };
     }
 
@@ -1194,11 +1208,7 @@ export class ToolRegistryManager extends EventEmitter {
         try {
             logInfo("[ToolRegistry] Fetching capability tags from Supabase");
 
-            const { data, error } = await this.supabase
-                .from("capability_tags")
-                .select("tag, description")
-                .eq("is_active", true)
-                .order("tag", { ascending: true });
+            const { data, error } = await this.supabase.from("capability_tags").select("tag, description").eq("is_active", true).order("tag", { ascending: true });
 
             if (error) {
                 throw new Error(`Supabase capability_tags query failed: ${error.message}`);
diff --git a/src/main/managers/toolWindowManager.ts b/src/main/managers/toolWindowManager.ts
index ea1b8c4c..49ffdad4 100644
--- a/src/main/managers/toolWindowManager.ts
+++ b/src/main/managers/toolWindowManager.ts
@@ -7,10 +7,19 @@ import { ToolBoxEvent } from "../../common/types/events";
 import { BrowserviewProtocolManager } from "./browserviewProtocolManager";
 import { ConnectionsManager } from "./connectionsManager";
 import { SettingsManager } from "./settingsManager";
+import { SplitLayoutManager } from "./splitLayoutManager";
 import { TerminalManager } from "./terminalManager";
 import { ToolFileSystemAccessManager } from "./toolFileSystemAccessManager";
 import { ToolManager } from "./toolsManager";
 
+interface InvocationContextMetadata {
+    source?: "tool" | "mcp";
+    mode?: "one-way" | "two-way";
+    correlationId?: string;
+    timeoutMs?: number;
+    expectsResponse?: boolean;
+}
+
 /**
  * ToolWindowManager
  *
@@ -67,6 +76,7 @@ export class ToolWindowManager {
             resolved: boolean;
             /** When true the caller does not expect return data; banner shows a "nothing returned" warning. */
             noReturn?: boolean;
+            invocationContext?: InvocationContextMetadata;
         }
     > = new Map();
     /**
@@ -92,6 +102,8 @@ export class ToolWindowManager {
     private activeToolId: string | null = null;
     private boundsUpdatePending: boolean = false;
     private frameScheduled = false;
+    /** Optional split layout manager — injected after construction via setSplitLayoutManager(). */
+    private splitLayoutManager: SplitLayoutManager | null = null;
     private boundsResponseListener: (event: Electron.IpcMainEvent, bounds: { x: number; y: number; width: number; height: number }) => void;
     private terminalVisibilityListener: () => void;
     private bannerVisibilityListener: () => void;
@@ -218,11 +230,7 @@ export class ToolWindowManager {
         // (in response to an INVOCATION_PROMPT_CONNECTIONS push to the main renderer).
         ipcMain.handle(
             TOOL_WINDOW_CHANNELS.PROVIDE_INVOCATION_CONNECTIONS,
-            async (
-                _event,
-                requestId: string,
-                result: { primaryConnectionId: string | null; secondaryConnectionId: string | null } | null,
-            ) => {
+            async (_event, requestId: string, result: { primaryConnectionId: string | null; secondaryConnectionId: string | null } | null) => {
                 const prompt = this.pendingConnectionPrompts.get(requestId);
                 if (!prompt) return;
                 this.pendingConnectionPrompts.delete(requestId);
@@ -466,6 +474,7 @@ export class ToolWindowManager {
                     ? {
                           callerInstanceId: pending.callerInstanceId,
                           prefillData: pending.prefillData,
+                          invocationContext: pending.invocationContext,
                       }
                     : {}),
                 ...(prefillData && !pending ? { prefillData } : {}),
@@ -532,6 +541,7 @@ export class ToolWindowManager {
         secondaryConnectionId: string | null,
         prefillData: Record<string, unknown>,
         noReturn?: boolean,
+        invocationContext?: InvocationContextMetadata,
     ): Promise<unknown> {
         // One-at-a-time enforcement
         if (this.activeCallees.has(callerInstanceId)) {
@@ -539,7 +549,7 @@ export class ToolWindowManager {
         }
 
         // FXS connection auto-inheritance: use caller's primary connection when none is specified
-        const effectivePrimaryConnectionId = primaryConnectionId ?? this.toolConnectionInfo.get(callerInstanceId)?.primaryConnectionId ?? null;
+        let effectivePrimaryConnectionId = primaryConnectionId ?? this.toolConnectionInfo.get(callerInstanceId)?.primaryConnectionId ?? null;
 
         // Multi-connection: if the callee requires a secondary connection but none was provided,
         // ask the main renderer to show the multi-connection selector before launching the tool.
@@ -551,12 +561,8 @@ export class ToolWindowManager {
             const isSecondaryRequired = multiConnectionMode === "required";
             const requestId = `invocation-conn-${callerInstanceId}-${Date.now()}`;
             try {
-                const connectionResult = await this.promptForInvocationConnections(
-                    requestId,
-                    tool.name,
-                    isSecondaryRequired,
-                    effectivePrimaryConnectionId,
-                );
+                const connectionResult = await this.promptForInvocationConnections(requestId, tool.name, isSecondaryRequired, effectivePrimaryConnectionId);
+                effectivePrimaryConnectionId = connectionResult.primaryConnectionId;
                 effectiveSecondaryConnectionId = connectionResult.secondaryConnectionId;
             } catch (err) {
                 throw new Error(`Connection selection cancelled: ${err instanceof Error ? err.message : String(err)}`);
@@ -571,6 +577,7 @@ export class ToolWindowManager {
                 reject,
                 resolved: false,
                 noReturn: noReturn ?? false,
+                invocationContext,
             });
             this.activeCallees.set(callerInstanceId, calleeInstanceId);
 
@@ -687,6 +694,39 @@ export class ToolWindowManager {
                 return false;
             }
 
+            // ── Split-mode handling ───────────────────────────────────────────────────
+            // When split is active, all tool switches are handled here regardless of
+            // whether the instance is already in a pane or is a brand-new tool.
+            if (this.splitLayoutManager?.isActive) {
+                const pane = this.splitLayoutManager.getPaneForInstance(instanceId);
+                if (pane) {
+                    // Already in a pane — make it the visible (active) tool for that pane
+                    this.splitLayoutManager.setActiveInPane(pane, instanceId);
+                } else {
+                    // New tool not yet in any pane — route to the focused pane
+                    this.splitLayoutManager.addToolToFocusedPane(instanceId);
+                }
+
+                this.activeToolId = instanceId;
+                this.invokeActiveToolChangedCallback();
+
+                const invocationEntryS = this.pendingInvocations.get(instanceId);
+                if (invocationEntryS) {
+                    const callerToolNameS = this.toolInstanceNames.get(invocationEntryS.callerInstanceId) ?? "Caller";
+                    if (invocationEntryS.noReturn) {
+                        this.mainWindow.webContents.send(TOOL_WINDOW_CHANNELS.INVOCATION_BANNER_STATE, { visible: false });
+                    } else {
+                        this.mainWindow.webContents.send(TOOL_WINDOW_CHANNELS.INVOCATION_BANNER_STATE, { visible: true, callerToolName: callerToolNameS });
+                    }
+                } else {
+                    this.mainWindow.webContents.send(TOOL_WINDOW_CHANNELS.INVOCATION_BANNER_STATE, { visible: false });
+                }
+
+                logInfo(`[ToolWindowManager] Split mode: ${pane ? "active in " + pane + " pane" : "added to focused pane"} → ${instanceId}`);
+                this.scheduleBoundsUpdate();
+                return true;
+            }
+
             // Hide current tool if any
             if (this.activeToolId && this.activeToolId !== instanceId) {
                 const currentView = this.toolViews.get(this.activeToolId);
@@ -797,6 +837,9 @@ export class ToolWindowManager {
             // Revoke filesystem access for this specific tool instance
             this.toolFilesystemAccessManager.revokeAllAccess(instanceId);
 
+            // Notify split layout manager so it can deactivate split if a pane tool closed
+            this.splitLayoutManager?.handleToolClosed(instanceId);
+
             logInfo(`[ToolWindowManager] Tool instance closed: ${instanceId}`);
             return true;
         } catch (error) {
@@ -988,6 +1031,13 @@ export class ToolWindowManager {
      * Apply the bounds to the active tool view
      */
     private applyToolViewBounds(bounds: { x: number; y: number; width: number; height: number }): void {
+        // ── Split-mode: delegate entirely to SplitLayoutManager ──────────────────
+        if (this.splitLayoutManager?.isActive) {
+            this.splitLayoutManager.applyLayout(bounds);
+            this.boundsUpdatePending = false;
+            return;
+        }
+
         if (!this.activeToolId) return;
 
         const toolView = this.toolViews.get(this.activeToolId);
@@ -1261,6 +1311,22 @@ export class ToolWindowManager {
         return this.activeToolId;
     }
 
+    /**
+     * Expose the internal BrowserView map so SplitLayoutManager can reference the same
+     * instance without duplicating state.  Callers must not mutate the map directly.
+     */
+    getToolViews(): Map<string, BrowserView> {
+        return this.toolViews;
+    }
+
+    /**
+     * Wire up the SplitLayoutManager.  Must be called after construction so that the
+     * shared toolViews reference is already stable.
+     */
+    setSplitLayoutManager(manager: SplitLayoutManager): void {
+        this.splitLayoutManager = manager;
+    }
+
     /**
      * Get the bounds of the active tool's BrowserView
      * @returns The bounds of the active tool's BrowserView, or null if no tool is active
diff --git a/src/main/managers/toolsManager.ts b/src/main/managers/toolsManager.ts
index fd1e4f73..3c0aa087 100644
--- a/src/main/managers/toolsManager.ts
+++ b/src/main/managers/toolsManager.ts
@@ -55,6 +55,10 @@ export class ToolManager extends EventEmitter {
         });
     }
 
+    getRegistryManager(): ToolRegistryManager {
+        return this.registryManager;
+    }
+
     private createToolFromInstalledManifest(manifest: ToolManifest): Tool {
         const tool: Tool = {
             id: manifest.id,
@@ -79,6 +83,7 @@ export class ToolManager extends EventEmitter {
             minAPI: manifest.minAPI,
             maxAPI: manifest.maxAPI,
             isSupported: VersionManager.isToolSupported(manifest.minAPI, manifest.maxAPI),
+            mcpHeadlessEnabled: manifest.mcpHeadlessEnabled,
             capabilities: manifest.capabilities,
         };
 
@@ -150,6 +155,7 @@ export class ToolManager extends EventEmitter {
             minAPI: manifest.minAPI,
             maxAPI: manifest.maxAPI,
             isSupported: VersionManager.isToolSupported(manifest.minAPI, manifest.maxAPI),
+            mcpHeadlessEnabled: manifest.mcpHeadlessEnabled,
             capabilities: manifest.capabilities,
         };
 
@@ -371,9 +377,7 @@ export class ToolManager extends EventEmitter {
                 fs.rmSync(toolPath, { recursive: true, force: true });
             }
         } else if (tool?.localPath) {
-            if (fs.existsSync(tool.localPath)) {
-                fs.rmSync(tool.localPath, { recursive: true, force: true });
-            }
+            // Do not delete local development tools, just unload them
         } else {
             await this.registryManager.uninstallTool(toolId);
         }
@@ -668,6 +672,7 @@ export class ToolManager extends EventEmitter {
 
         // Read optional pptb.config.json for invocation capabilities
         let capabilities: string[] | undefined;
+        let mcpHeadlessEnabled = false;
         const pptbConfigPath = path.join(toolPath, "pptb.config.json");
         if (fs.existsSync(pptbConfigPath)) {
             try {
@@ -676,6 +681,17 @@ export class ToolManager extends EventEmitter {
                 if (Array.isArray(caps) && caps.length > 0) {
                     capabilities = (caps as unknown[]).filter((c): c is string => typeof c === "string" && c.trim().length > 0);
                 }
+
+                const agentsConfig = pptbConfig?.agents;
+                if (agentsConfig && typeof agentsConfig === "object" && !Array.isArray(agentsConfig)) {
+                    const agentsRecord = agentsConfig as Record<string, unknown>;
+                    const invokable = agentsRecord.invokable === true;
+                    const supportsHeadlessFlag = agentsRecord.headless === true;
+                    const executionModes = agentsRecord.executionModes;
+                    const supportsHeadlessExecutionMode = Array.isArray(executionModes) && executionModes.some((mode) => mode === "headless");
+
+                    mcpHeadlessEnabled = invokable && (supportsHeadlessFlag || supportsHeadlessExecutionMode);
+                }
             } catch (err) {
                 logWarn(`[ToolRegistry] Could not read pptb.config.json for ${toolId}`, err);
             }
@@ -704,6 +720,7 @@ export class ToolManager extends EventEmitter {
             repository: typeof packageJson.repository === "string" ? packageJson.repository : packageJson.repository?.url,
             website: packageJson.homepage,
             readmeUrl: packageJson.readme,
+            mcpHeadlessEnabled,
             capabilities, // Invocation capability tags from pptb.config.json
         };
 
@@ -883,6 +900,7 @@ export class ToolManager extends EventEmitter {
 
         // Read optional pptb.config.json for invocation capabilities
         let capabilities: string[] | undefined;
+        let mcpHeadlessEnabled = false;
         const pptbConfigPath = path.join(localPath, "pptb.config.json");
         if (fs.existsSync(pptbConfigPath)) {
             try {
@@ -891,6 +909,17 @@ export class ToolManager extends EventEmitter {
                 if (Array.isArray(caps) && caps.length > 0) {
                     capabilities = (caps as unknown[]).filter((c): c is string => typeof c === "string" && c.trim().length > 0);
                 }
+
+                const agentsConfig = pptbConfig?.agents;
+                if (agentsConfig && typeof agentsConfig === "object" && !Array.isArray(agentsConfig)) {
+                    const agentsRecord = agentsConfig as Record<string, unknown>;
+                    const invokable = agentsRecord.invokable === true;
+                    const supportsHeadlessFlag = agentsRecord.headless === true;
+                    const executionModes = agentsRecord.executionModes;
+                    const supportsHeadlessExecutionMode = Array.isArray(executionModes) && executionModes.some((mode) => mode === "headless");
+
+                    mcpHeadlessEnabled = invokable && (supportsHeadlessFlag || supportsHeadlessExecutionMode);
+                }
             } catch (err) {
                 logWarn(`[ToolRegistry] Could not read pptb.config.json for ${toolId}`, err);
             }
@@ -919,6 +948,7 @@ export class ToolManager extends EventEmitter {
             repository: typeof packageJson.repository === "string" ? packageJson.repository : packageJson.repository?.url,
             website: packageJson.homepage,
             readmeUrl: packageJson.readme,
+            mcpHeadlessEnabled,
             capabilities, // Invocation capability tags from pptb.config.json
         };
 
diff --git a/src/main/managers/trayManager.ts b/src/main/managers/trayManager.ts
index e1a88868..eb2bf0c4 100644
--- a/src/main/managers/trayManager.ts
+++ b/src/main/managers/trayManager.ts
@@ -1,6 +1,7 @@
 import { app, BrowserWindow, Menu, nativeImage, Tray } from "electron";
 import { existsSync } from "fs";
 import * as path from "path";
+import { logError } from "../../common/logger";
 
 /**
  * TrayManager
@@ -20,10 +21,14 @@ export class TrayManager {
     private tray: Tray | null = null;
     private readonly getMainWindow: () => BrowserWindow | null;
     private readonly openMainWindow: () => void;
+    private readonly isMcpServerRunning: () => boolean;
+    private readonly toggleMcpServer: () => Promise<void>;
 
-    constructor(getMainWindow: () => BrowserWindow | null, openMainWindow: () => void) {
+    constructor(getMainWindow: () => BrowserWindow | null, openMainWindow: () => void, isMcpServerRunning: () => boolean, toggleMcpServer: () => Promise<void>) {
         this.getMainWindow = getMainWindow;
         this.openMainWindow = openMainWindow;
+        this.isMcpServerRunning = isMcpServerRunning;
+        this.toggleMcpServer = toggleMcpServer;
     }
 
     /**
@@ -76,6 +81,14 @@ export class TrayManager {
         }
     }
 
+    /**
+     * Rebuild the tray context menu to reflect current dynamic state
+     * (for example, MCP server running/stopped).
+     */
+    refreshContextMenu(): void {
+        this.updateContextMenu();
+    }
+
     /**
      * Resolve the correct icon path for the current release channel.
      * Uses `icons/insider/icon.png` for insider builds; falls back to
@@ -120,12 +133,33 @@ export class TrayManager {
             return;
         }
 
+        const mcpRunning = this.isMcpServerRunning();
+        const mcpStatusLabel = mcpRunning ? "MCP Server: Running" : "MCP Server: Stopped";
+        const mcpToggleLabel = mcpRunning ? "Stop MCP Server" : "Start MCP Server";
+
         const contextMenu = Menu.buildFromTemplate([
             {
                 label: `Open ${this.appName}`,
                 click: () => this.showMainWindow(),
             },
             { type: "separator" },
+            {
+                label: mcpStatusLabel,
+                enabled: false,
+            },
+            {
+                label: mcpToggleLabel,
+                click: () => {
+                    void this.toggleMcpServer()
+                        .catch((error) => {
+                            logError(error instanceof Error ? error : new Error(String(error)));
+                        })
+                        .finally(() => {
+                            this.updateContextMenu();
+                        });
+                },
+            },
+            { type: "separator" },
             {
                 label: "Quit",
                 click: () => app.quit(),
diff --git a/src/main/mcp/agentInvocationLogger.ts b/src/main/mcp/agentInvocationLogger.ts
new file mode 100644
index 00000000..8a34bcc9
--- /dev/null
+++ b/src/main/mcp/agentInvocationLogger.ts
@@ -0,0 +1,235 @@
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import pino from "pino";
+
+const LOG_FILE_NAME = "agent-invocation.log";
+const MAX_LOG_SIZE_MB = 5;
+const MAX_LOG_SIZE_BYTES = MAX_LOG_SIZE_MB * 1024 * 1024;
+const MAX_BACKUP_COUNT = 3;
+const REDACTED_VALUE = "[redacted]";
+const SENSITIVE_KEY_PATTERN = /(connection|token|secret|password|credential|auth|refresh)/i;
+
+/**
+ * Outcome of an agent tool invocation
+ */
+export type InvocationOutcome = "completed" | "no-result" | "rejected";
+
+/**
+ * Structure of an agent invocation log entry
+ */
+export interface AgentInvocationLogEntry {
+    timestamp: string;
+    toolId: string;
+    toolName: string;
+    connectionId: string | null;
+    prefillSummary: string;
+    outcome: InvocationOutcome;
+    invocationMode?: "one-way" | "two-way";
+    correlationId?: string;
+    error?: string;
+}
+
+/**
+ * Get the log file path in userData directory
+ */
+export function getLogFilePath(): string {
+    return path.join(getUserDataPath(), LOG_FILE_NAME);
+}
+
+/**
+ * Get the userData path for the application
+ */
+function getUserDataPath(): string {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const { app } = require("electron");
+        return app.getPath("userData");
+    } catch {
+        return path.join(os.tmpdir(), "powerplatform-toolbox-logs");
+    }
+}
+
+/**
+ * Rotate log file if it exceeds the maximum size
+ */
+function rotateLogIfNeeded(): void {
+    const logPath = getLogFilePath();
+
+    try {
+        if (!fs.existsSync(logPath)) {
+            return;
+        }
+
+        const stats = fs.statSync(logPath);
+        if (stats.size >= MAX_LOG_SIZE_BYTES) {
+            for (let i = MAX_BACKUP_COUNT - 1; i >= 0; i--) {
+                const oldPath = `${logPath}.${i === 0 ? "" : `.` + i}`;
+                const newPath = `${logPath}.${i + 1}`;
+                if (fs.existsSync(oldPath)) {
+                    fs.renameSync(oldPath, newPath);
+                }
+            }
+            fs.renameSync(logPath, `${logPath}.1`);
+        }
+    } catch (error) {
+        console.error("Failed to rotate log file:", error instanceof Error ? error.message : String(error));
+    }
+}
+
+/**
+ * Read all log entries from the log file
+ */
+export function readLogEntries(): AgentInvocationLogEntry[] {
+    const logPath = getLogFilePath();
+
+    try {
+        if (!fs.existsSync(logPath)) {
+            return [];
+        }
+
+        const content = fs.readFileSync(logPath, { encoding: "utf-8" });
+        const lines = content.split("\n").filter((line) => line.trim().length > 0);
+
+        return lines
+            .map((line) => {
+                try {
+                    return JSON.parse(line) as AgentInvocationLogEntry;
+                } catch {
+                    return null;
+                }
+            })
+            .filter((entry): entry is AgentInvocationLogEntry => entry !== null)
+            .sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
+    } catch (error) {
+        console.error("Failed to read log entries:", error instanceof Error ? error.message : String(error));
+        return [];
+    }
+}
+
+/**
+ * Clear all log entries (for testing/maintenance)
+ */
+export function clearLogEntries(): void {
+    const logPath = getLogFilePath();
+
+    try {
+        if (fs.existsSync(logPath)) {
+            fs.unlinkSync(logPath);
+        }
+        // Clear rotated logs
+        for (let i = 1; i <= MAX_BACKUP_COUNT; i++) {
+            const rotatedPath = `${logPath}.${i}`;
+            if (fs.existsSync(rotatedPath)) {
+                fs.unlinkSync(rotatedPath);
+            }
+        }
+    } catch (error) {
+        console.error("Failed to clear log entries:", error instanceof Error ? error.message : String(error));
+    }
+}
+
+/**
+ * Pino logger instance for agent invocations
+ */
+let logger: pino.Logger | null = null;
+
+/**
+ * Get or create the pino logger instance
+ */
+function getLogger(): pino.Logger {
+    if (logger) {
+        return logger;
+    }
+
+    const logPath = getLogFilePath();
+    const dir = path.dirname(logPath);
+
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+
+    const destination = pino.destination({
+        dest: logPath,
+        sync: true,
+    });
+
+    logger = pino(
+        {
+            level: "info",
+            timestamp: pino.stdTimeFunctions.isoTime,
+        },
+        destination,
+    );
+
+    return logger;
+}
+
+/**
+ * Get summary of prefill data (first 200 chars of stringified JSON)
+ */
+function getPrefillSummary(prefillData: Record<string, unknown> | undefined): string {
+    if (!prefillData || Object.keys(prefillData).length === 0) {
+        return "{}";
+    }
+    try {
+        const str = JSON.stringify(redactSensitiveValue(prefillData));
+        return str.length > 200 ? str.slice(0, 200) + "..." : str;
+    } catch {
+        return "[unserializable]";
+    }
+}
+
+function redactSensitiveValue(value: unknown, key?: string): unknown {
+    if (key && SENSITIVE_KEY_PATTERN.test(key)) {
+        return REDACTED_VALUE;
+    }
+
+    if (Array.isArray(value)) {
+        return value.map((item) => redactSensitiveValue(item));
+    }
+
+    if (value && typeof value === "object") {
+        const record = value as Record<string, unknown>;
+        const redacted: Record<string, unknown> = {};
+
+        for (const [entryKey, entryValue] of Object.entries(record)) {
+            redacted[entryKey] = redactSensitiveValue(entryValue, entryKey);
+        }
+
+        return redacted;
+    }
+
+    return value;
+}
+
+/**
+ * Log an agent tool invocation using pino
+ */
+export function logInvocation(params: {
+    toolId: string;
+    toolName: string;
+    connectionId: string | null;
+    prefillData?: Record<string, unknown>;
+    outcome: InvocationOutcome;
+    invocationMode?: "one-way" | "two-way";
+    correlationId?: string;
+    error?: string;
+}): void {
+    rotateLogIfNeeded();
+
+    const logEntry: AgentInvocationLogEntry = {
+        timestamp: new Date().toISOString(),
+        toolId: params.toolId,
+        toolName: params.toolName,
+        connectionId: params.connectionId ? REDACTED_VALUE : null,
+        prefillSummary: getPrefillSummary(params.prefillData),
+        outcome: params.outcome,
+        ...(params.invocationMode ? { invocationMode: params.invocationMode } : {}),
+        ...(params.correlationId ? { correlationId: params.correlationId } : {}),
+        ...(params.error ? { error: params.error } : {}),
+    };
+
+    const activeLogger = getLogger();
+    activeLogger.info(logEntry, "agent-invocation");
+}
diff --git a/src/main/mcp/agentToolRegistry.ts b/src/main/mcp/agentToolRegistry.ts
new file mode 100644
index 00000000..77a419b8
--- /dev/null
+++ b/src/main/mcp/agentToolRegistry.ts
@@ -0,0 +1,145 @@
+import * as fs from "fs";
+import * as path from "path";
+import { logInfo } from "../../common/logger";
+import { ToolManifest } from "../../common/types";
+import { ToolRegistryManager } from "../managers/toolRegistryManager";
+import { convertPPTBSchemaToJsonSchema, JsonObjectSchema } from "./schemaConverter";
+
+export type AgentInvocationMode = "one-way" | "two-way";
+export type AgentExecutionMode = "windowed" | "headless";
+
+export interface AgentTool {
+    toolId: string;
+    displayName: string;
+    description: string;
+    inputSchema: JsonObjectSchema;
+    outputSchema: JsonObjectSchema;
+    executionModes: AgentExecutionMode[];
+    defaultExecutionMode: AgentExecutionMode;
+    invocationModes: AgentInvocationMode[];
+    defaultInvocationMode: AgentInvocationMode;
+    timeoutMs?: number;
+}
+
+export interface GetAgentInvokableToolsOptions {
+    requireVerified?: boolean;
+}
+
+const toolNameMap = new Map<string, string>(); // friendlyName → internalId
+const FALLBACK_INVOCATION_MODES: AgentInvocationMode[] = ["two-way"];
+const FALLBACK_EXECUTION_MODES: AgentExecutionMode[] = ["windowed"];
+
+function isAgentInvocationMode(value: unknown): value is AgentInvocationMode {
+    return value === "one-way" || value === "two-way";
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function isAgentExecutionMode(value: unknown): value is AgentExecutionMode {
+    return value === "windowed" || value === "headless";
+}
+
+function normalizeAgentModes(value: unknown): AgentInvocationMode[] {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+
+    return value.filter((mode): mode is AgentInvocationMode => isAgentInvocationMode(mode));
+}
+
+function readAgentConfig(pptbConfig: Record<string, unknown>): Record<string, unknown> | undefined {
+    const agents = isRecord(pptbConfig.agents) ? pptbConfig.agents : undefined;
+    if (agents) {
+        return agents;
+    }
+
+    return undefined;
+}
+
+export async function getAgentInvokableTools(toolRegistryManager: ToolRegistryManager, options?: GetAgentInvokableToolsOptions): Promise<AgentTool[]> {
+    toolNameMap.clear();
+
+    void options?.requireVerified; // for future use, currently unused
+    const installedTools: ToolManifest[] = await toolRegistryManager.getInstalledTools();
+    logInfo(`[MCP] Loaded ${installedTools.length} installed tools`);
+
+    const result: AgentTool[] = [];
+
+    for (const tool of installedTools) {
+        const pptbConfigPath = path.join(tool.installPath, "pptb.config.json");
+        const friendlyName = tool.name.toLowerCase().replace(/[^a-z0-9]+/g, "-"); // MCP tool names can't have spaces
+        toolNameMap.set(friendlyName, tool.id);
+
+        if (!fs.existsSync(pptbConfigPath)) {
+            continue;
+        }
+
+        let pptbConfig: Record<string, unknown>;
+        try {
+            const raw = fs.readFileSync(pptbConfigPath, "utf-8");
+            pptbConfig = JSON.parse(raw) as Record<string, unknown>;
+        } catch {
+            continue;
+        }
+
+        const agentConfig = readAgentConfig(pptbConfig);
+        const invocation = pptbConfig.invocation as Record<string, unknown> | undefined;
+        const schemaSource = isRecord(invocation) ? invocation : {};
+        const invokable = agentConfig?.invokable === true;
+
+        if (!invokable) {
+            continue;
+        }
+
+        const invocationModesRaw = agentConfig?.modes;
+        const parsedModes = normalizeAgentModes(invocationModesRaw);
+        const invocationModes: AgentInvocationMode[] = parsedModes.length > 0 ? parsedModes : FALLBACK_INVOCATION_MODES;
+
+        const supportsHeadless = agentConfig?.headless === true;
+        const executionModesRaw = agentConfig?.executionModes;
+        const configuredExecutionModes = Array.isArray(executionModesRaw) ? executionModesRaw.filter((mode): mode is AgentExecutionMode => isAgentExecutionMode(mode)) : [];
+        const executionModes: AgentExecutionMode[] =
+            configuredExecutionModes.length > 0 ? configuredExecutionModes : supportsHeadless ? (["windowed", "headless"] as AgentExecutionMode[]) : FALLBACK_EXECUTION_MODES;
+        const defaultExecutionModeRaw = agentConfig?.defaultExecutionMode;
+        const defaultExecutionMode: AgentExecutionMode =
+            isAgentExecutionMode(defaultExecutionModeRaw) && executionModes.includes(defaultExecutionModeRaw)
+                ? defaultExecutionModeRaw
+                : executionModes.includes("windowed")
+                  ? "windowed"
+                  : (executionModes[0] ?? "windowed");
+
+        const defaultInvocationModeRaw = agentConfig?.defaultMode;
+        let defaultInvocationMode: AgentInvocationMode;
+        if (isAgentInvocationMode(defaultInvocationModeRaw) && invocationModes.includes(defaultInvocationModeRaw)) {
+            defaultInvocationMode = defaultInvocationModeRaw;
+        } else if (invocationModes.includes("two-way")) {
+            defaultInvocationMode = "two-way";
+        } else {
+            defaultInvocationMode = invocationModes[0] ?? "one-way";
+        }
+
+        const timeoutMsRaw = agentConfig?.timeoutMS;
+        const timeoutMs = typeof timeoutMsRaw === "number" && Number.isFinite(timeoutMsRaw) && timeoutMsRaw > 0 ? Math.floor(timeoutMsRaw) : undefined;
+
+        result.push({
+            toolId: tool.id,
+            displayName: friendlyName,
+            description: tool.description || "",
+            inputSchema: convertPPTBSchemaToJsonSchema(schemaSource.prefill),
+            outputSchema: convertPPTBSchemaToJsonSchema(schemaSource.returnTopic),
+            executionModes,
+            defaultExecutionMode,
+            invocationModes,
+            defaultInvocationMode,
+            ...(timeoutMs ? { timeoutMs } : {}),
+        });
+    }
+
+    return result;
+}
+
+export function resolveToolId(friendlyName: string): string | undefined {
+    return toolNameMap.get(friendlyName);
+}
diff --git a/src/main/mcp/headlessToolRuntime.ts b/src/main/mcp/headlessToolRuntime.ts
new file mode 100644
index 00000000..c3a928c4
--- /dev/null
+++ b/src/main/mcp/headlessToolRuntime.ts
@@ -0,0 +1,674 @@
+import { clipboard, nativeTheme, shell } from "electron";
+import * as fs from "fs";
+import * as path from "path";
+import { pathToFileURL } from "url";
+import { logError, logInfo } from "../../common/logger";
+import type { Connection, EntityRelatedMetadataPath, EntityRelatedMetadataResponse, MetadataOperationOptions, ToolSettings } from "../../common/types";
+import { ToolManifest } from "../../common/types";
+import { ConnectionsManager } from "../managers/connectionsManager";
+import { DataverseManager } from "../managers/dataverseManager";
+import { PowerPlatformManager } from "../managers/powerplatformManager";
+import { SettingsManager } from "../managers/settingsManager";
+
+type HeadlessInvokeFn = (input: Record<string, unknown>, context: HeadlessInvokeContext) => Promise<Record<string, unknown>>;
+
+interface HeadlessRuntimeModule {
+    invokeHeadless?: HeadlessInvokeFn;
+    default?: HeadlessInvokeFn | { invokeHeadless?: HeadlessInvokeFn };
+}
+
+export interface HeadlessInvokeContext {
+    toolId: string;
+    toolName: string;
+    invocationMode: "one-way" | "two-way";
+    authToken?: string;
+    connectionId?: string;
+    connectionUrl?: string;
+    connectionName?: string;
+    updateProgress: (percent: number, message?: string) => void;
+    logger: {
+        info: (message: string) => void;
+        error: (message: string) => void;
+    };
+}
+
+export interface HeadlessRuntimeServices {
+    settingsManager?: SettingsManager;
+    connectionsManager?: ConnectionsManager;
+    dataverseManager?: DataverseManager;
+    powerPlatformManager?: PowerPlatformManager;
+}
+
+interface HeadlessToolboxAPI {
+    getToolContext: () => Promise<Record<string, unknown> | null>;
+    connections: {
+        getActiveConnection: () => Promise<Record<string, unknown> | null>;
+        getSecondaryConnection: () => Promise<Record<string, unknown> | null>;
+    };
+    dataverse: {
+        create: (entityLogicalName: string, record: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        retrieve: (entityLogicalName: string, id: string, columns?: string[], connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        update: (entityLogicalName: string, id: string, record: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        delete: (entityLogicalName: string, id: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        retrieveMultiple: (fetchXml: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        execute: (request: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        fetchXmlQuery: (fetchXml: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        getEntityMetadata: (entityLogicalName: string, searchByLogicalName: boolean, selectColumns?: string[], connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        getAllEntitiesMetadata: (selectColumns?: string[], connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        getEntityRelatedMetadata: <P extends EntityRelatedMetadataPath>(
+            entityLogicalName: string,
+            relatedPath: P,
+            selectColumns?: string[],
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<EntityRelatedMetadataResponse<P>>;
+        getSolutions: (selectColumns: string[], connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        getCSDLDocument: (connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        queryData: (odataQuery: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        publishCustomizations: (tableLogicalName?: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        createMultiple: (entityLogicalName: string, records: Record<string, unknown>[], connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        updateMultiple: (entityLogicalName: string, records: Record<string, unknown>[], connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        getEntitySetName: (entityLogicalName: string) => Promise<unknown>;
+        associate: (
+            primaryEntityName: string,
+            primaryEntityId: string,
+            relationshipName: string,
+            relatedEntityName: string,
+            relatedEntityId: string,
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<unknown>;
+        disassociate: (primaryEntityName: string, primaryEntityId: string, relationshipName: string, relatedEntityId: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        deploySolution: (
+            base64SolutionContent: string | ArrayBuffer | ArrayBufferView,
+            options?: {
+                importJobId?: string;
+                publishWorkflows?: boolean;
+                overwriteUnmanagedCustomizations?: boolean;
+                skipProductUpdateDependencies?: boolean;
+                convertToManaged?: boolean;
+            },
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<unknown>;
+        getImportJobStatus: (importJobId: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        buildLabel: (text: string, languageCode?: number) => unknown;
+        getAttributeODataType: (attributeType: string) => string;
+        createEntityDefinition: (entityDefinition: Record<string, unknown>, options?: MetadataOperationOptions, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        updateEntityDefinition: (
+            entityIdentifier: string,
+            entityDefinition: Record<string, unknown>,
+            options?: MetadataOperationOptions,
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<unknown>;
+        deleteEntityDefinition: (entityIdentifier: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        createAttribute: (entityLogicalName: string, attributeDefinition: Record<string, unknown>, options?: MetadataOperationOptions, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        updateAttribute: (
+            entityLogicalName: string,
+            attributeIdentifier: string,
+            attributeDefinition: Record<string, unknown>,
+            options?: MetadataOperationOptions,
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<unknown>;
+        deleteAttribute: (entityLogicalName: string, attributeIdentifier: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        createPolymorphicLookupAttribute: (
+            entityLogicalName: string,
+            attributeDefinition: Record<string, unknown>,
+            options?: MetadataOperationOptions,
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<unknown>;
+        createRelationship: (relationshipDefinition: Record<string, unknown>, options?: MetadataOperationOptions, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        updateRelationship: (
+            relationshipIdentifier: string,
+            relationshipDefinition: Record<string, unknown>,
+            options?: MetadataOperationOptions,
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<unknown>;
+        deleteRelationship: (relationshipIdentifier: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        createGlobalOptionSet: (optionSetDefinition: Record<string, unknown>, options?: MetadataOperationOptions, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        updateGlobalOptionSet: (
+            optionSetIdentifier: string,
+            optionSetDefinition: Record<string, unknown>,
+            options?: MetadataOperationOptions,
+            connectionTarget?: "primary" | "secondary",
+        ) => Promise<unknown>;
+        deleteGlobalOptionSet: (optionSetIdentifier: string, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        insertOptionValue: (params: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        updateOptionValue: (params: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        deleteOptionValue: (params: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+        orderOption: (params: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => Promise<unknown>;
+    };
+    utils: {
+        showNotification: (options: Record<string, unknown>) => Promise<void>;
+        copyToClipboard: (text: string) => Promise<void>;
+        getCurrentTheme: () => Promise<"light" | "dark">;
+        executeParallel: <T = unknown>(...operations: Array<Promise<T> | (() => Promise<T>)>) => Promise<T[]>;
+        openExternal: (url: string) => Promise<void>;
+    };
+    settings: {
+        getAll: () => Promise<ToolSettings | undefined>;
+        get: (key: string) => Promise<unknown>;
+        set: (key: string, value: unknown) => Promise<void>;
+        setAll: (settings: Record<string, unknown>) => Promise<void>;
+    };
+    invocation: {
+        getLaunchContext: () => Promise<Record<string, unknown> | null>;
+        returnData: (returnData: Record<string, unknown>) => Promise<void>;
+        launchTool: () => Promise<never>;
+        findToolsByCapability: () => Promise<never>;
+        getKnownCapabilityTags: () => Promise<never>;
+    };
+}
+
+interface ToolConfigShape {
+    agents?: {
+        headlessEntry?: string;
+    };
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function parseToolConfig(installPath: string): ToolConfigShape {
+    const configPath = path.join(installPath, "pptb.config.json");
+    if (!fs.existsSync(configPath)) {
+        return {};
+    }
+
+    try {
+        const raw = fs.readFileSync(configPath, "utf-8");
+        return JSON.parse(raw) as ToolConfigShape;
+    } catch {
+        return {};
+    }
+}
+
+function parseToolPackageJson(installPath: string): Record<string, unknown> {
+    const packageJsonPath = path.join(installPath, "package.json");
+    if (!fs.existsSync(packageJsonPath)) {
+        return {};
+    }
+
+    try {
+        const raw = fs.readFileSync(packageJsonPath, "utf-8");
+        return JSON.parse(raw) as Record<string, unknown>;
+    } catch {
+        return {};
+    }
+}
+
+function resolveCandidatePaths(manifest: ToolManifest): string[] {
+    const installPath = manifest.installPath;
+    const config = parseToolConfig(installPath);
+    const packageJson = parseToolPackageJson(installPath);
+
+    const candidates = [config.agents?.headlessEntry, "dist/headless.js", "headless.js", typeof packageJson.main === "string" ? packageJson.main : undefined].filter(
+        (entry): entry is string => typeof entry === "string" && entry.trim().length > 0,
+    );
+
+    const resolved = candidates.map((candidate) => path.resolve(installPath, candidate)).filter((candidatePath) => fs.existsSync(candidatePath));
+
+    return [...new Set(resolved)];
+}
+
+function resolveInvokeFunction(moduleExports: HeadlessRuntimeModule): HeadlessInvokeFn | null {
+    if (typeof moduleExports.invokeHeadless === "function") {
+        return moduleExports.invokeHeadless;
+    }
+
+    if (typeof moduleExports.default === "function") {
+        return moduleExports.default as HeadlessInvokeFn;
+    }
+
+    if (isRecord(moduleExports.default) && typeof moduleExports.default.invokeHeadless === "function") {
+        return moduleExports.default.invokeHeadless;
+    }
+
+    return null;
+}
+
+function getGlobalScope(): Record<string, unknown> {
+    return globalThis as unknown as Record<string, unknown>;
+}
+
+function toToolSafeConnection(connection: Connection | null): Record<string, unknown> | null {
+    if (!connection) {
+        return null;
+    }
+
+    return {
+        id: connection.id,
+        name: connection.name,
+        url: connection.url,
+        environment: connection.environment,
+        createdAt: connection.createdAt,
+        lastUsedAt: connection.lastUsedAt,
+        category: connection.category,
+        environmentColor: connection.environmentColor,
+        categoryColor: connection.categoryColor,
+        enabledForPowerPlatformAPI: connection.enabledForPowerPlatformAPI,
+        scopesForPowerPlatformAPI: connection.scopesForPowerPlatformAPI,
+    };
+}
+
+function normalizeConnectionName(connectionName?: string): string | undefined {
+    const trimmed = connectionName?.trim();
+    return trimmed ? trimmed.toLowerCase() : undefined;
+}
+
+function resolveConnection(manifest: ToolManifest, context: HeadlessInvokeContext, services: HeadlessRuntimeServices, connectionTarget: "primary" | "secondary" = "primary"): Connection | null {
+    const connectionsManager = services.connectionsManager;
+    if (!connectionsManager) {
+        return null;
+    }
+
+    const connectionId = connectionTarget === "secondary" ? undefined : context.connectionId;
+    if (connectionId) {
+        return connectionsManager.getConnectionById(connectionId);
+    }
+
+    const connectionName = connectionTarget === "secondary" ? undefined : normalizeConnectionName(context.connectionName);
+    if (connectionName) {
+        return connectionsManager.getConnections().find((connection) => normalizeConnectionName(connection.name) === connectionName) ?? null;
+    }
+
+    logInfo(`[MCP][Headless] No resolved ${connectionTarget} connection for tool '${manifest.id}'`);
+    return null;
+}
+
+function requireResolvedConnection(manifest: ToolManifest, context: HeadlessInvokeContext, services: HeadlessRuntimeServices, connectionTarget: "primary" | "secondary" = "primary"): Connection {
+    const connection = resolveConnection(manifest, context, services, connectionTarget);
+    if (!connection) {
+        throw new Error(`No ${connectionTarget} connection is available for headless tool '${manifest.id}'. Provide a saved connectionName when invoking headless mode.`);
+    }
+
+    return connection;
+}
+
+function buildHeadlessToolboxApi(manifest: ToolManifest, input: Record<string, unknown>, context: HeadlessInvokeContext, services: HeadlessRuntimeServices): HeadlessToolboxAPI {
+    const getSettingsManager = (): SettingsManager | undefined => services.settingsManager;
+    const getDataverseManager = (): DataverseManager => {
+        if (!services.dataverseManager) {
+            throw new Error("Dataverse manager is not available in headless mode.");
+        }
+        return services.dataverseManager;
+    };
+    const resolvePrimaryConnection = () => resolveConnection(manifest, context, services, "primary");
+    const resolveSecondaryConnection = () => resolveConnection(manifest, context, services, "secondary");
+
+    const unsupported = (name: string) => {
+        throw new Error(`${name} is not available in headless mode.`);
+    };
+
+    return {
+        getToolContext: async () => ({
+            toolId: context.toolId,
+            toolName: context.toolName,
+            connectionId: context.connectionId ?? null,
+            connectionUrl: context.connectionUrl ?? null,
+            connectionName: context.connectionName ?? null,
+            invocationContext: {
+                source: "mcp",
+                mode: context.invocationMode,
+                expectsResponse: context.invocationMode === "two-way",
+            },
+        }),
+        connections: {
+            getActiveConnection: async () => toToolSafeConnection(resolvePrimaryConnection()),
+            getSecondaryConnection: async () => toToolSafeConnection(resolveSecondaryConnection()),
+        },
+        dataverse: {
+            create: async (entityLogicalName, record, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().create(connection.id, entityLogicalName, record);
+            },
+            retrieve: async (entityLogicalName, id, columns, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().retrieve(connection.id, entityLogicalName, id, columns);
+            },
+            update: async (entityLogicalName, id, record, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().update(connection.id, entityLogicalName, id, record);
+            },
+            delete: async (entityLogicalName, id, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().delete(connection.id, entityLogicalName, id);
+            },
+            retrieveMultiple: async (fetchXml, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().retrieveMultiple(connection.id, fetchXml);
+            },
+            execute: async (request, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().execute(connection.id, request as Parameters<DataverseManager["execute"]>[1]);
+            },
+            fetchXmlQuery: async (fetchXml, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().fetchXmlQuery(connection.id, fetchXml);
+            },
+            getEntityMetadata: async (entityLogicalName, searchByLogicalName, selectColumns, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().getEntityMetadata(connection.id, entityLogicalName, searchByLogicalName, selectColumns);
+            },
+            getAllEntitiesMetadata: async (selectColumns, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().getAllEntitiesMetadata(connection.id, selectColumns);
+            },
+            getEntityRelatedMetadata: async <P extends EntityRelatedMetadataPath>(
+                entityLogicalName: string,
+                relatedPath: P,
+                selectColumns?: string[],
+                connectionTarget: "primary" | "secondary" = "primary",
+            ) => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().getEntityRelatedMetadata(connection.id, entityLogicalName, relatedPath, selectColumns) as Promise<EntityRelatedMetadataResponse<P>>;
+            },
+            getSolutions: async (selectColumns, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().getSolutions(connection.id, selectColumns);
+            },
+            getCSDLDocument: async (connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().getCSDLDocument(connection.id);
+            },
+            queryData: async (odataQuery, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().queryData(connection.id, odataQuery);
+            },
+            publishCustomizations: async (tableLogicalName, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().publishCustomizations(connection.id, tableLogicalName);
+            },
+            createMultiple: async (entityLogicalName, records, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().createMultiple(connection.id, entityLogicalName, records);
+            },
+            updateMultiple: async (entityLogicalName, records, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().updateMultiple(connection.id, entityLogicalName, records);
+            },
+            getEntitySetName: async (entityLogicalName) => {
+                return getDataverseManager().getEntitySetName(entityLogicalName);
+            },
+            associate: async (primaryEntityName, primaryEntityId, relationshipName, relatedEntityName, relatedEntityId, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().associate(connection.id, primaryEntityName, primaryEntityId, relationshipName, relatedEntityName, relatedEntityId);
+            },
+            disassociate: async (primaryEntityName, primaryEntityId, relationshipName, relatedEntityId, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().disassociate(connection.id, primaryEntityName, primaryEntityId, relationshipName, relatedEntityId);
+            },
+            deploySolution: async (base64SolutionContent, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().deploySolution(connection.id, base64SolutionContent, options);
+            },
+            getImportJobStatus: async (importJobId, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().getImportJobStatus(connection.id, importJobId);
+            },
+            buildLabel: (text, languageCode = 1033) => {
+                return getDataverseManager().buildLabel(text, languageCode);
+            },
+            getAttributeODataType: (attributeType) => {
+                return getDataverseManager().getAttributeODataType(attributeType as never);
+            },
+            createEntityDefinition: async (entityDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().createEntityDefinition(connection.id, entityDefinition, options);
+            },
+            updateEntityDefinition: async (entityIdentifier, entityDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().updateEntityDefinition(connection.id, entityIdentifier, entityDefinition, options);
+            },
+            deleteEntityDefinition: async (entityIdentifier, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().deleteEntityDefinition(connection.id, entityIdentifier);
+            },
+            createAttribute: async (entityLogicalName, attributeDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().createAttribute(connection.id, entityLogicalName, attributeDefinition, options);
+            },
+            updateAttribute: async (entityLogicalName, attributeIdentifier, attributeDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().updateAttribute(connection.id, entityLogicalName, attributeIdentifier, attributeDefinition, options);
+            },
+            deleteAttribute: async (entityLogicalName, attributeIdentifier, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().deleteAttribute(connection.id, entityLogicalName, attributeIdentifier);
+            },
+            createPolymorphicLookupAttribute: async (entityLogicalName, attributeDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().createPolymorphicLookupAttribute(connection.id, entityLogicalName, attributeDefinition, options);
+            },
+            createRelationship: async (relationshipDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().createRelationship(connection.id, relationshipDefinition, options);
+            },
+            updateRelationship: async (relationshipIdentifier, relationshipDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().updateRelationship(connection.id, relationshipIdentifier, relationshipDefinition, options);
+            },
+            deleteRelationship: async (relationshipIdentifier, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().deleteRelationship(connection.id, relationshipIdentifier);
+            },
+            createGlobalOptionSet: async (optionSetDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().createGlobalOptionSet(connection.id, optionSetDefinition, options);
+            },
+            updateGlobalOptionSet: async (optionSetIdentifier, optionSetDefinition, options, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().updateGlobalOptionSet(connection.id, optionSetIdentifier, optionSetDefinition, options);
+            },
+            deleteGlobalOptionSet: async (optionSetIdentifier, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().deleteGlobalOptionSet(connection.id, optionSetIdentifier);
+            },
+            insertOptionValue: async (params, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().insertOptionValue(connection.id, params);
+            },
+            updateOptionValue: async (params, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().updateOptionValue(connection.id, params);
+            },
+            deleteOptionValue: async (params, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().deleteOptionValue(connection.id, params);
+            },
+            orderOption: async (params, connectionTarget = "primary") => {
+                const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+                return getDataverseManager().orderOption(connection.id, params);
+            },
+        },
+        utils: {
+            showNotification: async (options) => {
+                const title = typeof options.title === "string" ? options.title : "PPTB notification";
+                const body = typeof options.body === "string" ? options.body : JSON.stringify(options);
+                context.logger.info(`[Notification] ${title}: ${body}`);
+            },
+            copyToClipboard: async (text) => {
+                clipboard.writeText(text);
+            },
+            getCurrentTheme: async () => {
+                const settingsManager = getSettingsManager();
+                const theme = settingsManager?.getSetting("theme");
+                if (theme === "dark" || theme === "light") {
+                    return theme;
+                }
+
+                return nativeTheme.shouldUseDarkColors ? "dark" : "light";
+            },
+            executeParallel: async <T = unknown>(...operations: Array<Promise<T> | (() => Promise<T>)>) => {
+                const promises = operations.map((operation) => (typeof operation === "function" ? operation() : operation));
+                return Promise.all(promises);
+            },
+            openExternal: async (url: string) => {
+                await shell.openExternal(url);
+            },
+        },
+        settings: {
+            getAll: async () => getSettingsManager()?.getToolSettings(context.toolId),
+            get: async (key: string) => getSettingsManager()?.getToolSettings(context.toolId)?.[key],
+            set: async (key: string, value: unknown) => {
+                const settingsManager = getSettingsManager();
+                if (!settingsManager) {
+                    return;
+                }
+                const current = settingsManager.getToolSettings(context.toolId) ?? {};
+                settingsManager.updateToolSettings(context.toolId, { ...current, [key]: value });
+            },
+            setAll: async (settings: Record<string, unknown>) => {
+                const settingsManager = getSettingsManager();
+                if (!settingsManager) {
+                    return;
+                }
+                settingsManager.updateToolSettings(context.toolId, settings);
+            },
+        },
+        invocation: {
+            getLaunchContext: async () => {
+                const launchContext: Record<string, unknown> = { ...input };
+                launchContext.__pptb = {
+                    source: "mcp",
+                    mode: context.invocationMode,
+                    correlationId: context.connectionId ? `${context.toolId}-${context.connectionId}` : undefined,
+                    expectsResponse: context.invocationMode === "two-way",
+                };
+                return launchContext;
+            },
+            returnData: async () => {
+                context.logger.info("Headless returnData() was called; the MCP invocation result is already the return channel.");
+            },
+            launchTool: async () => unsupported("toolboxAPI.invocation.launchTool"),
+            findToolsByCapability: async () => unsupported("toolboxAPI.invocation.findToolsByCapability"),
+            getKnownCapabilityTags: async () => unsupported("toolboxAPI.invocation.getKnownCapabilityTags"),
+        },
+    };
+}
+
+async function installHeadlessGlobals(manifest: ToolManifest, input: Record<string, unknown>, context: HeadlessInvokeContext, services: HeadlessRuntimeServices): Promise<() => void> {
+    const globalScope = getGlobalScope();
+    const previousWindow = globalScope.window;
+    const previousToolboxApi = globalScope.toolboxAPI;
+    const previousDataverseApi = globalScope.dataverseAPI;
+    const previousPowerPlatformApi = globalScope.powerplatformAPI;
+
+    const toolboxAPI = buildHeadlessToolboxApi(manifest, input, context, services);
+    globalScope.window = globalThis as unknown as Record<string, unknown>;
+    globalScope.toolboxAPI = toolboxAPI;
+    globalScope.dataverseAPI = toolboxAPI.dataverse;
+    globalScope.powerplatformAPI = {
+        Analytics: buildPowerPlatformCategoryClient(manifest, context, services, "Analytics"),
+        AppManagement: buildPowerPlatformCategoryClient(manifest, context, services, "AppManagement"),
+        Authorization: buildPowerPlatformCategoryClient(manifest, context, services, "Authorization"),
+        Connectivity: buildPowerPlatformCategoryClient(manifest, context, services, "Connectivity"),
+        CopilotStudio: buildPowerPlatformCategoryClient(manifest, context, services, "CopilotStudio"),
+        Dynamics: buildPowerPlatformCategoryClient(manifest, context, services, "Dynamics"),
+        EnvironmentManagement: buildPowerPlatformCategoryClient(manifest, context, services, "EnvironmentManagement"),
+        Governance: buildPowerPlatformCategoryClient(manifest, context, services, "Governance"),
+        Licensing: buildPowerPlatformCategoryClient(manifest, context, services, "Licensing"),
+        PowerApps: buildPowerPlatformCategoryClient(manifest, context, services, "PowerApps"),
+        PowerAutomate: buildPowerPlatformCategoryClient(manifest, context, services, "PowerAutomate"),
+        PowerPages: buildPowerPlatformCategoryClient(manifest, context, services, "PowerPages"),
+        ResourceQuery: buildPowerPlatformCategoryClient(manifest, context, services, "ResourceQuery"),
+        UserManagement: buildPowerPlatformCategoryClient(manifest, context, services, "UserManagement"),
+        WorkflowAgents: buildPowerPlatformCategoryClient(manifest, context, services, "WorkflowAgents"),
+    };
+
+    return () => {
+        globalScope.window = previousWindow;
+        globalScope.toolboxAPI = previousToolboxApi;
+        globalScope.dataverseAPI = previousDataverseApi;
+        globalScope.powerplatformAPI = previousPowerPlatformApi;
+    };
+}
+
+function buildPowerPlatformCategoryClient(
+    manifest: ToolManifest,
+    context: HeadlessInvokeContext,
+    services: HeadlessRuntimeServices,
+    category: Parameters<NonNullable<PowerPlatformManager["request"]>>[1],
+) {
+    return {
+        Get: (relativePath = "", connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+            requestPowerPlatform(manifest, context, services, category, "GET", relativePath, undefined, headers, connectionTarget),
+        Post: (relativePath = "", body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+            requestPowerPlatform(manifest, context, services, category, "POST", relativePath, body, headers, connectionTarget),
+        Put: (relativePath = "", body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+            requestPowerPlatform(manifest, context, services, category, "PUT", relativePath, body, headers, connectionTarget),
+        Patch: (relativePath = "", body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+            requestPowerPlatform(manifest, context, services, category, "PATCH", relativePath, body, headers, connectionTarget),
+        Delete: (relativePath = "", connectionTarget?: "primary" | "secondary", headers?: Record<string, string>, body?: unknown) =>
+            requestPowerPlatform(manifest, context, services, category, "DELETE", relativePath, body, headers, connectionTarget),
+    };
+}
+
+async function requestPowerPlatform(
+    manifest: ToolManifest,
+    context: HeadlessInvokeContext,
+    services: HeadlessRuntimeServices,
+    category: Parameters<NonNullable<PowerPlatformManager["request"]>>[1],
+    method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE",
+    relativePath = "",
+    body?: unknown,
+    headers?: Record<string, string>,
+    connectionTarget: "primary" | "secondary" = "primary",
+) {
+    if (!services.powerPlatformManager) {
+        throw new Error(`toolboxAPI.powerplatform.${category}.${method} is not available in headless mode.`);
+    }
+
+    const connection = requireResolvedConnection(manifest, context, services, connectionTarget);
+    return services.powerPlatformManager.request(connection.id, category, method, relativePath, body, headers);
+}
+
+export async function invokeHeadlessTool(manifest: ToolManifest, input: Record<string, unknown>, context: HeadlessInvokeContext, services: HeadlessRuntimeServices): Promise<Record<string, unknown>> {
+    const candidatePaths = resolveCandidatePaths(manifest);
+    if (candidatePaths.length === 0) {
+        throw new Error(`No headless runtime entry found for tool '${manifest.id}'. Add agents.headlessEntry in pptb.config.json or provide dist/headless.js.`);
+    }
+
+    let lastError: Error | null = null;
+    const restoreGlobals = await installHeadlessGlobals(manifest, input, context, services);
+
+    try {
+        for (const entryPath of candidatePaths) {
+            try {
+                const moduleUrl = pathToFileURL(entryPath).href;
+                const loaded = (await import(moduleUrl)) as HeadlessRuntimeModule;
+                const invokeFn = resolveInvokeFunction(loaded);
+
+                if (!invokeFn) {
+                    lastError = new Error(`Entry '${entryPath}' does not export invokeHeadless(input, context).`);
+                    continue;
+                }
+
+                context.logger.info(`Executing headless runtime entry '${entryPath}'`);
+                const result = await invokeFn(input, context);
+
+                if (!isRecord(result)) {
+                    throw new Error("Headless runtime must return an object result.");
+                }
+
+                return result;
+            } catch (error) {
+                lastError = error instanceof Error ? error : new Error(String(error));
+                logError(`[MCP][Headless] Failed entry ${entryPath}`, lastError);
+            }
+        }
+    } finally {
+        restoreGlobals();
+    }
+
+    throw new Error(lastError?.message || `Failed to execute headless runtime for tool '${manifest.id}'.`);
+}
+
+export function createHeadlessLogger(toolId: string) {
+    return {
+        info: (message: string) => {
+            logInfo(`[MCP][Headless][${toolId}] ${message}`);
+        },
+        error: (message: string) => {
+            logError(`[MCP][Headless][${toolId}] ${message}`);
+        },
+    };
+}
diff --git a/src/main/mcp/mcpServer.ts b/src/main/mcp/mcpServer.ts
new file mode 100644
index 00000000..9d304f32
--- /dev/null
+++ b/src/main/mcp/mcpServer.ts
@@ -0,0 +1,1161 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { CallToolRequestSchema, CallToolResult, ElicitRequestFormParams, ListToolsRequestSchema, PrimitiveSchemaDefinition } from "@modelcontextprotocol/sdk/types.js";
+import { promises as fs } from "fs";
+import { createServer, IncomingMessage, ServerResponse } from "http";
+import os from "os";
+import path from "path";
+import { logError, logInfo } from "../../common/logger";
+import { Connection } from "../../common/types";
+import { AuthManager } from "../managers/authManager";
+import { ConnectionsManager } from "../managers/connectionsManager";
+import { DataverseManager } from "../managers/dataverseManager";
+import { HeadlessJobRecord, HeadlessToolInvocationManager } from "../managers/headlessToolInvocationManager";
+import { PowerPlatformManager } from "../managers/powerplatformManager";
+import { SettingsManager } from "../managers/settingsManager";
+import { ToolRegistryManager } from "../managers/toolRegistryManager";
+import { ToolManager } from "../managers/toolsManager";
+import { ToolWindowManager } from "../managers/toolWindowManager";
+import { logInvocation } from "./agentInvocationLogger";
+import { AgentExecutionMode, AgentInvocationMode, AgentTool, getAgentInvokableTools, resolveToolId } from "./agentToolRegistry";
+import { createHeadlessLogger, invokeHeadlessTool } from "./headlessToolRuntime";
+import { JsonObjectSchema } from "./schemaConverter";
+
+const MCP_AUTH_HEADER = "x-mcp-auth-token";
+const MCP_AUTH_HEADER_DISPLAY_NAME = "X-MCP-Auth-Token";
+const MCP_INVOCATION_META_KEY = "__pptb";
+const DEFAULT_TWO_WAY_TIMEOUT_MS = 120000;
+const MCP_SERVER_CONFIG_KEY = "pptb";
+
+type SupportedClient = "claude-desktop" | "vscode";
+type SupportedOs = "macos" | "windows" | "linux";
+
+interface McpClientConfigWriteResult {
+    client: SupportedClient;
+    os: SupportedOs;
+    filePath: string;
+    serverName: string;
+}
+
+interface InvocationMeta {
+    mode?: AgentInvocationMode;
+    timeoutMs?: number;
+    executionMode?: AgentExecutionMode;
+    authToken?: string;
+    connectionName?: string;
+}
+
+interface ResolvedHeadlessAuthContext {
+    authToken?: string;
+    source: "provided-token" | "connection-name" | "none";
+    connectionName?: string;
+    connectionId?: string;
+    connectionUrl?: string;
+}
+
+type InvocationLogParams = Parameters<typeof logInvocation>[0] & {
+    invocationMode?: "one-way" | "two-way";
+    correlationId?: string;
+};
+
+function logInvocationWithMeta(params: InvocationLogParams): void {
+    // Some TS language-service states may resolve a narrower logInvocation type.
+    // Preserve metadata when supported while keeping call-sites type-safe.
+    logInvocation(params as Parameters<typeof logInvocation>[0]);
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function hasObjectProperties(schema: unknown): boolean {
+    if (!isRecord(schema) || !isRecord(schema.properties)) {
+        return false;
+    }
+
+    return Object.keys(schema.properties).length > 0;
+}
+
+function parseInvocationMeta(args: Record<string, unknown>): InvocationMeta {
+    const raw = args[MCP_INVOCATION_META_KEY];
+    if (!isRecord(raw)) {
+        return {};
+    }
+
+    const mode = raw.mode === "one-way" || raw.mode === "two-way" ? raw.mode : undefined;
+    const executionMode = raw.executionMode === "windowed" || raw.executionMode === "headless" ? raw.executionMode : undefined;
+    const timeoutMs = typeof raw.timeoutMs === "number" && Number.isFinite(raw.timeoutMs) && raw.timeoutMs > 0 ? Math.floor(raw.timeoutMs) : undefined;
+    const authToken = typeof raw.authToken === "string" && raw.authToken.trim().length > 0 ? raw.authToken.trim() : undefined;
+    const connectionName = typeof raw.connectionName === "string" && raw.connectionName.trim().length > 0 ? raw.connectionName.trim() : undefined;
+
+    return {
+        ...(mode ? { mode } : {}),
+        ...(executionMode ? { executionMode } : {}),
+        ...(timeoutMs ? { timeoutMs } : {}),
+        ...(authToken ? { authToken } : {}),
+        ...(connectionName ? { connectionName } : {}),
+    };
+}
+
+function stripInvocationMeta(args: Record<string, unknown>): Record<string, unknown> {
+    const clone = { ...args };
+    delete clone[MCP_INVOCATION_META_KEY];
+    return clone;
+}
+
+/**
+ * Parses validation errors to find top-level required-field-missing errors.
+ * Only top-level fields ($.fieldName) are returned since elicitation supports flat schemas only.
+ */
+function extractMissingFieldNames(errors: string[]): string[] {
+    const missing: string[] = [];
+    for (const err of errors) {
+        const match = /^\$\.([^.:]+): required field is missing$/.exec(err);
+        if (match?.[1]) {
+            missing.push(match[1]);
+        }
+    }
+    return missing;
+}
+
+/**
+ * Builds a flat elicitation requestedSchema from missing required fields in the tool's input schema.
+ * Returns null if any missing field cannot be represented as a primitive (e.g. object or array types),
+ * since form-based elicitation only supports flat primitive values.
+ */
+function buildElicitationProperties(inputSchema: JsonObjectSchema, fieldNames: string[]): Record<string, PrimitiveSchemaDefinition> | null {
+    const properties = isRecord(inputSchema.properties) ? inputSchema.properties : {};
+    const result: Record<string, PrimitiveSchemaDefinition> = {};
+
+    for (const name of fieldNames) {
+        const prop = isRecord(properties[name]) ? (properties[name] as Record<string, unknown>) : undefined;
+        const type = typeof prop?.type === "string" ? prop.type : undefined;
+        const description = typeof prop?.description === "string" ? prop.description : undefined;
+        const title = typeof prop?.title === "string" ? prop.title : undefined;
+        const enumValues = Array.isArray(prop?.enum) ? (prop.enum as unknown[]).filter((v): v is string => typeof v === "string") : undefined;
+
+        if (type === "boolean") {
+            result[name] = { type: "boolean", ...(title ? { title } : {}), ...(description ? { description } : {}) };
+        } else if (type === "number" || type === "integer") {
+            result[name] = { type: "number", ...(title ? { title } : {}), ...(description ? { description } : {}) };
+        } else if (enumValues && enumValues.length > 0) {
+            result[name] = { type: "string", enum: enumValues, ...(title ? { title } : {}), ...(description ? { description } : {}) };
+        } else if (type === "string" || type === undefined) {
+            result[name] = { type: "string", ...(title ? { title } : {}), ...(description ? { description } : {}) };
+        } else {
+            // Object or array — cannot be entered via a flat elicitation form
+            return null;
+        }
+    }
+
+    return Object.keys(result).length > 0 ? result : null;
+}
+
+function createInvocationError(text: string): CallToolResult {
+    return {
+        content: [{ type: "text", text }],
+        isError: true,
+    };
+}
+
+function createStructuredSuccess(payload: Record<string, unknown>): CallToolResult {
+    return {
+        content: [{ type: "text", text: JSON.stringify(payload) }],
+        structuredContent: payload,
+        isError: false,
+    };
+}
+
+function withTimeout<T>(promise: Promise<T>, timeoutMs: number, timeoutMessage: string): Promise<T> {
+    let timeoutHandle: NodeJS.Timeout | undefined;
+
+    const timeoutPromise = new Promise<T>((_, reject) => {
+        timeoutHandle = setTimeout(() => {
+            timeoutHandle = undefined;
+            reject(new Error(timeoutMessage));
+        }, timeoutMs);
+    });
+
+    return Promise.race([
+        promise.then(
+            (value) => {
+                if (timeoutHandle) {
+                    clearTimeout(timeoutHandle);
+                }
+                return value;
+            },
+            (error) => {
+                if (timeoutHandle) {
+                    clearTimeout(timeoutHandle);
+                }
+                throw error;
+            },
+        ),
+        timeoutPromise,
+    ]);
+}
+
+function validateAgainstSchema(value: unknown, schema: unknown, path = "$"): string[] {
+    if (!isRecord(schema)) {
+        return [];
+    }
+
+    const errors: string[] = [];
+    const schemaType = typeof schema.type === "string" ? schema.type : undefined;
+
+    if (schemaType === "object") {
+        if (!isRecord(value)) {
+            errors.push(`${path}: expected object`);
+            return errors;
+        }
+
+        const required = Array.isArray(schema.required) ? schema.required.filter((item): item is string => typeof item === "string") : [];
+        for (const requiredKey of required) {
+            if (!(requiredKey in value)) {
+                errors.push(`${path}.${requiredKey}: required field is missing`);
+            }
+        }
+
+        if (isRecord(schema.properties)) {
+            for (const [key, childSchema] of Object.entries(schema.properties)) {
+                if (!(key in value)) {
+                    continue;
+                }
+                errors.push(...validateAgainstSchema(value[key], childSchema, `${path}.${key}`));
+            }
+        }
+
+        return errors;
+    }
+
+    if (schemaType === "array") {
+        if (!Array.isArray(value)) {
+            errors.push(`${path}: expected array`);
+            return errors;
+        }
+        if (schema.items !== undefined) {
+            for (let i = 0; i < value.length; i++) {
+                errors.push(...validateAgainstSchema(value[i], schema.items, `${path}[${i}]`));
+            }
+        }
+        return errors;
+    }
+
+    if (schemaType === "string" && typeof value !== "string") {
+        errors.push(`${path}: expected string`);
+    } else if (schemaType === "number" && typeof value !== "number") {
+        errors.push(`${path}: expected number`);
+    } else if (schemaType === "boolean" && typeof value !== "boolean") {
+        errors.push(`${path}: expected boolean`);
+    }
+
+    if (Array.isArray(schema.enum) && schema.enum.length > 0 && !schema.enum.includes(value)) {
+        errors.push(`${path}: value must be one of [${schema.enum.join(", ")}]`);
+    }
+
+    return errors;
+}
+
+export class McpServerManager {
+    private httpServer: ReturnType<typeof createServer> | null = null;
+    private port: number;
+    private host: string;
+    private settingsManager: SettingsManager;
+    private toolRegistryManager: ToolRegistryManager;
+    private toolManager: ToolManager;
+    private toolWindowManager: ToolWindowManager | null = null;
+    private connectionsManager: ConnectionsManager | null = null;
+    private authManager: AuthManager | null = null;
+    private dataverseManager: DataverseManager | null = null;
+    private powerPlatformManager: PowerPlatformManager | null = null;
+    private expectedToken: string;
+    private agentToolsCache: { tools: AgentTool[] } | null = null;
+    private headlessInvocationManager: HeadlessToolInvocationManager;
+
+    constructor(port = 7339, host = "127.0.0.1", settingsManager: SettingsManager, toolRegistryManager: ToolRegistryManager, toolManager: ToolManager) {
+        this.port = port;
+        this.host = host;
+        this.settingsManager = settingsManager;
+        this.toolRegistryManager = toolRegistryManager;
+        this.toolManager = toolManager;
+        this.expectedToken = this.settingsManager.getMcpAccessToken();
+        this.headlessInvocationManager = new HeadlessToolInvocationManager();
+
+        this.toolRegistryManager.on("tool:installed", () => {
+            this.agentToolsCache = null;
+            logInfo("[MCP] Agent tool list invalidated: tool installed");
+        });
+
+        this.toolRegistryManager.on("tool:uninstalled", () => {
+            this.agentToolsCache = null;
+            logInfo("[MCP] Agent tool list invalidated: tool uninstalled");
+        });
+    }
+
+    setToolWindowManager(twm: ToolWindowManager): void {
+        this.toolWindowManager = twm;
+    }
+
+    setConnectionAuthManagers(connectionsManager: ConnectionsManager, authManager: AuthManager): void {
+        this.connectionsManager = connectionsManager;
+        this.authManager = authManager;
+        this.dataverseManager = new DataverseManager(connectionsManager, authManager);
+        this.powerPlatformManager = new PowerPlatformManager(connectionsManager, authManager);
+    }
+
+    isRunning(): boolean {
+        return this.httpServer !== null;
+    }
+
+    getServerDetails(): {
+        address: string;
+        authHeaderName: string;
+        authHeaderValue: string;
+        isRunning: boolean;
+    } {
+        return {
+            address: `http://${this.host}:${this.port}`,
+            authHeaderName: MCP_AUTH_HEADER_DISPLAY_NAME,
+            authHeaderValue: this.expectedToken,
+            isRunning: this.isRunning(),
+        };
+    }
+
+    async configureClient(client: SupportedClient): Promise<McpClientConfigWriteResult> {
+        const resolvedOs = this.resolveHostOS();
+        const filePath = this.getClientConfigPath(client, resolvedOs);
+        const serverDetails = this.getServerDetails();
+        const vscodeServerEntry = {
+            type: "http",
+            url: `${serverDetails.address}/mcp`,
+            headers: {
+                [MCP_AUTH_HEADER_DISPLAY_NAME]: serverDetails.authHeaderValue,
+            },
+        };
+        const claudeServerEntry = {
+            command: "npx",
+            args: ["-y", "mcp-remote", `${serverDetails.address}/mcp`, "--header", `${MCP_AUTH_HEADER_DISPLAY_NAME}: ${serverDetails.authHeaderValue}`],
+        };
+
+        const root = await this.readJsonObject(filePath);
+        if (client === "claude-desktop") {
+            const mcpServers = isRecord(root.mcpServers) ? root.mcpServers : {};
+            mcpServers[MCP_SERVER_CONFIG_KEY] = claudeServerEntry;
+            root.mcpServers = mcpServers;
+        } else {
+            const servers = isRecord(root.servers) ? root.servers : {};
+            servers[MCP_SERVER_CONFIG_KEY] = vscodeServerEntry;
+            root.servers = servers;
+        }
+
+        await fs.mkdir(path.dirname(filePath), { recursive: true });
+        await fs.writeFile(filePath, `${JSON.stringify(root, null, 4)}\n`, "utf-8");
+
+        logInfo("[MCP] Updated client configuration", {
+            client,
+            os: resolvedOs,
+            filePath,
+            serverName: MCP_SERVER_CONFIG_KEY,
+        });
+
+        return {
+            client,
+            os: resolvedOs,
+            filePath,
+            serverName: MCP_SERVER_CONFIG_KEY,
+        };
+    }
+
+    private resolveHostOS(): SupportedOs {
+        switch (process.platform) {
+            case "darwin":
+                return "macos";
+            case "win32":
+                return "windows";
+            default:
+                return "linux";
+        }
+    }
+
+    private getClientConfigPath(client: SupportedClient, hostOs: SupportedOs): string {
+        const homeDir = os.homedir();
+        if (client === "claude-desktop") {
+            if (hostOs === "macos") {
+                return path.join(homeDir, "Library", "Application Support", "Claude", "claude_desktop_config.json");
+            }
+            if (hostOs === "windows") {
+                const appDataDir = process.env.APPDATA || path.join(homeDir, "AppData", "Roaming");
+                return path.join(appDataDir, "Claude", "claude_desktop_config.json");
+            }
+            return path.join(homeDir, ".config", "Claude", "claude_desktop_config.json");
+        }
+
+        if (hostOs === "macos") {
+            return path.join(homeDir, "Library", "Application Support", "Code", "User", "mcp.json");
+        }
+        if (hostOs === "windows") {
+            const appDataDir = process.env.APPDATA || path.join(homeDir, "AppData", "Roaming");
+            return path.join(appDataDir, "Code", "User", "mcp.json");
+        }
+        return path.join(homeDir, ".config", "Code", "User", "mcp.json");
+    }
+
+    private async readJsonObject(filePath: string): Promise<Record<string, unknown>> {
+        try {
+            const raw = await fs.readFile(filePath, "utf-8");
+            const parsed: unknown = JSON.parse(raw);
+            if (!isRecord(parsed)) {
+                throw new Error(`Expected JSON object at root in '${filePath}'`);
+            }
+            return parsed;
+        } catch (error) {
+            const nodeError = error as NodeJS.ErrnoException;
+            if (nodeError.code === "ENOENT") {
+                return {};
+            }
+            throw error;
+        }
+    }
+
+    private async getAgentTools(): Promise<AgentTool[]> {
+        if (this.agentToolsCache === null) {
+            this.agentToolsCache = { tools: await getAgentInvokableTools(this.toolRegistryManager) };
+        }
+        return this.agentToolsCache.tools;
+    }
+
+    private inferMode(tool: AgentTool, payload: Record<string, unknown>, requestedMode: AgentInvocationMode | undefined): AgentInvocationMode {
+        if (requestedMode && tool.invocationModes.includes(requestedMode)) {
+            return requestedMode;
+        }
+
+        if (requestedMode && !tool.invocationModes.includes(requestedMode)) {
+            throw new Error(`Requested mode '${requestedMode}' is not supported. Supported modes: ${tool.invocationModes.join(", ")}`);
+        }
+
+        if (tool.outputSchema.type !== "object" || !isRecord(tool.outputSchema.properties) || Object.keys(tool.outputSchema.properties).length === 0) {
+            if (tool.invocationModes.includes("one-way")) {
+                return "one-way";
+            }
+        }
+
+        if (tool.invocationModes.includes(tool.defaultInvocationMode)) {
+            return tool.defaultInvocationMode;
+        }
+
+        return tool.invocationModes[0] ?? "two-way";
+    }
+
+    private inferExecutionMode(tool: AgentTool, requestedExecutionMode: AgentExecutionMode | undefined): AgentExecutionMode {
+        if (requestedExecutionMode && tool.executionModes.includes(requestedExecutionMode)) {
+            return requestedExecutionMode;
+        }
+
+        if (requestedExecutionMode && !tool.executionModes.includes(requestedExecutionMode)) {
+            throw new Error(`Requested execution mode '${requestedExecutionMode}' is not supported. Supported execution modes: ${tool.executionModes.join(", ")}`);
+        }
+
+        if (tool.executionModes.includes(tool.defaultExecutionMode)) {
+            return tool.defaultExecutionMode;
+        }
+
+        return tool.executionModes[0] ?? "windowed";
+    }
+
+    private async waitForHeadlessJobCompletion(jobId: string, timeoutMs: number): Promise<HeadlessJobRecord> {
+        const deadlineMs = Date.now() + timeoutMs;
+
+        while (Date.now() <= deadlineMs) {
+            const job = this.headlessInvocationManager.getJob(jobId);
+            if (!job) {
+                throw new Error(`Headless job '${jobId}' not found while waiting for completion.`);
+            }
+
+            if (job.status === "completed" || job.status === "failed") {
+                return job;
+            }
+
+            await new Promise<void>((resolve) => {
+                setTimeout(resolve, 200);
+            });
+        }
+
+        throw new Error(`Timed out waiting for headless job '${jobId}' completion after ${timeoutMs} ms.`);
+    }
+
+    private getReusableAccessToken(connection: Connection): string | undefined {
+        if (!connection.accessToken) {
+            return undefined;
+        }
+
+        if (!connection.tokenExpiry) {
+            return connection.accessToken;
+        }
+
+        const expiry = new Date(connection.tokenExpiry).getTime();
+        const now = Date.now();
+
+        // Keep a small safety buffer to avoid near-expiry token use.
+        if (Number.isFinite(expiry) && expiry - now > 60_000) {
+            return connection.accessToken;
+        }
+
+        return undefined;
+    }
+
+    private async resolveHeadlessAuthContext(invocationMeta: InvocationMeta): Promise<ResolvedHeadlessAuthContext> {
+        if (invocationMeta.authToken) {
+            return {
+                authToken: invocationMeta.authToken,
+                source: "provided-token",
+            };
+        }
+
+        if (!invocationMeta.connectionName) {
+            return {
+                source: "none",
+            };
+        }
+
+        if (!this.connectionsManager || !this.authManager) {
+            throw new Error("Connection/auth managers are not configured for connectionName-based authentication.");
+        }
+
+        const matches = this.connectionsManager.getConnections().filter((c) => c.name.trim().toLowerCase() === invocationMeta.connectionName!.trim().toLowerCase());
+
+        if (matches.length === 0) {
+            throw new Error(`No saved connection found with name '${invocationMeta.connectionName}'.`);
+        }
+
+        if (matches.length > 1) {
+            throw new Error(`Multiple connections found with name '${invocationMeta.connectionName}'. Please make names unique.`);
+        }
+
+        const connection = matches[0];
+        const reusableToken = this.getReusableAccessToken(connection);
+        if (reusableToken) {
+            return {
+                authToken: reusableToken,
+                source: "connection-name",
+                connectionName: connection.name,
+                connectionId: connection.id,
+                connectionUrl: connection.url,
+            };
+        }
+
+        let authResult: { accessToken: string; refreshToken?: string; expiresOn: Date; msalAccountId?: string };
+
+        switch (connection.authenticationType) {
+            case "clientSecret":
+                authResult = await this.authManager.authenticateClientSecret(connection);
+                break;
+            case "usernamePassword":
+                if (connection.msalAccountId) {
+                    const silent = await this.authManager.acquireTokenSilently(connection);
+                    authResult = { accessToken: silent.accessToken, expiresOn: silent.expiresOn, msalAccountId: connection.msalAccountId };
+                } else if (connection.refreshToken) {
+                    authResult = await this.authManager.refreshAccessToken(connection, connection.refreshToken);
+                } else {
+                    authResult = await this.authManager.authenticateUsernamePassword(connection);
+                }
+                break;
+            case "interactive":
+                if (connection.msalAccountId) {
+                    const silent = await this.authManager.acquireTokenSilently(connection);
+                    authResult = { accessToken: silent.accessToken, expiresOn: silent.expiresOn, msalAccountId: connection.msalAccountId };
+                } else if (connection.refreshToken) {
+                    authResult = await this.authManager.refreshAccessToken(connection, connection.refreshToken);
+                } else {
+                    throw new Error(`Interactive connection '${connection.name}' has no reusable session. Reconnect this connection from UI first, then retry headless invocation.`);
+                }
+                break;
+            case "connectionString":
+                throw new Error(`Connection '${connection.name}' uses unsupported authenticationType 'connectionString' for headless token acquisition.`);
+            default:
+                throw new Error(`Unsupported authentication type for connection '${connection.name}'.`);
+        }
+
+        this.connectionsManager.updateConnectionTokens(connection.id, {
+            accessToken: authResult.accessToken,
+            refreshToken: authResult.refreshToken,
+            expiresOn: authResult.expiresOn,
+            msalAccountId: authResult.msalAccountId,
+        });
+
+        return {
+            authToken: authResult.accessToken,
+            source: "connection-name",
+            connectionName: connection.name,
+            connectionId: connection.id,
+            connectionUrl: connection.url,
+        };
+    }
+
+    async start(): Promise<void> {
+        if (this.httpServer) {
+            logInfo("[MCP] Server already started");
+            return;
+        }
+
+        this.httpServer = createServer(this.handleRequest.bind(this));
+
+        await new Promise<void>((resolve, reject) => {
+            this.httpServer!.listen(this.port, this.host, () => {
+                logInfo(`[MCP] Server listening on http://${this.host}:${this.port}`);
+                resolve();
+            });
+            this.httpServer!.on("error", (error) => {
+                logError(error instanceof Error ? error : new Error(String(error)));
+                reject(error);
+            });
+        });
+    }
+
+    async stop(): Promise<void> {
+        if (!this.httpServer) {
+            return;
+        }
+
+        await this.httpServer.close();
+        this.httpServer = null;
+        this.headlessInvocationManager.dispose();
+        logInfo("[MCP] Server stopped");
+    }
+
+    private async handleRequest(req: IncomingMessage, res: ServerResponse): Promise<void> {
+        const providedToken = req.headers[MCP_AUTH_HEADER] as string | undefined;
+
+        if (!providedToken || providedToken !== this.expectedToken) {
+            logInfo("[MCP] Authentication failed: missing or invalid token");
+            res.writeHead(401, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ error: "Unauthorized: valid MCP access token required" }));
+            return;
+        }
+
+        if (req.method === "GET" && req.url) {
+            const statusPathMatch = req.url.match(/^\/mcp\/jobs\/([a-zA-Z0-9-]+)(?:\/status)?$/);
+            if (statusPathMatch?.[1]) {
+                const jobId = statusPathMatch[1];
+                const job = this.headlessInvocationManager.getJob(jobId);
+
+                if (!job) {
+                    res.writeHead(404, { "Content-Type": "application/json" });
+                    res.end(JSON.stringify({ error: "Job not found" }));
+                    return;
+                }
+
+                res.writeHead(200, { "Content-Type": "application/json" });
+                res.end(
+                    JSON.stringify({
+                        ...job,
+                        statusUrl: `/mcp/jobs/${jobId}/status`,
+                    }),
+                );
+                return;
+            }
+        }
+
+        const server = new McpServer({ name: "pptb-mcp", version: "1.0.0" }, { capabilities: { tools: {} } });
+        const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: undefined });
+
+        const agentTools = await this.getAgentTools();
+
+        server.server.registerCapabilities({ tools: { listChanged: true } });
+        server.server.setRequestHandler(ListToolsRequestSchema, () => ({
+            tools: agentTools.map((tool) => ({
+                name: tool.displayName,
+                title: tool.displayName,
+                description: `${tool.description} [modes: ${tool.invocationModes.join(", ")}; default: ${tool.defaultInvocationMode}; returnsData: ${hasObjectProperties(tool.outputSchema) ? "yes" : "no"}]`,
+                inputSchema: {
+                    ...tool.inputSchema,
+                    properties: {
+                        ...(isRecord(tool.inputSchema.properties) ? tool.inputSchema.properties : {}),
+                        [MCP_INVOCATION_META_KEY]: {
+                            type: "object",
+                            description: "Optional invocation metadata for MCP callers.",
+                            properties: {
+                                mode: {
+                                    type: "string",
+                                    enum: tool.invocationModes,
+                                    description: `Invocation mode. Defaults to '${tool.defaultInvocationMode}' when omitted.`,
+                                },
+                                executionMode: {
+                                    type: "string",
+                                    enum: tool.executionModes,
+                                    description: `Execution mode. Defaults to '${tool.defaultExecutionMode}' when omitted.`,
+                                },
+                                timeoutMs: {
+                                    type: "number",
+                                    description: "Optional timeout override in milliseconds for this call.",
+                                },
+                                authToken: {
+                                    type: "string",
+                                    description: "Optional caller-provided auth token for headless execution.",
+                                },
+                                connectionName: {
+                                    type: "string",
+                                    description: "Optional saved PPTB connection name. Used to resolve an auth token server-side when authToken is omitted.",
+                                },
+                            },
+                        },
+                    },
+                },
+                outputSchema: tool.outputSchema,
+            })),
+        }));
+
+        server.server.setRequestHandler(CallToolRequestSchema, async (request): Promise<CallToolResult> => {
+            const toolIdFromName = resolveToolId(request.params.name);
+            const toolArgs = isRecord(request.params.arguments) ? request.params.arguments : {};
+            const invocationMeta = parseInvocationMeta(toolArgs);
+            let prefillData = stripInvocationMeta(toolArgs);
+
+            const agentTools = await this.getAgentTools();
+            const matchedTool = agentTools.find((tool) => tool.toolId === toolIdFromName);
+
+            if (!matchedTool || !toolIdFromName) {
+                logInvocationWithMeta({
+                    toolId: `unknown:${request.params.name}`,
+                    toolName: request.params.name,
+                    connectionId: null,
+                    prefillData,
+                    outcome: "rejected",
+                    error: "Tool not found or not agent-invokable",
+                });
+                return createInvocationError(`Tool not found or not agent-invokable: ${request.params.name}`);
+            }
+
+            const toolId = matchedTool.toolId;
+            const displayName = matchedTool.displayName;
+            const inputValidationErrors = validateAgainstSchema(prefillData, matchedTool.inputSchema);
+            if (inputValidationErrors.length > 0) {
+                const missingFields = extractMissingFieldNames(inputValidationErrors);
+                let elicitedSuccessfully = false;
+
+                // Attempt elicitation only when every validation error is a missing required field
+                // and all of those fields can be represented as flat primitives in a form.
+                if (missingFields.length > 0 && missingFields.length === inputValidationErrors.length) {
+                    const elicitProperties = buildElicitationProperties(matchedTool.inputSchema, missingFields);
+                    if (elicitProperties) {
+                        try {
+                            const clientCaps = server.server.getClientCapabilities();
+                            if (clientCaps?.elicitation?.form) {
+                                const elicitParams: ElicitRequestFormParams = {
+                                    message: `The tool "${displayName}" requires the following parameters. Please provide values to continue.`,
+                                    requestedSchema: {
+                                        type: "object",
+                                        properties: elicitProperties,
+                                        required: missingFields,
+                                    },
+                                };
+                                const elicitResult = await server.server.elicitInput(elicitParams);
+
+                                if (elicitResult.action === "accept" && isRecord(elicitResult.content)) {
+                                    const mergedPrefill = { ...prefillData, ...elicitResult.content };
+                                    const revalidationErrors = validateAgainstSchema(mergedPrefill, matchedTool.inputSchema);
+                                    if (revalidationErrors.length === 0) {
+                                        prefillData = mergedPrefill;
+                                        elicitedSuccessfully = true;
+                                    } else {
+                                        const errorText = `Input validation failed after elicitation: ${revalidationErrors.join("; ")}`;
+                                        logInvocationWithMeta({ toolId, toolName: displayName, connectionId: null, prefillData, outcome: "rejected", error: errorText });
+                                        return createInvocationError(errorText);
+                                    }
+                                } else {
+                                    logInvocationWithMeta({
+                                        toolId,
+                                        toolName: displayName,
+                                        connectionId: null,
+                                        prefillData,
+                                        outcome: "rejected",
+                                        error: "User declined or cancelled parameter elicitation",
+                                    });
+                                    return createInvocationError(`Tool invocation cancelled: required parameters were not provided for "${displayName}".`);
+                                }
+                            }
+                        } catch {
+                            // Elicitation not supported or failed; fall through to the validation error below
+                        }
+                    }
+                }
+
+                if (!elicitedSuccessfully) {
+                    const errorText = `Input validation failed: ${inputValidationErrors.join("; ")}`;
+                    logInvocationWithMeta({
+                        toolId,
+                        toolName: displayName,
+                        connectionId: null,
+                        prefillData,
+                        outcome: "rejected",
+                        error: errorText,
+                    });
+                    return createInvocationError(errorText);
+                }
+            }
+
+            let executionMode: AgentExecutionMode;
+            let invocationMode: AgentInvocationMode;
+
+            try {
+                executionMode = this.inferExecutionMode(matchedTool, invocationMeta.executionMode);
+                invocationMode = this.inferMode(matchedTool, prefillData, invocationMeta.mode);
+            } catch (error) {
+                const errorText = error instanceof Error ? error.message : String(error);
+                logInvocationWithMeta({
+                    toolId,
+                    toolName: displayName,
+                    connectionId: null,
+                    prefillData,
+                    outcome: "rejected",
+                    error: errorText,
+                });
+                return createInvocationError(errorText);
+            }
+
+            switch (executionMode) {
+                case "headless": {
+                    const effectiveTimeoutMs = invocationMeta.timeoutMs ?? matchedTool.timeoutMs ?? DEFAULT_TWO_WAY_TIMEOUT_MS;
+                    const installedManifest = this.toolRegistryManager.getInstalledManifestSync(toolId);
+                    let resolvedAuthContext: ResolvedHeadlessAuthContext;
+
+                    if (!installedManifest) {
+                        const errorText = `Tool manifest not found for: ${toolId}`;
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: null,
+                            prefillData,
+                            outcome: "rejected",
+                            error: errorText,
+                            invocationMode,
+                        });
+                        return createInvocationError(errorText);
+                    }
+
+                    try {
+                        resolvedAuthContext = await this.resolveHeadlessAuthContext(invocationMeta);
+                    } catch (error) {
+                        const errorText = error instanceof Error ? error.message : String(error);
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: null,
+                            prefillData,
+                            outcome: "rejected",
+                            error: errorText,
+                            invocationMode,
+                        });
+                        return createInvocationError(`Failed to resolve authentication context: ${errorText}`);
+                    }
+
+                    try {
+                        const job = await this.headlessInvocationManager.startJob({
+                            toolId,
+                            toolName: displayName,
+                            timeoutMs: effectiveTimeoutMs,
+                            execute: async (jobId) => {
+                                const result = await invokeHeadlessTool(
+                                    installedManifest,
+                                    prefillData,
+                                    {
+                                        toolId,
+                                        toolName: displayName,
+                                        invocationMode,
+                                        authToken: resolvedAuthContext.authToken,
+                                        connectionId: resolvedAuthContext.connectionId,
+                                        connectionUrl: resolvedAuthContext.connectionUrl,
+                                        connectionName: resolvedAuthContext.connectionName,
+                                        updateProgress: (percent, message) => {
+                                            this.headlessInvocationManager.updateProgress(jobId, percent, message);
+                                        },
+                                        logger: createHeadlessLogger(toolId),
+                                    },
+                                    {
+                                        settingsManager: this.settingsManager,
+                                        connectionsManager: this.connectionsManager ?? undefined,
+                                        dataverseManager: this.dataverseManager ?? undefined,
+                                        powerPlatformManager: this.powerPlatformManager ?? undefined,
+                                    },
+                                );
+
+                                const outputValidationErrors = validateAgainstSchema(result, matchedTool.outputSchema);
+                                if (outputValidationErrors.length > 0) {
+                                    throw new Error(`Output validation failed: ${outputValidationErrors.join("; ")}`);
+                                }
+
+                                return result;
+                            },
+                        });
+
+                        if (invocationMode === "two-way") {
+                            const finalJob = await this.waitForHeadlessJobCompletion(job.jobId, effectiveTimeoutMs);
+
+                            if (finalJob.status === "failed") {
+                                const errorText = finalJob.error || `Headless execution failed for '${displayName}'.`;
+                                logInvocationWithMeta({
+                                    toolId,
+                                    toolName: displayName,
+                                    connectionId: null,
+                                    prefillData,
+                                    outcome: "rejected",
+                                    error: errorText,
+                                    invocationMode,
+                                    correlationId: job.jobId,
+                                });
+                                return createInvocationError(errorText);
+                            }
+
+                            const finalPayload = finalJob.result;
+                            if (!finalPayload) {
+                                const errorText = `Headless execution for '${displayName}' completed without a payload.`;
+                                logInvocationWithMeta({
+                                    toolId,
+                                    toolName: displayName,
+                                    connectionId: null,
+                                    prefillData,
+                                    outcome: "no-result",
+                                    error: errorText,
+                                    invocationMode,
+                                    correlationId: job.jobId,
+                                });
+                                return createInvocationError(errorText);
+                            }
+
+                            logInvocationWithMeta({
+                                toolId,
+                                toolName: displayName,
+                                connectionId: null,
+                                prefillData,
+                                outcome: "completed",
+                                invocationMode,
+                                correlationId: job.jobId,
+                            });
+
+                            return createStructuredSuccess(finalPayload);
+                        }
+
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: null,
+                            prefillData,
+                            outcome: "completed",
+                            invocationMode,
+                            correlationId: job.jobId,
+                        });
+
+                        return createStructuredSuccess({
+                            status: "accepted",
+                            executionMode,
+                            mode: invocationMode,
+                            jobId: job.jobId,
+                            jobStatusPath: `/mcp/jobs/${job.jobId}`,
+                            statusUrl: `/mcp/jobs/${job.jobId}/status`,
+                            jobStatus: "pending",
+                            timeoutMs: effectiveTimeoutMs,
+                            hasAuthToken: Boolean(resolvedAuthContext.authToken),
+                            authSource: resolvedAuthContext.source,
+                            connectionName: resolvedAuthContext.connectionName,
+                        });
+                    } catch (error) {
+                        const errorText = error instanceof Error ? error.message : String(error);
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: null,
+                            prefillData,
+                            outcome: "rejected",
+                            error: errorText,
+                            invocationMode,
+                        });
+                        return createInvocationError(`Failed to start headless execution: ${errorText}`);
+                    }
+                }
+
+                case "windowed": {
+                    if (!this.toolWindowManager) {
+                        const errorText = "Tool window manager is not available";
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: null,
+                            prefillData,
+                            outcome: "rejected",
+                            error: errorText,
+                        });
+                        return createInvocationError(errorText);
+                    }
+
+                    const toolRecord = this.toolManager.getTool(matchedTool.toolId);
+                    if (!toolRecord) {
+                        const errorText = `Tool manifest not found for: ${matchedTool.toolId}`;
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: null,
+                            prefillData,
+                            outcome: "rejected",
+                            error: errorText,
+                        });
+                        return createInvocationError(errorText);
+                    }
+
+                    const correlationId = `mcp-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`;
+                    const callerInstanceId = `mcp-caller-${correlationId}`;
+                    const calleeInstanceId = `${matchedTool.toolId}-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`;
+                    const primaryConnectionId: string | null = null;
+                    const secondaryConnectionId: string | null = null;
+                    const noReturn = invocationMode === "one-way";
+
+                    try {
+                        const launchPromise = this.toolWindowManager.launchToolWithContext(
+                            callerInstanceId,
+                            calleeInstanceId,
+                            toolRecord,
+                            primaryConnectionId,
+                            secondaryConnectionId,
+                            prefillData,
+                            noReturn,
+                            {
+                                source: "mcp",
+                                mode: invocationMode,
+                                correlationId,
+                                timeoutMs: invocationMeta.timeoutMs,
+                                expectsResponse: invocationMode === "two-way",
+                            },
+                        );
+
+                        if (invocationMode === "one-way") {
+                            launchPromise.catch((error) => {
+                                const errorText = error instanceof Error ? error.message : String(error);
+                                logInvocationWithMeta({
+                                    toolId,
+                                    toolName: displayName,
+                                    connectionId: primaryConnectionId,
+                                    prefillData,
+                                    outcome: "rejected",
+                                    error: errorText,
+                                });
+                            });
+
+                            logInvocationWithMeta({
+                                toolId,
+                                toolName: displayName,
+                                connectionId: primaryConnectionId,
+                                prefillData,
+                                outcome: "completed",
+                            });
+
+                            const responsePayload: Record<string, unknown> = {
+                                status: "accepted",
+                                executionMode,
+                                mode: invocationMode,
+                                correlationId,
+                            };
+
+                            return createStructuredSuccess(responsePayload);
+                        }
+
+                        const effectiveTimeoutMs = invocationMeta.timeoutMs ?? matchedTool.timeoutMs ?? DEFAULT_TWO_WAY_TIMEOUT_MS;
+                        const result = await withTimeout(launchPromise, effectiveTimeoutMs, `Timed out waiting for '${displayName}' to return data after ${effectiveTimeoutMs} ms`);
+
+                        if (result === null) {
+                            logInvocationWithMeta({
+                                toolId,
+                                toolName: displayName,
+                                connectionId: primaryConnectionId,
+                                prefillData,
+                                outcome: "no-result",
+                            });
+                            return {
+                                content: [
+                                    {
+                                        type: "text",
+                                        text: JSON.stringify({
+                                            status: "no_result",
+                                            correlationId,
+                                            message: "User did not complete the action — the tool window was closed without returning data.",
+                                        }),
+                                    },
+                                ],
+                                structuredContent: {
+                                    status: "no_result",
+                                    executionMode,
+                                    correlationId,
+                                    message: "User did not complete the action — the tool window was closed without returning data.",
+                                },
+                                isError: false,
+                            };
+                        }
+
+                        const outputValidationErrors = validateAgainstSchema(result, matchedTool.outputSchema);
+                        if (outputValidationErrors.length > 0) {
+                            const errorText = `Output validation failed: ${outputValidationErrors.join("; ")}`;
+                            logInvocationWithMeta({
+                                toolId,
+                                toolName: displayName,
+                                connectionId: primaryConnectionId,
+                                prefillData,
+                                outcome: "rejected",
+                                error: errorText,
+                            });
+                            return createInvocationError(errorText);
+                        }
+
+                        const payload = (result ?? undefined) as Record<string, unknown> | undefined;
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: primaryConnectionId,
+                            prefillData,
+                            outcome: "completed",
+                        });
+                        return createStructuredSuccess(payload ?? {});
+                    } catch (error) {
+                        const errorText = error instanceof Error ? error.message : String(error);
+                        logInvocationWithMeta({
+                            toolId,
+                            toolName: displayName,
+                            connectionId: primaryConnectionId,
+                            prefillData,
+                            outcome: "rejected",
+                            error: errorText,
+                        });
+                        return createInvocationError(`Failed to launch tool: ${errorText}`);
+                    }
+                }
+
+                default: {
+                    const errorText = `Unsupported execution mode: ${executionMode}`;
+                    logInvocationWithMeta({
+                        toolId,
+                        toolName: displayName,
+                        connectionId: null,
+                        prefillData,
+                        outcome: "rejected",
+                        error: errorText,
+                    });
+                    logInfo(`[MCP] Unsupported executionMode '${executionMode}' for tool ${toolId}`);
+                    return createInvocationError(errorText);
+                }
+            }
+        });
+
+        const cleanup = (): void => {
+            transport.close();
+        };
+        res.on("close", cleanup);
+        res.on("finish", cleanup);
+
+        try {
+            await server.connect(transport);
+            await transport.handleRequest(req, res);
+        } catch (error) {
+            logError(error instanceof Error ? error : new Error(String(error)));
+            if (!res.headersSent) {
+                res.writeHead(500);
+                res.end(JSON.stringify({ error: "Internal server error" }));
+            }
+        }
+    }
+}
diff --git a/src/main/mcp/schemaConverter.ts b/src/main/mcp/schemaConverter.ts
new file mode 100644
index 00000000..71b0c49b
--- /dev/null
+++ b/src/main/mcp/schemaConverter.ts
@@ -0,0 +1,72 @@
+type JsonSchemaType = "string" | "number" | "boolean" | "array" | "object";
+
+export type JsonObjectSchema = Record<string, unknown>;
+
+const jsonSchemaTypes: JsonSchemaType[] = ["string", "number", "boolean", "array", "object"];
+
+function isJsonSchemaType(value: string): value is JsonSchemaType {
+    return jsonSchemaTypes.includes(value as JsonSchemaType);
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function convertRequiredArray(value: unknown): string[] {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+
+    return value.filter((entry): entry is string => typeof entry === "string" && entry.length > 0);
+}
+
+export function convertPPTBSchemaToJsonSchema(pptbSchema: unknown): JsonObjectSchema {
+    if (!isRecord(pptbSchema)) {
+        return {};
+    }
+
+    const result: JsonObjectSchema = {};
+    const type = typeof pptbSchema.type === "string" ? pptbSchema.type : undefined;
+
+    if (type !== undefined && isJsonSchemaType(type)) {
+        result.type = type;
+    } else if (isRecord(pptbSchema.properties)) {
+        result.type = "object";
+    }
+
+    if (Array.isArray(pptbSchema.enum)) {
+        result.enum = pptbSchema.enum;
+    }
+
+    if (type === "array" && isRecord(pptbSchema.items)) {
+        result.items = convertPPTBSchemaToJsonSchema(pptbSchema.items);
+    }
+
+    if (result.type === "object" || isRecord(pptbSchema.properties)) {
+        const properties = pptbSchema.properties;
+
+        if (isRecord(properties)) {
+            const convertedProperties: Record<string, unknown> = {};
+            const requiredFields: string[] = [];
+
+            for (const [name, property] of Object.entries(properties)) {
+                convertedProperties[name] = convertPPTBSchemaToJsonSchema(property);
+
+                if (isRecord(property) && property.required === true) {
+                    requiredFields.push(name);
+                }
+            }
+
+            result.properties = convertedProperties;
+
+            const schemaRequired = convertRequiredArray(pptbSchema.required);
+            if (schemaRequired.length > 0) {
+                result.required = schemaRequired;
+            } else if (requiredFields.length > 0) {
+                result.required = requiredFields;
+            }
+        }
+    }
+
+    return result;
+}
diff --git a/src/main/modalPreload.ts b/src/main/modalPreload.ts
index cac631f3..55a82117 100644
--- a/src/main/modalPreload.ts
+++ b/src/main/modalPreload.ts
@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer } from "electron";
-import { CONNECTION_CHANNELS, MODAL_WINDOW_CHANNELS } from "../common/ipc/channels";
+import { CONNECTION_CHANNELS, MODAL_WINDOW_CHANNELS, UTIL_CHANNELS } from "../common/ipc/channels";
 
 type ModalMessageHandler = (payload: unknown) => void;
 const messageHandlers = new Set<ModalMessageHandler>();
@@ -25,5 +25,11 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
         checkBrowserInstalled: (browserType: string) => ipcRenderer.invoke(CONNECTION_CHANNELS.CHECK_BROWSER_INSTALLED, browserType),
         getBrowserProfiles: (browserType: string) => ipcRenderer.invoke(CONNECTION_CHANNELS.GET_BROWSER_PROFILES, browserType),
         getCategories: () => ipcRenderer.invoke(CONNECTION_CHANNELS.GET_CATEGORIES),
+        configureAppRegistration: (clientId: string, includePowerPlatformPermissions?: boolean, generateOnly?: boolean) =>
+            ipcRenderer.invoke(CONNECTION_CHANNELS.CONFIGURE_APP_REGISTRATION, { clientId, includePowerPlatformPermissions, generateOnly }),
+    },
+    utils: {
+        copyToClipboard: (text: string) => ipcRenderer.invoke(UTIL_CHANNELS.COPY_TO_CLIPBOARD, text),
+        showNotification: (options: unknown) => ipcRenderer.invoke(UTIL_CHANNELS.SHOW_NOTIFICATION, options),
     },
 });
diff --git a/src/main/notificationPreload.ts b/src/main/notificationPreload.ts
index 6032b644..25145888 100644
--- a/src/main/notificationPreload.ts
+++ b/src/main/notificationPreload.ts
@@ -4,4 +4,6 @@ import { contextBridge, ipcRenderer } from "electron";
 contextBridge.exposeInMainWorld("electron", {
     dismissNotification: (index: number) => ipcRenderer.send("notification:dismiss", index),
     actionClicked: (index: number, actionIndex: number) => ipcRenderer.send("notification:action", index, actionIndex),
+    clearHistory: () => ipcRenderer.send("notification-history:clear"),
+    closeHistoryPanel: () => ipcRenderer.send("notification-history:close"),
 });
diff --git a/src/main/preload.ts b/src/main/preload.ts
index 7ebb6323..31388b65 100644
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -1,10 +1,13 @@
 import { contextBridge, ipcRenderer } from "electron";
 import {
+    AGENT_INVOCATION_CHANNELS,
     CONNECTION_CHANNELS,
     DATAVERSE_CHANNELS,
     EVENT_CHANNELS,
     FILESYSTEM_CHANNELS,
+    MCP_SERVER_CHANNELS,
     SETTINGS_CHANNELS,
+    SPLIT_LAYOUT_CHANNELS,
     TERMINAL_CHANNELS,
     TOOL_CHANNELS,
     TOOL_WINDOW_CHANNELS,
@@ -23,6 +26,7 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
     updateUserSettings: (settings: unknown) => ipcRenderer.invoke(SETTINGS_CHANNELS.UPDATE_USER_SETTINGS, settings),
     getSetting: (key: string) => ipcRenderer.invoke(SETTINGS_CHANNELS.GET_SETTING, key),
     setSetting: (key: string, value: unknown) => ipcRenderer.invoke(SETTINGS_CHANNELS.SET_SETTING, key, value),
+    getMcpAccessToken: () => ipcRenderer.invoke(SETTINGS_CHANNELS.GET_MCP_ACCESS_TOKEN),
 
     // Connections namespace - organized like in the iframe
     connections: {
@@ -72,8 +76,7 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
         ipcRenderer.invoke(TOOL_WINDOW_CHANNELS.UPDATE_TOOL_CONNECTION, instanceId, primaryConnectionId, secondaryConnectionId),
     findToolsByCapability: (tag: string) => ipcRenderer.invoke(TOOL_WINDOW_CHANNELS.FIND_TOOLS_BY_CAPABILITY, tag),
     /** Trigger banner "Return to Caller" — resolves the currently active callee's invocation with null and auto-closes it. */
-    returnToCallerBanner: () =>
-        ipcRenderer.invoke(TOOL_WINDOW_CHANNELS.RETURN_INVOCATION_DATA, null, null),
+    returnToCallerBanner: () => ipcRenderer.invoke(TOOL_WINDOW_CHANNELS.RETURN_INVOCATION_DATA, null, null),
     onInvocationBannerState: (callback: (state: { visible: boolean; callerToolName?: string }) => void) => {
         ipcRenderer.on(TOOL_WINDOW_CHANNELS.INVOCATION_BANNER_STATE, (_event, state) => callback(state));
     },
@@ -100,6 +103,20 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
         ipcRenderer.on(TOOL_WINDOW_CHANNELS.CALLEE_TOOL_CLOSED, (_event, data) => callback(data));
     },
 
+    // Split layout namespace
+    splitLayout: {
+        activate: (leftInstanceId: string, rightInstanceId: string) => ipcRenderer.invoke(SPLIT_LAYOUT_CHANNELS.ACTIVATE, leftInstanceId, rightInstanceId),
+        deactivate: () => ipcRenderer.invoke(SPLIT_LAYOUT_CHANNELS.DEACTIVATE),
+        setRatio: (ratio: number) => ipcRenderer.invoke(SPLIT_LAYOUT_CHANNELS.SET_RATIO, ratio),
+        getState: () => ipcRenderer.invoke(SPLIT_LAYOUT_CHANNELS.GET_STATE),
+        switchPane: (pane: "left" | "right", instanceId: string) => ipcRenderer.invoke(SPLIT_LAYOUT_CHANNELS.SWITCH_PANE, pane, instanceId),
+        moveToPane: (instanceId: string, targetPane: "left" | "right") => ipcRenderer.invoke(SPLIT_LAYOUT_CHANNELS.MOVE_TO_PANE, instanceId, targetPane),
+        focusPane: (pane: "left" | "right") => ipcRenderer.invoke(SPLIT_LAYOUT_CHANNELS.FOCUS_PANE, pane),
+        onStateChanged: (callback: (state: import("../common/types/api").SplitLayoutState) => void) => {
+            ipcRenderer.on(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, (_event, state) => callback(state));
+        },
+    },
+
     // Favorite tools - Only for PPTB UI
     addFavoriteTool: (toolId: string) => ipcRenderer.invoke(SETTINGS_CHANNELS.ADD_FAVORITE_TOOL, toolId),
     removeFavoriteTool: (toolId: string) => ipcRenderer.invoke(SETTINGS_CHANNELS.REMOVE_FAVORITE_TOOL, toolId),
@@ -395,6 +412,20 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
         deleteOptionValue: (params: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => ipcRenderer.invoke(DATAVERSE_CHANNELS.DELETE_OPTION_VALUE, params, connectionTarget),
         orderOption: (params: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => ipcRenderer.invoke(DATAVERSE_CHANNELS.ORDER_OPTION, params, connectionTarget),
     },
+
+    // Agent invocation logging - Only for PPTB UI
+    agentInvocation: {
+        getLogs: () => ipcRenderer.invoke(AGENT_INVOCATION_CHANNELS.GET_LOGS),
+    },
+
+    // MCP server details - Only for PPTB UI
+    mcpServer: {
+        getDetails: () => ipcRenderer.invoke(MCP_SERVER_CHANNELS.GET_DETAILS),
+        start: () => ipcRenderer.invoke(MCP_SERVER_CHANNELS.START),
+        stop: () => ipcRenderer.invoke(MCP_SERVER_CHANNELS.STOP),
+        configureClaudeDesktop: () => ipcRenderer.invoke(MCP_SERVER_CHANNELS.CONFIGURE_CLAUDE_DESKTOP),
+        configureVSCode: () => ipcRenderer.invoke(MCP_SERVER_CHANNELS.CONFIGURE_VSCODE),
+    },
 });
 
 // Expose a simple API namespace for renderer IPC events
diff --git a/src/main/toolPreloadBridge.ts b/src/main/toolPreloadBridge.ts
index 8914a9d5..0c94c707 100644
--- a/src/main/toolPreloadBridge.ts
+++ b/src/main/toolPreloadBridge.ts
@@ -16,6 +16,7 @@ import {
     DATAVERSE_CHANNELS,
     EVENT_CHANNELS,
     FILESYSTEM_CHANNELS,
+    POWERPLATFORM_CHANNELS,
     SETTINGS_CHANNELS,
     TERMINAL_CHANNELS,
     TOOL_CHANNELS,
@@ -105,6 +106,64 @@ function ipcInvoke(channel: string, ...args: unknown[]): Promise<unknown> {
     return ipcRenderer.invoke(channel, ...args);
 }
 
+type PowerPlatformCategory =
+    | "Analytics"
+    | "AppManagement"
+    | "Authorization"
+    | "Connectivity"
+    | "CopilotStudio"
+    | "Dynamics"
+    | "EnvironmentManagement"
+    | "Governance"
+    | "Licensing"
+    | "PowerApps"
+    | "PowerAutomate"
+    | "PowerPages"
+    | "ResourceQuery"
+    | "UserManagement"
+    | "WorkflowAgents";
+
+type PowerPlatformMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+
+const POWER_PLATFORM_CATEGORIES: PowerPlatformCategory[] = [
+    "Analytics",
+    "AppManagement",
+    "Authorization",
+    "Connectivity",
+    "CopilotStudio",
+    "Dynamics",
+    "EnvironmentManagement",
+    "Governance",
+    "Licensing",
+    "PowerApps",
+    "PowerAutomate",
+    "PowerPages",
+    "ResourceQuery",
+    "UserManagement",
+    "WorkflowAgents",
+];
+
+const buildPowerPlatformCategoryClient = (category: PowerPlatformCategory) => ({
+    Get: (path = "", connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+        ipcInvoke(POWERPLATFORM_CHANNELS.REQUEST, category, "GET" as PowerPlatformMethod, path, undefined, headers, connectionTarget),
+    Post: (path = "", body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+        ipcInvoke(POWERPLATFORM_CHANNELS.REQUEST, category, "POST" as PowerPlatformMethod, path, body, headers, connectionTarget),
+    Put: (path = "", body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+        ipcInvoke(POWERPLATFORM_CHANNELS.REQUEST, category, "PUT" as PowerPlatformMethod, path, body, headers, connectionTarget),
+    Patch: (path = "", body?: unknown, connectionTarget?: "primary" | "secondary", headers?: Record<string, string>) =>
+        ipcInvoke(POWERPLATFORM_CHANNELS.REQUEST, category, "PATCH" as PowerPlatformMethod, path, body, headers, connectionTarget),
+    Delete: (path = "", connectionTarget?: "primary" | "secondary", headers?: Record<string, string>, body?: unknown) =>
+        ipcInvoke(POWERPLATFORM_CHANNELS.REQUEST, category, "DELETE" as PowerPlatformMethod, path, body, headers, connectionTarget),
+});
+
+const powerPlatformApi = POWER_PLATFORM_CATEGORIES.reduce(
+    (acc, category) => {
+        acc[category] = buildPowerPlatformCategoryClient(category);
+        return acc;
+    },
+    {} as Record<PowerPlatformCategory, ReturnType<typeof buildPowerPlatformCategoryClient>>,
+);
+
 type ToolSafeConnection = {
     id: string;
     name: string;
@@ -116,6 +175,8 @@ type ToolSafeConnection = {
     category?: string;
     environmentColor?: string;
     categoryColor?: string;
+    enabledForPowerPlatformAPI?: boolean;
+    scopesForPowerPlatformAPI?: string[];
 };
 
 function toToolSafeConnection(connection: unknown): ToolSafeConnection | null {
@@ -145,6 +206,9 @@ function toToolSafeConnection(connection: unknown): ToolSafeConnection | null {
         category: typeof source.category === "string" ? source.category : undefined,
         environmentColor: typeof source.environmentColor === "string" ? source.environmentColor : undefined,
         categoryColor: typeof source.categoryColor === "string" ? source.categoryColor : undefined,
+        enabledForPowerPlatformAPI: typeof source.enabledForPowerPlatformAPI === "boolean" ? source.enabledForPowerPlatformAPI : undefined,
+        scopesForPowerPlatformAPI:
+            Array.isArray(source.scopesForPowerPlatformAPI) && source.scopesForPowerPlatformAPI.every((scope) => typeof scope === "string") ? source.scopesForPowerPlatformAPI : undefined,
     };
 }
 
@@ -342,6 +406,8 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
         /**
          * Returns the prefill data that was passed by the caller tool when it launched this tool,
          * or null if this tool was not launched via an inter-tool invocation.
+         *
+         * If available, invocation metadata is exposed under `__pptb`.
          */
         getLaunchContext: async (): Promise<Record<string, unknown> | null> => {
             await withTimeout(toolContextReady, TOOL_CONTEXT_TIMEOUT_MS, TOOL_CONTEXT_TIMEOUT_ERROR);
@@ -352,7 +418,14 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
             if (prefillData === null || prefillData === undefined || typeof prefillData !== "object" || Array.isArray(prefillData)) {
                 return null;
             }
-            return prefillData as Record<string, unknown>;
+
+            const launchContext = { ...(prefillData as Record<string, unknown>) };
+            const invocationContext = toolContext.invocationContext;
+            if (invocationContext && typeof invocationContext === "object" && !Array.isArray(invocationContext)) {
+                launchContext.__pptb = invocationContext;
+            }
+
+            return launchContext;
         },
 
         /**
@@ -401,9 +474,7 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
             // Generate a unique instanceId for the callee (mirrors the pattern used in the renderer)
             const calleeInstanceId = `${targetToolId}-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`;
 
-            const primaryConnectionId = options?.primaryConnectionId !== undefined
-                ? options.primaryConnectionId
-                : (toolContext?.connectionId ?? null); // FXS auto-inherit: use caller's active connection
+            const primaryConnectionId = options?.primaryConnectionId !== undefined ? options.primaryConnectionId : (toolContext?.connectionId ?? null); // FXS auto-inherit: use caller's active connection
             const secondaryConnectionId = options?.secondaryConnectionId !== undefined ? options.secondaryConnectionId : null;
             const noReturn = options?.noReturn ?? false;
 
@@ -430,6 +501,9 @@ contextBridge.exposeInMainWorld("toolboxAPI", {
             return ipcInvoke(TOOL_CHANNELS.GET_KNOWN_CAPABILITY_TAGS) as Promise<Array<{ tag: string; description: string }>>;
         },
     },
+
+    // Power Platform API - generic HTTP methods for all categories
+    powerplatform: powerPlatformApi,
 });
 
 // Also expose dataverseAPI as a direct alias (for tools that use it directly)
@@ -516,4 +590,6 @@ contextBridge.exposeInMainWorld("dataverseAPI", {
     orderOption: (params: Record<string, unknown>, connectionTarget?: "primary" | "secondary") => ipcInvoke(DATAVERSE_CHANNELS.ORDER_OPTION, params, connectionTarget),
 });
 
-logInfo("[ToolPreloadBridge] Initialized - toolboxAPI and dataverseAPI exposed");
+contextBridge.exposeInMainWorld("powerplatformAPI", powerPlatformApi);
+
+logInfo("[ToolPreloadBridge] Initialized - toolboxAPI, dataverseAPI, and powerplatformAPI exposed");
diff --git a/src/renderer/constants/index.ts b/src/renderer/constants/index.ts
index ae0852a0..a8c794a6 100644
--- a/src/renderer/constants/index.ts
+++ b/src/renderer/constants/index.ts
@@ -36,6 +36,7 @@ export const ACTIVITY_BAR_ICONS = [
     { id: "connections-icon", file: "connections.svg" },
     { id: "marketplace-icon", file: "marketplace.svg" },
     { id: "search-icon", file: "search.svg" },
+    { id: "logs-icon", file: "mcp.svg" },
     { id: "links-icon", file: "bookmark.svg" },
     { id: "debug-icon", file: "debug.svg" },
     { id: "settings-icon", file: "settings.svg" },
diff --git a/src/renderer/icons/dark/logs.svg b/src/renderer/icons/dark/logs.svg
new file mode 100644
index 00000000..2dda7d69
--- /dev/null
+++ b/src/renderer/icons/dark/logs.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="white" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M7.75 11.5C7.33579 11.5 7 11.8358 7 12.25C7 12.6642 7.33579 13 7.75 13C8.16421 13 8.5 12.6642 8.5 12.25C8.5 11.8358 8.16421 11.5 7.75 11.5ZM7 15.25C7 14.8358 7.33579 14.5 7.75 14.5C8.16421 14.5 8.5 14.8358 8.5 15.25C8.5 15.6642 8.16421 16 7.75 16C7.33579 16 7 15.6642 7 15.25ZM10 12.25C10 11.8358 10.3358 11.5 10.75 11.5H13.8038C14.218 11.5 14.5538 11.8358 14.5538 12.25C14.5538 12.6642 14.218 13 13.8038 13H10.75C10.3358 13 10 12.6642 10 12.25ZM10.75 14.5C10.3358 14.5 10 14.8358 10 15.25C10 15.6642 10.3358 16 10.75 16H13.8038C14.218 16 14.5538 15.6642 14.5538 15.25C14.5538 14.8358 14.218 14.5 13.8038 14.5H10.75ZM6.25 2C5.00736 2 4 3.00736 4 4.25V17.25C4 18.4926 5.00736 19.5 6.25 19.5H15.25C16.4926 19.5 17.5 18.4926 17.5 17.25V8.86885C17.5 8.27211 17.2629 7.69981 16.841 7.27786L12.2221 2.65901C11.8002 2.23705 11.2279 2 10.6312 2H6.25ZM5.5 4.25C5.5 3.83579 5.83579 3.5 6.25 3.5H10.5039V6.74753C10.5039 7.99017 11.5113 8.99753 12.7539 8.99753H16V17.25C16 17.6642 15.6642 18 15.25 18H6.25C5.83579 18 5.5 17.6642 5.5 17.25V4.25ZM12.0039 6.74753V4.56209L14.9393 7.49753H12.7539C12.3397 7.49753 12.0039 7.16174 12.0039 6.74753ZM8.75088 22C7.77121 22 6.93778 21.3739 6.62891 20.5H15.2509C17.0458 20.5 18.5009 19.0449 18.5009 17.25V8.93689L19.3419 9.77788C19.7638 10.1998 20.0009 10.7721 20.0009 11.3689V17.25C20.0009 19.8734 17.8742 22 15.2509 22H8.75088Z"
+        fill="white" />
+</svg>
\ No newline at end of file
diff --git a/src/renderer/icons/dark/mcp.svg b/src/renderer/icons/dark/mcp.svg
new file mode 100644
index 00000000..1e743525
--- /dev/null
+++ b/src/renderer/icons/dark/mcp.svg
@@ -0,0 +1,10 @@
+<svg fill="#ffffff" fill-rule="evenodd" style="flex:none" width="24" height="24" viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg">
+    <title>ModelContextProtocol</title>
+    <path
+        d="M15.688 2.343a2.588 2.588 0 00-3.61 0l-9.626 9.44a.863.863 0 01-1.203 0 .823.823 0 010-1.18l9.626-9.44a4.313 4.313 0 016.016 0 4.116 4.116 0 011.204 3.54 4.3 4.3 0 013.609 1.18l.05.05a4.115 4.115 0 010 5.9l-8.706 8.537a.274.274 0 000 .393l1.788 1.754a.823.823 0 010 1.18.863.863 0 01-1.203 0l-1.788-1.753a1.92 1.92 0 010-2.754l8.706-8.538a2.47 2.47 0 000-3.54l-.05-.049a2.588 2.588 0 00-3.607-.003l-7.172 7.034-.002.002-.098.097a.863.863 0 01-1.204 0 .823.823 0 010-1.18l7.273-7.133a2.47 2.47 0 00-.003-3.537z">
+    </path>
+    <path
+        d="M14.485 4.703a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a4.115 4.115 0 000 5.9 4.314 4.314 0 006.016 0l7.12-6.982a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a2.588 2.588 0 01-3.61 0 2.47 2.47 0 010-3.54l7.12-6.982z">
+    </path>
+</svg>
\ No newline at end of file
diff --git a/src/renderer/icons/light/logs.svg b/src/renderer/icons/light/logs.svg
new file mode 100644
index 00000000..5946a73e
--- /dev/null
+++ b/src/renderer/icons/light/logs.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M7.75 11.5C7.33579 11.5 7 11.8358 7 12.25C7 12.6642 7.33579 13 7.75 13C8.16421 13 8.5 12.6642 8.5 12.25C8.5 11.8358 8.16421 11.5 7.75 11.5ZM7 15.25C7 14.8358 7.33579 14.5 7.75 14.5C8.16421 14.5 8.5 14.8358 8.5 15.25C8.5 15.6642 8.16421 16 7.75 16C7.33579 16 7 15.6642 7 15.25ZM10 12.25C10 11.8358 10.3358 11.5 10.75 11.5H13.8038C14.218 11.5 14.5538 11.8358 14.5538 12.25C14.5538 12.6642 14.218 13 13.8038 13H10.75C10.3358 13 10 12.6642 10 12.25ZM10.75 14.5C10.3358 14.5 10 14.8358 10 15.25C10 15.6642 10.3358 16 10.75 16H13.8038C14.218 16 14.5538 15.6642 14.5538 15.25C14.5538 14.8358 14.218 14.5 13.8038 14.5H10.75ZM6.25 2C5.00736 2 4 3.00736 4 4.25V17.25C4 18.4926 5.00736 19.5 6.25 19.5H15.25C16.4926 19.5 17.5 18.4926 17.5 17.25V8.86885C17.5 8.27211 17.2629 7.69981 16.841 7.27786L12.2221 2.65901C11.8002 2.23705 11.2279 2 10.6312 2H6.25ZM5.5 4.25C5.5 3.83579 5.83579 3.5 6.25 3.5H10.5039V6.74753C10.5039 7.99017 11.5113 8.99753 12.7539 8.99753H16V17.25C16 17.6642 15.6642 18 15.25 18H6.25C5.83579 18 5.5 17.6642 5.5 17.25V4.25ZM12.0039 6.74753V4.56209L14.9393 7.49753H12.7539C12.3397 7.49753 12.0039 7.16174 12.0039 6.74753ZM8.75088 22C7.77121 22 6.93778 21.3739 6.62891 20.5H15.2509C17.0458 20.5 18.5009 19.0449 18.5009 17.25V8.93689L19.3419 9.77788C19.7638 10.1998 20.0009 10.7721 20.0009 11.3689V17.25C20.0009 19.8734 17.8742 22 15.2509 22H8.75088Z"
+        fill="currentColor" />
+</svg>
\ No newline at end of file
diff --git a/src/renderer/icons/light/mcp.svg b/src/renderer/icons/light/mcp.svg
new file mode 100644
index 00000000..043a6438
--- /dev/null
+++ b/src/renderer/icons/light/mcp.svg
@@ -0,0 +1,10 @@
+<svg fill="#000000" fill-rule="evenodd" style="flex:none;" width="24" height="24" viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg">
+    <title>ModelContextProtocol</title>
+    <path
+        d="M15.688 2.343a2.588 2.588 0 00-3.61 0l-9.626 9.44a.863.863 0 01-1.203 0 .823.823 0 010-1.18l9.626-9.44a4.313 4.313 0 016.016 0 4.116 4.116 0 011.204 3.54 4.3 4.3 0 013.609 1.18l.05.05a4.115 4.115 0 010 5.9l-8.706 8.537a.274.274 0 000 .393l1.788 1.754a.823.823 0 010 1.18.863.863 0 01-1.203 0l-1.788-1.753a1.92 1.92 0 010-2.754l8.706-8.538a2.47 2.47 0 000-3.54l-.05-.049a2.588 2.588 0 00-3.607-.003l-7.172 7.034-.002.002-.098.097a.863.863 0 01-1.204 0 .823.823 0 010-1.18l7.273-7.133a2.47 2.47 0 00-.003-3.537z">
+    </path>
+    <path
+        d="M14.485 4.703a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a4.115 4.115 0 000 5.9 4.314 4.314 0 006.016 0l7.12-6.982a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a2.588 2.588 0 01-3.61 0 2.47 2.47 0 010-3.54l7.12-6.982z">
+    </path>
+</svg>
\ No newline at end of file
diff --git a/src/renderer/index.html b/src/renderer/index.html
index b3cf5380..7188d192 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -40,6 +40,9 @@
                     </button>
                 </nav>
                 <nav class="activity-bar-footer">
+                    <button class="activity-item" id="mcp-btn" title="MCP Server (Preview)">
+                        <img id="logs-icon" src="icons/dark/mcp.svg" alt="MCP Icon" class="activity-icon" />
+                    </button>
                     <button class="activity-item" id="settings-activity-btn" title="Settings">
                         <img id="settings-icon" src="icons/dark/settings.svg" alt="Settings Icon" class="activity-icon" />
                     </button>
@@ -106,6 +109,10 @@ <h2 class="sidebar-title">INSTALLED</h2>
                                 <input type="checkbox" id="tools-update-required-filter" class="filter-checkbox-input" />
                                 <span>Update Available</span>
                             </label>
+                            <label class="filter-checkbox-label" for="tools-mcp-enabled-filter" id="tools-mcp-enabled-filter-row">
+                                <input type="checkbox" id="tools-mcp-enabled-filter" class="filter-checkbox-input" />
+                                <span>MCP Enabled</span>
+                            </label>
                         </div>
                     </div>
                     <div class="sidebar-body">
@@ -249,10 +256,14 @@ <h2 class="sidebar-title">MARKETPLACE</h2>
                         </div>
                         <div class="filter-divider"></div>
                         <div class="filter-section">
-                            <label style="display: flex; align-items: center; gap: 8px; cursor: pointer">
-                                <input type="checkbox" id="marketplace-new-filter" style="cursor: pointer" />
+                            <label class="filter-checkbox-label">
+                                <input type="checkbox" id="marketplace-new-filter" class="filter-checkbox-input" />
                                 <span>New (last 7 days)</span>
                             </label>
+                            <label class="filter-checkbox-label" id="marketplace-mcp-enabled-filter-row">
+                                <input type="checkbox" id="marketplace-mcp-enabled-filter" class="filter-checkbox-input" />
+                                <span>MCP Enabled</span>
+                            </label>
                         </div>
                     </div>
                     <div class="sidebar-body">
@@ -339,15 +350,16 @@ <h2 class="sidebar-title">DEBUG</h2>
             <main class="main-content">
                 <!-- Tool Panel (for launched tools) -->
                 <div id="tool-panel" class="tool-panel" style="display: none">
-                    <div class="tool-panel-header">
-                        <div class="tool-tabs-container">
+                    <div class="tool-panel-header" id="tool-panel-header">
+                        <!-- Left pane tab bar (default / always visible) -->
+                        <div class="tool-tabs-container" id="left-tabs-container">
                             <button class="tool-tabs-scroll-button tool-tabs-scroll-left" id="scroll-tabs-left" title="Scroll tabs left" aria-label="Scroll tabs left">
                                 <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
                                     <path fill-rule="evenodd" clip-rule="evenodd" d="M10.072 11.316L6.715 7.96l3.357-3.357-.618-.62-4.667 4.668v.618l4.667 4.667.618-.62z" />
                                 </svg>
                             </button>
                             <div class="tool-tabs" id="tool-tabs">
-                                <!-- Tabs will be dynamically added here -->
+                                <!-- Left-pane tabs dynamically added here -->
                             </div>
                             <button class="tool-tabs-scroll-button tool-tabs-scroll-right" id="scroll-tabs-right" title="Scroll tabs right" aria-label="Scroll tabs right">
                                 <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
@@ -355,6 +367,13 @@ <h2 class="sidebar-title">DEBUG</h2>
                                 </svg>
                             </button>
                         </div>
+                        <!-- Split-view right pane tab bar (hidden until split activated) -->
+                        <div class="split-tabs-bar-divider" id="split-tabs-bar-divider" style="display: none" aria-hidden="true"></div>
+                        <div class="tool-tabs-container" id="right-tabs-container" style="display: none" role="tablist" aria-label="Right pane tabs">
+                            <div class="tool-tabs" id="right-tool-tabs">
+                                <!-- Right-pane tabs dynamically added here -->
+                            </div>
+                        </div>
                         <div class="tool-panel-controls">
                             <button class="btn-icon" id="close-all-tools" title="Close all tools">✕</button>
                         </div>
@@ -362,6 +381,16 @@ <h2 class="sidebar-title">DEBUG</h2>
                     <div class="tool-panel-content-wrapper" id="tool-panel-content-wrapper">
                         <div class="tool-panel-content" id="tool-panel-content">
                             <!-- BrowserView tools are rendered here by the backend ToolWindowManager -->
+                            <!-- Split-pane divider: visible in the gap between left and right BrowserViews -->
+                            <div
+                                id="split-pane-divider"
+                                class="split-pane-divider"
+                                style="display: none"
+                                role="separator"
+                                aria-orientation="vertical"
+                                aria-label="Drag to resize split panes"
+                                title="Drag to resize panes"
+                            ></div>
                         </div>
                         <!-- Tool detail tab content panel (rendered inline, shown when a detail tab is active) -->
                         <div id="tool-detail-content-panel" style="display: none"></div>
@@ -602,6 +631,12 @@ <h2 class="whats-new-title">What's New</h2>
                     <span class="footer-terminal-toggle-label">Show Terminal</span>
                 </button>
                 <span id="secondary-connection-status" class="secondary-connection-status"></span>
+                <button type="button" class="footer-bell-btn" id="footer-notification-bell-btn" title="Notifications" aria-label="Notifications" aria-pressed="false" aria-haspopup="true">
+                    <svg width="16" height="16" viewBox="0 0 20 20" fill="currentColor" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+                        <path d="M10 2a6 6 0 0 0-6 6v2.586l-.707.707A1 1 0 0 0 4 13h12a1 1 0 0 0 .707-1.707L16 10.586V8a6 6 0 0 0-6-6zM10 18a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2z" />
+                    </svg>
+                    <span class="notification-badge" id="notification-badge" hidden aria-label="unread notifications">0</span>
+                </button>
             </div>
         </footer>
 
diff --git a/src/renderer/modals/addConnection/controller.ts b/src/renderer/modals/addConnection/controller.ts
index 9e834f0f..1fe0ca06 100644
--- a/src/renderer/modals/addConnection/controller.ts
+++ b/src/renderer/modals/addConnection/controller.ts
@@ -1,3 +1,5 @@
+import { getModalFeedbackScriptHelpers } from "../feedbackScript";
+
 export interface AddConnectionModalChannelIds {
     submit: string;
     submitReady: string;
@@ -28,10 +30,29 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
     const connectionStringFields = document.getElementById("connection-string-fields");
     const testButton = document.getElementById("test-connection-btn");
     const addButton = document.getElementById("confirm-connection-btn");
+    const copyScriptSaveButton = document.getElementById("copy-script-save-btn");
+    const configureNote = document.getElementById("connection-configure-note");
     const testFeedback = document.getElementById("connection-test-feedback");
+    const ppApiCheckbox = document.getElementById("connection-enabled-for-powerplatform-api");
+    const ppApiWrapper = document.getElementById("power-platform-api-wrapper");
+    const ppApiHelp = document.getElementById("power-platform-api-help");
     const browserTypeSelect = document.getElementById("connection-browser-type");
     const browserProfileSelect = document.getElementById("connection-browser-profile");
     const browserWarning = document.getElementById("browser-not-installed-warning");
+    const interactiveClientIdInput = document.getElementById("connection-optional-client-id");
+    const usernamePasswordClientIdInput = document.getElementById("connection-optional-client-id-up");
+    const interactiveClientIdLabel = document.getElementById("connection-optional-client-id-label");
+    const usernamePasswordClientIdLabel = document.getElementById("connection-optional-client-id-up-label");
+    const POWER_PLATFORM_ADMIN_PERMISSIONS = [
+        "Connectivity.Connections.Read",
+        "EnvironmentManagement.Environments.Read",
+        "PowerApps.Apps.Read",
+        "PowerAutomate.Flows.Read",
+        "ResourceQuery.Resources.Read",
+    ];
+    const supportsPowerPlatformApi = (authType) => authType === "interactive" || authType === "usernamePassword";
+    let pendingConfigureSaveScript = "";
+    let configureSaveInFlight = false;
     const getBrowserProfileSelection = () => {
         const select = browserProfileSelect instanceof HTMLSelectElement ? browserProfileSelect : null;
         if (!select) {
@@ -47,13 +68,202 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
         return { value, name: datasetName || fallbackName };
     };
 
+    const getCurrentClientId = () => {
+        const authType = authTypeSelect?.value || "interactive";
+        if (authType === "clientSecret") {
+            return getInputValue("connection-client-id");
+        }
+        if (authType === "usernamePassword") {
+            return getInputValue("connection-optional-client-id-up");
+        }
+        if (authType === "interactive") {
+            return getInputValue("connection-optional-client-id");
+        }
+        return "";
+    };
+
+    const shouldShowConfigureFooter = () => {
+        return Boolean(getCurrentClientId()) || (ppApiCheckbox instanceof HTMLInputElement && ppApiCheckbox.checked);
+    };
+
+    const isPowerPlatformApiEnabled = () => {
+        return ppApiCheckbox instanceof HTMLInputElement && ppApiCheckbox.checked;
+    };
+
+    const getPrimaryActionLabel = () => {
+        const isConfigureMode = shouldShowConfigureFooter();
+        const authType = authTypeSelect?.value || "interactive";
+        if (!isConfigureMode) {
+            return "Add";
+        }
+        if (authType === "clientSecret") {
+            return "Configure & Add";
+        }
+        return "Configure & Add";
+    };
+
+    const getManualActionLabel = () => {
+        return shouldShowConfigureFooter() ? "Copy Script & Add" : "Add";
+    };
+
+    const getConfigureNoteText = () => {
+        // const redirectNote = "Reply URLs to set: msal<client-id>://auth and http://localhost.";
+        if (isPowerPlatformApiEnabled()) {
+            return "Configure & Add will update reply URLs and add basic Power Platform API permissions. Use Copy Script & Add to skip automatic configuration and save with a handoff script.";
+        }
+
+        return "Configure & Add will update reply URLs only. Use Copy Script & Add to skip automatic configuration and save with a handoff script.";
+    };
+
+    const buildAdminHandOffScript = (validationMessage) => {
+        const clientId = getCurrentClientId() || "[your-client-id]";
+        const includePowerPlatformPermissions = isPowerPlatformApiEnabled();
+        const scriptPermissions = POWER_PLATFORM_ADMIN_PERMISSIONS.map((permission) => '    "' + permission + '"').join("\\n");
+        const scriptLines = [
+            "# Power Platform ToolBox client setup handoff",
+            "# Validation issue: " + validationMessage,
+            "# PPTB requires Mobile and desktop application redirect URIs. Register both entries below in Entra.",
+            '$clientId = "' + clientId + '"',
+            '$redirectUris = @("msal" + $clientId + "://auth", "http://localhost")',
+            "",
+            'Write-Host "Client ID to register:" $clientId',
+            'Write-Host "Redirect URIs to add under Mobile and desktop applications:"',
+            'foreach ($redirectUri in $redirectUris) {',
+            '    Write-Host (" - " + $redirectUri)',
+            '}',
+        ];
+
+        if (includePowerPlatformPermissions) {
+            scriptLines.push(
+                '$requiredPermissions = @(',
+                scriptPermissions,
+                ")",
+                'Write-Host "Power Platform API permissions to add:"',
+                'foreach ($permission in $requiredPermissions) {',
+                '    Write-Host (" - " + $permission)',
+                '}',
+            );
+        }
+
+        scriptLines.push('Write-Host "If the app registration is already configured, re-open PPTB and try Configure & Add again."');
+        return scriptLines.join("\\n");
+    };
+
+    const updateConfigureFooterState = () => {
+        const isConfigureMode = shouldShowConfigureFooter();
+        if (configureNote) {
+            configureNote.style.display = isConfigureMode ? "block" : "none";
+            configureNote.textContent = isConfigureMode ? getConfigureNoteText() : "";
+        }
+        if (copyScriptSaveButton instanceof HTMLButtonElement) {
+            copyScriptSaveButton.style.display = isConfigureMode ? "inline-flex" : "none";
+            if (!copyScriptSaveButton.disabled) {
+                copyScriptSaveButton.textContent = getManualActionLabel();
+            }
+        }
+        if (addButton instanceof HTMLButtonElement && !addButton.disabled) {
+            addButton.textContent = getPrimaryActionLabel();
+        }
+    };
+
+    const copyAdminHandOffScript = async (validationMessage) => {
+        const script = pendingConfigureSaveScript || buildAdminHandOffScript(validationMessage);
+        try {
+            await window.toolboxAPI.utils.copyToClipboard(script);
+        } catch {
+            // Copy is best-effort; still continue with the failure message.
+        }
+
+        await window.toolboxAPI.utils.showNotification({
+            title: "Setup script copied",
+            body: "The PowerShell handoff script has been copied for your admin.",
+            type: "warning",
+        });
+    };
+
+    const getGeneratedAppRegistrationScript = async () => {
+        const clientId = getCurrentClientId();
+        if (!clientId || !window.toolboxAPI?.connections?.configureAppRegistration) {
+            return "";
+        }
+
+        try {
+            const generatedResult = await window.toolboxAPI.connections.configureAppRegistration(clientId, isPowerPlatformApiEnabled(), true);
+            if (generatedResult && typeof generatedResult.script === "string" && generatedResult.script.trim().length > 0) {
+                return generatedResult.script;
+            }
+        } catch {
+            // Fall back to the local handoff script.
+        }
+
+        return "";
+    };
+
+    const runConfigureAndSavePreflight = async () => {
+        if (!shouldShowConfigureFooter()) {
+            return { success: true };
+        }
+
+        const clientId = getCurrentClientId();
+        if (!clientId) {
+            return {
+                success: false,
+                message: "Client ID is required before Configure & Add can update app registration.",
+                script: buildAdminHandOffScript("Client ID is missing."),
+            };
+        }
+
+        if (!window.toolboxAPI?.connections?.configureAppRegistration) {
+            return {
+                success: false,
+                message: "App registration automation API is unavailable in this modal.",
+                script: buildAdminHandOffScript("App registration automation API is unavailable in this modal."),
+            };
+        }
+
+        return await window.toolboxAPI.connections.configureAppRegistration(clientId, isPowerPlatformApiEnabled());
+    };
+
     const updateAuthVisibility = () => {
         const authType = authTypeSelect?.value || "interactive";
+        const showPowerPlatformApiOption = supportsPowerPlatformApi(authType);
         if (interactiveFields) interactiveFields.style.display = authType === "interactive" ? "flex" : "none";
         if (clientSecretFields) clientSecretFields.style.display = authType === "clientSecret" ? "flex" : "none";
         if (usernamePasswordFields) usernamePasswordFields.style.display = authType === "usernamePassword" ? "flex" : "none";
         if (connectionStringFields) connectionStringFields.style.display = authType === "connectionString" ? "flex" : "none";
         if (testButton) testButton.style.display = (authType === "interactive" || authType === "connectionString") ? "none" : "inline-flex";
+        if (ppApiWrapper) ppApiWrapper.style.display = showPowerPlatformApiOption ? "" : "none";
+        if (ppApiHelp) ppApiHelp.style.display = showPowerPlatformApiOption ? "" : "none";
+        if (!showPowerPlatformApiOption && ppApiCheckbox instanceof HTMLInputElement) {
+            ppApiCheckbox.checked = false;
+        }
+        updatePowerPlatformClientIdRequirement();
+        updateConfigureFooterState();
+    };
+
+    const updatePowerPlatformClientIdRequirement = () => {
+        const requiresClientId = ppApiCheckbox instanceof HTMLInputElement ? ppApiCheckbox.checked : false;
+
+        if (interactiveClientIdInput instanceof HTMLInputElement) {
+            interactiveClientIdInput.required = requiresClientId;
+        }
+        if (usernamePasswordClientIdInput instanceof HTMLInputElement) {
+            usernamePasswordClientIdInput.required = requiresClientId;
+        }
+
+        if (interactiveClientIdLabel) {
+            interactiveClientIdLabel.textContent = requiresClientId ? "Client ID (Required for Power Platform API)" : "Client ID (Optional)";
+        }
+        if (usernamePasswordClientIdLabel) {
+            usernamePasswordClientIdLabel.textContent = requiresClientId ? "Client ID (Required for Power Platform API)" : "Client ID (Optional)";
+        }
+        updateConfigureFooterState();
+    };
+
+    const confirmPowerPlatformApiConsent = () => {
+        return window.confirm(
+            "Power Platform API access requires admin-approved privileges and a properly configured Client ID.\\n\\nIf required privileges are missing, tools may not work as expected.\\n\\nSelect OK to Agree and continue.\\nSelect Cancel to keep this option disabled.",
+        );
     };
 
     const loadBrowserProfiles = async () => {
@@ -117,13 +327,19 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
         }
     };
 
-    const updateTestFeedback = (message) => {
+    ${getModalFeedbackScriptHelpers()}
+
+    const updateTestFeedback = (data) => {
         if (!testFeedback) return;
+        const message = getFeedbackMessage(data);
         if (typeof message === "string" && message.trim().length > 0) {
+            const feedbackType = getFeedbackType(data);
             testFeedback.textContent = message;
+            testFeedback.className = "modal-feedback " + feedbackType;
             testFeedback.style.display = "block";
         } else {
             testFeedback.textContent = "";
+            testFeedback.className = "modal-feedback";
             testFeedback.style.display = "none";
         }
     };
@@ -150,6 +366,7 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
         usernamePasswordTenantId: getInputValue("connection-tenant-id-up"),
         connectionString: getInputValue("connection-string-input"),
         browserType: getInputValue("connection-browser-type") || "default",
+        enabledForPowerPlatformAPI: (document.getElementById("connection-enabled-for-powerplatform-api")?.checked) ?? false,
         category: (() => {
             const sel = document.getElementById("connection-category-select");
             if (!(sel instanceof HTMLSelectElement)) return "";
@@ -205,6 +422,17 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
     authTypeSelect?.addEventListener("change", updateAuthVisibility);
     updateAuthVisibility();
 
+    ppApiCheckbox?.addEventListener("change", () => {
+        if (ppApiCheckbox instanceof HTMLInputElement && ppApiCheckbox.checked) {
+            const agreed = confirmPowerPlatformApiConsent();
+            if (!agreed) {
+                ppApiCheckbox.checked = false;
+            }
+        }
+        updatePowerPlatformClientIdRequirement();
+    });
+    updatePowerPlatformClientIdRequirement();
+
     // Environment default colors per env type
     const ENV_COLORS = { Dev: "#2e7d32", Test: "#0288d1", UAT: "#f57c00", Production: "#c62828" };
     const getDefaultEnvColor = (env) => ENV_COLORS[env] || "#2e7d32";
@@ -330,6 +558,11 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
     }
     clearCategoryColorBtn?.addEventListener("click", resetCategoryColor);
 
+    [interactiveClientIdInput, usernamePasswordClientIdInput, authTypeSelect, ppApiCheckbox].forEach((element) => {
+        element?.addEventListener?.("input", updateConfigureFooterState);
+        element?.addEventListener?.("change", updateConfigureFooterState);
+    });
+
     // Browser type change listener
     browserTypeSelect?.addEventListener("change", () => {
         loadBrowserProfiles();
@@ -344,9 +577,55 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
         }
     }
 
-    addButton?.addEventListener("click", () => {
-        setButtonState(addButton, true, "Adding...", "Add");
-        modalBridge.send(CHANNELS.submit, collectFormData());
+    addButton?.addEventListener("click", async () => {
+        const formData = collectFormData();
+        configureSaveInFlight = true;
+        pendingConfigureSaveScript = "";
+        setButtonState(addButton, true, "Configuring...", getPrimaryActionLabel());
+        setButtonState(copyScriptSaveButton, true, "Working...", getManualActionLabel());
+
+        try {
+            const configureResult = await runConfigureAndSavePreflight();
+            if (!configureResult?.success) {
+                const failureMessage = typeof configureResult?.message === "string" && configureResult.message.trim().length > 0 ? configureResult.message : "Failed to configure app registration.";
+                pendingConfigureSaveScript = typeof configureResult?.script === "string" && configureResult.script.trim().length > 0 ? configureResult.script : buildAdminHandOffScript(failureMessage);
+                await copyAdminHandOffScript(failureMessage);
+                updateTestFeedback({ message: failureMessage, type: "error" });
+                configureSaveInFlight = false;
+                setButtonState(addButton, false, "", getPrimaryActionLabel());
+                setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
+                return;
+            }
+        } catch (error) {
+            const failureMessage = (error instanceof Error && error.message) || "Failed to configure app registration.";
+            pendingConfigureSaveScript = buildAdminHandOffScript(failureMessage);
+            await copyAdminHandOffScript(failureMessage);
+            updateTestFeedback({ message: failureMessage, type: "error" });
+            configureSaveInFlight = false;
+            setButtonState(addButton, false, "", getPrimaryActionLabel());
+            setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
+            return;
+        }
+
+        modalBridge.send(CHANNELS.submit, formData);
+    });
+
+    copyScriptSaveButton?.addEventListener("click", async () => {
+        const formData = collectFormData();
+        setButtonState(copyScriptSaveButton, true, "Copying...", getManualActionLabel());
+        setButtonState(addButton, true, "Working...", getPrimaryActionLabel());
+
+        try {
+            const generatedScript = await getGeneratedAppRegistrationScript();
+            pendingConfigureSaveScript = generatedScript || buildAdminHandOffScript("Manual setup requested by user.");
+            await copyAdminHandOffScript("Manual setup requested by user.");
+            modalBridge.send(CHANNELS.submit, formData);
+        } catch (error) {
+            const failureMessage = (error instanceof Error && error.message) || "Failed to copy setup script.";
+            updateTestFeedback({ message: failureMessage, type: "error" });
+            setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
+            setButtonState(addButton, false, "", getPrimaryActionLabel());
+        }
     });
 
     testButton?.addEventListener("click", () => {
@@ -359,13 +638,21 @@ export function getAddConnectionModalControllerScript(channels: AddConnectionMod
     modalBridge.onMessage?.((payload) => {
         if (!payload || typeof payload !== "object") return;
         if (payload.channel === CHANNELS.submitReady) {
-            setButtonState(addButton, false, "", "Add");
+            configureSaveInFlight = false;
+            pendingConfigureSaveScript = "";
+            setButtonState(addButton, false, "", getPrimaryActionLabel());
+            setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
         }
         if (payload.channel === CHANNELS.testReady) {
             setButtonState(testButton, false, "", "Test Connection");
         }
         if (payload.channel === CHANNELS.testFeedback) {
-            updateTestFeedback(typeof payload.data === "string" ? payload.data : "");
+            if (configureSaveInFlight && typeof payload.data === "string" && payload.data.trim().length > 0) {
+                pendingConfigureSaveScript = buildAdminHandOffScript(payload.data);
+                void copyAdminHandOffScript(payload.data);
+                configureSaveInFlight = false;
+            }
+            updateTestFeedback(payload.data);
         }
     });
 
diff --git a/src/renderer/modals/addConnection/view.ts b/src/renderer/modals/addConnection/view.ts
index 542af87d..4cbbdad0 100644
--- a/src/renderer/modals/addConnection/view.ts
+++ b/src/renderer/modals/addConnection/view.ts
@@ -37,6 +37,11 @@ export function getAddConnectionModalView(isDarkTheme: boolean): ModalViewTempla
                 </select>
             </div>
         </div>
+        <div class="checkbox-wrapper" id="power-platform-api-wrapper" style="margin-bottom: 12px;">
+            <input type="checkbox" id="connection-enabled-for-powerplatform-api" class="modal-checkbox" />
+            <label for="connection-enabled-for-powerplatform-api" class="checkbox-label">Enable for Power Platform API</label>
+        </div>
+        <p class="helper-text" id="power-platform-api-help" style="margin-top: 0; margin-bottom: 12px;">Check this to allow this connection to be used for Power Platform API tools.</p>
         <div class="form-group">
             <label for="connection-url">Environment URL</label>
             <input type="text" id="connection-url" class="modal-input" placeholder="https://org.crm.dynamics.com" />
@@ -103,7 +108,7 @@ export function getAddConnectionModalView(isDarkTheme: boolean): ModalViewTempla
                     <label for="connection-username">Username / Email (Optional)</label>
                     <input type="text" id="connection-username" class="modal-input" placeholder="user@domain.com" />
                     <p class="helper-text">Pre-fill the login prompt with a specific email address. Leave empty to choose from browser accounts.</p>
-                    <label for="connection-optional-client-id">Client ID (Optional)</label>
+                    <label for="connection-optional-client-id" id="connection-optional-client-id-label">Client ID (Optional)</label>
                     <input type="text" id="connection-optional-client-id" class="modal-input" placeholder="51f81489-12ee-4a9e-aaae-a2591f45987d" />
                     <p class="helper-text">Override the default Azure AD App ID if needed. Leave empty to use the development app.</p>
                     <label for="connection-tenant-id">Tenant ID (Optional)</label>
@@ -131,7 +136,7 @@ export function getAddConnectionModalView(isDarkTheme: boolean): ModalViewTempla
                         <input type="password" id="connection-password" class="modal-input" placeholder="password" />
                         <button type="button" id="toggle-password" class="password-toggle-btn" aria-label="Toggle visibility">👁️</button>
                     </div>
-                    <label for="connection-optional-client-id-up">Client ID (Optional)</label>
+                    <label for="connection-optional-client-id-up" id="connection-optional-client-id-up-label">Client ID (Optional)</label>
                     <input type="text" id="connection-optional-client-id-up" class="modal-input" placeholder="51f81489-12ee-4a9e-aaae-a2591f45987d" />
                     <p class="helper-text">Override the default Azure AD App ID if needed. Leave empty to use the development app.</p>
                     <label for="connection-tenant-id-up">Tenant ID (Optional)</label>
@@ -150,8 +155,10 @@ export function getAddConnectionModalView(isDarkTheme: boolean): ModalViewTempla
     <div id="connection-test-feedback" class="modal-feedback" role="alert" aria-live="polite"></div>
     <div class="modal-footer">
         <button id="test-connection-btn" class="fluent-button fluent-button-ghost" style="display: none">Test Connection</button>
+        <p id="connection-configure-note" class="helper-text" style="display: none; margin: 0; max-width: 420px;"></p>
         <span class="footer-spacer"></span>
         <button id="cancel-connection-btn" class="fluent-button fluent-button-secondary">Cancel</button>
+        <button id="copy-script-save-btn" class="fluent-button fluent-button-secondary" style="display: none;">Copy Script &amp; Add</button>
         <button id="confirm-connection-btn" class="fluent-button fluent-button-primary">Add</button>
     </div>
 
diff --git a/src/renderer/modals/editConnection/controller.ts b/src/renderer/modals/editConnection/controller.ts
index 755699c7..df22587b 100644
--- a/src/renderer/modals/editConnection/controller.ts
+++ b/src/renderer/modals/editConnection/controller.ts
@@ -1,3 +1,5 @@
+import { getModalFeedbackScriptHelpers } from "../feedbackScript";
+
 export interface EditConnectionModalChannelIds {
     submit: string;
     submitReady: string;
@@ -29,10 +31,29 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
     const connectionStringFields = document.getElementById("connection-string-fields");
     const testButton = document.getElementById("test-connection-btn");
     const saveButton = document.getElementById("confirm-connection-btn");
+    const copyScriptSaveButton = document.getElementById("copy-script-save-btn");
+    const configureNote = document.getElementById("connection-configure-note");
     const testFeedback = document.getElementById("connection-test-feedback");
+    const ppApiCheckbox = document.getElementById("connection-enabled-for-powerplatform-api");
+    const ppApiWrapper = document.getElementById("power-platform-api-wrapper");
+    const ppApiHelp = document.getElementById("power-platform-api-help");
     const browserTypeSelect = document.getElementById("connection-browser-type");
     const browserProfileSelect = document.getElementById("connection-browser-profile");
     const browserWarning = document.getElementById("browser-not-installed-warning");
+    const interactiveClientIdInput = document.getElementById("connection-optional-client-id");
+    const usernamePasswordClientIdInput = document.getElementById("connection-optional-client-id-up");
+    const interactiveClientIdLabel = document.getElementById("connection-optional-client-id-label");
+    const usernamePasswordClientIdLabel = document.getElementById("connection-optional-client-id-up-label");
+    const POWER_PLATFORM_ADMIN_PERMISSIONS = [
+        "Connectivity.Connections.Read",
+        "EnvironmentManagement.Environments.Read",
+        "PowerApps.Apps.Read",
+        "PowerAutomate.Flows.Read",
+        "ResourceQuery.Resources.Read",
+    ];
+    const supportsPowerPlatformApi = (authType) => authType === "interactive" || authType === "usernamePassword";
+    let pendingConfigureSaveScript = "";
+    let configureSaveInFlight = false;
     const getBrowserProfileSelection = () => {
         const select = browserProfileSelect instanceof HTMLSelectElement ? browserProfileSelect : null;
         if (!select) {
@@ -48,6 +69,154 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
         return { value, name: datasetName || fallbackName };
     };
 
+    const getCurrentClientId = () => {
+        const authType = authTypeSelect?.value || "interactive";
+        if (authType === "clientSecret") {
+            return getInputValue("connection-client-id");
+        }
+        if (authType === "usernamePassword") {
+            return getInputValue("connection-optional-client-id-up");
+        }
+        if (authType === "interactive") {
+            return getInputValue("connection-optional-client-id");
+        }
+        return "";
+    };
+
+    const shouldShowConfigureFooter = () => {
+        return Boolean(getCurrentClientId()) || (ppApiCheckbox instanceof HTMLInputElement && ppApiCheckbox.checked);
+    };
+
+    const isPowerPlatformApiEnabled = () => {
+        return ppApiCheckbox instanceof HTMLInputElement && ppApiCheckbox.checked;
+    };
+
+    const getPrimaryActionLabel = () => {
+        return shouldShowConfigureFooter() ? "Configure & Save" : "Save";
+    };
+
+    const getManualActionLabel = () => {
+        return shouldShowConfigureFooter() ? "Copy Script & Save" : "Save";
+    };
+
+    const getConfigureNoteText = () => {
+        // const redirectNote = "Reply URLs to set: msal<client-id>://auth and http://localhost.";
+        if (isPowerPlatformApiEnabled()) {
+            return "Configure & Save will update reply URLs and add basic Power Platform API permissions. Use Copy Script & Save to skip automatic configuration and save with a handoff script.";
+        }
+
+        return "Configure & Save will update reply URLs only. Use Copy Script & Save to skip automatic configuration and save with a handoff script.";
+    };
+
+    const buildAdminHandOffScript = (validationMessage) => {
+        const clientId = getCurrentClientId() || "[your-client-id]";
+        const includePowerPlatformPermissions = isPowerPlatformApiEnabled();
+        const scriptPermissions = POWER_PLATFORM_ADMIN_PERMISSIONS.map((permission) => '    "' + permission + '"').join("\\n");
+        const scriptLines = [
+            "# Power Platform ToolBox client setup handoff",
+            "# Validation issue: " + validationMessage,
+            "# PPTB requires Mobile and desktop application redirect URIs. Register both entries below in Entra.",
+            '$clientId = "' + clientId + '"',
+            '$redirectUris = @("msal" + $clientId + "://auth", "http://localhost")',
+            "",
+            'Write-Host "Client ID to register:" $clientId',
+            'Write-Host "Redirect URIs to add under Mobile and desktop applications:"',
+            'foreach ($redirectUri in $redirectUris) {',
+            '    Write-Host (" - " + $redirectUri)',
+            '}',
+        ];
+
+        if (includePowerPlatformPermissions) {
+            scriptLines.push(
+                '$requiredPermissions = @(',
+                scriptPermissions,
+                ")",
+                'Write-Host "Power Platform API permissions to add:"',
+                'foreach ($permission in $requiredPermissions) {',
+                '    Write-Host (" - " + $permission)',
+                '}',
+            );
+        }
+
+        scriptLines.push('Write-Host "If the app registration is already configured, re-open PPTB and try Configure & Save again."');
+        return scriptLines.join("\\n");
+    };
+
+    const updateConfigureFooterState = () => {
+        const isConfigureMode = shouldShowConfigureFooter();
+        if (configureNote) {
+            configureNote.style.display = isConfigureMode ? "block" : "none";
+            configureNote.textContent = isConfigureMode ? getConfigureNoteText() : "";
+        }
+        if (copyScriptSaveButton instanceof HTMLButtonElement) {
+            copyScriptSaveButton.style.display = isConfigureMode ? "inline-flex" : "none";
+            if (!copyScriptSaveButton.disabled) {
+                copyScriptSaveButton.textContent = getManualActionLabel();
+            }
+        }
+        if (saveButton instanceof HTMLButtonElement && !saveButton.disabled) {
+            saveButton.textContent = getPrimaryActionLabel();
+        }
+    };
+
+    const copyAdminHandOffScript = async (validationMessage) => {
+        const script = pendingConfigureSaveScript || buildAdminHandOffScript(validationMessage);
+        try {
+            await window.toolboxAPI.utils.copyToClipboard(script);
+        } catch {
+            // Copy is best-effort; still continue with the failure message.
+        }
+
+        await window.toolboxAPI.utils.showNotification({
+            title: "Setup script copied",
+            body: "The PowerShell handoff script has been copied for your admin.",
+            type: "warning",
+        });
+    };
+
+    const getGeneratedAppRegistrationScript = async () => {
+        const clientId = getCurrentClientId();
+        if (!clientId || !window.toolboxAPI?.connections?.configureAppRegistration) {
+            return "";
+        }
+
+        try {
+            const generatedResult = await window.toolboxAPI.connections.configureAppRegistration(clientId, isPowerPlatformApiEnabled(), true);
+            if (generatedResult && typeof generatedResult.script === "string" && generatedResult.script.trim().length > 0) {
+                return generatedResult.script;
+            }
+        } catch {
+            // Fall back to the local handoff script.
+        }
+
+        return "";
+    };
+
+    const runConfigureAndSavePreflight = async () => {
+        if (!shouldShowConfigureFooter()) {
+            return { success: true };
+        }
+
+        const clientId = getCurrentClientId();
+        if (!clientId) {
+            return {
+                success: false,
+                message: "Client ID is required before Configure & Save can update app registration.",
+                script: buildAdminHandOffScript("Client ID is missing."),
+            };
+        }
+
+        if (!window.toolboxAPI?.connections?.configureAppRegistration) {
+            return {
+                success: false,
+                message: "App registration automation API is unavailable in this modal.",
+                script: buildAdminHandOffScript("App registration automation API is unavailable in this modal."),
+            };
+        }
+
+        return await window.toolboxAPI.connections.configureAppRegistration(clientId, isPowerPlatformApiEnabled());
+    };
+
     // Store the original connection ID
     let connectionId = null;
 
@@ -57,11 +226,44 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
 
     const updateAuthVisibility = () => {
         const authType = authTypeSelect?.value || "interactive";
+        const showPowerPlatformApiOption = supportsPowerPlatformApi(authType);
         if (interactiveFields) interactiveFields.style.display = authType === "interactive" ? "flex" : "none";
         if (clientSecretFields) clientSecretFields.style.display = authType === "clientSecret" ? "flex" : "none";
         if (usernamePasswordFields) usernamePasswordFields.style.display = authType === "usernamePassword" ? "flex" : "none";
         if (connectionStringFields) connectionStringFields.style.display = authType === "connectionString" ? "flex" : "none";
         if (testButton) testButton.style.display = (authType === "interactive" || authType === "connectionString") ? "none" : "inline-flex";
+        if (ppApiWrapper) ppApiWrapper.style.display = showPowerPlatformApiOption ? "" : "none";
+        if (ppApiHelp) ppApiHelp.style.display = showPowerPlatformApiOption ? "" : "none";
+        if (!showPowerPlatformApiOption && ppApiCheckbox instanceof HTMLInputElement) {
+            ppApiCheckbox.checked = false;
+        }
+        updatePowerPlatformClientIdRequirement();
+        updateConfigureFooterState();
+    };
+
+    const updatePowerPlatformClientIdRequirement = () => {
+        const requiresClientId = ppApiCheckbox instanceof HTMLInputElement ? ppApiCheckbox.checked : false;
+
+        if (interactiveClientIdInput instanceof HTMLInputElement) {
+            interactiveClientIdInput.required = requiresClientId;
+        }
+        if (usernamePasswordClientIdInput instanceof HTMLInputElement) {
+            usernamePasswordClientIdInput.required = requiresClientId;
+        }
+
+        if (interactiveClientIdLabel) {
+            interactiveClientIdLabel.textContent = requiresClientId ? "Client ID (Required for Power Platform API)" : "Client ID (Optional)";
+        }
+        if (usernamePasswordClientIdLabel) {
+            usernamePasswordClientIdLabel.textContent = requiresClientId ? "Client ID (Required for Power Platform API)" : "Client ID (Optional)";
+        }
+        updateConfigureFooterState();
+    };
+
+    const confirmPowerPlatformApiConsent = () => {
+        return window.confirm(
+            "Power Platform API access requires admin-approved privileges and a properly configured Client ID.\\n\\nIf required privileges are missing, tools may not work as expected.\\n\\nSelect OK to Agree and continue.\\nSelect Cancel to keep this option disabled.",
+        );
     };
 
     const loadBrowserProfiles = async () => {
@@ -131,13 +333,19 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
         }
     };
 
-    const updateTestFeedback = (message) => {
+    ${getModalFeedbackScriptHelpers()}
+
+    const updateTestFeedback = (data) => {
         if (!testFeedback) return;
+        const message = getFeedbackMessage(data);
         if (typeof message === "string" && message.trim().length > 0) {
+            const feedbackType = getFeedbackType(data);
             testFeedback.textContent = message;
+            testFeedback.className = "modal-feedback " + feedbackType;
             testFeedback.style.display = "block";
         } else {
             testFeedback.textContent = "";
+            testFeedback.className = "modal-feedback";
             testFeedback.style.display = "none";
         }
     };
@@ -172,6 +380,7 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
         usernamePasswordTenantId: getInputValue("connection-tenant-id-up"),
         connectionString: getInputValue("connection-string-input"),
         browserType: getInputValue("connection-browser-type") || "default",
+        enabledForPowerPlatformAPI: (document.getElementById("connection-enabled-for-powerplatform-api")?.checked) ?? false,
         category: (() => {
             const sel = document.getElementById("connection-category-select");
             if (!(sel instanceof HTMLSelectElement)) return "";
@@ -211,6 +420,12 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
         if (envSelect) envSelect.value = connection.environment || "Dev";
         
         if (authTypeSelect) authTypeSelect.value = connection.authenticationType || "interactive";
+
+        const ppApiCheckbox = document.getElementById("connection-enabled-for-powerplatform-api");
+        if (ppApiCheckbox instanceof HTMLInputElement) {
+            ppApiCheckbox.checked = connection.enabledForPowerPlatformAPI === true;
+        }
+        updatePowerPlatformClientIdRequirement();
         
         // Populate browser settings (applies to all auth types)
         setInputValue("connection-browser-type", connection.browserType || "default");
@@ -299,6 +514,11 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
             setInputValue("connection-client-id", connection.clientId);
             setInputValue("connection-client-secret", connection.clientSecret);
             setInputValue("connection-tenant-id-cs", connection.tenantId);
+            // Populate Power Platform API checkbox for client secret auth
+            const ppApiCheckbox = document.getElementById("connection-enabled-for-powerplatform-api");
+            if (ppApiCheckbox instanceof HTMLInputElement) {
+                ppApiCheckbox.checked = connection.enabledForPowerPlatformAPI === true;
+            }
         } else if (connection.authenticationType === "usernamePassword") {
             setInputValue("connection-username-up", connection.username);
             setInputValue("connection-password", connection.password);
@@ -309,6 +529,7 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
         }
         
         updateAuthVisibility();
+        updateConfigureFooterState();
     };
 
     const setButtonState = (button, isLoading, loadingLabel, defaultLabel) => {
@@ -338,6 +559,17 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
     authTypeSelect?.addEventListener("change", updateAuthVisibility);
     updateAuthVisibility();
 
+    ppApiCheckbox?.addEventListener("change", () => {
+        if (ppApiCheckbox instanceof HTMLInputElement && ppApiCheckbox.checked) {
+            const agreed = confirmPowerPlatformApiConsent();
+            if (!agreed) {
+                ppApiCheckbox.checked = false;
+            }
+        }
+        updatePowerPlatformClientIdRequirement();
+    });
+    updatePowerPlatformClientIdRequirement();
+
     // Environment color picker setup
     const envSelectEl = document.getElementById("connection-environment");
     const colorInput = document.getElementById("connection-environment-color");
@@ -455,14 +687,65 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
     }
     clearCategoryColorBtn?.addEventListener("click", resetCategoryColor);
 
+    [interactiveClientIdInput, usernamePasswordClientIdInput, authTypeSelect, ppApiCheckbox].forEach((element) => {
+        element?.addEventListener?.("input", updateConfigureFooterState);
+        element?.addEventListener?.("change", updateConfigureFooterState);
+    });
+
     // Browser type change listener
     browserTypeSelect?.addEventListener("change", () => {
         loadBrowserProfiles();
     });
 
-    saveButton?.addEventListener("click", () => {
-        setButtonState(saveButton, true, "Saving...", "Save Changes");
-        modalBridge.send(CHANNELS.submit, collectFormData());
+    saveButton?.addEventListener("click", async () => {
+        const formData = collectFormData();
+        configureSaveInFlight = true;
+        pendingConfigureSaveScript = "";
+        setButtonState(saveButton, true, "Configuring...", getPrimaryActionLabel());
+        setButtonState(copyScriptSaveButton, true, "Working...", getManualActionLabel());
+
+        try {
+            const configureResult = await runConfigureAndSavePreflight();
+            if (!configureResult?.success) {
+                const failureMessage = typeof configureResult?.message === "string" && configureResult.message.trim().length > 0 ? configureResult.message : "Failed to configure app registration.";
+                pendingConfigureSaveScript = typeof configureResult?.script === "string" && configureResult.script.trim().length > 0 ? configureResult.script : buildAdminHandOffScript(failureMessage);
+                await copyAdminHandOffScript(failureMessage);
+                updateTestFeedback({ message: failureMessage, type: "error" });
+                configureSaveInFlight = false;
+                setButtonState(saveButton, false, "", getPrimaryActionLabel());
+                setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
+                return;
+            }
+        } catch (error) {
+            const failureMessage = (error instanceof Error && error.message) || "Failed to configure app registration.";
+            pendingConfigureSaveScript = buildAdminHandOffScript(failureMessage);
+            await copyAdminHandOffScript(failureMessage);
+            updateTestFeedback({ message: failureMessage, type: "error" });
+            configureSaveInFlight = false;
+            setButtonState(saveButton, false, "", getPrimaryActionLabel());
+            setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
+            return;
+        }
+
+        modalBridge.send(CHANNELS.submit, formData);
+    });
+
+    copyScriptSaveButton?.addEventListener("click", async () => {
+        const formData = collectFormData();
+        setButtonState(copyScriptSaveButton, true, "Copying...", getManualActionLabel());
+        setButtonState(saveButton, true, "Working...", getPrimaryActionLabel());
+
+        try {
+            const generatedScript = await getGeneratedAppRegistrationScript();
+            pendingConfigureSaveScript = generatedScript || buildAdminHandOffScript("Manual setup requested by user.");
+            await copyAdminHandOffScript("Manual setup requested by user.");
+            modalBridge.send(CHANNELS.submit, formData);
+        } catch (error) {
+            const failureMessage = (error instanceof Error && error.message) || "Failed to copy setup script.";
+            updateTestFeedback({ message: failureMessage, type: "error" });
+            setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
+            setButtonState(saveButton, false, "", getPrimaryActionLabel());
+        }
     });
 
     testButton?.addEventListener("click", () => {
@@ -475,13 +758,21 @@ export function getEditConnectionModalControllerScript(channels: EditConnectionM
     modalBridge.onMessage?.((payload) => {
         if (!payload || typeof payload !== "object") return;
         if (payload.channel === CHANNELS.submitReady) {
-            setButtonState(saveButton, false, "", "Save Changes");
+            configureSaveInFlight = false;
+            pendingConfigureSaveScript = "";
+            setButtonState(saveButton, false, "", getPrimaryActionLabel());
+            setButtonState(copyScriptSaveButton, false, "", getManualActionLabel());
         }
         if (payload.channel === CHANNELS.testReady) {
             setButtonState(testButton, false, "", "Test Connection");
         }
         if (payload.channel === CHANNELS.testFeedback) {
-            updateTestFeedback(typeof payload.data === "string" ? payload.data : "");
+            if (configureSaveInFlight && typeof payload.data === "string" && payload.data.trim().length > 0) {
+                pendingConfigureSaveScript = buildAdminHandOffScript(payload.data);
+                void copyAdminHandOffScript(payload.data);
+                configureSaveInFlight = false;
+            }
+            updateTestFeedback(payload.data);
         }
         if (payload.channel === CHANNELS.populateConnection) {
             populateFormData(payload.data);
diff --git a/src/renderer/modals/editConnection/view.ts b/src/renderer/modals/editConnection/view.ts
index 3c730041..9b25c4a1 100644
--- a/src/renderer/modals/editConnection/view.ts
+++ b/src/renderer/modals/editConnection/view.ts
@@ -37,6 +37,11 @@ export function getEditConnectionModalView(isDarkTheme: boolean): ModalViewTempl
                 </select>
             </div>
         </div>
+        <div class="checkbox-wrapper" id="power-platform-api-wrapper" style="margin-bottom: 12px;">
+            <input type="checkbox" id="connection-enabled-for-powerplatform-api" class="modal-checkbox" />
+            <label for="connection-enabled-for-powerplatform-api" class="checkbox-label">Enable for Power Platform API</label>
+        </div>
+        <p class="helper-text" id="power-platform-api-help" style="margin-top: 0; margin-bottom: 12px;">Check this to allow this connection to be used for Power Platform API tools.</p>
         <div class="form-group">
             <label for="connection-url">Environment URL</label>
             <input type="text" id="connection-url" class="modal-input" placeholder="https://org.crm.dynamics.com" />
@@ -103,7 +108,7 @@ export function getEditConnectionModalView(isDarkTheme: boolean): ModalViewTempl
                     <label for="connection-username">Username / Email (Optional)</label>
                     <input type="text" id="connection-username" class="modal-input" placeholder="user@domain.com" />
                     <p class="helper-text">Pre-fill the login prompt with a specific email address. Leave empty to choose from browser accounts.</p>
-                    <label for="connection-optional-client-id">Client ID (Optional)</label>
+                    <label for="connection-optional-client-id" id="connection-optional-client-id-label">Client ID (Optional)</label>
                     <input type="text" id="connection-optional-client-id" class="modal-input" placeholder="51f81489-12ee-4a9e-aaae-a2591f45987d" />
                     <p class="helper-text">Override the default Azure AD App ID if needed. Leave empty to use the development app.</p>
                     <label for="connection-tenant-id">Tenant ID (Optional)</label>
@@ -131,7 +136,7 @@ export function getEditConnectionModalView(isDarkTheme: boolean): ModalViewTempl
                         <input type="password" id="connection-password" class="modal-input" placeholder="password" />
                         <button type="button" id="toggle-password" class="password-toggle-btn" aria-label="Toggle visibility">👁️</button>
                     </div>
-                    <label for="connection-optional-client-id-up">Client ID (Optional)</label>
+                    <label for="connection-optional-client-id-up" id="connection-optional-client-id-up-label">Client ID (Optional)</label>
                     <input type="text" id="connection-optional-client-id-up" class="modal-input" placeholder="51f81489-12ee-4a9e-aaae-a2591f45987d" />
                     <p class="helper-text">Override the default Azure AD App ID if needed. Leave empty to use the development app.</p>
                     <label for="connection-tenant-id-up">Tenant ID (Optional)</label>
@@ -150,9 +155,11 @@ export function getEditConnectionModalView(isDarkTheme: boolean): ModalViewTempl
     <div id="connection-test-feedback" class="modal-feedback" role="alert" aria-live="polite"></div>
     <div class="modal-footer">
         <button id="test-connection-btn" class="fluent-button fluent-button-ghost" style="display: none">Test Connection</button>
+        <p id="connection-configure-note" class="helper-text" style="display: none; margin: 0; max-width: 420px;"></p>
         <span class="footer-spacer"></span>
         <button id="cancel-connection-btn" class="fluent-button fluent-button-secondary">Cancel</button>
-        <button id="confirm-connection-btn" class="fluent-button fluent-button-primary">Save Changes</button>
+        <button id="copy-script-save-btn" class="fluent-button fluent-button-secondary" style="display: none;">Copy Script &amp; Save</button>
+        <button id="confirm-connection-btn" class="fluent-button fluent-button-primary">Save</button>
     </div>
 
 </div>`;
diff --git a/src/renderer/modals/feedbackScript.ts b/src/renderer/modals/feedbackScript.ts
new file mode 100644
index 00000000..c074584f
--- /dev/null
+++ b/src/renderer/modals/feedbackScript.ts
@@ -0,0 +1,29 @@
+export function getModalFeedbackScriptHelpers(): string {
+    return `
+    /**
+     * Extracts the feedback message from either a legacy string payload or a structured
+     * feedback object with message/type properties.
+     *
+     * @param {string | { message?: string, type?: string }} data
+     * @returns {string}
+     */
+    const getFeedbackMessage = (data) => {
+        return typeof data === "string"
+            ? data
+            : data && typeof data === "object" && typeof data.message === "string"
+              ? data.message
+              : "";
+    };
+
+    /**
+     * Determines the feedback style from a structured feedback payload.
+     * Any non-success payload falls back to the error treatment.
+     *
+     * @param {string | { message?: string, type?: string }} data
+     * @returns {"success" | "error"}
+     */
+    const getFeedbackType = (data) => {
+        return data && typeof data === "object" && data.type === "success" ? "success" : "error";
+    };
+`;
+}
diff --git a/src/renderer/modals/selectConnection/controller.ts b/src/renderer/modals/selectConnection/controller.ts
index c6b299ab..3895e4a7 100644
--- a/src/renderer/modals/selectConnection/controller.ts
+++ b/src/renderer/modals/selectConnection/controller.ts
@@ -15,14 +15,17 @@ export interface ConnectionListData {
 
 /**
  * Returns the controller script that wires up DOM events for the select connection modal.
+ * @param channels - Channel IDs for IPC communication
+ * @param enabledForPowerPlatformAPI - Whether to show Power Platform API guidance/tag context
  */
-export function getSelectConnectionModalControllerScript(channels: SelectConnectionModalChannelIds): string {
+export function getSelectConnectionModalControllerScript(channels: SelectConnectionModalChannelIds, enabledForPowerPlatformAPI: boolean = false): string {
     const serializedChannels = JSON.stringify(channels);
     const sortingUtilities = getConnectionSortingUtilitiesScript();
     return `
 <script>
 (() => {
     const CHANNELS = ${serializedChannels};
+    const ENABLED_FOR_POWER_PLATFORM_API = ${enabledForPowerPlatformAPI};
     const modalBridge = window.modalBridge;
     if (!modalBridge) {
         console.warn("modalBridge API is unavailable");
@@ -188,6 +191,7 @@ ${sortingUtilities}
             const envBadgeClass = envColor ? 'connection-env-badge' : \`connection-env-badge env-\${escapeHtml(conn.environment.toLowerCase())}\`;
             const catColor = conn.categoryColor && /^#[0-9A-Fa-f]{6}$/.test(conn.categoryColor) ? conn.categoryColor : null;
             const catBadgeMarkup = conn.category ? \`<span class="category-badge" \${catColor ? \`style="background-color:\${catColor}1a;color:\${catColor};border:1px solid \${catColor}4d"\` : ''}>\${escapeHtml(conn.category)}</span>\` : '';
+            const ppApiBadgeMarkup = conn.enabledForPowerPlatformAPI === true ? '<span class="power-platform-api-badge">PP API</span>' : '';
             return \`
             <div class="connection-item \${conn.isActive ? 'active' : ''}" data-connection-id="\${escapeHtml(conn.id)}">
                 <div class="connection-header">
@@ -198,6 +202,7 @@ ${sortingUtilities}
                     <div class="connection-item-meta-left">
                         <span class="\${envBadgeClass}"\${envBadgeStyle}>\${escapeHtml(conn.environment)}</span>
                         <span class="auth-type-badge">\${formatAuthType(conn.authenticationType)}</span>
+                        \${ppApiBadgeMarkup}
                         \${catBadgeMarkup}
                         \${conn.isActive ? '<span style="color: #107c10; font-size: 11px;">✓ Active</span>' : ''}
                     </div>
@@ -416,6 +421,14 @@ ${sortingUtilities}
         console.warn("modalBridge.onMessage is not available");
     }
 
+    // Show Power Platform API info message if required
+    if (ENABLED_FOR_POWER_PLATFORM_API === true) {
+        const ppApiInfo = document.getElementById("power-platform-api-info");
+        if (ppApiInfo) {
+            ppApiInfo.style.display = "block";
+        }
+    }
+    
     // Request connections list from main process
     modalBridge.send(CHANNELS.populateConnections, {});
 })();
diff --git a/src/renderer/modals/selectConnection/view.ts b/src/renderer/modals/selectConnection/view.ts
index b21ac63f..1ef0c4ee 100644
--- a/src/renderer/modals/selectConnection/view.ts
+++ b/src/renderer/modals/selectConnection/view.ts
@@ -1,5 +1,5 @@
-import { getModalStyles } from "../sharedStyles";
 import { escapeHtml } from "../../utils/toolIconResolver";
+import { getModalStyles } from "../sharedStyles";
 
 export interface ModalViewTemplate {
     styles: string;
@@ -11,9 +11,7 @@ export interface ModalViewTemplate {
  */
 export function getSelectConnectionModalView(isDarkTheme: boolean, toolName?: string): ModalViewTemplate {
     const styles = getModalStyles(isDarkTheme);
-    const toolNameHtml = toolName
-        ? `<p class="modal-eyebrow">${escapeHtml(toolName)}</p>`
-        : `<p class="modal-eyebrow">Connections</p>`;
+    const toolNameHtml = toolName ? `<p class="modal-eyebrow">${escapeHtml(toolName)}</p>` : `<p class="modal-eyebrow">Connections</p>`;
 
     const body = `
 
@@ -29,6 +27,9 @@ export function getSelectConnectionModalView(isDarkTheme: boolean, toolName?: st
         <div class="info-message">
             Please select a connection to connect to your Dataverse environment before using this tool.
         </div>
+        <div id="power-platform-api-info" class="modal-warning" style="display: none; margin-bottom: 12px;">
+            <span>This tool uses Power Platform API. Selecting a connection that is not enabled for PP API may cause issues while using this tool.</span>
+        </div>
         <div class="modal-search-container">
             <div class="modal-search-bar">
                 <div class="modal-search-input-wrapper">
diff --git a/src/renderer/modals/selectMultiConnection/controller.ts b/src/renderer/modals/selectMultiConnection/controller.ts
index 8c72917a..0a852436 100644
--- a/src/renderer/modals/selectMultiConnection/controller.ts
+++ b/src/renderer/modals/selectMultiConnection/controller.ts
@@ -17,8 +17,13 @@ export interface ConnectionListData {
  * Returns the controller script that wires up DOM events for the select multi-connection modal.
  * @param channels - Channel IDs for IPC communication
  * @param isSecondaryRequired - Whether the secondary connection is required (true) or optional (false)
+ * @param enabledForPowerPlatformAPI - Whether to show Power Platform API guidance/tag context
  */
-export function getSelectMultiConnectionModalControllerScript(channels: SelectMultiConnectionModalChannelIds, isSecondaryRequired: boolean = true): string {
+export function getSelectMultiConnectionModalControllerScript(
+    channels: SelectMultiConnectionModalChannelIds,
+    isSecondaryRequired: boolean = true,
+    enabledForPowerPlatformAPI: boolean = false,
+): string {
     const serializedChannels = JSON.stringify(channels);
     const sortingUtilities = getConnectionSortingUtilitiesScript();
     return `
@@ -26,6 +31,7 @@ export function getSelectMultiConnectionModalControllerScript(channels: SelectMu
 (() => {
     const CHANNELS = ${serializedChannels};
     const IS_SECONDARY_REQUIRED = ${isSecondaryRequired};
+    const ENABLED_FOR_POWER_PLATFORM_API = ${enabledForPowerPlatformAPI};
     const modalBridge = window.modalBridge;
     if (!modalBridge) {
         console.warn("modalBridge API is unavailable");
@@ -206,6 +212,7 @@ ${sortingUtilities}
             const envBadgeClass = envColor ? 'connection-env-badge' : \`connection-env-badge env-\${escapeHtml(conn.environment.toLowerCase())}\`;
             const catColor = conn.categoryColor && /^#[0-9A-Fa-f]{6}$/.test(conn.categoryColor) ? conn.categoryColor : null;
             const catBadgeMarkup = conn.category ? \`<span class="category-badge" \${catColor ? \`style="background-color:\${catColor}1a;color:\${catColor};border:1px solid \${catColor}4d"\` : ''}>\${escapeHtml(conn.category)}</span>\` : '';
+            const ppApiBadgeMarkup = conn.enabledForPowerPlatformAPI === true ? '<span class="power-platform-api-badge">PP API</span>' : '';
             
             return \`
             <div class="connection-item \${isAuthenticated ? 'authenticated' : ''} \${isDisabled ? 'disabled' : ''}" 
@@ -225,6 +232,7 @@ ${sortingUtilities}
                     <div class="connection-item-meta-left">
                         <span class="\${envBadgeClass}"\${envBadgeStyle}>\${escapeHtml(conn.environment)}</span>
                         <span class="auth-type-badge">\${formatAuthType(conn.authenticationType)}</span>
+                        \${ppApiBadgeMarkup}
                         \${catBadgeMarkup}
                     </div>
                     \${browserBadge ? \`<div class="connection-item-meta-right">\${browserBadge}</div>\` : ''}
@@ -317,9 +325,9 @@ ${sortingUtilities}
         const button = document.querySelector(\`.connect-button[data-connection-id="\${connectionId}"][data-list="\${listType}"]\`);
         if (!button) return;
 
+        // Disable button and show loading state
+        const originalText = button.textContent;
         try {
-            // Disable button and show loading state
-            const originalText = button.textContent;
             button.disabled = true;
             button.textContent = 'Connecting...';
 
@@ -337,7 +345,7 @@ ${sortingUtilities}
 
             // The connectReady message handler will update the UI based on success/failure
         } catch (error) {
-            captureException('Error connecting:', error);
+            console.error('Error connecting:', error);
             button.disabled = false;
             button.textContent = originalText;
         }
@@ -476,7 +484,7 @@ ${sortingUtilities}
                         button.textContent = 'Connect';
                     }
                     // Optionally show an error message
-                    captureException('Authentication failed:', payload.data.error);
+                    console.error('Authentication failed:', payload.data.error);
                 }
             }
             
@@ -488,6 +496,14 @@ ${sortingUtilities}
         console.warn("modalBridge.onMessage is not available");
     }
 
+    // Show Power Platform API info message if required
+    if (ENABLED_FOR_POWER_PLATFORM_API === true) {
+        const ppApiInfo = document.getElementById("power-platform-api-info-multi");
+        if (ppApiInfo) {
+            ppApiInfo.style.display = "block";
+        }
+    }
+
     // Request connections list from main process
     modalBridge.send(CHANNELS.populateConnections, {});
 })();
diff --git a/src/renderer/modals/selectMultiConnection/view.ts b/src/renderer/modals/selectMultiConnection/view.ts
index d28fd134..ae4b773b 100644
--- a/src/renderer/modals/selectMultiConnection/view.ts
+++ b/src/renderer/modals/selectMultiConnection/view.ts
@@ -1,5 +1,5 @@
-import { getModalStyles } from "../sharedStyles";
 import { escapeHtml } from "../../utils/toolIconResolver";
+import { getModalStyles } from "../sharedStyles";
 
 export interface ModalViewTemplate {
     styles: string;
@@ -99,9 +99,7 @@ export function getSelectMultiConnectionModalView(isDarkTheme: boolean, isSecond
     }
 </style>`;
 
-    const toolNameHtml = toolName
-        ? `<p class="modal-eyebrow">${escapeHtml(toolName)}</p>`
-        : `<p class="modal-eyebrow">Multi-Connection ${isSecondaryRequired ? "Required" : "Optional"}</p>`;
+    const toolNameHtml = toolName ? `<p class="modal-eyebrow">${escapeHtml(toolName)}</p>` : `<p class="modal-eyebrow">Multi-Connection ${isSecondaryRequired ? "Required" : "Optional"}</p>`;
 
     const body = `
 
@@ -116,8 +114,11 @@ export function getSelectMultiConnectionModalView(isDarkTheme: boolean, isSecond
     <div class="modal-body">
         <div class="info-message">
             This tool requires a primary connection${isSecondaryRequired ? " and a secondary connection" : ". A secondary connection is optional"}. Please select ${
-        isSecondaryRequired ? "both connections" : "at least a primary connection"
-    } to continue.
+                isSecondaryRequired ? "both connections" : "at least a primary connection"
+            } to continue.
+        </div>
+        <div id="power-platform-api-info-multi" class="modal-warning" style="display: none; margin-bottom: 12px;">
+            <span>This tool uses Power Platform API. Selecting a connection that is not enabled for PP API may cause issues while using this tool.</span>
         </div>
         
         <div class="modal-search-container">
diff --git a/src/renderer/modals/sharedStyles.ts b/src/renderer/modals/sharedStyles.ts
index 332b55c1..6e6957aa 100644
--- a/src/renderer/modals/sharedStyles.ts
+++ b/src/renderer/modals/sharedStyles.ts
@@ -198,13 +198,25 @@ export function getModalStyles(isDarkTheme: boolean): string {
         display: none;
         padding: 10px 12px;
         border-radius: 8px;
-        border: 1px solid rgba(255, 77, 109, 0.35);
-        background: rgba(255, 77, 109, 0.12);
-        color: #ffb3c1;
+        border: 1px solid ${isDarkTheme ? "rgba(255, 255, 255, 0.12)" : "rgba(0, 0, 0, 0.12)"};
+        background: ${isDarkTheme ? "rgba(255, 255, 255, 0.04)" : "rgba(0, 0, 0, 0.04)"};
+        color: ${isDarkTheme ? "rgba(255, 255, 255, 0.85)" : "rgba(0, 0, 0, 0.85)"};
         font-size: 13px;
         line-height: 1.4;
     }
 
+    .modal-feedback.success {
+        border-color: rgba(16, 124, 16, 0.35);
+        background: rgba(16, 124, 16, 0.12);
+        color: ${isDarkTheme ? "#9fd89f" : "#0f6c0f"};
+    }
+
+    .modal-feedback.error {
+        border-color: rgba(255, 77, 109, 0.35);
+        background: rgba(255, 77, 109, 0.12);
+        color: ${isDarkTheme ? "#ffb3c1" : "#a4262c"};
+    }
+
     .modal-warning {
         display: none;
         padding: 10px 12px;
@@ -443,6 +455,21 @@ export function getModalStyles(isDarkTheme: boolean): string {
         font-size: 11px;
     }
 
+    .power-platform-api-badge {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        padding: 2px 8px;
+        border-radius: 4px;
+        font-size: 11px;
+        font-weight: 600;
+        letter-spacing: 0.02em;
+        line-height: 1;
+        background: ${isDarkTheme ? "rgba(14, 99, 156, 0.22)" : "rgba(14, 99, 156, 0.14)"};
+        color: ${isDarkTheme ? "#89d7ff" : "#0e639c"};
+        border: 1px solid ${isDarkTheme ? "rgba(76, 194, 255, 0.35)" : "rgba(14, 99, 156, 0.35)"};
+    }
+
     .fluent-button:disabled {
         opacity: 0.5;
         cursor: not-allowed;
@@ -713,5 +740,30 @@ export function getModalStyles(isDarkTheme: boolean): string {
     .connection-group-items.collapsed {
         display: none;
     }
+
+    .checkbox-wrapper {
+        display: flex;
+        align-items: flex-start;
+        gap: 8px;
+        margin-top: 8px;
+    }
+
+    .modal-checkbox {
+        margin-top: 2px;
+        width: 16px;
+        height: 16px;
+        border-radius: 4px;
+        border: 1px solid ${isDarkTheme ? "rgba(255, 255, 255, 0.16)" : "rgba(0, 0, 0, 0.16)"};
+        background: ${isDarkTheme ? "rgba(255, 255, 255, 0.05)" : "rgba(0, 0, 0, 0.03)"};
+        cursor: pointer;
+        accent-color: #0e639c;
+    }
+
+    .checkbox-label {
+        font-size: 13px;
+        color: ${isDarkTheme ? "rgba(255, 255, 255, 0.9)" : "rgba(0, 0, 0, 0.8)"};
+        cursor: pointer;
+        user-select: none;
+    }
 </style>`;
 }
diff --git a/src/renderer/modals/toolDetail/controller.ts b/src/renderer/modals/toolDetail/controller.ts
index a5eb35a5..6b4998e6 100644
--- a/src/renderer/modals/toolDetail/controller.ts
+++ b/src/renderer/modals/toolDetail/controller.ts
@@ -164,7 +164,7 @@ export function getToolDetailModalControllerScript(config: ToolDetailModalContro
                 readmeContainer.textContent = markdown;
             }
         } catch (error) {
-            captureException("Failed to load README", error);
+            console.error("Failed to load README", error);
             readmeContainer.textContent = "Unable to load README.";
         }
     };
diff --git a/src/renderer/modules/agentInvocationLogsManagement.ts b/src/renderer/modules/agentInvocationLogsManagement.ts
new file mode 100644
index 00000000..a63491f8
--- /dev/null
+++ b/src/renderer/modules/agentInvocationLogsManagement.ts
@@ -0,0 +1,251 @@
+import { logError } from "../../common/logger";
+import { openLocalPageAsTab, registerCloseGuard } from "./toolManagement";
+
+/**
+ * Render the agent invocation logs content into a panel
+ */
+export function renderAgentInvocationLogsContent(panel: HTMLElement): void {
+    panel.className = "settings-tab-container";
+    panel.innerHTML = `
+        <div class="settings-tab-content" id="mcp-tab">
+            <div class="settings-vscode-section">
+                <h2 class="settings-vscode-section-title">
+                    MCP Server
+                    <p class="agent-log-subheader" style="margin-bottom: 16px;">
+                        Server connection details and invocation history for MCP-triggered tool launches.
+                    </p>
+                </h2>
+
+                <div class="settings-vscode-item" style="margin-bottom: 8px;">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Server Status</span>
+                    </div>
+                    <div class="settings-vscode-item-control">
+                        <span id="mcp-server-status" style="font-weight: 600;"></span>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item" style="margin-bottom: 8px;">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Server Address</span>
+                        <p class="settings-vscode-item-description">Use this HTTP endpoint when configuring your MCP client.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-server-control-row">
+                            <input type="text" id="mcp-server-address" class="fluent-input settings-vscode-input mcp-server-value-input" readonly />
+                            <button id="copy-mcp-server-address-btn" class="sidebar-icon-btn mcp-copy-icon-btn" aria-label="Copy server address" title="Copy server address">
+                                <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                                    <path d="M8.5 5.5C8.5 4.12 9.62 3 11 3H18C19.38 3 20.5 4.12 20.5 5.5V12.5C20.5 13.88 19.38 15 18 15H11C9.62 15 8.5 13.88 8.5 12.5V5.5ZM11 4.5C10.45 4.5 10 4.95 10 5.5V12.5C10 13.05 10.45 13.5 11 13.5H18C18.55 13.5 19 13.05 19 12.5V5.5C19 4.95 18.55 4.5 18 4.5H11Z" fill="currentColor"/>
+                                    <path d="M4.5 9.5C4.5 8.12 5.62 7 7 7H7.5V8.5H7C6.45 8.5 6 8.95 6 9.5V17.5C6 18.05 6.45 18.5 7 18.5H14C14.55 18.5 15 18.05 15 17.5V17H16.5V17.5C16.5 18.88 15.38 20 14 20H7C5.62 20 4.5 18.88 4.5 17.5V9.5Z" fill="currentColor"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item" style="margin-bottom: 8px;">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Auth Header Name</span>
+                        <p class="settings-vscode-item-description">Include this header in each MCP request.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-server-control-row">
+                            <input type="text" id="mcp-auth-header-name" class="fluent-input settings-vscode-input mcp-server-value-input" readonly />
+                            <button id="copy-mcp-auth-header-name-btn" class="sidebar-icon-btn mcp-copy-icon-btn" aria-label="Copy auth header name" title="Copy auth header name">
+                                <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                                    <path d="M8.5 5.5C8.5 4.12 9.62 3 11 3H18C19.38 3 20.5 4.12 20.5 5.5V12.5C20.5 13.88 19.38 15 18 15H11C9.62 15 8.5 13.88 8.5 12.5V5.5ZM11 4.5C10.45 4.5 10 4.95 10 5.5V12.5C10 13.05 10.45 13.5 11 13.5H18C18.55 13.5 19 13.05 19 12.5V5.5C19 4.95 18.55 4.5 18 4.5H11Z" fill="currentColor"/>
+                                    <path d="M4.5 9.5C4.5 8.12 5.62 7 7 7H7.5V8.5H7C6.45 8.5 6 8.95 6 9.5V17.5C6 18.05 6.45 18.5 7 18.5H14C14.55 18.5 15 18.05 15 17.5V17H16.5V17.5C16.5 18.88 15.38 20 14 20H7C5.62 20 4.5 18.88 4.5 17.5V9.5Z" fill="currentColor"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item" style="margin-bottom: 16px;">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Auth Header Value (Token)</span>
+                        <p class="settings-vscode-item-description">Secret token used by MCP clients to authenticate with the local server.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-server-control-row">
+                            <input type="text" id="mcp-auth-header-value" class="fluent-input settings-vscode-input mcp-server-value-input" readonly />
+                            <button id="copy-mcp-auth-header-value-btn" class="sidebar-icon-btn mcp-copy-icon-btn" aria-label="Copy auth token" title="Copy auth token">
+                                <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                                    <path d="M8.5 5.5C8.5 4.12 9.62 3 11 3H18C19.38 3 20.5 4.12 20.5 5.5V12.5C20.5 13.88 19.38 15 18 15H11C9.62 15 8.5 13.88 8.5 12.5V5.5ZM11 4.5C10.45 4.5 10 4.95 10 5.5V12.5C10 13.05 10.45 13.5 11 13.5H18C18.55 13.5 19 13.05 19 12.5V5.5C19 4.95 18.55 4.5 18 4.5H11Z" fill="currentColor"/>
+                                    <path d="M4.5 9.5C4.5 8.12 5.62 7 7 7H7.5V8.5H7C6.45 8.5 6 8.95 6 9.5V17.5C6 18.05 6.45 18.5 7 18.5H14C14.55 18.5 15 18.05 15 17.5V17H16.5V17.5C16.5 18.88 15.38 20 14 20H7C5.62 20 4.5 18.88 4.5 17.5V9.5Z" fill="currentColor"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div id="mcp-container" class="invocation-logs-container">
+                    <div class="empty-state" id="mcp-empty" style="display: none;">
+                        <p>No agent invocations recorded yet.</p>
+                        <p class="empty-state-hint">Invoke tools through the MCP server to see activity here.</p>
+                    </div>
+<table class="invocation-logs-table" id="invocation-logs-table" style="width: 100%; border-collapse: collapse; display: none;">
+                         <thead>
+                             <tr style="border-bottom: 1px solid var(--border-color, rgba(0,0,0,0.1));">
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Timestamp</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Tool Name</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Tool ID</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Mode</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Connection</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Prefill</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));;">Outcome</th>
+                             </tr>
+                         </thead>
+                         <tbody id="invocation-logs-tbody"></tbody>
+                     </table>
+                </div>
+            </div>
+        </div>
+    `;
+
+    // Load and render logs
+    loadAndRenderLogs();
+}
+
+/**
+ * Outcome badge styles
+ */
+function getOutcomeBadgeStyle(outcome: string): string {
+    switch (outcome) {
+        case "completed":
+            return "background: #107c10; color: white;";
+        case "no-result":
+            return "background: #8a8886; color: white;";
+        case "rejected":
+            return "background: #d13438; color: white;";
+        default:
+            return "background: #6b6b6b; color: white;";
+    }
+}
+
+/**
+ * Load and render the logs
+ */
+async function loadAndRenderLogs(): Promise<void> {
+    try {
+        const [serverDetails, logs] = await Promise.all([window.toolboxAPI.mcpServer.getDetails(), window.toolboxAPI.agentInvocation.getLogs()]);
+        const container = document.getElementById("mcp-container");
+        const emptyState = document.getElementById("mcp-empty");
+        const table = document.getElementById("invocation-logs-table");
+        const tbody = document.getElementById("invocation-logs-tbody");
+        const statusLabel = document.getElementById("mcp-server-status");
+        const addressInput = document.getElementById("mcp-server-address") as HTMLInputElement | null;
+        const headerNameInput = document.getElementById("mcp-auth-header-name") as HTMLInputElement | null;
+        const headerValueInput = document.getElementById("mcp-auth-header-value") as HTMLInputElement | null;
+
+        if (!container || !emptyState || !table || !tbody) return;
+
+        if (addressInput) {
+            addressInput.value = serverDetails.address;
+        }
+        if (headerNameInput) {
+            headerNameInput.value = serverDetails.authHeaderName;
+        }
+        if (headerValueInput) {
+            headerValueInput.value = serverDetails.authHeaderValue;
+        }
+        if (statusLabel) {
+            statusLabel.textContent = serverDetails.isRunning ? "Running" : "Stopped";
+            statusLabel.setAttribute("style", `font-weight: 600; color: ${serverDetails.isRunning ? "#107c10" : "#d13438"};`);
+        }
+
+        wireCopyButton("copy-mcp-server-address-btn", () => serverDetails.address, "MCP server address copied");
+        wireCopyButton("copy-mcp-auth-header-name-btn", () => serverDetails.authHeaderName, "MCP auth header name copied");
+        wireCopyButton("copy-mcp-auth-header-value-btn", () => serverDetails.authHeaderValue, "MCP auth token copied");
+
+        if (logs.length === 0) {
+            emptyState.style.display = "block";
+            table.style.display = "none";
+            return;
+        }
+
+        emptyState.style.display = "none";
+        table.style.display = "table";
+
+        tbody.innerHTML = logs
+            .map(
+                (log) => `
+            <tr style="border-bottom: 1px solid var(--border-color-light, rgba(0,0,0,0.05));">
+                <td style="padding: 8px; font-size: 13px; white-space: nowrap;">${formatTimestamp(log.timestamp)}</td>
+                <td style="padding: 8px; font-size: 13px;">${escapeHtml(log.toolName)}</td>
+                <td style="padding: 8px; font-size: 13px; font-family: monospace;">${escapeHtml(log.toolId)}</td>
+                <td style="padding: 8px; font-size: 13px; text-transform: uppercase;">${log.invocationMode ? escapeHtml(log.invocationMode) : '<span style="color: var(--text-muted, rgba(0,0,0,0.4));">—</span>'}</td>
+                <td style="padding: 8px; font-size: 13px;">${log.connectionId ? escapeHtml(log.connectionId) : '<span style="color: var(--text-muted, rgba(0,0,0,0.4));">—</span>'}</td>
+                <td style="padding: 8px; font-size: 13px; max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" title="${escapeHtml(log.prefillSummary)}">${escapeHtml(log.prefillSummary)}</td>
+                <td style="padding: 8px; font-size: 13px;">
+                    <span style="display: inline-block; padding: 2px 8px; border-radius: 4px; font-size: 11px; font-weight: 600; text-transform: uppercase; ${getOutcomeBadgeStyle(log.outcome)}">${escapeHtml(log.outcome)}</span>
+                    ${log.error ? `<span style="margin-left: 6px; color: var(--error-color, #d13438); cursor: pointer;" title="${escapeHtml(log.error)}">⚠</span>` : ""}
+                </td>
+            </tr>
+        `,
+            )
+            .join("");
+    } catch (error) {
+        logError("Failed to load agent invocation logs", error);
+        const container = document.getElementById("mcp-container");
+        if (container) {
+            container.innerHTML = `<div class="empty-state"><p>Error loading logs</p><p class="empty-state-hint">${escapeHtml(error instanceof Error ? error.message : String(error))}</p></div>`;
+        }
+    }
+}
+
+function wireCopyButton(buttonId: string, getValue: () => string, successMessage: string): void {
+    const button = document.getElementById(buttonId) as HTMLButtonElement | null;
+    if (!button || button.dataset.bound === "true") {
+        return;
+    }
+
+    button.dataset.bound = "true";
+    button.addEventListener("click", () => {
+        const value = getValue();
+        void window.toolboxAPI.utils.copyToClipboard(value);
+        void window.toolboxAPI.utils.showNotification({
+            title: "Copied",
+            body: successMessage,
+            type: "success",
+        });
+    });
+}
+
+/**
+ * Format timestamp for display
+ */
+function formatTimestamp(timestamp: string): string {
+    try {
+        const date = new Date(timestamp);
+        return date.toLocaleString([], {
+            year: "numeric",
+            month: "short",
+            day: "numeric",
+            hour: "2-digit",
+            minute: "2-digit",
+            second: "2-digit",
+        });
+    } catch {
+        return timestamp;
+    }
+}
+
+/**
+ * Escape HTML to prevent XSS
+ */
+function escapeHtml(text: string): string {
+    const div = document.createElement("div");
+    div.textContent = text;
+    return div.innerHTML;
+}
+
+/**
+ * Open agent invocation logs as a tab
+ */
+export async function openAgentInvocationLogsTab(): Promise<void> {
+    registerCloseGuard("mcp", async () => {
+        return true;
+    });
+    await openLocalPageAsTab("mcp", "MCP Server", renderAgentInvocationLogsContent, "");
+}
diff --git a/src/renderer/modules/connectionManagement.ts b/src/renderer/modules/connectionManagement.ts
index 1cc9f4f7..6960d34a 100644
--- a/src/renderer/modules/connectionManagement.ts
+++ b/src/renderer/modules/connectionManagement.ts
@@ -4,7 +4,7 @@
  */
 
 import { logDebug, logError, logInfo, logWarn } from "../../common/logger";
-import type { ConnectionsSortOption, DataverseConnection, ModalWindowClosedPayload, ModalWindowMessagePayload, UIConnectionData } from "../../common/types";
+import type { Connection, ConnectionsSortOption, ModalWindowClosedPayload, ModalWindowMessagePayload, UIConnectionData } from "../../common/types";
 import { parseConnectionString } from "../../common/types/connection";
 import { getAddConnectionModalControllerScript } from "../modals/addConnection/controller";
 import { getAddConnectionModalView } from "../modals/addConnection/view";
@@ -52,6 +52,7 @@ interface ConnectionFormPayload {
     category?: string;
     environmentColor?: string;
     categoryColor?: string;
+    enabledForPowerPlatformAPI?: boolean;
 }
 
 interface AuthenticateConnectionAction {
@@ -171,6 +172,9 @@ let highlightConnectionId: string | null = null;
 // Store the name of the tool requesting a connection (shown in the modal header)
 let requestingToolName: string | undefined = undefined;
 
+// Store whether the tool requires Power Platform API connections
+let requirePowerPlatformApi: boolean = false;
+
 // Store the connection ID being edited
 let editingConnectionId: string | null = null;
 
@@ -275,8 +279,9 @@ export function initializeSelectConnectionModalBridge(): void {
  * Returns a promise that resolves with the selected connectionId when a connection is selected and connected, or rejects if cancelled
  * @param toolConnectionId - Optional connection ID to highlight as active (for tool-specific selection)
  * @param toolName - Optional name of the tool requesting the connection (shown in modal header)
+ * @param enabledForPowerPlatformAPI - Whether to filter for Power Platform API enabled connections
  */
-export async function openSelectConnectionModal(toolConnectionId?: string | null, toolName?: string): Promise<string> {
+export async function openSelectConnectionModal(toolConnectionId?: string | null, toolName?: string, enabledForPowerPlatformAPI: boolean = false): Promise<string> {
     return new Promise((resolve, reject) => {
         initializeSelectConnectionModalBridge();
 
@@ -286,6 +291,9 @@ export async function openSelectConnectionModal(toolConnectionId?: string | null
         // Store the tool name to display in the modal header
         requestingToolName = toolName;
 
+        // Store whether to require Power Platform API enabled connections
+        requirePowerPlatformApi = enabledForPowerPlatformAPI;
+
         // Store resolve/reject handlers for later use
         selectConnectionModalPromiseHandlers.resolve = resolve;
         selectConnectionModalPromiseHandlers.reject = reject;
@@ -299,6 +307,7 @@ export async function openSelectConnectionModal(toolConnectionId?: string | null
                 selectConnectionModalPromiseHandlers.reject = null;
                 highlightConnectionId = null; // Clear highlight
                 requestingToolName = undefined; // Clear tool name
+                requirePowerPlatformApi = false; // Clear Power Platform API flag
                 // Remove the handler after first call
                 offBrowserWindowModalClosed(modalClosedHandler);
             }
@@ -308,7 +317,7 @@ export async function openSelectConnectionModal(toolConnectionId?: string | null
 
         showBrowserWindowModal({
             id: "select-connection-browser-modal",
-            html: buildSelectConnectionModalHtml(),
+            html: buildSelectConnectionModalHtml(requirePowerPlatformApi),
             width: SELECT_CONNECTION_MODAL_DIMENSIONS.width,
             height: SELECT_CONNECTION_MODAL_DIMENSIONS.height,
         }).catch(reject);
@@ -332,10 +341,10 @@ function handleSelectConnectionModalMessage(payload: ModalWindowMessagePayload):
     }
 }
 
-function buildSelectConnectionModalHtml(): string {
+function buildSelectConnectionModalHtml(enabledForPowerPlatformAPI: boolean = false): string {
     const isDarkTheme = document.body.classList.contains("dark-theme");
     const { styles, body } = getSelectConnectionModalView(isDarkTheme, requestingToolName);
-    const script = getSelectConnectionModalControllerScript(SELECT_CONNECTION_MODAL_CHANNELS);
+    const script = getSelectConnectionModalControllerScript(SELECT_CONNECTION_MODAL_CHANNELS, enabledForPowerPlatformAPI);
     return `${styles}\n${body}\n${script}`.trim();
 }
 
@@ -404,7 +413,7 @@ async function handlePopulateConnectionsRequest(): Promise<void> {
         const connections = await window.toolboxAPI.connections.getAll();
         const sortOption = await getConnectionsSortPreference();
         // Exclude connections with incomplete credentials from selection
-        const usableConnections = connections.filter((c: DataverseConnection) => !c.hasIncompleteCredentials);
+        const usableConnections = connections.filter((c: Connection) => !c.hasIncompleteCredentials);
         const sortedConnections = sortConnections(usableConnections, sortOption);
 
         // Send connections list to modal
@@ -414,7 +423,7 @@ async function handlePopulateConnectionsRequest(): Promise<void> {
                 sortOption,
                 // Map persisted connections to UI-level data with isActive property
                 connections: sortedConnections.map(
-                    (conn: DataverseConnection): UIConnectionData => ({
+                    (conn: Connection): UIConnectionData => ({
                         id: conn.id,
                         name: conn.name,
                         url: conn.url,
@@ -431,6 +440,7 @@ async function handlePopulateConnectionsRequest(): Promise<void> {
                         category: conn.category,
                         environmentColor: conn.environmentColor,
                         categoryColor: conn.categoryColor,
+                        enabledForPowerPlatformAPI: conn.enabledForPowerPlatformAPI,
                     }),
                 ),
             },
@@ -462,14 +472,22 @@ export function initializeSelectMultiConnectionModalBridge(): void {
  * Returns a promise that resolves with both connection IDs, or rejects if cancelled
  * @param isSecondaryRequired - Whether the secondary connection is required (true) or optional (false)
  * @param toolName - Optional name of the tool requesting the connections (shown in modal header)
+ * @param enabledForPowerPlatformAPI - Whether to filter for Power Platform API enabled connections
  */
-export async function openSelectMultiConnectionModal(isSecondaryRequired: boolean = true, toolName?: string): Promise<{ primaryConnectionId: string; secondaryConnectionId: string | null }> {
+export async function openSelectMultiConnectionModal(
+    isSecondaryRequired: boolean = true,
+    toolName?: string,
+    enabledForPowerPlatformAPI: boolean = false,
+): Promise<{ primaryConnectionId: string; secondaryConnectionId: string | null }> {
     return new Promise((resolve, reject) => {
         initializeSelectMultiConnectionModalBridge();
 
         // Store the tool name to display in the modal header
         requestingToolName = toolName;
 
+        // Store whether to require Power Platform API enabled connections
+        requirePowerPlatformApi = enabledForPowerPlatformAPI;
+
         // Store resolve/reject handlers for later use
         selectMultiConnectionModalPromiseHandlers.resolve = resolve;
         selectMultiConnectionModalPromiseHandlers.reject = reject;
@@ -482,6 +500,7 @@ export async function openSelectMultiConnectionModal(isSecondaryRequired: boolea
                 selectMultiConnectionModalPromiseHandlers.resolve = null;
                 selectMultiConnectionModalPromiseHandlers.reject = null;
                 requestingToolName = undefined; // Clear tool name
+                requirePowerPlatformApi = false; // Clear Power Platform API flag
                 // Remove the handler after first call
                 offBrowserWindowModalClosed(modalClosedHandler);
             }
@@ -491,7 +510,7 @@ export async function openSelectMultiConnectionModal(isSecondaryRequired: boolea
 
         showBrowserWindowModal({
             id: "select-multi-connection-browser-modal",
-            html: buildSelectMultiConnectionModalHtml(isSecondaryRequired),
+            html: buildSelectMultiConnectionModalHtml(isSecondaryRequired, enabledForPowerPlatformAPI),
             width: SELECT_MULTI_CONNECTION_MODAL_DIMENSIONS.width,
             height: SELECT_MULTI_CONNECTION_MODAL_DIMENSIONS.height,
         }).catch(reject);
@@ -515,10 +534,10 @@ function handleSelectMultiConnectionModalMessage(payload: ModalWindowMessagePayl
     }
 }
 
-function buildSelectMultiConnectionModalHtml(isSecondaryRequired: boolean = true): string {
+function buildSelectMultiConnectionModalHtml(isSecondaryRequired: boolean = true, enabledForPowerPlatformAPI: boolean = false): string {
     const isDarkTheme = document.body.classList.contains("dark-theme");
     const { styles, body } = getSelectMultiConnectionModalView(isDarkTheme, isSecondaryRequired, requestingToolName);
-    const script = getSelectMultiConnectionModalControllerScript(SELECT_MULTI_CONNECTION_MODAL_CHANNELS, isSecondaryRequired);
+    const script = getSelectMultiConnectionModalControllerScript(SELECT_MULTI_CONNECTION_MODAL_CHANNELS, isSecondaryRequired, enabledForPowerPlatformAPI);
     return `${styles}\n${body}\n${script}`.trim();
 }
 
@@ -609,7 +628,7 @@ async function handlePopulateMultiConnectionsRequest(): Promise<void> {
         const connections = await window.toolboxAPI.connections.getAll();
         const sortOption = await getConnectionsSortPreference();
         // Exclude connections with incomplete credentials from selection
-        const usableConnections = connections.filter((c: DataverseConnection) => !c.hasIncompleteCredentials);
+        const usableConnections = connections.filter((c: Connection) => !c.hasIncompleteCredentials);
         const sortedConnections = sortConnections(usableConnections, sortOption);
 
         // Send connections list to modal
@@ -617,7 +636,7 @@ async function handlePopulateMultiConnectionsRequest(): Promise<void> {
             channel: SELECT_MULTI_CONNECTION_MODAL_CHANNELS.populateConnections,
             data: {
                 sortOption,
-                connections: sortedConnections.map((conn: DataverseConnection) => ({
+                connections: sortedConnections.map((conn: Connection) => ({
                     id: conn.id,
                     name: conn.name,
                     url: conn.url,
@@ -632,6 +651,7 @@ async function handlePopulateMultiConnectionsRequest(): Promise<void> {
                     category: conn.category,
                     environmentColor: conn.environmentColor,
                     categoryColor: conn.categoryColor,
+                    enabledForPowerPlatformAPI: conn.enabledForPowerPlatformAPI,
                 })),
             },
         });
@@ -752,7 +772,7 @@ export async function loadConnections(): Promise<void> {
                 <div class="connection-header">
                     <div>
                         <div class="connection-name">${conn.name}</div>
-                        ${getEnvBadgeMarkup(conn as DataverseConnection)}
+                        ${getEnvBadgeMarkup(conn as Connection)}
                     </div>
                     <div class="connection-actions">
                         ${
@@ -844,7 +864,7 @@ export async function connectToConnection(id: string): Promise<string> {
     try {
         // Verify the connection exists by getting all connections and finding it
         const connections = await window.toolboxAPI.connections.getAll();
-        const connection = connections.find((c: DataverseConnection) => c.id === id);
+        const connection = connections.find((c: Connection) => c.id === id);
         if (!connection) {
             throw new Error("Connection not found");
         }
@@ -923,13 +943,11 @@ export async function handleReauthentication(connectionId: string): Promise<void
 }
 
 async function handleAddConnectionSubmit(formPayload?: ConnectionFormPayload): Promise<void> {
+    await setAddConnectionTestFeedback("");
+
     const validationMessage = validateConnectionPayload(formPayload, "add");
     if (validationMessage) {
-        await window.toolboxAPI.utils.showNotification({
-            title: "Invalid Input",
-            body: validationMessage,
-            type: "error",
-        });
+        await setAddConnectionTestFeedback(validationMessage);
         await signalAddConnectionSubmitReady();
         return;
     }
@@ -947,11 +965,7 @@ async function handleAddConnectionSubmit(formPayload?: ConnectionFormPayload): P
         await loadConnections();
     } catch (error) {
         logError("Error adding connection", error);
-        await window.toolboxAPI.utils.showNotification({
-            title: "Failed to Add Connection",
-            body: (error as Error).message,
-            type: "error",
-        });
+        await setAddConnectionTestFeedback((error as Error).message);
         await signalAddConnectionSubmitReady();
     }
 }
@@ -965,11 +979,6 @@ async function handleTestConnectionRequest(formPayload?: ConnectionFormPayload):
 
     const validationMessage = validateConnectionPayload(formPayload, "test");
     if (validationMessage) {
-        await window.toolboxAPI.utils.showNotification({
-            title: "Invalid Input",
-            body: validationMessage,
-            type: "error",
-        });
         if (editingConnectionId !== null) {
             await setEditConnectionTestFeedback(validationMessage);
             await signalEditConnectionTestReady();
@@ -985,22 +994,12 @@ async function handleTestConnectionRequest(formPayload?: ConnectionFormPayload):
     try {
         const result = await window.toolboxAPI.connections.test(testConn);
         if (result.success) {
-            await window.toolboxAPI.utils.showNotification({
-                title: "Connection Successful",
-                body: "Successfully connected to the environment!",
-                type: "success",
-            });
             if (editingConnectionId !== null) {
-                await setEditConnectionTestFeedback("");
+                await setEditConnectionTestFeedback("Connection test succeeded.", "success");
             } else {
-                await setAddConnectionTestFeedback("");
+                await setAddConnectionTestFeedback("Connection test succeeded.", "success");
             }
         } else {
-            await window.toolboxAPI.utils.showNotification({
-                title: "Connection Failed",
-                body: result.error || "Failed to connect to the environment.",
-                type: "error",
-            });
             if (editingConnectionId !== null) {
                 await setEditConnectionTestFeedback(result.error || "Failed to connect to the environment.");
             } else {
@@ -1008,11 +1007,6 @@ async function handleTestConnectionRequest(formPayload?: ConnectionFormPayload):
             }
         }
     } catch (error) {
-        await window.toolboxAPI.utils.showNotification({
-            title: "Connection Test Failed",
-            body: (error as Error).message,
-            type: "error",
-        });
         if (editingConnectionId !== null) {
             await setEditConnectionTestFeedback((error as Error).message);
         } else {
@@ -1112,23 +1106,17 @@ async function handlePopulateEditConnectionRequest(): Promise<void> {
 }
 
 async function handleEditConnectionSubmit(formPayload?: ConnectionFormPayload): Promise<void> {
+    await setEditConnectionTestFeedback("");
+
     const validationMessage = validateConnectionPayload(formPayload, "edit");
     if (validationMessage) {
-        await window.toolboxAPI.utils.showNotification({
-            title: "Invalid Input",
-            body: validationMessage,
-            type: "error",
-        });
+        await setEditConnectionTestFeedback(validationMessage);
         await signalEditConnectionSubmitReady();
         return;
     }
 
     if (!editingConnectionId) {
-        await window.toolboxAPI.utils.showNotification({
-            title: "Error",
-            body: "No connection ID found for editing.",
-            type: "error",
-        });
+        await setEditConnectionTestFeedback("No connection ID found for editing.");
         await signalEditConnectionSubmitReady();
         return;
     }
@@ -1148,11 +1136,7 @@ async function handleEditConnectionSubmit(formPayload?: ConnectionFormPayload):
         await loadSidebarConnections();
     } catch (error) {
         logError("Error updating connection", error);
-        await window.toolboxAPI.utils.showNotification({
-            title: "Failed to Update Connection",
-            body: (error as Error).message,
-            type: "error",
-        });
+        await setEditConnectionTestFeedback((error as Error).message);
         await signalEditConnectionSubmitReady();
     }
 }
@@ -1165,8 +1149,11 @@ async function signalEditConnectionTestReady(): Promise<void> {
     await sendBrowserWindowModalMessage({ channel: EDIT_CONNECTION_MODAL_CHANNELS.testReady });
 }
 
-async function setEditConnectionTestFeedback(message?: string): Promise<void> {
-    await sendBrowserWindowModalMessage({ channel: EDIT_CONNECTION_MODAL_CHANNELS.testFeedback, data: message ?? "" });
+async function setEditConnectionTestFeedback(message?: string, type: "success" | "error" = "error"): Promise<void> {
+    await sendBrowserWindowModalMessage({
+        channel: EDIT_CONNECTION_MODAL_CHANNELS.testFeedback,
+        data: message ? { message, type } : "",
+    });
 }
 
 /**
@@ -1244,7 +1231,7 @@ export async function exportConnections(ids?: string[]): Promise<void> {
  * @param xmlContent Raw XML string from the XrmToolBox ConnectionsList file.
  * @returns A PPTB-compatible import payload ready to pass to `importConnections`.
  */
-function parseXtbXmlToImportPayload(xmlContent: string): { version: 1; exportedAt: string; connections: Partial<DataverseConnection>[] } {
+function parseXtbXmlToImportPayload(xmlContent: string): { version: 1; exportedAt: string; connections: Partial<Connection>[] } {
     const parser = new DOMParser();
     const xmlDoc = parser.parseFromString(xmlContent, "text/xml");
 
@@ -1266,7 +1253,7 @@ function parseXtbXmlToImportPayload(xmlContent: string): { version: 1; exportedA
     }
 
     const now = new Date().toISOString();
-    const connections: Partial<DataverseConnection>[] = [];
+    const connections: Partial<Connection>[] = [];
 
     for (const node of connectionNodes) {
         const getText = (tagName: string, parent: Element = node): string => parent.querySelector(tagName)?.textContent?.trim() ?? "";
@@ -1314,7 +1301,7 @@ function parseXtbXmlToImportPayload(xmlContent: string): { version: 1; exportedA
             environment = "Test";
         }
 
-        const conn: Partial<DataverseConnection> = {
+        const conn: Partial<Connection> = {
             name: getText("ConnectionName"),
             url,
             environment,
@@ -1468,16 +1455,20 @@ export async function importConnections(): Promise<void> {
 
 /**
  * Hostname pattern for valid Dataverse environments.
- * Matches: *.crm*.dynamics.com (commercial/GCC), *.crm.microsoftdynamics.us (GCC High), *.crm.appsplatform.us (DoD).
+ * Matches: *.crm*.dynamics.com / *.crm*.dynamics.cn / *.api.crm*.dynamics.com (commercial/GCC),
+ * *.crm.microsoftdynamics.us / *.api.crm.microsoftdynamics.us (GCC High),
+ * *.crm.appsplatform.us / *.api.crm.appsplatform.us (DoD).
  * The org-name segment follows RFC 1123 (starts and ends with alphanumeric, hyphens allowed in the middle).
  * \d* is intentionally lenient to accommodate current and future Microsoft region codes (crm, crm4, crm9, crm11, etc.).
  * End-anchored and case-insensitive; applied against the parsed hostname only.
  */
-const DATAVERSE_HOST_PATTERN = /^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?\.crm\d*\.(dynamics\.com|microsoftdynamics\.us|appsplatform\.us)(\.mcas\.ms)?$/i;
+const DATAVERSE_HOST_PATTERN = /^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?\.(api\.)?crm\d*\.(dynamics\.com|dynamics\.cn|microsoftdynamics\.us|appsplatform\.us)(\.mcas\.ms)?$/i;
 
 /**
  * Validates that a URL string points to a Dataverse environment hostname.
- * Accepted domains: *.crm*.dynamics.com (commercial/GCC), *.crm.microsoftdynamics.us (GCC High), *.crm.appsplatform.us (DoD).
+ * Accepted domains: *.crm*.dynamics.com / *.crm*.dynamics.cn / *.api.crm*.dynamics.com (commercial/GCC),
+ * *.crm.microsoftdynamics.us / *.api.crm.microsoftdynamics.us (GCC High),
+ * *.crm.appsplatform.us / *.api.crm.appsplatform.us (DoD).
  * Validation is performed against the parsed hostname only (not the path/query) and is case-insensitive.
  */
 function isValidDataverseUrl(rawUrl: string): boolean {
@@ -1495,6 +1486,7 @@ function validateConnectionPayload(formPayload: ConnectionFormPayload | undefine
     }
 
     const authType = normalizeAuthenticationType(formPayload.authenticationType);
+    const requiresPowerPlatformClientId = formPayload.enabledForPowerPlatformAPI === true;
 
     // Special validation for connection string
     if (authType === "connectionString") {
@@ -1509,6 +1501,10 @@ function validateConnectionPayload(formPayload: ConnectionFormPayload | undefine
             return "Invalid connection string format. Please ensure it includes at least a URL parameter.";
         }
 
+        if (requiresPowerPlatformClientId && !sanitizeInput(parsed.clientId)) {
+            return "Client ID is required when Power Platform API is enabled.";
+        }
+
         // Validate URL format (commercial, GCC High, and DoD environments)
         if (!isValidDataverseUrl(parsed.url)) {
             return "Connection string URL must contain a valid Dataverse domain (e.g., https://orgname.crm.dynamics.com or https://orgname.crm.microsoftdynamics.us).";
@@ -1545,12 +1541,20 @@ function validateConnectionPayload(formPayload: ConnectionFormPayload | undefine
         if (!sanitizeInput(formPayload.username) || !sanitizeInput(formPayload.password)) {
             return "Username and Password are required for Username/Password authentication.";
         }
+
+        if (requiresPowerPlatformClientId && !sanitizeInput(formPayload.usernamePasswordClientId)) {
+            return "Client ID is required for Username/Password authentication when Power Platform API is enabled.";
+        }
+    } else if (authType === "interactive") {
+        if (requiresPowerPlatformClientId && !sanitizeInput(formPayload.optionalClientId)) {
+            return "Client ID is required for Microsoft Login (OAuth) when Power Platform API is enabled.";
+        }
     }
 
     return null;
 }
 
-function buildConnectionFromPayload(formPayload: ConnectionFormPayload, mode: "add" | "edit" | "test"): DataverseConnection {
+function buildConnectionFromPayload(formPayload: ConnectionFormPayload, mode: "add" | "edit" | "test"): Connection {
     const authenticationType = normalizeAuthenticationType(formPayload.authenticationType);
 
     // Handle connection string specially
@@ -1563,8 +1567,8 @@ function buildConnectionFromPayload(formPayload: ConnectionFormPayload, mode: "a
         }
 
         // Build connection from parsed data
-        const connection: DataverseConnection = {
-            id: mode === "add" ? Date.now().toString() : mode === "edit" ? (formPayload.id ?? "") : "test",
+        const connection: Connection = {
+            id: mode === "add" ? Date.now().toString() : mode === "edit" ? formPayload.id ?? "" : "test",
             name: mode === "add" || mode === "edit" ? sanitizeInput(formPayload.name) : "Test Connection",
             url: parsed.url,
             environment: mode === "add" || mode === "edit" ? normalizeEnvironment(formPayload.environment) : "Test",
@@ -1583,7 +1587,7 @@ function buildConnectionFromPayload(formPayload: ConnectionFormPayload, mode: "a
         const browserType = sanitizeInput(formPayload.browserType);
         const browserProfile = sanitizeInput(formPayload.browserProfile);
         const browserProfileName = sanitizeInput(formPayload.browserProfileName);
-        connection.browserType = (browserType || "default") as DataverseConnection["browserType"];
+        connection.browserType = (browserType || "default") as Connection["browserType"];
         connection.browserProfile = browserProfile || undefined;
         connection.browserProfileName = browserProfileName || undefined;
 
@@ -1601,21 +1605,22 @@ function buildConnectionFromPayload(formPayload: ConnectionFormPayload, mode: "a
     }
 
     // Standard connection building for non-connection-string types
-    const connection: DataverseConnection = {
-        id: mode === "add" ? Date.now().toString() : mode === "edit" ? (formPayload.id ?? "") : "test",
+    const connection: Connection = {
+        id: mode === "add" ? Date.now().toString() : mode === "edit" ? formPayload.id ?? "" : "test",
         name: mode === "add" || mode === "edit" ? sanitizeInput(formPayload.name) : "Test Connection",
         url: sanitizeInput(formPayload.url),
         environment: mode === "add" || mode === "edit" ? normalizeEnvironment(formPayload.environment) : "Test",
         authenticationType,
         createdAt: new Date().toISOString(),
         // Note: isActive is NOT part of DataverseConnection - it's a UI-level property
+        enabledForPowerPlatformAPI: formPayload.enabledForPowerPlatformAPI === true,
     };
 
     // Browser settings apply to all auth types (used for opening URLs with authentication)
     const browserType = sanitizeInput(formPayload.browserType);
     const browserProfile = sanitizeInput(formPayload.browserProfile);
     const browserProfileName = sanitizeInput(formPayload.browserProfileName);
-    connection.browserType = (browserType || "default") as DataverseConnection["browserType"];
+    connection.browserType = (browserType || "default") as Connection["browserType"];
     connection.browserProfile = browserProfile || undefined;
     connection.browserProfileName = browserProfileName || undefined;
 
@@ -1685,7 +1690,7 @@ function formatAuthType(authType: "interactive" | "clientSecret" | "usernamePass
     return labels[authType] || authType;
 }
 
-function getBrowserBadgeMarkup(conn: DataverseConnection): string {
+function getBrowserBadgeMarkup(conn: Connection): string {
     const browserType = conn.browserType;
     if (!browserType || browserType === "default") {
         return "";
@@ -1712,7 +1717,7 @@ function getBrowserBadgeMarkup(conn: DataverseConnection): string {
     `;
 }
 
-function getEnvBadgeMarkup(conn: DataverseConnection): string {
+function getEnvBadgeMarkup(conn: Connection): string {
     const env = conn.environment || "Dev";
     const safeEnv = escapeHtml(env);
     if (conn.environmentColor && /^#[0-9A-Fa-f]{6}$/.test(conn.environmentColor)) {
@@ -1722,7 +1727,7 @@ function getEnvBadgeMarkup(conn: DataverseConnection): string {
     return `<span class="connection-env-badge env-${escapeHtml(env.toLowerCase())}">${safeEnv}</span>`;
 }
 
-function formatBrowserType(browserType: DataverseConnection["browserType"]): string {
+function formatBrowserType(browserType: Connection["browserType"]): string {
     const labels: Record<string, string> = {
         default: "Browser",
         chrome: "Chrome",
@@ -1731,7 +1736,7 @@ function formatBrowserType(browserType: DataverseConnection["browserType"]): str
     return labels[browserType || "default"] || "Browser";
 }
 
-function getBrowserIconPath(browserType: DataverseConnection["browserType"]): string | null {
+function getBrowserIconPath(browserType: Connection["browserType"]): string | null {
     switch (browserType) {
         case "chrome":
             return "icons/logos/chrome.png";
@@ -1761,8 +1766,11 @@ async function signalAddConnectionTestReady(): Promise<void> {
     await sendBrowserWindowModalMessage({ channel: ADD_CONNECTION_MODAL_CHANNELS.testReady });
 }
 
-async function setAddConnectionTestFeedback(message?: string): Promise<void> {
-    await sendBrowserWindowModalMessage({ channel: ADD_CONNECTION_MODAL_CHANNELS.testFeedback, data: message ?? "" });
+async function setAddConnectionTestFeedback(message?: string, type: "success" | "error" = "error"): Promise<void> {
+    await sendBrowserWindowModalMessage({
+        channel: ADD_CONNECTION_MODAL_CHANNELS.testFeedback,
+        data: message ? { message, type } : "",
+    });
 }
 
 let activeConnectionContextMenu: { menu: HTMLElement; anchor: HTMLElement; cleanup: () => void } | null = null;
@@ -1779,7 +1787,7 @@ function closeActiveConnectionContextMenu(): void {
 /**
  * Show context menu for connection
  */
-function showConnectionContextMenu(conn: DataverseConnection, anchor: HTMLElement): void {
+function showConnectionContextMenu(conn: Connection, anchor: HTMLElement): void {
     // Toggle: if clicking the same anchor, close existing menu
     if (activeConnectionContextMenu && activeConnectionContextMenu.anchor === anchor) {
         closeActiveConnectionContextMenu();
@@ -1925,12 +1933,12 @@ export async function loadSidebarConnections(): Promise<void> {
         const categoryFilter = document.getElementById("connections-category-filter") as HTMLSelectElement | null;
         if (categoryFilter) {
             const allCategories = new Set<string>();
-            connections.forEach((conn: DataverseConnection) => {
+            connections.forEach((conn: Connection) => {
                 if (conn.category) allCategories.add(conn.category);
             });
             const currentCategoryValue = categoryFilter.value;
             // Rebuild options (keep "All Categories" + "__default__" if there are any uncategorized)
-            const hasDefault = connections.some((conn: DataverseConnection) => !conn.category);
+            const hasDefault = connections.some((conn: Connection) => !conn.category);
             let optionsHtml = '<option value="">All Categories</option>';
             if (hasDefault) {
                 optionsHtml += '<option value="__default__">Default (No Category)</option>';
@@ -1960,7 +1968,7 @@ export async function loadSidebarConnections(): Promise<void> {
         }
 
         // Apply filters
-        const filteredConnections = connections.filter((conn: DataverseConnection) => {
+        const filteredConnections = connections.filter((conn: Connection) => {
             // Search filter (name or URL)
             if (searchTerm) {
                 const haystacks: string[] = [conn.name || "", conn.url || ""];
@@ -2013,8 +2021,8 @@ export async function loadSidebarConnections(): Promise<void> {
         }
 
         // Group connections by category (empty string = uncategorized / "Default")
-        const groupMap = new Map<string, DataverseConnection[]>();
-        sortedConnections.forEach((conn: DataverseConnection) => {
+        const groupMap = new Map<string, Connection[]>();
+        sortedConnections.forEach((conn: Connection) => {
             const key = conn.category || "";
             if (!groupMap.has(key)) groupMap.set(key, []);
             groupMap.get(key)!.push(conn);
@@ -2027,7 +2035,7 @@ export async function loadSidebarConnections(): Promise<void> {
             return a.localeCompare(b);
         });
 
-        const renderConnectionItem = (conn: DataverseConnection): string => {
+        const renderConnectionItem = (conn: Connection): string => {
             const isDarkTheme = document.body.classList.contains("dark-theme");
             const moreIconPath = isDarkTheme ? "icons/dark/more-icon.svg" : "icons/light/more-icon.svg";
             const browserBadgeMarkup = getBrowserBadgeMarkup(conn);
@@ -2076,11 +2084,13 @@ export async function loadSidebarConnections(): Promise<void> {
                     const groupConns = groupMap.get(groupKey)!;
                     const displayKey = groupKey === "" ? "Default" : groupKey;
                     const escapedKey = escapeHtml(displayKey);
-                    const catColor = groupKey !== "" ? groupConns.find((c: DataverseConnection) => c.categoryColor)?.categoryColor || "" : "";
+                    const catColor = groupKey !== "" ? groupConns.find((c: Connection) => c.categoryColor)?.categoryColor || "" : "";
                     const safeCatColor = catColor && /^#[0-9A-Fa-f]{6}$/.test(catColor) ? escapeHtml(catColor) : "";
                     const colorSwatchHtml =
                         groupKey !== ""
-                            ? `<input type="color" class="connection-group-color-picker" value="${safeCatColor || "#888888"}" data-category-key="${escapeHtml(groupKey)}" title="Change category color" />`
+                            ? `<input type="color" class="connection-group-color-picker" value="${safeCatColor || "#888888"}" data-category-key="${escapeHtml(
+                                  groupKey,
+                              )}" title="Change category color" />`
                             : "";
                     const items = groupConns.map(renderConnectionItem).join("");
                     return `
@@ -2090,7 +2100,9 @@ export async function loadSidebarConnections(): Promise<void> {
                             ${colorSwatchHtml}
                             <span class="connection-group-count">${groupConns.length}</span>
                             <span class="connection-group-toggle">▼</span>
-                            <button class="connection-group-export-btn" data-category-key="${escapeHtml(groupKey)}" title="Export ${escapedKey} connections" aria-label="Export ${escapedKey} connections">
+                            <button class="connection-group-export-btn" data-category-key="${escapeHtml(
+                                groupKey,
+                            )}" title="Export ${escapedKey} connections" aria-label="Export ${escapedKey} connections">
                                 <img src="${exportIconPath}" width="12" height="12" alt="Export ${escapedKey} connections" class="connection-group-export-icon" />
                             </button>
                         </div>
@@ -2112,7 +2124,7 @@ export async function loadSidebarConnections(): Promise<void> {
                 const connectionId = target.getAttribute("data-connection-id");
                 if (!connectionId) return;
 
-                const conn = sortedConnections.find((c: DataverseConnection) => c.id === connectionId);
+                const conn = sortedConnections.find((c: Connection) => c.id === connectionId);
                 if (!conn) return;
 
                 showConnectionContextMenu(conn, target);
@@ -2128,7 +2140,7 @@ export async function loadSidebarConnections(): Promise<void> {
                 // categoryKey is the raw key (empty string for Default)
                 const categoryConns = groupMap.get(categoryKey ?? "");
                 if (!categoryConns || categoryConns.length === 0) return;
-                const ids = categoryConns.map((c: DataverseConnection) => c.id);
+                const ids = categoryConns.map((c: Connection) => c.id);
                 await exportConnections(ids);
             });
         });
@@ -2148,9 +2160,7 @@ export async function loadSidebarConnections(): Promise<void> {
                 try {
                     const allConns = await window.toolboxAPI.connections.getAll();
                     await Promise.all(
-                        allConns
-                            .filter((c: DataverseConnection) => (c.category || "") === categoryKey)
-                            .map((c: DataverseConnection) => window.toolboxAPI.connections.update(c.id, { categoryColor: newColor })),
+                        allConns.filter((c: Connection) => (c.category || "") === categoryKey).map((c: Connection) => window.toolboxAPI.connections.update(c.id, { categoryColor: newColor })),
                     );
                     await loadConnections();
                 } catch (err) {
diff --git a/src/renderer/modules/globalSearchManagement.ts b/src/renderer/modules/globalSearchManagement.ts
index 4f8c7884..372657ec 100644
--- a/src/renderer/modules/globalSearchManagement.ts
+++ b/src/renderer/modules/globalSearchManagement.ts
@@ -4,14 +4,14 @@
  * marketplace tools, connections, and settings.
  */
 
-import type { DataverseConnection } from "../../common/types/connection";
+import { logError, logInfo } from "../../common/logger";
+import type { Connection } from "../../common/types/connection";
 import type { Tool } from "../../common/types/tool";
 import type { ToolDetail } from "../types/index";
 import { escapeHtml } from "../utils/toolIconResolver";
 import { getToolLibrary, openToolDetail } from "./marketplaceManagement";
-import { logInfo, logError } from "../../common/logger";
-import { switchSidebar } from "./sidebarManagement";
 import { openSettingsTab } from "./settingsManagement";
+import { switchSidebar } from "./sidebarManagement";
 
 // ── Types ─────────────────────────────────────────────────────────────────────
 
@@ -243,7 +243,7 @@ async function runSearch(query: string): Promise<void> {
 
         // 3. Connections
         const connectionsRaw = await window.toolboxAPI.connections.getAll();
-        const connections = connectionsRaw as DataverseConnection[];
+        const connections = connectionsRaw as Connection[];
         for (const conn of connections) {
             if (matches(q, conn.name, conn.url, conn.environment)) {
                 results.push({
@@ -537,4 +537,3 @@ export function initializeGlobalSearch(): void {
 
     logInfo("Global search initialized", {});
 }
-
diff --git a/src/renderer/modules/homepageManagement.ts b/src/renderer/modules/homepageManagement.ts
index c91f1960..a1552f3c 100644
--- a/src/renderer/modules/homepageManagement.ts
+++ b/src/renderer/modules/homepageManagement.ts
@@ -3,12 +3,13 @@
  * Handles homepage display, data loading, and user interactions
  */
 
+import { logError } from "../../common/logger";
 import type { LastUsedToolEntry } from "../../common/types";
 import { applyToolIconMasks, generateToolIconHtml } from "../utils/toolIconResolver";
 import { filterMarketplaceByNew } from "./marketplaceManagement";
+import { isMcpPreviewUiEnabled } from "./previewFeatureManagement";
 import { switchSidebar } from "./sidebarManagement";
 import { launchTool, LaunchToolOptions } from "./toolManagement";
-import { logError } from "../../common/logger";
 
 function normalizeHomepageError(error: unknown, fallbackMessage: string): Error {
     if (error instanceof Error) {
@@ -365,6 +366,9 @@ async function loadRecentlyUsedTools(allTools: any[], recentEntries: LastUsedToo
 function renderToolsList(container: HTMLElement, tools: any[]): void {
     // Clear existing content
     container.innerHTML = "";
+    const isDarkTheme = document.body.classList.contains("dark-theme");
+    const mcpIconPath = isDarkTheme ? "icons/dark/mcp.svg" : "icons/light/mcp.svg";
+    const mcpPreviewUiEnabled = isMcpPreviewUiEnabled();
 
     tools.forEach((tool) => {
         // Create tool item
@@ -391,15 +395,28 @@ function renderToolsList(container: HTMLElement, tools: any[]): void {
         const infoContainer = document.createElement("div");
         infoContainer.className = "quick-tool-info";
 
+        const nameRow = document.createElement("div");
+        nameRow.className = "quick-tool-name-row";
+
         const nameDiv = document.createElement("div");
         nameDiv.className = "quick-tool-name";
         nameDiv.textContent = tool.name;
 
+        nameRow.appendChild(nameDiv);
+        if (mcpPreviewUiEnabled && tool.mcpHeadlessEnabled === true) {
+            const mcpBadge = document.createElement("span");
+            mcpBadge.className = "quick-tool-mcp-badge";
+            mcpBadge.setAttribute("title", "MCP headless enabled");
+            mcpBadge.setAttribute("aria-label", "MCP headless enabled");
+            mcpBadge.innerHTML = `<img src="${mcpIconPath}" alt="" aria-hidden="true" />`;
+            nameRow.appendChild(mcpBadge);
+        }
+
         const versionDiv = document.createElement("div");
         versionDiv.className = "quick-tool-version";
         versionDiv.textContent = `v${tool.version}`;
 
-        infoContainer.appendChild(nameDiv);
+        infoContainer.appendChild(nameRow);
         infoContainer.appendChild(versionDiv);
 
         // Assemble the tool item
@@ -420,6 +437,9 @@ function renderToolsList(container: HTMLElement, tools: any[]): void {
 
 function renderRecentToolsList(container: HTMLElement, items: { tool: any; entry: LastUsedToolEntry }[]): void {
     container.innerHTML = "";
+    const isDarkTheme = document.body.classList.contains("dark-theme");
+    const mcpIconPath = isDarkTheme ? "icons/dark/mcp.svg" : "icons/light/mcp.svg";
+    const mcpPreviewUiEnabled = isMcpPreviewUiEnabled();
 
     items.forEach(({ tool, entry }) => {
         const toolItem = document.createElement("div");
@@ -443,15 +463,28 @@ function renderRecentToolsList(container: HTMLElement, items: { tool: any; entry
         const infoContainer = document.createElement("div");
         infoContainer.className = "quick-tool-info";
 
+        const nameRow = document.createElement("div");
+        nameRow.className = "quick-tool-name-row";
+
         const nameDiv = document.createElement("div");
         nameDiv.className = "quick-tool-name";
         nameDiv.textContent = tool.name;
 
+        nameRow.appendChild(nameDiv);
+        if (mcpPreviewUiEnabled && tool.mcpHeadlessEnabled === true) {
+            const mcpBadge = document.createElement("span");
+            mcpBadge.className = "quick-tool-mcp-badge";
+            mcpBadge.setAttribute("title", "MCP headless enabled");
+            mcpBadge.setAttribute("aria-label", "MCP headless enabled");
+            mcpBadge.innerHTML = `<img src="${mcpIconPath}" alt="" aria-hidden="true" />`;
+            nameRow.appendChild(mcpBadge);
+        }
+
         const versionDiv = document.createElement("div");
         versionDiv.className = "quick-tool-version";
         versionDiv.textContent = `v${tool.version}`;
 
-        infoContainer.appendChild(nameDiv);
+        infoContainer.appendChild(nameRow);
         infoContainer.appendChild(versionDiv);
 
         const connectionLabel = entry.primaryConnection?.name || entry.primaryConnection?.url || entry.primaryConnection?.id || null;
diff --git a/src/renderer/modules/initialization.ts b/src/renderer/modules/initialization.ts
index e24245ad..9394866e 100644
--- a/src/renderer/modules/initialization.ts
+++ b/src/renderer/modules/initialization.ts
@@ -28,13 +28,27 @@ import {
 import { initializeGlobalSearch } from "./globalSearchManagement";
 import { loadHomepageData, setupHomepageActions } from "./homepageManagement";
 import { clearMarketplaceDropdownFilters, handleProtocolInstallToolRequest, loadMarketplace, loadToolsLibrary } from "./marketplaceManagement";
+import { openAgentInvocationLogsTab } from "./mcpManagement";
 import { closeModal, openModal } from "./modalManagement";
-import { setDefaultNotificationDuration, showPPTBNotification } from "./notifications";
+import { initNotificationHistoryPanel, setDefaultNotificationDuration, showPPTBNotification } from "./notifications";
+import { applyPreviewFeaturesVisibility, normalizePreviewFeatureFlags } from "./previewFeatureManagement";
 import { openSettingsTab } from "./settingsManagement";
 import { switchSidebar } from "./sidebarManagement";
 import { handleTerminalClosed, handleTerminalCommandCompleted, handleTerminalCreated, handleTerminalError, handleTerminalOutput, setupTerminalPanel } from "./terminalManagement";
 import { applyDebugMenuVisibility, applyTerminalFont, applyTheme } from "./themeManagement";
-import { applyAppearanceSettings, closeAllTools, initializeCalleeToolListeners, initializeInvocationBanner, initializeInvocationConnectionsPrompt, initializeTabScrollButtons, launchTool, restoreSession, setupKeyboardShortcuts, showHomePage } from "./toolManagement";
+import {
+    applyAppearanceSettings,
+    closeAllTools,
+    initializeCalleeToolListeners,
+    initializeInvocationBanner,
+    initializeInvocationConnectionsPrompt,
+    initializeTabScrollButtons,
+    initSplitLayout,
+    launchTool,
+    restoreSession,
+    setupKeyboardShortcuts,
+    showHomePage,
+} from "./toolManagement";
 import { clearInstalledToolsDropdownFilters, loadSidebarTools } from "./toolsSidebarManagement";
 
 /**
@@ -59,6 +73,9 @@ export async function initializeApplication(): Promise<void> {
         // BrowserView bounds during session restore, causing tools to fill the whole window.
         setupToolPanelBoundsListener();
 
+        // Set up the split-pane divider and listen for state changes from the main process
+        initSplitLayout();
+
         // Set up Activity Bar navigation
         setupActivityBar();
 
@@ -98,6 +115,10 @@ export async function initializeApplication(): Promise<void> {
         // Set up global search command palette
         initializeGlobalSearch();
 
+        // Set up notification history panel (bell icon in footer) early so the click
+        // handler is registered before any async operations that might delay init.
+        initNotificationHistoryPanel();
+
         // Load and apply theme settings on startup
         await loadInitialSettings();
         logCheckpoint("Initial settings loaded");
@@ -229,6 +250,16 @@ function setupActivityBar(): void {
             });
         });
     }
+
+    // Agent invocation logs button opens a tab
+    const agentInvocationLogsBtn = document.getElementById("mcp-btn");
+    if (agentInvocationLogsBtn) {
+        agentInvocationLogsBtn.addEventListener("click", () => {
+            openAgentInvocationLogsTab().catch((err) => {
+                logError(err instanceof Error ? err : new Error(String(err)));
+            });
+        });
+    }
 }
 
 /**
@@ -616,6 +647,7 @@ async function loadInitialSettings(): Promise<void> {
     applyTheme(settings.theme);
     applyTerminalFont(settings.terminalFont || DEFAULT_TERMINAL_FONT);
     applyDebugMenuVisibility(settings.showDebugMenu ?? false);
+    applyPreviewFeaturesVisibility(normalizePreviewFeatureFlags(settings));
     setDefaultNotificationDuration(settings.notificationDuration ?? DEFAULT_NOTIFICATION_DURATION);
     applyAppearanceSettings(
         settings.showCategoryColor ?? DEFAULT_SHOW_CATEGORY_COLOR,
@@ -782,6 +814,7 @@ function setupToolPanelBoundsListener(): void {
                 width: Math.round(rect.width),
                 height: adjustedHeight,
             };
+
             logInfo("[Renderer] Sending tool panel bounds:", bounds);
             window.api.send("get-tool-panel-bounds-response", bounds);
         } else {
diff --git a/src/renderer/modules/marketplaceManagement.ts b/src/renderer/modules/marketplaceManagement.ts
index a2c689f0..372a62d5 100644
--- a/src/renderer/modules/marketplaceManagement.ts
+++ b/src/renderer/modules/marketplaceManagement.ts
@@ -9,13 +9,15 @@ import type { ToolDetail } from "../types/index";
 import { renderMarkdownToSafeHtml, wireExternalLinks } from "../utils/markdown";
 import { getUnsupportedBadgeTitle, getUnsupportedRequirement } from "../utils/toolCompatibility";
 import { applyToolIconMasks, escapeHtml, generateToolIconHtml } from "../utils/toolIconResolver";
-import { openToolDetailTab } from "./toolManagement";
+import { isMcpPreviewUiEnabled } from "./previewFeatureManagement";
+import { openLocalPageAsTab } from "./toolManagement";
 import { loadSidebarTools } from "./toolsSidebarManagement";
 
 interface InstalledTool {
     id: string;
     version: string;
     name?: string;
+    mcpHeadlessEnabled?: boolean;
 }
 
 // Tool library loaded from registry
@@ -59,6 +61,7 @@ export async function loadToolsLibrary(): Promise<void> {
                     maxAPI: tool.maxAPI, // Include max API version
                     isSupported: tool.isSupported, // Include compatibility status
                     npmPackageName: tool.npmPackageName, // Include npm package name for pre-release detection
+                    mcpHeadlessEnabled: tool.mcpHeadlessEnabled,
                 }) as ToolDetail,
         );
 
@@ -101,16 +104,27 @@ export async function loadMarketplace(): Promise<void> {
     const categoryFilter = document.getElementById("marketplace-category-filter") as HTMLSelectElement | null;
     const authorFilter = document.getElementById("marketplace-author-filter") as HTMLSelectElement | null;
     const newFilter = document.getElementById("marketplace-new-filter") as HTMLInputElement | null;
+    const mcpEnabledFilter = document.getElementById("marketplace-mcp-enabled-filter") as HTMLInputElement | null;
+    const mcpEnabledFilterRow = document.getElementById("marketplace-mcp-enabled-filter-row") as HTMLElement | null;
     const sortSelect = document.getElementById("marketplace-sort-select") as HTMLSelectElement | null;
+    const mcpPreviewUiEnabled = isMcpPreviewUiEnabled();
+
+    if (mcpEnabledFilterRow) {
+        mcpEnabledFilterRow.style.display = mcpPreviewUiEnabled ? "" : "none";
+    }
+    if (!mcpPreviewUiEnabled && mcpEnabledFilter) {
+        mcpEnabledFilter.checked = false;
+    }
 
     const searchTerm = searchInput?.value ? searchInput.value.toLowerCase() : "";
     const selectedCategory = categoryFilter?.value || "";
     const selectedAuthor = authorFilter?.value || "";
     const showNewOnly = newFilter?.checked || false;
+    const showMcpEnabledOnly = mcpPreviewUiEnabled && (mcpEnabledFilter?.checked || false);
     const deprecatedToolsVisibility = (await window.toolboxAPI.getSetting("deprecatedToolsVisibility")) || "hide-all";
 
     // Update filter button indicator and one-click clear button visibility
-    const hasDropdownFilters = !!(selectedCategory || selectedAuthor || showNewOnly);
+    const hasDropdownFilters = !!(selectedCategory || selectedAuthor || showNewOnly || showMcpEnabledOnly);
     const marketplaceFilterBtn = document.getElementById("marketplace-filter-btn");
     if (marketplaceFilterBtn) {
         marketplaceFilterBtn.classList.toggle("has-active-filters", hasDropdownFilters);
@@ -161,6 +175,11 @@ export async function loadMarketplace(): Promise<void> {
             return false;
         }
 
+        // MCP enabled filter
+        if (showMcpEnabledOnly && t.mcpHeadlessEnabled !== true) {
+            return false;
+        }
+
         // Deprecated filter
         if (t.status === "deprecated") {
             if (deprecatedToolsVisibility === "hide-all" || deprecatedToolsVisibility === "show-installed") {
@@ -195,7 +214,7 @@ export async function loadMarketplace(): Promise<void> {
     // Show empty state if no tools match the search
     if (filteredTools.length === 0) {
         const hasSearchTerm = searchTerm.length > 0;
-        const hasActiveFilters = hasSearchTerm || selectedCategory || selectedAuthor || showNewOnly;
+        const hasActiveFilters = hasSearchTerm || selectedCategory || selectedAuthor || showNewOnly || showMcpEnabledOnly;
         const emptyMessage = hasSearchTerm ? "Try a different search term." : hasActiveFilters ? "No tools match the current filters." : "Check back later for new tools.";
         marketplaceList.innerHTML = `
             <div class="empty-state">
@@ -220,9 +239,14 @@ export async function loadMarketplace(): Promise<void> {
 
     marketplaceList.innerHTML = filteredTools
         .map((tool) => {
-            const installedTool = installedToolsMap.get(tool.id);
-            const isInstalled = !!installedTool;
+            const isInstalled = installedToolsMap.has(tool.id);
             const isDarkTheme = document.body.classList.contains("dark-theme");
+            const mcpIconPath = isDarkTheme ? "icons/dark/mcp.svg" : "icons/light/mcp.svg";
+            const mcpHeadlessEnabled = mcpPreviewUiEnabled && tool.mcpHeadlessEnabled === true;
+            const mcpBadgeHtml = mcpHeadlessEnabled
+                ? `<span class="tool-mcp-headless-badge" title="MCP headless enabled" aria-label="MCP headless enabled"><img src="${mcpIconPath}" alt="" aria-hidden="true" /><span>MCP</span></span>`
+                : "";
+            const compactTagsClass = mcpHeadlessEnabled ? "marketplace-item-top-tags has-mcp-badge" : "marketplace-item-top-tags";
 
             // Check if tool is new (created within last 7 days)
             const isNewTool = isToolNew(tool);
@@ -270,6 +294,7 @@ export async function loadMarketplace(): Promise<void> {
                 </div>
             </div>
             <div class="marketplace-item-author-pptb">${authorsDisplay}</div>
+            <div class="${compactTagsClass}">${mcpBadgeHtml}</div>
         </div>
     `;
             }
@@ -299,7 +324,7 @@ export async function loadMarketplace(): Promise<void> {
             <div class="marketplace-item-footer-pptb">
                 ${analyticsHtml}
             </div>
-            <div class="marketplace-item-top-tags">${newBadgeHtml}${categoriesHtml}${deprecatedBadgeHtml}${unsupportedBadgeHtml}</div>
+            <div class="marketplace-item-top-tags">${mcpBadgeHtml}${newBadgeHtml}${categoriesHtml}${deprecatedBadgeHtml}${unsupportedBadgeHtml}</div>
         </div>
     `;
         })
@@ -320,7 +345,11 @@ export async function loadMarketplace(): Promise<void> {
                 const tool = toolLibrary.find((t) => t.id === toolId);
                 if (tool) {
                     const isInstalled = installedToolsMap.has(toolId);
-                    openToolDetail(tool, isInstalled);
+                    const toolForDetail: ToolDetail = {
+                        ...tool,
+                        mcpHeadlessEnabled: mcpPreviewUiEnabled && tool.mcpHeadlessEnabled === true,
+                    };
+                    openToolDetail(toolForDetail, isInstalled);
                 }
             }
         });
@@ -401,6 +430,13 @@ export async function loadMarketplace(): Promise<void> {
         });
     }
 
+    if (mcpEnabledFilter && !(mcpEnabledFilter as any)._pptbBound) {
+        (mcpEnabledFilter as any)._pptbBound = true;
+        mcpEnabledFilter.addEventListener("change", () => {
+            loadMarketplace();
+        });
+    }
+
     // Setup sort event listener
     if (sortSelect && !(sortSelect as any)._pptbBound) {
         (sortSelect as any)._pptbBound = true;
@@ -466,7 +502,7 @@ function isToolNew(tool: ToolDetail): boolean {
  */
 export async function openToolDetail(tool: ToolDetail, isInstalled: boolean): Promise<void> {
     const tabId = `tool-detail-${tool.id}`;
-    await openToolDetailTab(tabId, tool.name, (panel: HTMLElement) => {
+    await openLocalPageAsTab(tabId, tool.name, (panel: HTMLElement) => {
         renderToolDetailContent(panel, tool, isInstalled);
     });
 }
@@ -480,8 +516,16 @@ function renderToolDetailContent(panel: HTMLElement, tool: ToolDetail, isInstall
     if (tool.version) metaBadges.push(`v${tool.version}`);
     if (tool.downloads !== undefined) metaBadges.push(`${tool.downloads.toLocaleString()} downloads`);
     const categories = tool.categories?.length ? tool.categories.map((c) => escapeHtml(c)) : [];
-
-    const tagsMarkup = categories.length ? categories.map((tag) => `<span>${tag}</span>`).join("") : "";
+    const isDarkTheme = document.body.classList.contains("dark-theme");
+    const mcpPreviewUiEnabled = isMcpPreviewUiEnabled();
+    const mcpIconPath = isDarkTheme ? "icons/dark/mcp.svg" : "icons/light/mcp.svg";
+    const mcpTagMarkup =
+        mcpPreviewUiEnabled && tool.mcpHeadlessEnabled === true
+            ? `<span class="tool-mcp-headless-badge" title="MCP headless enabled" aria-label="MCP headless enabled"><img src="${mcpIconPath}" alt="" aria-hidden="true" /><span>MCP</span></span>`
+            : "";
+
+    const categoryTagsMarkup = categories.length ? categories.map((tag) => `<span>${tag}</span>`).join("") : "";
+    const tagsMarkup = `${mcpTagMarkup}${categoryTagsMarkup}`;
     const badgeMarkup = metaBadges.map((badge) => `<span>${escapeHtml(badge)}</span>`).join("");
     const ratingsHtml = tool.rating !== undefined ? `<span>${tool.rating.toFixed(1)} ★</span>` : "";
 
@@ -714,6 +758,12 @@ function clearMarketplaceFilters(): void {
         newFilter.checked = false;
     }
 
+    // Reset MCP enabled filter
+    const mcpEnabledFilter = document.getElementById("marketplace-mcp-enabled-filter") as HTMLInputElement | null;
+    if (mcpEnabledFilter) {
+        mcpEnabledFilter.checked = false;
+    }
+
     // Reload the marketplace to reflect the cleared filters
     loadMarketplace();
 }
@@ -741,6 +791,12 @@ export function clearMarketplaceDropdownFilters(): void {
         newFilter.checked = false;
     }
 
+    // Reset MCP enabled filter
+    const mcpEnabledFilter = document.getElementById("marketplace-mcp-enabled-filter") as HTMLInputElement | null;
+    if (mcpEnabledFilter) {
+        mcpEnabledFilter.checked = false;
+    }
+
     // Reload the marketplace to reflect the cleared filters
     loadMarketplace();
 }
diff --git a/src/renderer/modules/mcpManagement.ts b/src/renderer/modules/mcpManagement.ts
new file mode 100644
index 00000000..5538ba17
--- /dev/null
+++ b/src/renderer/modules/mcpManagement.ts
@@ -0,0 +1,399 @@
+import { logError } from "../../common/logger";
+import { openLocalPageAsTab, registerCloseGuard } from "./toolManagement";
+
+/**
+ * Render the MCP server content into a panel
+ */
+export function renderMCPServerContent(panel: HTMLElement): void {
+    panel.className = "settings-tab-container";
+    panel.innerHTML = `
+        <div class="settings-tab-content" id="mcp-tab">
+            <div class="settings-vscode-section">
+                <h2 class="settings-vscode-section-title">MCP Server</h2>
+                <p class="mcp-subheader">Server connection details and invocation history for MCP-triggered tool launches.</p>
+
+                <div class="settings-vscode-item mcp-settings-item">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Server Status</span>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <span id="mcp-server-status" style="font-weight: 600;"></span>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item mcp-settings-item">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Server Control</span>
+                        <p class="settings-vscode-item-description">Start or stop the local MCP server.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-server-actions-row">
+                            <button id="mcp-server-toggle-btn" class="fluent-button fluent-button-primary settings-vscode-btn">Start MCP Server</button>
+                            <span id="mcp-server-action-status" class="settings-vscode-item-description mcp-server-action-status"></span>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item mcp-settings-item">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Server Address</span>
+                        <p class="settings-vscode-item-description">Use this HTTP endpoint when configuring your MCP client.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-server-control-row">
+                            <input type="text" id="mcp-server-address" class="fluent-input settings-vscode-input mcp-server-value-input" readonly />
+                            <button id="copy-mcp-server-address-btn" class="sidebar-icon-btn mcp-copy-icon-btn" aria-label="Copy server address" title="Copy server address">
+                                <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                                    <path d="M8.5 5.5C8.5 4.12 9.62 3 11 3H18C19.38 3 20.5 4.12 20.5 5.5V12.5C20.5 13.88 19.38 15 18 15H11C9.62 15 8.5 13.88 8.5 12.5V5.5ZM11 4.5C10.45 4.5 10 4.95 10 5.5V12.5C10 13.05 10.45 13.5 11 13.5H18C18.55 13.5 19 13.05 19 12.5V5.5C19 4.95 18.55 4.5 18 4.5H11Z" fill="currentColor"/>
+                                    <path d="M4.5 9.5C4.5 8.12 5.62 7 7 7H7.5V8.5H7C6.45 8.5 6 8.95 6 9.5V17.5C6 18.05 6.45 18.5 7 18.5H14C14.55 18.5 15 18.05 15 17.5V17H16.5V17.5C16.5 18.88 15.38 20 14 20H7C5.62 20 4.5 18.88 4.5 17.5V9.5Z" fill="currentColor"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item mcp-settings-item">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Auth Header Name</span>
+                        <p class="settings-vscode-item-description">Include this header in each MCP request.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-server-control-row">
+                            <input type="text" id="mcp-auth-header-name" class="fluent-input settings-vscode-input mcp-server-value-input" readonly />
+                            <button id="copy-mcp-auth-header-name-btn" class="sidebar-icon-btn mcp-copy-icon-btn" aria-label="Copy auth header name" title="Copy auth header name">
+                                <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                                    <path d="M8.5 5.5C8.5 4.12 9.62 3 11 3H18C19.38 3 20.5 4.12 20.5 5.5V12.5C20.5 13.88 19.38 15 18 15H11C9.62 15 8.5 13.88 8.5 12.5V5.5ZM11 4.5C10.45 4.5 10 4.95 10 5.5V12.5C10 13.05 10.45 13.5 11 13.5H18C18.55 13.5 19 13.05 19 12.5V5.5C19 4.95 18.55 4.5 18 4.5H11Z" fill="currentColor"/>
+                                    <path d="M4.5 9.5C4.5 8.12 5.62 7 7 7H7.5V8.5H7C6.45 8.5 6 8.95 6 9.5V17.5C6 18.05 6.45 18.5 7 18.5H14C14.55 18.5 15 18.05 15 17.5V17H16.5V17.5C16.5 18.88 15.38 20 14 20H7C5.62 20 4.5 18.88 4.5 17.5V9.5Z" fill="currentColor"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item mcp-settings-item-spaced">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Auth Header Value (Token)</span>
+                        <p class="settings-vscode-item-description">Secret token used by MCP clients to authenticate with the local server.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-server-control-row">
+                            <input type="text" id="mcp-auth-header-value" class="fluent-input settings-vscode-input mcp-server-value-input" readonly />
+                            <button id="copy-mcp-auth-header-value-btn" class="sidebar-icon-btn mcp-copy-icon-btn" aria-label="Copy auth token" title="Copy auth token">
+                                <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                                    <path d="M8.5 5.5C8.5 4.12 9.62 3 11 3H18C19.38 3 20.5 4.12 20.5 5.5V12.5C20.5 13.88 19.38 15 18 15H11C9.62 15 8.5 13.88 8.5 12.5V5.5ZM11 4.5C10.45 4.5 10 4.95 10 5.5V12.5C10 13.05 10.45 13.5 11 13.5H18C18.55 13.5 19 13.05 19 12.5V5.5C19 4.95 18.55 4.5 18 4.5H11Z" fill="currentColor"/>
+                                    <path d="M4.5 9.5C4.5 8.12 5.62 7 7 7H7.5V8.5H7C6.45 8.5 6 8.95 6 9.5V17.5C6 18.05 6.45 18.5 7 18.5H14C14.55 18.5 15 18.05 15 17.5V17H16.5V17.5C16.5 18.88 15.38 20 14 20H7C5.62 20 4.5 18.88 4.5 17.5V9.5Z" fill="currentColor"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="settings-vscode-item mcp-settings-item-spaced">
+                    <div class="settings-vscode-item-info">
+                        <span class="settings-vscode-item-label">Quick Connect</span>
+                        <p class="settings-vscode-item-description">Create or update local MCP config files for supported clients using this server's URL and auth header/token.</p>
+                    </div>
+                    <div class="settings-vscode-item-control mcp-server-item-control">
+                        <div class="mcp-client-connect-row">
+                            <button id="connect-claude-desktop-btn" class="fluent-button fluent-button-secondary settings-vscode-btn">Connect to Claude Desktop</button>
+                            <button id="connect-vscode-btn" class="fluent-button fluent-button-secondary settings-vscode-btn">Connect to VSCode</button>
+                        </div>
+                        <div id="mcp-client-config-status" class="settings-vscode-item-description" style="margin-top: 6px; display: none;"></div>
+                    </div>
+                </div>
+
+                <div id="mcp-container" class="invocation-logs-container">
+                    <div class="empty-state" id="mcp-empty" style="display: none;">
+                        <p>No agent invocations recorded yet.</p>
+                        <p class="empty-state-hint">Invoke tools through the MCP server to see activity here.</p>
+                    </div>
+<table class="invocation-logs-table" id="invocation-logs-table" style="width: 100%; border-collapse: collapse; display: none;">
+                         <thead>
+                             <tr style="border-bottom: 1px solid var(--border-color, rgba(0,0,0,0.1));">
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Timestamp</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Tool Name</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Tool ID</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Mode</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Connection</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));">Prefill</th>
+                                 <th style="text-align: left; padding: 8px; font-weight: 600; font-size: 12px; text-transform: uppercase; color: var(--text-muted, rgba(0,0,0,0.6));;">Outcome</th>
+                             </tr>
+                         </thead>
+                         <tbody id="invocation-logs-tbody"></tbody>
+                     </table>
+                </div>
+            </div>
+        </div>
+    `;
+
+    // Load and render logs
+    loadAndRenderLogs();
+}
+
+/**
+ * Outcome badge styles
+ */
+function getOutcomeBadgeStyle(outcome: string): string {
+    switch (outcome) {
+        case "completed":
+            return "background: #107c10; color: white;";
+        case "no-result":
+            return "background: #8a8886; color: white;";
+        case "rejected":
+            return "background: #d13438; color: white;";
+        default:
+            return "background: #6b6b6b; color: white;";
+    }
+}
+
+function updateMcpServerStatusUi(isRunning: boolean): void {
+    const statusLabel = document.getElementById("mcp-server-status");
+    const toggleButton = document.getElementById("mcp-server-toggle-btn") as HTMLButtonElement | null;
+
+    if (statusLabel) {
+        statusLabel.textContent = isRunning ? "Running" : "Stopped";
+        statusLabel.setAttribute("style", `font-weight: 600; color: ${isRunning ? "#107c10" : "#d13438"};`);
+    }
+
+    if (toggleButton) {
+        toggleButton.textContent = isRunning ? "Stop MCP Server" : "Start MCP Server";
+        toggleButton.dataset.running = String(isRunning);
+    }
+}
+
+/**
+ * Load and render the logs
+ */
+async function loadAndRenderLogs(): Promise<void> {
+    try {
+        const [serverDetails, logs] = await Promise.all([window.toolboxAPI.mcpServer.getDetails(), window.toolboxAPI.agentInvocation.getLogs()]);
+        const container = document.getElementById("mcp-container");
+        const emptyState = document.getElementById("mcp-empty");
+        const table = document.getElementById("invocation-logs-table");
+        const tbody = document.getElementById("invocation-logs-tbody");
+        const addressInput = document.getElementById("mcp-server-address") as HTMLInputElement | null;
+        const headerNameInput = document.getElementById("mcp-auth-header-name") as HTMLInputElement | null;
+        const headerValueInput = document.getElementById("mcp-auth-header-value") as HTMLInputElement | null;
+
+        if (!container || !emptyState || !table || !tbody) return;
+
+        if (addressInput) {
+            addressInput.value = serverDetails.address;
+        }
+        if (headerNameInput) {
+            headerNameInput.value = serverDetails.authHeaderName;
+        }
+        if (headerValueInput) {
+            headerValueInput.value = serverDetails.authHeaderValue;
+        }
+        updateMcpServerStatusUi(serverDetails.isRunning);
+
+        wireCopyButton("copy-mcp-server-address-btn", () => serverDetails.address, "MCP server address copied");
+        wireCopyButton("copy-mcp-auth-header-name-btn", () => serverDetails.authHeaderName, "MCP auth header name copied");
+        wireCopyButton("copy-mcp-auth-header-value-btn", () => serverDetails.authHeaderValue, "MCP auth token copied");
+        wireMcpServerToggleButton();
+        wireClientConfigButtons();
+
+        if (logs.length === 0) {
+            emptyState.style.display = "block";
+            table.style.display = "none";
+            return;
+        }
+
+        emptyState.style.display = "none";
+        table.style.display = "table";
+
+        tbody.innerHTML = logs
+            .map(
+                (log) => `
+            <tr style="border-bottom: 1px solid var(--border-color-light, rgba(0,0,0,0.05));">
+                <td style="padding: 8px; font-size: 13px; white-space: nowrap;">${formatTimestamp(log.timestamp)}</td>
+                <td style="padding: 8px; font-size: 13px;">${escapeHtml(log.toolName)}</td>
+                <td style="padding: 8px; font-size: 13px; font-family: monospace;">${escapeHtml(log.toolId)}</td>
+                <td style="padding: 8px; font-size: 13px; text-transform: uppercase;">${log.invocationMode ? escapeHtml(log.invocationMode) : '<span style="color: var(--text-muted, rgba(0,0,0,0.4));">—</span>'}</td>
+                <td style="padding: 8px; font-size: 13px;">${log.connectionId ? escapeHtml(log.connectionId) : '<span style="color: var(--text-muted, rgba(0,0,0,0.4));">—</span>'}</td>
+                <td style="padding: 8px; font-size: 13px; max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" title="${escapeHtml(log.prefillSummary)}">${escapeHtml(log.prefillSummary)}</td>
+                <td style="padding: 8px; font-size: 13px;">
+                    <span style="display: inline-block; padding: 2px 8px; border-radius: 4px; font-size: 11px; font-weight: 600; text-transform: uppercase; ${getOutcomeBadgeStyle(log.outcome)}">${escapeHtml(log.outcome)}</span>
+                    ${log.error ? `<span style="margin-left: 6px; color: var(--error-color, #d13438); cursor: pointer;" title="${escapeHtml(log.error)}">⚠</span>` : ""}
+                </td>
+            </tr>
+        `,
+            )
+            .join("");
+    } catch (error) {
+        logError("Failed to load agent invocation logs", error);
+        const container = document.getElementById("mcp-container");
+        if (container) {
+            container.innerHTML = `<div class="empty-state"><p>Error loading logs</p><p class="empty-state-hint">${escapeHtml(error instanceof Error ? error.message : String(error))}</p></div>`;
+        }
+    }
+}
+
+function wireClientConfigButtons(): void {
+    const claudeBtn = document.getElementById("connect-claude-desktop-btn") as HTMLButtonElement | null;
+    const vscodeBtn = document.getElementById("connect-vscode-btn") as HTMLButtonElement | null;
+    const statusEl = document.getElementById("mcp-client-config-status") as HTMLDivElement | null;
+
+    if (!claudeBtn || !vscodeBtn || !statusEl) {
+        return;
+    }
+
+    const setButtonsEnabled = (enabled: boolean): void => {
+        claudeBtn.disabled = !enabled;
+        vscodeBtn.disabled = !enabled;
+    };
+
+    const showStatus = (message: string, isError: boolean): void => {
+        statusEl.textContent = message;
+        statusEl.style.display = "block";
+        statusEl.style.color = isError ? "var(--error-color, #d13438)" : "var(--text-muted, rgba(0,0,0,0.65))";
+    };
+
+    const writeConfig = async (target: "claude" | "vscode"): Promise<void> => {
+        try {
+            setButtonsEnabled(false);
+            showStatus(`Configuring ${target === "claude" ? "Claude Desktop" : "VSCode"}...`, false);
+
+            const result = target === "claude" ? await window.toolboxAPI.mcpServer.configureClaudeDesktop() : await window.toolboxAPI.mcpServer.configureVSCode();
+
+            showStatus(`Updated ${target === "claude" ? "Claude Desktop" : "VSCode"} config at ${result.filePath} (${result.os}).`, false);
+            await window.toolboxAPI.utils.showNotification({
+                title: "MCP Config Updated",
+                body: `${target === "claude" ? "Claude Desktop" : "VSCode"} is now configured for ${result.serverName}.`,
+                type: "success",
+            });
+        } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            showStatus(`Failed to configure ${target === "claude" ? "Claude Desktop" : "VSCode"}: ${message}`, true);
+            await window.toolboxAPI.utils.showNotification({
+                title: "MCP Config Failed",
+                body: `Unable to configure ${target === "claude" ? "Claude Desktop" : "VSCode"}.`,
+                type: "error",
+            });
+            logError("Failed to write MCP client config", error);
+        } finally {
+            setButtonsEnabled(true);
+        }
+    };
+
+    if (claudeBtn.dataset.bound !== "true") {
+        claudeBtn.dataset.bound = "true";
+        claudeBtn.addEventListener("click", () => {
+            void writeConfig("claude");
+        });
+    }
+
+    if (vscodeBtn.dataset.bound !== "true") {
+        vscodeBtn.dataset.bound = "true";
+        vscodeBtn.addEventListener("click", () => {
+            void writeConfig("vscode");
+        });
+    }
+}
+
+function wireMcpServerToggleButton(): void {
+    const toggleBtn = document.getElementById("mcp-server-toggle-btn") as HTMLButtonElement | null;
+    const actionStatus = document.getElementById("mcp-server-action-status") as HTMLSpanElement | null;
+
+    if (!toggleBtn || !actionStatus || toggleBtn.dataset.bound === "true") {
+        return;
+    }
+
+    const setBusy = (busy: boolean): void => {
+        toggleBtn.disabled = busy;
+    };
+
+    const setActionStatus = (message: string, isError: boolean): void => {
+        actionStatus.textContent = message;
+        actionStatus.style.color = isError ? "var(--error-color, #d13438)" : "var(--text-secondary, #8a8886)";
+    };
+
+    toggleBtn.dataset.bound = "true";
+    toggleBtn.addEventListener("click", () => {
+        void (async () => {
+            const isRunning = toggleBtn.dataset.running === "true";
+            const nextActionLabel = isRunning ? "Stopping MCP server..." : "Starting MCP server...";
+            setBusy(true);
+            setActionStatus(nextActionLabel, false);
+
+            try {
+                const details = isRunning ? await window.toolboxAPI.mcpServer.stop() : await window.toolboxAPI.mcpServer.start();
+                updateMcpServerStatusUi(details.isRunning);
+                setActionStatus(details.isRunning ? "MCP server is running." : "MCP server is stopped.", false);
+                await window.toolboxAPI.utils.showNotification({
+                    title: details.isRunning ? "MCP Server Started" : "MCP Server Stopped",
+                    body: details.isRunning ? "Local MCP server is now running." : "Local MCP server has been stopped.",
+                    type: "success",
+                });
+            } catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                setActionStatus(`Failed to ${isRunning ? "stop" : "start"} MCP server: ${message}`, true);
+                logError("Failed to toggle MCP server", error);
+                await window.toolboxAPI.utils.showNotification({
+                    title: "MCP Server Action Failed",
+                    body: `Unable to ${isRunning ? "stop" : "start"} MCP server.`,
+                    type: "error",
+                });
+            } finally {
+                setBusy(false);
+            }
+        })();
+    });
+}
+
+function wireCopyButton(buttonId: string, getValue: () => string, successMessage: string): void {
+    const button = document.getElementById(buttonId) as HTMLButtonElement | null;
+    if (!button || button.dataset.bound === "true") {
+        return;
+    }
+
+    button.dataset.bound = "true";
+    button.addEventListener("click", () => {
+        const value = getValue();
+        void window.toolboxAPI.utils.copyToClipboard(value);
+        void window.toolboxAPI.utils.showNotification({
+            title: "Copied",
+            body: successMessage,
+            type: "success",
+        });
+    });
+}
+
+/**
+ * Format timestamp for display
+ */
+function formatTimestamp(timestamp: string): string {
+    try {
+        const date = new Date(timestamp);
+        return date.toLocaleString([], {
+            year: "numeric",
+            month: "short",
+            day: "numeric",
+            hour: "2-digit",
+            minute: "2-digit",
+            second: "2-digit",
+        });
+    } catch {
+        return timestamp;
+    }
+}
+
+/**
+ * Escape HTML to prevent XSS
+ */
+function escapeHtml(text: string): string {
+    const div = document.createElement("div");
+    div.textContent = text;
+    return div.innerHTML;
+}
+
+/**
+ * Open agent invocation logs as a tab
+ */
+export async function openAgentInvocationLogsTab(): Promise<void> {
+    registerCloseGuard("mcp", async () => {
+        return true;
+    });
+    await openLocalPageAsTab("mcp", "MCP Server", renderMCPServerContent, "");
+}
diff --git a/src/renderer/modules/notifications.ts b/src/renderer/modules/notifications.ts
index d8fdd7a8..a01533f7 100644
--- a/src/renderer/modules/notifications.ts
+++ b/src/renderer/modules/notifications.ts
@@ -94,7 +94,8 @@ function setupNotificationActionListener(): void {
 
 /**
  * Show PPTB notification using dedicated BrowserWindow
- * Notifications are displayed in an always-on-top frameless window above the BrowserView
+ * Notifications are displayed in an always-on-top frameless window above the BrowserView.
+ * Each notification is also forwarded to the main process for persistent history tracking.
  */
 export function showPPTBNotification(options: NotificationOptions): void {
     // Ensure the action listener is set up
@@ -113,7 +114,7 @@ export function showPPTBNotification(options: NotificationOptions): void {
         // remain available until the user explicitly dismisses the notification.
         const effectiveDuration = duration === 0 ? Number.MAX_SAFE_INTEGER - Date.now() : duration;
         const expiresAt = Date.now() + effectiveDuration + CALLBACK_TTL_BUFFER_MS;
-        
+
         actions.forEach((action: { label: string; callback: string }, index: number) => {
             const originalCallback = options.actions![index].callback;
             notificationCallbacks.set(action.callback, {
@@ -121,12 +122,12 @@ export function showPPTBNotification(options: NotificationOptions): void {
                 expiresAt,
             });
         });
-        
+
         // Start the cleanup interval to handle dismissed notifications
         startCleanupInterval();
     }
 
-    // Send to notification window manager via IPC
+    // Send to notification window manager via IPC (also records in main-process history)
     window.api.invoke("notification:show", {
         title: options.title,
         body: options.body,
@@ -135,3 +136,69 @@ export function showPPTBNotification(options: NotificationOptions): void {
         actions,
     });
 }
+
+// ── Notification History Panel ────────────────────────────────────────────────
+// The history panel is a separate always-on-top BrowserWindow managed by the
+// main process (NotificationHistoryWindowManager).  The renderer is responsible
+// only for the bell button UI and badge update.
+
+/** Whether the history panel window is currently open */
+let isPanelOpen = false;
+
+/**
+ * Initialize the notification history panel bell button.
+ * Wires up the bell button click to open/close the main-process history window
+ * and listens for badge-update and panel-closed events from the main process.
+ * Must be called once after the DOM is ready.
+ */
+export function initNotificationHistoryPanel(): void {
+    const bellBtn = document.getElementById("footer-notification-bell-btn");
+    if (!bellBtn) return;
+
+    // Toggle the history window on bell button click
+    bellBtn.addEventListener("click", (e) => {
+        e.stopPropagation();
+        if (isPanelOpen) {
+            window.api.send("notification-history:close");
+        } else {
+            isPanelOpen = true;
+            bellBtn.setAttribute("aria-pressed", "true");
+            window.api.send("notification-history:open");
+        }
+    });
+
+    // Main process confirms the panel opened (updates aria-pressed)
+    window.api.on("notification-history:opened", () => {
+        isPanelOpen = true;
+        bellBtn.setAttribute("aria-pressed", "true");
+    });
+
+    // Main process notifies us when the panel closed (blur, Escape, or explicit close)
+    window.api.on("notification-history:closed", () => {
+        isPanelOpen = false;
+        bellBtn.setAttribute("aria-pressed", "false");
+    });
+
+    // Main process sends badge updates whenever the unread count changes.
+    // window.api.on wraps ipcRenderer.on directly, so args[0] is the IPC event object
+    // and args[1] is the first data payload (the unread count).
+    window.api.on("notification:badge-update", (...args: unknown[]) => {
+        const count = typeof args[1] === "number" ? args[1] : 0;
+        updateBadge(count);
+    });
+}
+
+/** Update the badge element to reflect the current unread count */
+function updateBadge(count: number): void {
+    const badge = document.getElementById("notification-badge");
+    if (!badge) return;
+
+    if (count > 0) {
+        const label = count > 99 ? "99+" : String(count);
+        badge.textContent = label;
+        badge.setAttribute("aria-label", `${label} unread notifications`);
+        badge.hidden = false;
+    } else {
+        badge.hidden = true;
+    }
+}
diff --git a/src/renderer/modules/previewFeatureManagement.ts b/src/renderer/modules/previewFeatureManagement.ts
new file mode 100644
index 00000000..51167647
--- /dev/null
+++ b/src/renderer/modules/previewFeatureManagement.ts
@@ -0,0 +1,82 @@
+import { buildPreviewFeatureFlags, PREVIEW_FEATURE_IDS, PreviewFeatureId, UserSettings } from "../../common/types";
+
+interface PreviewFeatureDefinition {
+    id: PreviewFeatureId;
+    label: string;
+    description: string;
+    targetElementIds: string[];
+}
+
+const PREVIEW_FEATURE_SETTINGS_ID_PREFIX = "sidebar-preview-feature-";
+
+const PREVIEW_FEATURE_DEFINITIONS: PreviewFeatureDefinition[] = [
+    {
+        id: PREVIEW_FEATURE_IDS.MCP_SERVER,
+        label: "Agentic AI capabilities (MCP Server)",
+        description:
+            "Enables MCP Server management in the sidebar for configuring and managing agentic AI capabilities. The server runs in the background to power your agentic AI tools. <br> Needs a restart of ToolBox to fully take effect.",
+        targetElementIds: ["mcp-btn"],
+    },
+];
+
+let activePreviewFeatureFlags: Record<PreviewFeatureId, boolean> = buildPreviewFeatureFlags();
+
+// Keep MCP-specific UI behind preview while the feature is in preview.
+// When MCP is generally available, set this to false (or remove checks that call isMcpPreviewUiEnabled).
+const GATE_MCP_UI_BEHIND_PREVIEW = true;
+
+function toggleElementVisibilityById(elementId: string, isVisible: boolean): void {
+    const element = document.getElementById(elementId) as HTMLElement | null;
+    if (element) {
+        element.style.display = isVisible ? "" : "none";
+    }
+}
+
+export function getPreviewFeatureDefinitions(): PreviewFeatureDefinition[] {
+    return PREVIEW_FEATURE_DEFINITIONS.slice();
+}
+
+export function getPreviewFeatureCheckboxId(featureId: PreviewFeatureId): string {
+    return `${PREVIEW_FEATURE_SETTINGS_ID_PREFIX}${featureId}`;
+}
+
+export function normalizePreviewFeatureFlags(settings: Pick<UserSettings, "previewFeatures" | "enablePreviewFeatures">): Record<PreviewFeatureId, boolean> {
+    return buildPreviewFeatureFlags(settings.previewFeatures, settings.enablePreviewFeatures);
+}
+
+export function collectPreviewFeatureFlagsFromSettingsPanel(): Record<PreviewFeatureId, boolean> {
+    const featureFlags = buildPreviewFeatureFlags();
+
+    PREVIEW_FEATURE_DEFINITIONS.forEach((feature) => {
+        const checkbox = document.getElementById(getPreviewFeatureCheckboxId(feature.id)) as HTMLInputElement | null;
+        featureFlags[feature.id] = checkbox?.checked === true;
+    });
+
+    return featureFlags;
+}
+
+/**
+ * Apply preview feature visibility to the current renderer surface.
+ */
+export function applyPreviewFeaturesVisibility(features: Record<PreviewFeatureId, boolean>): void {
+    activePreviewFeatureFlags = buildPreviewFeatureFlags(features);
+
+    PREVIEW_FEATURE_DEFINITIONS.forEach((feature) => {
+        const isEnabled = activePreviewFeatureFlags[feature.id] === true;
+        feature.targetElementIds.forEach((elementId) => {
+            toggleElementVisibilityById(elementId, isEnabled);
+        });
+    });
+}
+
+export function isPreviewFeatureEnabled(featureId: PreviewFeatureId): boolean {
+    return activePreviewFeatureFlags[featureId] === true;
+}
+
+export function isMcpPreviewUiEnabled(): boolean {
+    if (!GATE_MCP_UI_BEHIND_PREVIEW) {
+        return true;
+    }
+
+    return isPreviewFeatureEnabled(PREVIEW_FEATURE_IDS.MCP_SERVER);
+}
diff --git a/src/renderer/modules/settingsManagement.ts b/src/renderer/modules/settingsManagement.ts
index 79ed503f..b011d1de 100644
--- a/src/renderer/modules/settingsManagement.ts
+++ b/src/renderer/modules/settingsManagement.ts
@@ -4,6 +4,7 @@
  */
 
 import { logError } from "../../common/logger";
+import { buildPreviewFeatureFlags } from "../../common/types";
 import {
     DEFAULT_CATEGORY_COLOR_THICKNESS,
     DEFAULT_ENVIRONMENT_COLOR_THICKNESS,
@@ -17,13 +18,48 @@ import {
 import type { SettingsState } from "../types/index";
 import { loadMarketplace } from "./marketplaceManagement";
 import { setDefaultNotificationDuration } from "./notifications";
+import {
+    applyPreviewFeaturesVisibility,
+    collectPreviewFeatureFlagsFromSettingsPanel,
+    getPreviewFeatureCheckboxId,
+    getPreviewFeatureDefinitions,
+    normalizePreviewFeatureFlags,
+} from "./previewFeatureManagement";
 import { applyDebugMenuVisibility, applyTerminalFont, applyTheme } from "./themeManagement";
-import { applyAppearanceSettings, openToolDetailTab, registerCloseGuard } from "./toolManagement";
+import { applyAppearanceSettings, openLocalPageAsTab, registerCloseGuard } from "./toolManagement";
 import { loadSidebarTools } from "./toolsSidebarManagement";
 
 // Track original settings to detect changes
 let originalSettings: SettingsState = {};
 
+function arePreviewFeatureFlagsEqual(left?: SettingsState["previewFeatures"], right?: SettingsState["previewFeatures"]): boolean {
+    const normalizedLeft = buildPreviewFeatureFlags(left);
+    const normalizedRight = buildPreviewFeatureFlags(right);
+    return Object.keys(normalizedLeft).every((featureId) => normalizedLeft[featureId as keyof typeof normalizedLeft] === normalizedRight[featureId as keyof typeof normalizedRight]);
+}
+
+function renderPreviewFeatureSettingsRows(): string {
+    return getPreviewFeatureDefinitions()
+        .map((feature) => {
+            const checkboxId = getPreviewFeatureCheckboxId(feature.id);
+            return `
+                <div class="settings-vscode-item">
+                    <div class="settings-vscode-item-info">
+                        <label class="settings-vscode-item-label" for="${checkboxId}">${feature.label}</label>
+                        <p class="settings-vscode-item-description">${feature.description}</p>
+                    </div>
+                    <div class="settings-vscode-item-control">
+                        <label class="settings-vscode-checkbox-label">
+                            <input type="checkbox" id="${checkboxId}" class="settings-vscode-checkbox" />
+                            <span>Enable</span>
+                        </label>
+                    </div>
+                </div>
+            `;
+        })
+        .join("");
+}
+
 /**
  * Load settings into the settings UI panel
  */
@@ -45,6 +81,7 @@ export async function loadSettings(): Promise<void> {
 
     if (themeSelect && autoUpdateCheck && showDebugMenuCheck && deprecatedToolsSelect && toolDisplayModeSelect && terminalFontSelect) {
         const settings = await window.toolboxAPI.getUserSettings();
+        const previewFeatures = normalizePreviewFeatureFlags(settings);
 
         // Store original settings for change detection
         originalSettings = {
@@ -60,6 +97,8 @@ export async function loadSettings(): Promise<void> {
             showEnvironmentColor: settings.showEnvironmentColor ?? DEFAULT_SHOW_ENVIRONMENT_COLOR,
             categoryColorThickness: settings.categoryColorThickness ?? DEFAULT_CATEGORY_COLOR_THICKNESS,
             environmentColorThickness: settings.environmentColorThickness ?? DEFAULT_ENVIRONMENT_COLOR_THICKNESS,
+            enablePreviewFeatures: Object.values(previewFeatures).some((enabled) => enabled === true),
+            previewFeatures,
         };
 
         themeSelect.value = settings.theme;
@@ -87,6 +126,12 @@ export async function loadSettings(): Promise<void> {
         if (environmentColorThicknessInput) {
             environmentColorThicknessInput.value = String(settings.environmentColorThickness ?? DEFAULT_ENVIRONMENT_COLOR_THICKNESS);
         }
+        getPreviewFeatureDefinitions().forEach((feature) => {
+            const checkbox = document.getElementById(getPreviewFeatureCheckboxId(feature.id)) as HTMLInputElement | null;
+            if (checkbox) {
+                checkbox.checked = previewFeatures[feature.id] === true;
+            }
+        });
 
         const terminalFont = settings.terminalFont || DEFAULT_TERMINAL_FONT;
 
@@ -151,6 +196,8 @@ export async function saveSettings(): Promise<void> {
     const environmentColorThickness = environmentColorThicknessInput
         ? Math.min(MAX_COLOR_BORDER_THICKNESS, Math.max(MIN_COLOR_BORDER_THICKNESS, Number(environmentColorThicknessInput.value) || DEFAULT_ENVIRONMENT_COLOR_THICKNESS))
         : DEFAULT_ENVIRONMENT_COLOR_THICKNESS;
+    const previewFeatures = collectPreviewFeatureFlagsFromSettingsPanel();
+    const enablePreviewFeatures = Object.values(previewFeatures).some((enabled) => enabled === true);
 
     const currentSettings = {
         theme: themeSelect.value,
@@ -165,6 +212,8 @@ export async function saveSettings(): Promise<void> {
         showEnvironmentColor,
         categoryColorThickness,
         environmentColorThickness,
+        enablePreviewFeatures,
+        previewFeatures,
     };
 
     // Only include changed settings in the update
@@ -206,6 +255,12 @@ export async function saveSettings(): Promise<void> {
     if (currentSettings.environmentColorThickness !== originalSettings.environmentColorThickness) {
         changedSettings.environmentColorThickness = currentSettings.environmentColorThickness;
     }
+    if (currentSettings.enablePreviewFeatures !== (originalSettings.enablePreviewFeatures ?? false)) {
+        changedSettings.enablePreviewFeatures = currentSettings.enablePreviewFeatures;
+    }
+    if (!arePreviewFeatureFlagsEqual(currentSettings.previewFeatures, originalSettings.previewFeatures ?? buildPreviewFeatureFlags())) {
+        changedSettings.previewFeatures = currentSettings.previewFeatures;
+    }
 
     // Only save and emit event if something changed
     if (Object.keys(changedSettings).length > 0) {
@@ -215,6 +270,7 @@ export async function saveSettings(): Promise<void> {
         applyTheme(currentSettings.theme);
         applyTerminalFont(currentSettings.terminalFont);
         applyDebugMenuVisibility(currentSettings.showDebugMenu);
+        applyPreviewFeaturesVisibility(currentSettings.previewFeatures);
         setDefaultNotificationDuration(currentSettings.notificationDuration);
         applyAppearanceSettings(currentSettings.showCategoryColor, currentSettings.showEnvironmentColor, currentSettings.categoryColorThickness, currentSettings.environmentColorThickness);
 
@@ -297,6 +353,9 @@ function hasUnsavedChanges(): boolean {
         if (val !== (originalSettings.environmentColorThickness ?? DEFAULT_ENVIRONMENT_COLOR_THICKNESS)) return true;
     }
 
+    const currentPreviewFeatures = collectPreviewFeatureFlagsFromSettingsPanel();
+    if (!arePreviewFeatureFlagsEqual(currentPreviewFeatures, originalSettings.previewFeatures ?? buildPreviewFeatureFlags())) return true;
+
     return false;
 }
 
@@ -513,6 +572,11 @@ export function renderSettingsContent(panel: HTMLElement): void {
                 </div>
             </section>
 
+            <section id="settings-section-preview" class="settings-vscode-section">
+                <h2 class="settings-vscode-section-title">Preview Features</h2>
+                ${renderPreviewFeatureSettingsRows()}
+            </section>
+
             <div class="settings-vscode-actions">
                 <button id="sidebar-save-settings-btn" class="fluent-button fluent-button-primary">Save Settings</button>
                 <span class="settings-vscode-item-description">Changes apply instantly after saving.</span>
@@ -625,5 +689,5 @@ export async function openSettingsTab(): Promise<void> {
         if (!hasUnsavedChanges()) return true;
         return window.confirm("You have unsaved settings changes. Close anyway and discard them?");
     });
-    await openToolDetailTab("app-settings", "Settings", renderSettingsContent, "");
+    await openLocalPageAsTab("app-settings", "Settings", renderSettingsContent, "");
 }
diff --git a/src/renderer/modules/toolManagement.ts b/src/renderer/modules/toolManagement.ts
index de41e3ed..cfb4a61e 100644
--- a/src/renderer/modules/toolManagement.ts
+++ b/src/renderer/modules/toolManagement.ts
@@ -5,7 +5,7 @@
 
 import { logError, logInfo, logWarn } from "../../common/logger";
 import { normalizeCspExceptionSource, type CspExceptionSource } from "../../common/types";
-import type { DataverseConnection } from "../../common/types/connection";
+import type { Connection } from "../../common/types/connection";
 import {
     DEFAULT_CATEGORY_COLOR_THICKNESS,
     DEFAULT_ENVIRONMENT_COLOR_THICKNESS,
@@ -142,18 +142,19 @@ async function changeToolConnectionForInstance(instanceId: string): Promise<void
 
     const multiConnectionMode = targetTool.tool.features?.multiConnection || "none";
     const hasMultiConnection = multiConnectionMode === "required" || multiConnectionMode === "optional";
+    const requirePowerPlatformApi = targetTool.tool.features?.enabledForPowerPlatformAPI === true;
 
     try {
         if (hasMultiConnection) {
             const isSecondaryRequired = multiConnectionMode === "required";
-            const result = await openSelectMultiConnectionModal(isSecondaryRequired);
+            const result = await openSelectMultiConnectionModal(isSecondaryRequired, targetTool.tool.name, requirePowerPlatformApi);
 
             await setToolConnection(instanceId, result.primaryConnectionId);
             await setToolSecondaryConnection(instanceId, result.secondaryConnectionId);
 
             const connections = await window.toolboxAPI.connections.getAll();
-            const primaryConnection = connections.find((item: DataverseConnection) => item.id === result.primaryConnectionId);
-            const secondaryConnection = result.secondaryConnectionId ? connections.find((item: DataverseConnection) => item.id === result.secondaryConnectionId) : null;
+            const primaryConnection = connections.find((item: Connection) => item.id === result.primaryConnectionId);
+            const secondaryConnection = result.secondaryConnectionId ? connections.find((item: Connection) => item.id === result.secondaryConnectionId) : null;
 
             const connectionDetails = secondaryConnection ? `${primaryConnection?.name || "Primary"} and ${secondaryConnection.name}` : primaryConnection?.name || "the selected connection";
 
@@ -163,7 +164,7 @@ async function changeToolConnectionForInstance(instanceId: string): Promise<void
                 type: "success",
             });
         } else {
-            const selectedConnectionId = await openSelectConnectionModal(targetTool.connectionId);
+            const selectedConnectionId = await openSelectConnectionModal(targetTool.connectionId, targetTool.tool.name, requirePowerPlatformApi);
 
             if (!selectedConnectionId) {
                 return;
@@ -172,7 +173,7 @@ async function changeToolConnectionForInstance(instanceId: string): Promise<void
             await setToolConnection(instanceId, selectedConnectionId);
 
             const connections = await window.toolboxAPI.connections.getAll();
-            const connection = connections.find((item: DataverseConnection) => item.id === selectedConnectionId);
+            const connection = connections.find((item: Connection) => item.id === selectedConnectionId);
             window.toolboxAPI.utils.showNotification({
                 title: "Connection Set",
                 body: `${targetTool.tool.name} is now connected to ${connection?.name || "the selected connection"}.`,
@@ -189,6 +190,12 @@ async function showTabContextMenu(instanceId: string, clientX: number, clientY:
     const canCloseCurrent = canCloseTab(instanceId);
     const closableOtherTabIds = getClosableTabIds(instanceId);
     const closableTabIds = getClosableTabIds();
+    // "Split Right" is available when there is at least one OTHER regular open tab
+    const canSplitRight = canManageTab && Array.from(openTools.values()).some((t) => t.instanceId !== instanceId && !t.isDetailTab);
+    // "Move to Right/Left Pane" based on current split state and which pane this tab is in
+    const currentPane = isSplitActive ? getTabCurrentPane(instanceId) : null;
+    const canMoveToRight = isSplitActive && currentPane === "left" && canManageTab;
+    const canMoveToLeft = isSplitActive && currentPane === "right" && canManageTab;
     let action: string | null = null;
     try {
         action = await window.toolboxAPI.utils.showContextMenu({
@@ -199,6 +206,10 @@ async function showTabContextMenu(instanceId: string, clientX: number, clientY:
                 { id: "close-others", label: "Close Other Tabs", enabled: closableOtherTabIds.length > 0 },
                 { id: "close-all", label: "Close All Tabs", enabled: closableTabIds.length > 0 },
                 { type: "separator" },
+                { id: "split-right", label: "Split Right", enabled: canSplitRight && !isSplitActive },
+                { id: "move-to-right", label: "Move to Right Pane", enabled: canMoveToRight },
+                { id: "move-to-left", label: "Move to Left Pane", enabled: canMoveToLeft },
+                { type: "separator" },
                 { id: "duplicate-tab", label: "Duplicate Tab", enabled: canManageTab },
                 { id: "duplicate-tab-new-connection", label: "Duplicate Tab with New Connection", enabled: canManageTab },
                 { id: "change-connection", label: "Change Connection", enabled: canManageTab },
@@ -223,6 +234,21 @@ async function showTabContextMenu(instanceId: string, clientX: number, clientY:
         return;
     }
 
+    if (action === "split-right") {
+        await splitRight(instanceId);
+        return;
+    }
+
+    if (action === "move-to-right") {
+        await window.toolboxAPI.splitLayout.moveToPane(instanceId, "right").catch(() => {});
+        return;
+    }
+
+    if (action === "move-to-left") {
+        await window.toolboxAPI.splitLayout.moveToPane(instanceId, "left").catch(() => {});
+        return;
+    }
+
     if (action === "duplicate-tab") {
         await duplicateToolTab(instanceId);
         return;
@@ -390,7 +416,7 @@ export async function launchTool(toolId: string, options?: LaunchToolOptions): P
 
             if (missingPrimary || missingSecondary) {
                 try {
-                    const result = await openSelectMultiConnectionModal(isSecondaryRequired, tool.name);
+                    const result = await openSelectMultiConnectionModal(isSecondaryRequired, tool.name, tool.features?.enabledForPowerPlatformAPI === true);
                     primaryConnectionId = result.primaryConnectionId;
                     secondaryConnectionId = result.secondaryConnectionId;
                     logInfo("Multi-connections selected:", { primaryConnectionId, secondaryConnectionId });
@@ -416,7 +442,7 @@ export async function launchTool(toolId: string, options?: LaunchToolOptions): P
                 // Regular single-connection flow - prompt if no stored connection
                 logInfo("Showing connection selection modal for new instance...");
                 try {
-                    const selectedConnectionId = await openSelectConnectionModal(null, tool.name);
+                    const selectedConnectionId = await openSelectConnectionModal(null, tool.name, tool.features?.enabledForPowerPlatformAPI === true);
                     logInfo("Connection established. Continuing with tool launch...");
                     if (selectedConnectionId) {
                         primaryConnectionId = selectedConnectionId;
@@ -497,14 +523,7 @@ export async function launchTool(toolId: string, options?: LaunchToolOptions): P
         if (options?.callerInstanceId) {
             // Intentionally fire-and-forget so the callee tool can open immediately while invocation result resolves later.
             void window.toolboxAPI
-                .launchToolWithContext(
-                    options.callerInstanceId,
-                    instanceId,
-                    tool,
-                    primaryConnectionId,
-                    secondaryConnectionId ?? null,
-                    options.prefillData ?? {},
-                )
+                .launchToolWithContext(options.callerInstanceId, instanceId, tool, primaryConnectionId, secondaryConnectionId ?? null, options.prefillData ?? {})
                 .catch(async (error) => {
                     const errorMessage = error instanceof Error ? error.message : String(error);
                     logError("Inter-tool invocation launch failed", { instanceId, error: errorMessage });
@@ -713,13 +732,13 @@ async function updateTabConnectionSubtext(instanceId: string): Promise<void> {
 }
 
 /**
- * Open a tool detail tab (shows tool details as a tab instead of a modal dialog)
+ * Open a a local page like tool details, settings, or other internal pages as a tab (shows content as a tab instead of a modal dialog)
  * @param tabId Unique identifier for the tab (e.g., "tool-detail-{toolId}")
  * @param displayName Name shown on the tab
  * @param renderContent Callback that populates the detail panel with content
  * @param tabLabelSuffix Text appended to the display name for the tab label and tooltip. Defaults to " - Details" to visually distinguish detail tabs from regular tool tabs.
  */
-export async function openToolDetailTab(tabId: string, displayName: string, renderContent: (panel: HTMLElement) => void, tabLabelSuffix = " - Details"): Promise<void> {
+export async function openLocalPageAsTab(tabId: string, displayName: string, renderContent: (panel: HTMLElement) => void, tabLabelSuffix = " - Details"): Promise<void> {
     // If this tool's detail tab is already open, just switch to it
     if (openTools.has(tabId)) {
         // Refresh content in case install state changed
@@ -1037,17 +1056,23 @@ function handleDragOver(e: DragEvent, tab: HTMLElement): false {
     }
 
     if (draggedTab && tab !== draggedTab) {
-        const toolTabs = document.getElementById("tool-tabs");
-        if (!toolTabs) return false;
-
-        const tabs = Array.from(toolTabs.children);
-        const draggedIndex = tabs.indexOf(draggedTab);
-        const targetIndex = tabs.indexOf(tab);
-
-        if (draggedIndex < targetIndex) {
-            toolTabs.insertBefore(draggedTab, tab.nextSibling);
-        } else {
-            toolTabs.insertBefore(draggedTab, tab);
+        const draggedParent = draggedTab.parentElement;
+        const targetParent = tab.parentElement;
+
+        if (draggedParent && targetParent && draggedParent !== targetParent) {
+            // Cross-pane drag — highlight target container but don't move DOM yet
+            tab.classList.add("over");
+        } else if (targetParent) {
+            // Same-pane reorder
+            const tabs = Array.from(targetParent.children);
+            const draggedIndex = tabs.indexOf(draggedTab);
+            const targetIndex = tabs.indexOf(tab);
+
+            if (draggedIndex < targetIndex) {
+                targetParent.insertBefore(draggedTab, tab.nextSibling);
+            } else {
+                targetParent.insertBefore(draggedTab, tab);
+            }
         }
     }
 
@@ -1058,6 +1083,22 @@ function handleDrop(e: DragEvent): false {
     if (e.stopPropagation) {
         e.stopPropagation();
     }
+
+    if (draggedTab && isSplitActive) {
+        const draggedParent = draggedTab.parentElement;
+        // Find the tool-tabs container the drop occurred in (may be the tab's parent)
+        const dropTarget = e.currentTarget as HTMLElement;
+        const targetContainer = dropTarget.closest(".tool-tabs") as HTMLElement | null;
+        if (draggedParent && targetContainer && draggedParent !== targetContainer) {
+            const targetIsRight = targetContainer.id === "right-tool-tabs";
+            const targetPane: "left" | "right" = targetIsRight ? "right" : "left";
+            const instanceId = draggedTab.getAttribute("data-instance-id");
+            if (instanceId) {
+                void window.toolboxAPI.splitLayout.moveToPane(instanceId, targetPane).catch(() => {});
+            }
+        }
+    }
+
     return false;
 }
 
@@ -1667,7 +1708,7 @@ export async function openToolSecondaryConnectionModal(): Promise<void> {
 
             // Get connection from all connections list
             const connections = await window.toolboxAPI.connections.getAll();
-            const connection = connections.find((c: DataverseConnection) => c.id === selectedConnectionId);
+            const connection = connections.find((c: Connection) => c.id === selectedConnectionId);
             window.toolboxAPI.utils.showNotification({
                 title: "Secondary Connection Set",
                 body: `${activeTool.tool.name} secondary connection is now connected to ${connection?.name || "the selected connection"}.`,
@@ -1937,3 +1978,272 @@ export function initializeCalleeToolListeners(): void {
         }
     });
 }
+
+// ─── Split Layout ─────────────────────────────────────────────────────────────
+
+/** Half-width of the visible divider gap (matches SPLIT_DIVIDER_WIDTH / 2 in main process). */
+const SPLIT_HALF_DIVIDER_PX = 2;
+
+// ── Renderer-side split state mirror ──────────────────────────────────────────
+// Updated on every STATE_CHANGED event from the main process.
+let splitLeftGroup: string[] = [];
+let splitRightGroup: string[] = [];
+let isSplitActive = false;
+
+/** Return which pane the given instanceId is currently in, or null if not in split. */
+function getTabCurrentPane(instanceId: string): "left" | "right" | null {
+    if (!isSplitActive) return null;
+    if (splitLeftGroup.includes(instanceId)) return "left";
+    if (splitRightGroup.includes(instanceId)) return "right";
+    return null;
+}
+
+/**
+ * Activate split-right for the given tab.
+ * The current active tab becomes the left pane; instanceId moves to the right pane.
+ */
+async function splitRight(instanceId: string): Promise<void> {
+    const openTool = openTools.get(instanceId);
+    if (!openTool || openTool.isDetailTab) return;
+
+    // Choose the left pane: prefer the currently active tab, otherwise any other regular tool
+    let leftInstanceId: string | null = null;
+
+    if (activeToolId && activeToolId !== instanceId) {
+        const leftTool = openTools.get(activeToolId);
+        if (leftTool && !leftTool.isDetailTab) {
+            leftInstanceId = activeToolId;
+        }
+    }
+
+    if (!leftInstanceId) {
+        for (const [id, tool] of openTools) {
+            if (id !== instanceId && !tool.isDetailTab) {
+                leftInstanceId = id;
+                break;
+            }
+        }
+    }
+
+    if (!leftInstanceId) {
+        await window.toolboxAPI.utils.showNotification({
+            title: "Split Right",
+            body: "Open at least two tools before splitting the view.",
+            type: "info",
+        });
+        return;
+    }
+
+    await window.toolboxAPI.switchToolWindow(leftInstanceId).catch(() => {});
+    const success = await window.toolboxAPI.splitLayout.activate(leftInstanceId, instanceId);
+    if (!success) {
+        logWarn("splitRight: main process declined split activation");
+    }
+}
+
+/** Update the content-area divider position and the tab-bar widths. */
+function updateSplitDividerPosition(ratio: number): void {
+    const divider = document.getElementById("split-pane-divider") as HTMLElement | null;
+    if (divider) {
+        divider.style.left = `calc(${ratio * 100}% - ${SPLIT_HALF_DIVIDER_PX}px)`;
+    }
+    // Keep tab-bar proportions in sync with the content-area divider
+    const header = document.getElementById("tool-panel-header") as HTMLElement | null;
+    if (header) {
+        header.style.setProperty("--split-left-basis", `${ratio * 100}%`);
+    }
+}
+
+/**
+ * Reconcile tab DOM elements between the two tab bars based on the latest split state.
+ * Tabs in leftGroup go to #tool-tabs; tabs in rightGroup go to #right-tool-tabs.
+ * Tabs not in either group (shouldn't normally happen) stay in #tool-tabs.
+ */
+function reconcileTabBars(state: { leftGroup: string[]; rightGroup: string[]; activeLeftInstanceId: string | null; activeRightInstanceId: string | null }): void {
+    const leftBar = document.getElementById("tool-tabs") as HTMLElement | null;
+    const rightBar = document.getElementById("right-tool-tabs") as HTMLElement | null;
+    if (!leftBar || !rightBar) return;
+
+    // Move right-group tabs to the right bar
+    for (const instanceId of state.rightGroup) {
+        const tab = document.getElementById(`tool-tab-${instanceId}`);
+        if (tab && tab.parentElement !== rightBar) {
+            rightBar.appendChild(tab);
+        }
+    }
+
+    // Move left-group tabs (and any stray tabs not in right group) to the left bar
+    for (const instanceId of state.leftGroup) {
+        const tab = document.getElementById(`tool-tab-${instanceId}`);
+        if (tab && tab.parentElement !== leftBar) {
+            leftBar.appendChild(tab);
+        }
+    }
+
+    // Apply active states in each bar
+    leftBar.querySelectorAll<HTMLElement>(".tool-tab").forEach((tab) => {
+        const id = tab.getAttribute("data-instance-id");
+        tab.classList.toggle("active", id === state.activeLeftInstanceId);
+    });
+    rightBar.querySelectorAll<HTMLElement>(".tool-tab").forEach((tab) => {
+        const id = tab.getAttribute("data-instance-id");
+        tab.classList.toggle("active", id === state.activeRightInstanceId);
+    });
+}
+
+/** Move all tabs from the right bar back to the left bar (called on split deactivation). */
+function mergeTabBarsToLeft(): void {
+    const leftBar = document.getElementById("tool-tabs") as HTMLElement | null;
+    const rightBar = document.getElementById("right-tool-tabs") as HTMLElement | null;
+    if (!leftBar || !rightBar) return;
+
+    Array.from(rightBar.children).forEach((tab) => leftBar.appendChild(tab));
+}
+
+/** Show or hide the right tab bar and separator. */
+function setRightTabBarVisible(visible: boolean): void {
+    const rightContainer = document.getElementById("right-tabs-container") as HTMLElement | null;
+    const separator = document.getElementById("split-tabs-bar-divider") as HTMLElement | null;
+    const header = document.getElementById("tool-panel-header") as HTMLElement | null;
+    if (rightContainer) rightContainer.style.display = visible ? "flex" : "none";
+    if (separator) separator.style.display = visible ? "flex" : "none";
+    if (header) header.classList.toggle("split-active", visible);
+}
+
+/** Set up drop-zone handlers on a tab bar container for cross-pane DnD. */
+function setupTabBarDropZone(container: HTMLElement, targetPane: "left" | "right"): void {
+    container.addEventListener("dragover", (e) => {
+        if (!isSplitActive || !draggedTab) return;
+        const draggedParent = draggedTab.parentElement;
+        const dropBar = container.querySelector(".tool-tabs") as HTMLElement | null;
+        if (draggedParent && dropBar && draggedParent !== dropBar) {
+            e.preventDefault();
+            if (e.dataTransfer) e.dataTransfer.dropEffect = "move";
+            container.classList.add("drag-over-pane");
+        }
+    });
+    container.addEventListener("dragleave", () => {
+        container.classList.remove("drag-over-pane");
+    });
+    container.addEventListener("drop", (e) => {
+        container.classList.remove("drag-over-pane");
+        if (!isSplitActive || !draggedTab) return;
+        const dropBar = container.querySelector(".tool-tabs") as HTMLElement | null;
+        if (draggedTab.parentElement !== dropBar) {
+            e.stopPropagation();
+            const instanceId = draggedTab.getAttribute("data-instance-id");
+            if (instanceId) {
+                void window.toolboxAPI.splitLayout.moveToPane(instanceId, targetPane).catch(() => {});
+            }
+        }
+    });
+}
+
+/** Handle a split STATE_CHANGED event pushed by the main process. */
+function onSplitStateChanged(state: import("../../common/types/api").SplitLayoutState): void {
+    const wasActive = isSplitActive;
+
+    isSplitActive = state.isActive;
+    splitLeftGroup = state.leftGroup;
+    splitRightGroup = state.rightGroup;
+
+    const divider = document.getElementById("split-pane-divider") as HTMLElement | null;
+
+    if (state.isActive) {
+        // Show/update split UI
+        if (divider) divider.style.display = "block";
+        setRightTabBarVisible(true);
+        updateSplitDividerPosition(state.ratio);
+        reconcileTabBars(state);
+    } else {
+        // Tear down split UI
+        if (divider) divider.style.display = "none";
+        setRightTabBarVisible(false);
+        mergeTabBarsToLeft();
+
+        // When split is deactivated by the main process (e.g. last tab in a pane closed
+        // or moved), activate the surviving tool.
+        if (wasActive) {
+            // The surviving active tool is whichever was left: prefer focused pane's active.
+            // At deactivation time our local state is already zeroed, so look at open tools.
+            const survivingId =
+                (state.activeLeftInstanceId && openTools.has(state.activeLeftInstanceId) ? state.activeLeftInstanceId : null) ??
+                (state.activeRightInstanceId && openTools.has(state.activeRightInstanceId) ? state.activeRightInstanceId : null) ??
+                (openTools.size > 0 ? Array.from(openTools.keys())[openTools.size - 1] : null);
+            if (survivingId) {
+                void switchToTool(survivingId);
+            }
+        }
+    }
+}
+
+/**
+ * Set up the split-pane divider drag behaviour, drop zones on both tab bars,
+ * and subscribe to STATE_CHANGED from the main process.
+ * Called once during application initialisation.
+ */
+export function initSplitLayout(): void {
+    const divider = document.getElementById("split-pane-divider") as HTMLElement | null;
+    if (divider) {
+        setupDividerDrag(divider);
+    }
+
+    // Set up cross-pane drag-and-drop on both tab bar containers
+    const leftContainer = document.getElementById("left-tabs-container") as HTMLElement | null;
+    const rightContainer = document.getElementById("right-tabs-container") as HTMLElement | null;
+    if (leftContainer) setupTabBarDropZone(leftContainer, "left");
+    if (rightContainer) setupTabBarDropZone(rightContainer, "right");
+
+    // Subscribe to state changes pushed by the main process
+    window.toolboxAPI.splitLayout.onStateChanged((state) => {
+        onSplitStateChanged(state);
+    });
+}
+
+function setupDividerDrag(divider: HTMLElement): void {
+    let isDragging = false;
+    let lastSentRatio = -1;
+
+    divider.addEventListener("mousedown", (e) => {
+        e.preventDefault();
+        isDragging = true;
+        divider.classList.add("dragging");
+
+        const onMouseMove = (e: MouseEvent) => {
+            if (!isDragging) return;
+            const content = document.getElementById("tool-panel-content");
+            if (!content) return;
+            const rect = content.getBoundingClientRect();
+            const newRatio = Math.max(0.15, Math.min(0.85, (e.clientX - rect.left) / rect.width));
+
+            // Update divider and tab bar positions immediately for smooth feedback
+            updateSplitDividerPosition(newRatio);
+
+            // Throttle IPC calls — only send when ratio changed meaningfully
+            if (Math.abs(newRatio - lastSentRatio) > 0.002) {
+                lastSentRatio = newRatio;
+                window.toolboxAPI.splitLayout.setRatio(newRatio).catch(() => {});
+            }
+        };
+
+        const onMouseUp = (e: MouseEvent) => {
+            if (!isDragging) return;
+            isDragging = false;
+            divider.classList.remove("dragging");
+
+            // Persist the final position
+            const content = document.getElementById("tool-panel-content");
+            if (content) {
+                const rect = content.getBoundingClientRect();
+                const finalRatio = Math.max(0.15, Math.min(0.85, (e.clientX - rect.left) / rect.width));
+                window.toolboxAPI.splitLayout.setRatio(finalRatio).catch(() => {});
+            }
+
+            document.removeEventListener("mousemove", onMouseMove);
+            document.removeEventListener("mouseup", onMouseUp);
+        };
+
+        document.addEventListener("mousemove", onMouseMove);
+        document.addEventListener("mouseup", onMouseUp);
+    });
+}
diff --git a/src/renderer/modules/toolsSidebarManagement.ts b/src/renderer/modules/toolsSidebarManagement.ts
index c2da1fd7..ca326891 100644
--- a/src/renderer/modules/toolsSidebarManagement.ts
+++ b/src/renderer/modules/toolsSidebarManagement.ts
@@ -9,6 +9,7 @@ import { getUnsupportedBadgeTitle, getUnsupportedRequirement } from "../utils/to
 import { applyToolIconMasks, generateToolIconHtml } from "../utils/toolIconResolver";
 import { getToolSourceIconHtml } from "../utils/toolSourceIcon";
 import { loadMarketplace, openToolDetail } from "./marketplaceManagement";
+import { isMcpPreviewUiEnabled } from "./previewFeatureManagement";
 import { switchSidebar } from "./sidebarManagement";
 import { launchTool } from "./toolManagement";
 
@@ -66,14 +67,25 @@ export async function loadSidebarTools(): Promise<void> {
         const authorFilter = document.getElementById("tools-author-filter") as HTMLSelectElement | null;
         const sortSelect = document.getElementById("tools-sort-select") as HTMLSelectElement | null;
         const updateRequiredFilter = document.getElementById("tools-update-required-filter") as CheckboxElement | null;
+        const mcpEnabledFilter = document.getElementById("tools-mcp-enabled-filter") as CheckboxElement | null;
+        const mcpEnabledFilterRow = document.getElementById("tools-mcp-enabled-filter-row") as HTMLElement | null;
+        const mcpPreviewUiEnabled = isMcpPreviewUiEnabled();
+
+        if (mcpEnabledFilterRow) {
+            mcpEnabledFilterRow.style.display = mcpPreviewUiEnabled ? "" : "none";
+        }
+        if (!mcpPreviewUiEnabled && mcpEnabledFilter) {
+            mcpEnabledFilter.checked = false;
+        }
 
         const searchTerm = searchInput?.value ? searchInput.value.toLowerCase() : "";
         const selectedCategory = categoryFilter?.value || "";
         const selectedAuthor = authorFilter?.value || "";
         const showUpdateRequiredOnly = !!updateRequiredFilter?.checked;
+        const showMcpEnabledOnly = mcpPreviewUiEnabled && !!mcpEnabledFilter?.checked;
 
         // Update filter button indicator and one-click clear button visibility
-        const hasDropdownFilters = !!(selectedCategory || selectedAuthor || showUpdateRequiredOnly);
+        const hasDropdownFilters = !!(selectedCategory || selectedAuthor || showUpdateRequiredOnly || showMcpEnabledOnly);
         const toolsFilterBtn = document.getElementById("tools-filter-btn");
         if (toolsFilterBtn) {
             toolsFilterBtn.classList.toggle("has-active-filters", hasDropdownFilters);
@@ -122,6 +134,11 @@ export async function loadSidebarTools(): Promise<void> {
                 return false;
             }
 
+            // MCP enabled filter
+            if (showMcpEnabledOnly && t.mcpHeadlessEnabled !== true) {
+                return false;
+            }
+
             // Deprecated filter
             if (t.status === "deprecated") {
                 if (deprecatedToolsVisibility === "hide-all" || deprecatedToolsVisibility === "show-marketplace") {
@@ -161,7 +178,7 @@ export async function loadSidebarTools(): Promise<void> {
         // Empty state when no matches after filtering
         if (sortedTools.length === 0) {
             const hasSearchTerm = searchTerm.length > 0;
-            const hasActiveFilters = hasSearchTerm || selectedCategory || selectedAuthor || showUpdateRequiredOnly;
+            const hasActiveFilters = hasSearchTerm || selectedCategory || selectedAuthor || showUpdateRequiredOnly || showMcpEnabledOnly;
             const emptyMessage = hasSearchTerm ? `No installed tools match "${searchTerm}".` : hasActiveFilters ? "No tools match the current filters." : "Try a different search term.";
             toolsList.innerHTML = `
                 <div class="empty-state">
@@ -202,6 +219,7 @@ export async function loadSidebarTools(): Promise<void> {
         toolsList.innerHTML = sortedTools
             .map((tool: ToolDetail & { hasUpdate?: boolean; latestVersion?: string; isFavorite?: boolean; isUpdating?: boolean }) => {
                 const isDarkTheme = document.body.classList.contains("dark-theme");
+                const mcpIconPath = isDarkTheme ? "icons/dark/mcp.svg" : "icons/light/mcp.svg";
 
                 // Icon handling using utility function
                 const defaultToolIcon = isDarkTheme ? "icons/dark/tool-default.svg" : "icons/light/tool-default.svg";
@@ -249,6 +267,11 @@ export async function loadSidebarTools(): Promise<void> {
                     tool.mau !== undefined ? `<span class="tool-metric" title="Monthly Active Users">👥 ${tool.mau}</span>` : ""
                 }</div>`;
                 const authorsDisplay = `by ${tool.authors && tool.authors.length ? tool.authors.join(", ") : ""}`;
+                const mcpBadgeHtml =
+                    mcpPreviewUiEnabled && tool.mcpHeadlessEnabled === true
+                        ? `<span class="tool-mcp-headless-badge" title="MCP headless enabled" aria-label="MCP headless enabled"><img src="${mcpIconPath}" alt="" aria-hidden="true" /><span>MCP</span></span>`
+                        : "";
+                const compactTagsClass = mcpPreviewUiEnabled && tool.mcpHeadlessEnabled === true ? "tool-item-top-tags has-mcp-badge" : "tool-item-top-tags";
 
                 // Helper: Generate updating overlay HTML
                 const updatingOverlayHtml = isUpdating
@@ -304,6 +327,7 @@ export async function loadSidebarTools(): Promise<void> {
                             </div>
                         </div>
                         <div class="tool-item-authors-pptb">${authorsDisplay}</div>
+                        <div class="${compactTagsClass}">${mcpBadgeHtml}</div>
                     </div>`;
                 }
 
@@ -354,7 +378,7 @@ export async function loadSidebarTools(): Promise<void> {
                         <div class="tool-item-footer-pptb">
                             ${analyticsHtml}
                         </div>
-                        <div class="tool-item-top-tags">${categoriesHtml}${deprecatedBadgeHtml}${unsupportedBadgeHtml}</div>
+                        <div class="tool-item-top-tags">${mcpBadgeHtml}${categoriesHtml}${deprecatedBadgeHtml}${unsupportedBadgeHtml}</div>
                         ${
                             shouldShowUpdateInfo
                                 ? `<div class="tool-item-update-btn"><button class="fluent-button fluent-button-primary" data-action="update" data-tool-id="${tool.id}" title="Update to v${latestVersion}">Update</button></div>`
@@ -433,6 +457,7 @@ export async function loadSidebarTools(): Promise<void> {
     const categoryFilter = document.getElementById("tools-category-filter") as HTMLSelectElement | null;
     const authorFilter = document.getElementById("tools-author-filter") as HTMLSelectElement | null;
     const updateRequiredFilter = document.getElementById("tools-update-required-filter") as CheckboxElement | null;
+    const mcpEnabledFilter = document.getElementById("tools-mcp-enabled-filter") as CheckboxElement | null;
 
     if (searchInput && !(searchInput as any)._pptbBound) {
         (searchInput as any)._pptbBound = true;
@@ -463,6 +488,13 @@ export async function loadSidebarTools(): Promise<void> {
         });
     }
 
+    if (mcpEnabledFilter && !mcpEnabledFilter._pptbBound) {
+        mcpEnabledFilter._pptbBound = true;
+        mcpEnabledFilter.addEventListener("change", () => {
+            loadSidebarTools();
+        });
+    }
+
     // Setup sort event listener
     const sortSelect = document.getElementById("tools-sort-select") as HTMLSelectElement | null;
     if (sortSelect && !(sortSelect as any)._pptbBound) {
@@ -761,6 +793,11 @@ function clearAllFilters(): void {
         updateRequiredFilter.checked = false;
     }
 
+    const mcpEnabledFilter = document.getElementById("tools-mcp-enabled-filter") as CheckboxElement | null;
+    if (mcpEnabledFilter) {
+        mcpEnabledFilter.checked = false;
+    }
+
     // Reload the sidebar tools to reflect the cleared filters
     loadSidebarTools();
 }
@@ -787,6 +824,11 @@ export function clearInstalledToolsDropdownFilters(): void {
         updateRequiredFilter.checked = false;
     }
 
+    const mcpEnabledFilter = document.getElementById("tools-mcp-enabled-filter") as CheckboxElement | null;
+    if (mcpEnabledFilter) {
+        mcpEnabledFilter.checked = false;
+    }
+
     // Reload the sidebar tools to reflect the cleared filters
     loadSidebarTools();
 }
diff --git a/src/renderer/modules/whatsNewManagement.ts b/src/renderer/modules/whatsNewManagement.ts
index 4355bd5b..35521446 100644
--- a/src/renderer/modules/whatsNewManagement.ts
+++ b/src/renderer/modules/whatsNewManagement.ts
@@ -5,7 +5,7 @@
 
 import { logWarn } from "../../common/logger";
 import { renderMarkdownToSafeHtml, wireExternalLinks } from "../utils/markdown";
-import { openToolDetailTab } from "./toolManagement";
+import { openLocalPageAsTab } from "./toolManagement";
 
 const WHATS_NEW_TAB_ID = "whats-new";
 const WHATS_NEW_TAB_TITLE = "What's New";
@@ -65,7 +65,7 @@ export async function openWhatsNewTab(versionOverride?: string): Promise<void> {
     const websiteUrl = normalizedVersion ? buildWhatsNewWebsiteUrl(normalizedVersion) : "";
     const markdownUrl = normalizedVersion ? buildWhatsNewMarkdownUrl(normalizedVersion) : "";
 
-    await openToolDetailTab(
+    await openLocalPageAsTab(
         WHATS_NEW_TAB_ID,
         WHATS_NEW_TAB_TITLE,
         (panel) => {
diff --git a/src/renderer/styles.scss b/src/renderer/styles.scss
index 9abbc619..1d5715ed 100644
--- a/src/renderer/styles.scss
+++ b/src/renderer/styles.scss
@@ -11,6 +11,7 @@
     --text-color: #{$text-color};
     --text-primary: #{$text-color};
     --text-secondary: #605e5c;
+    --text-muted: #{$text-muted};
     --bg-color: #{$bg-color};
     --card-background: #{$bg-color};
     --input-background: #f3f2f1;
@@ -62,6 +63,7 @@ body.dark-theme {
     --text-color: #{$dark-text-color};
     --text-primary: #{$dark-text-color};
     --text-secondary: #c8c6c4;
+    --text-muted: #{$dark-text-muted};
     --bg-color: #{$dark-bg-color};
     --card-background: #2d2d30;
     --input-background: #1e1e1e;
@@ -1087,6 +1089,17 @@ body.dark-theme .settings-section-card {
     font-size: 11px;
 }
 
+.power-platform-api-badge {
+    padding: 2px 8px;
+    border-radius: 4px;
+    background: color-mix(in srgb, var(--primary-color) 16%, transparent);
+    color: var(--primary-color);
+    border: 1px solid color-mix(in srgb, var(--primary-color) 35%, transparent);
+    font-size: 11px;
+    font-weight: 600;
+    letter-spacing: 0.02em;
+}
+
 .connection-actions {
     display: flex;
     gap: 8px;
@@ -1601,6 +1614,48 @@ body.dark-theme .settings-section-card {
     height: 40px;
     min-height: 40px;
     position: relative;
+    overflow: hidden;
+
+    /* ── Split-active layout ─────────────────────────────────────────────────
+     * When .split-active is added, the left/right tab containers sit side by
+     * side.  Their flex-basis values are set via JS (--split-left-basis /
+     * --split-right-basis) so the separator aligns with the content divider.
+     */
+    &.split-active {
+        overflow: visible; // allow tab bar shadow to be visible
+
+        #left-tabs-container {
+            flex: 0 0 var(--split-left-basis, 50%);
+            min-width: 80px;
+            max-width: calc(100% - 80px - 4px);
+            border-right: none;
+        }
+
+        #right-tabs-container {
+            flex: 1 1 auto;
+            min-width: 80px;
+            overflow: hidden;
+        }
+    }
+}
+
+/* ── Split-pane tab-bar visual separator ────────────────────────────────────── */
+
+.split-tabs-bar-divider {
+    flex: 0 0 4px;
+    width: 4px;
+    align-self: stretch;
+    background-color: var(--border-color);
+    cursor: col-resize;
+    z-index: 5;
+}
+
+/* Right tab bar drop-zone highlight when a tab is dragged over it */
+#right-tabs-container.drag-over-pane,
+#left-tabs-container.drag-over-pane {
+    background: color-mix(in srgb, var(--accent-color, #6a00ff) 12%, transparent);
+    outline: 1px solid var(--accent-color, #6a00ff);
+    outline-offset: -1px;
 }
 
 .tool-panel-controls {
@@ -1857,6 +1912,61 @@ body.dark-theme .settings-section-card {
     overflow: hidden;
 }
 
+/* ── Split-pane divider ───────────────────────────────────────────────────── */
+
+.split-pane-divider {
+    position: absolute;
+    top: 0;
+    height: 100%;
+    width: 4px;
+    background-color: var(--border-color);
+    cursor: col-resize;
+    z-index: 2;
+    user-select: none;
+    transition: background-color 0.15s ease;
+
+    &::after {
+        content: "";
+        position: absolute;
+        top: 0;
+        left: -4px;
+        right: -4px;
+        bottom: 0;
+    }
+
+    &:hover,
+    &.dragging {
+        background-color: var(--accent-color, #6a00ff);
+    }
+}
+
+/* ── Split-pane tab badges (L / R) ───────────────────────────────────────── */
+
+.split-pane-badge {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 9px;
+    font-weight: 700;
+    line-height: 1;
+    width: 14px;
+    height: 14px;
+    border-radius: 3px;
+    margin-right: 4px;
+    flex-shrink: 0;
+    pointer-events: none;
+    background-color: var(--accent-color, #6a00ff);
+    color: #fff;
+}
+
+.tool-tab.split-pane-left .split-pane-badge {
+    background-color: var(--accent-color, #6a00ff);
+}
+
+.tool-tab.split-pane-right .split-pane-badge {
+    background-color: var(--accent-color-alt, #00b4d8);
+}
+
 .tool-panel-content-wrapper {
     flex: 1;
     display: flex;
@@ -2163,6 +2273,60 @@ body.dark-theme .settings-vscode-item:hover {
     align-self: flex-start;
 }
 
+.mcp-settings-item {
+    margin-bottom: 8px;
+}
+
+.mcp-settings-item-spaced {
+    margin-bottom: 16px;
+}
+
+.mcp-server-item-control {
+    width: 360px;
+}
+
+.mcp-server-control-row {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding-right: 8px;
+}
+
+.mcp-server-value-input {
+    flex: 1;
+    min-width: 0;
+    font-family: monospace;
+}
+
+.mcp-copy-icon-btn {
+    width: 32px;
+    height: 32px;
+    padding: 0;
+    flex-shrink: 0;
+}
+
+.mcp-copy-icon-btn svg {
+    width: 16px;
+    height: 16px;
+}
+
+.mcp-client-connect-row {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+}
+
+.mcp-server-actions-row {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    flex-wrap: wrap;
+}
+
+.mcp-server-action-status {
+    min-height: 18px;
+}
+
 /* Checkbox with label */
 .settings-vscode-checkbox-label {
     display: inline-flex;
@@ -2204,6 +2368,8 @@ body.dark-theme .settings-vscode-item:hover {
     z-index: 10;
     justify-content: end;
     flex-direction: row-reverse;
+    // justify-content: end;
+    // flex-direction: row-reverse;
 }
 
 .tool-detail-tab-header {
@@ -2267,6 +2433,18 @@ body.dark-theme .settings-vscode-item:hover {
     color: var(--text-color);
 }
 
+.tool-detail-tab-tags .tool-mcp-headless-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+}
+
+.tool-detail-tab-tags .tool-mcp-headless-badge img {
+    width: 12px;
+    height: 12px;
+    display: block;
+}
+
 .tool-detail-tab-name {
     margin: 0;
     font-size: 22px;
@@ -2970,6 +3148,31 @@ img.tool-item-icon-img {
     margin-right: 4px;
 }
 
+.tool-mcp-headless-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    padding: 2px 7px;
+    border-radius: 999px;
+    border: 1px solid var(--border-color);
+    background: rgba(0, 120, 212, 0.08);
+    color: var(--text-color);
+    font-size: 10px;
+    font-weight: 600;
+    line-height: 1;
+    white-space: nowrap;
+}
+
+.tool-mcp-headless-badge img {
+    width: 12px;
+    height: 12px;
+    display: block;
+}
+
+body.dark-theme .tool-mcp-headless-badge {
+    background: rgba(0, 120, 212, 0.18);
+}
+
 .tool-item-pptb.deprecated {
     border-left: 3px solid #d83b01;
     background: rgba(216, 59, 1, 0.05);
@@ -3063,6 +3266,12 @@ img.tool-item-icon-img {
     margin-left: 38px;
 }
 
+.tool-item-compact .tool-item-top-tags.has-mcp-badge {
+    display: flex !important;
+    margin-left: 38px;
+    padding-top: 4px;
+}
+
 /* Compact mode styles for marketplace */
 .marketplace-item-compact {
     padding: 8px 12px !important;
@@ -3084,6 +3293,12 @@ img.tool-item-icon-img {
     margin-left: 38px;
 }
 
+.marketplace-item-compact .marketplace-item-top-tags.has-mcp-badge {
+    display: flex !important;
+    margin-left: 38px;
+    padding-top: 4px;
+}
+
 /* VSCode-style marketplace list */
 .marketplace-tools-list-pptb {
     display: flex;
@@ -5809,3 +6024,60 @@ body.dark-theme .global-search-item-badge.badge-settings {
     background: rgba(255, 255, 255, 0.2);
     color: #fff;
 }
+
+.mcp-subheader {
+    margin: 8px 0 16px;
+    font-weight: normal;
+    text-transform: none;
+}
+
+/* ── Notification Bell Button ───────────────────────────────────────────── */
+
+.footer-bell-btn {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    padding: 0;
+    border: none;
+    background: transparent;
+    color: var(--text-secondary);
+    border-radius: 4px;
+    cursor: pointer;
+    transition:
+        color 0.15s ease,
+        background 0.15s ease;
+    flex-shrink: 0;
+}
+
+.footer-bell-btn:hover {
+    background: rgba(0, 0, 0, 0.08);
+    color: var(--text-color);
+}
+
+.dark-theme .footer-bell-btn:hover {
+    background: rgba(255, 255, 255, 0.1);
+}
+
+.footer-bell-btn[aria-pressed="true"] {
+    color: var(--accent-color, #0078d4);
+}
+
+.notification-badge {
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    min-width: 14px;
+    height: 14px;
+    padding: 0 3px;
+    background: #d13438;
+    color: #ffffff;
+    font-size: 9px;
+    font-weight: 700;
+    line-height: 14px;
+    border-radius: 7px;
+    text-align: center;
+    pointer-events: none;
+}
diff --git a/src/renderer/styles/_variables.scss b/src/renderer/styles/_variables.scss
index fe10b0ad..05626151 100644
--- a/src/renderer/styles/_variables.scss
+++ b/src/renderer/styles/_variables.scss
@@ -1,5 +1,6 @@
 // Color Variables - Light Theme
 $primary-color: #0078d4;
+$text-muted: #605e5c;
 $primary-hover: #106ebe;
 $secondary-color: #f3f2f1;
 $text-color: #323130;
@@ -11,6 +12,7 @@ $primary-gradient-hover: linear-gradient(to right, #106ebe, #7a35e0);
 
 // Dark Theme Colors
 $dark-text-color: #f3f2f1;
+$dark-text-muted: #c8c6c4;
 $dark-bg-color: #1e1e1e;
 $dark-sidebar-bg: #252526;
 $dark-border-color: #3e3e42;
diff --git a/src/renderer/styles/homepage.scss b/src/renderer/styles/homepage.scss
index 62b375b7..54d72d49 100644
--- a/src/renderer/styles/homepage.scss
+++ b/src/renderer/styles/homepage.scss
@@ -286,6 +286,35 @@ body.dark-theme .quick-tool-item:hover {
     text-overflow: ellipsis;
 }
 
+.quick-tool-name-row {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    min-width: 0;
+}
+
+.quick-tool-mcp-badge {
+    width: 16px;
+    height: 16px;
+    border-radius: 999px;
+    border: 1px solid var(--border-color);
+    background: rgba(0, 120, 212, 0.08);
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+}
+
+.quick-tool-mcp-badge img {
+    width: 11px;
+    height: 11px;
+    display: block;
+}
+
+body.dark-theme .quick-tool-mcp-badge {
+    background: rgba(0, 120, 212, 0.18);
+}
+
 .quick-tool-version {
     font-size: 12px;
     color: var(--text-secondary, #605e5c);
diff --git a/src/renderer/types/index.ts b/src/renderer/types/index.ts
index 3cdc94ba..cd40d14c 100644
--- a/src/renderer/types/index.ts
+++ b/src/renderer/types/index.ts
@@ -2,6 +2,8 @@
  * Renderer-specific type definitions
  */
 
+import type { PreviewFeatureFlags } from "../../common/types";
+
 /**
  * Interface for an open tool instance
  */
@@ -62,6 +64,8 @@ export interface SettingsState {
     showEnvironmentColor?: boolean;
     categoryColorThickness?: number;
     environmentColorThickness?: number;
+    enablePreviewFeatures?: boolean;
+    previewFeatures?: PreviewFeatureFlags;
 }
 
 /**
@@ -103,4 +107,5 @@ export interface ToolDetail {
     maxAPI?: string; // Maximum ToolBox API version tested
     isSupported?: boolean; // Whether this tool is compatible with current ToolBox version
     npmPackageName?: string; // npm package name used for pre-release version detection
+    mcpHeadlessEnabled?: boolean; // Whether this tool supports MCP headless execution
 }
diff --git a/src/renderer/utils/connectionSorting.ts b/src/renderer/utils/connectionSorting.ts
index da80356d..31820a59 100644
--- a/src/renderer/utils/connectionSorting.ts
+++ b/src/renderer/utils/connectionSorting.ts
@@ -1,4 +1,4 @@
-import { DataverseConnection, UIConnectionData } from "../../common/types/connection";
+import { Connection, UIConnectionData } from "../../common/types/connection";
 import { ConnectionsSortOption } from "../../common/types/settings";
 
 /**
@@ -22,7 +22,7 @@ const UNKNOWN_ENVIRONMENT_SORT_ORDER = 999;
  * Falls back to createdAt if lastUsedAt is not available or invalid.
  * Returns 0 if neither timestamp is available.
  */
-export function getLastUsedTimestamp(conn: DataverseConnection | UIConnectionData): number {
+export function getLastUsedTimestamp(conn: Connection | UIConnectionData): number {
     if (conn.lastUsedAt) {
         const parsedLastUsed = Date.parse(conn.lastUsedAt);
         if (!Number.isNaN(parsedLastUsed)) {
@@ -42,7 +42,7 @@ export function getLastUsedTimestamp(conn: DataverseConnection | UIConnectionDat
  * Sort connections based on the specified sort option.
  * Returns a new sorted array without modifying the original.
  */
-export function sortConnections<T extends DataverseConnection | UIConnectionData>(connections: T[], sortOption: ConnectionsSortOption): T[] {
+export function sortConnections<T extends Connection | UIConnectionData>(connections: T[], sortOption: ConnectionsSortOption): T[] {
     return [...connections].sort((a, b) => {
         switch (sortOption) {
             case "last-used": {
@@ -72,12 +72,12 @@ export function sortConnections<T extends DataverseConnection | UIConnectionData
 /**
  * Returns the JavaScript code for connection sorting utilities.
  * This is used for inline scripts in modal controllers.
- * 
+ *
  * The generated code includes:
  * - `ENVIRONMENT_SORT_ORDER` - Environment priority map
  * - `getLastUsedTimestamp(conn)` - Extract timestamp for sorting
  * - `sortConnections(a, b, sortOption)` - Comparator function for Array.sort()
- * 
+ *
  * Note: The sortConnections comparator expects a pre-sanitized sortOption parameter
  * (one of: "last-used", "name-asc", "name-desc", "environment").
  * Modal controllers must validate/sanitize the sort option before calling.
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 00000000..8307ebb7
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,71 @@
+# Tests
+
+This directory contains the full test suite for Power Platform ToolBox.
+
+## Structure
+
+```
+tests/
+  __mocks__/
+    electron.ts          # Manual mock — replaces the Electron runtime in unit tests
+    electron-store.ts    # Manual mock — replaces file-backed storage with in-memory Map
+  unit/
+    main/
+      managers/          # Jest unit tests for main-process managers
+    common/              # Jest unit tests for shared utility functions
+    renderer/            # Jest unit tests for renderer utility functions
+  e2e/
+    fixtures.ts          # Playwright fixture: launches/tears down the Electron app
+    app.spec.ts          # E2E: app launch and basic visibility
+    navigation.spec.ts   # E2E: sidebar navigation
+```
+
+## Running tests
+
+### Unit tests (Jest)
+
+```bash
+pnpm run test:unit          # run once
+pnpm run test:unit:watch    # watch mode
+pnpm run test:unit:coverage # with coverage report
+```
+
+### E2E tests (Playwright)
+
+```bash
+pnpm run build              # build the app first (e2e requires a built app)
+pnpm run test:e2e           # run all e2e tests
+pnpm run test:e2e:ui        # open Playwright UI mode
+```
+
+### All tests
+
+```bash
+pnpm run test               # unit + e2e
+```
+
+## Adding tests
+
+### New unit test
+
+Create a file under `tests/unit/` mirroring the source path, e.g.:
+
+```
+src/main/managers/myManager.ts  →  tests/unit/main/managers/myManager.test.ts
+```
+
+Import the module under test directly — Jest will automatically apply the
+`electron` and `electron-store` mocks via `moduleNameMapper` in `jest.config.ts`.
+
+### New e2e test
+
+Create a `*.spec.ts` file in `tests/e2e/` and import `test` and `expect` from
+`./fixtures` (not directly from `@playwright/test`) so that each test gets a
+fresh Electron process.
+
+## Mocks
+
+| Mock file                     | What it replaces        | Key behaviour                                                                      |
+| ----------------------------- | ----------------------- | ---------------------------------------------------------------------------------- |
+| `__mocks__/electron.ts`       | `electron` module       | `safeStorage` encodes/decodes via base64 Buffer; other APIs are Jest spy functions |
+| `__mocks__/electron-store.ts` | `electron-store` module | In-memory `Map`-based store that mirrors the `electron-store` API                  |
diff --git a/tests/__mocks__/electron-store.ts b/tests/__mocks__/electron-store.ts
new file mode 100644
index 00000000..f3522987
--- /dev/null
+++ b/tests/__mocks__/electron-store.ts
@@ -0,0 +1,58 @@
+/**
+ * Manual mock for the `electron-store` module.
+ *
+ * Replaces the file-backed Store with an in-memory Map so that unit tests
+ * run without touching the filesystem and without requiring the Electron
+ * runtime.
+ */
+
+interface StoreOptions<T extends Record<string, unknown>> {
+    name?: string;
+    defaults?: Partial<T>;
+    schema?: unknown;
+}
+
+class MockStore<T extends Record<string, unknown>> {
+    private data: Map<string, unknown>;
+    private readonly defaults: Partial<T>;
+
+    constructor(options: StoreOptions<T> = {}) {
+        this.defaults = options.defaults ?? {};
+        this.data = new Map<string, unknown>();
+    }
+
+    get store(): T {
+        const result: Record<string, unknown> = { ...this.defaults };
+        for (const [k, v] of this.data.entries()) {
+            result[k] = v;
+        }
+        return result as T;
+    }
+
+    get<K extends keyof T>(key: K): T[K] {
+        if (this.data.has(key as string)) {
+            return this.data.get(key as string) as T[K];
+        }
+        return (this.defaults as T)[key];
+    }
+
+    set<K extends keyof T>(key: K, value: T[K]): void;
+    set(key: string, value: unknown): void;
+    set(key: string, value: unknown): void {
+        this.data.set(key, value);
+    }
+
+    has(key: string): boolean {
+        return this.data.has(key) || Object.prototype.hasOwnProperty.call(this.defaults, key);
+    }
+
+    delete(key: string): void {
+        this.data.delete(key);
+    }
+
+    clear(): void {
+        this.data.clear();
+    }
+}
+
+export default MockStore;
diff --git a/tests/__mocks__/electron.ts b/tests/__mocks__/electron.ts
new file mode 100644
index 00000000..46be9137
--- /dev/null
+++ b/tests/__mocks__/electron.ts
@@ -0,0 +1,150 @@
+/**
+ * Manual mock for the `electron` module.
+ *
+ * Used by Jest unit tests running in Node.js where the real Electron runtime is
+ * not available. Each API surface is implemented with the minimum behaviour
+ * required by the managers under test.
+ */
+
+// ---------------------------------------------------------------------------
+// safeStorage mock
+// ---------------------------------------------------------------------------
+const _encryptionAvailable = true;
+
+export const safeStorage = {
+    isEncryptionAvailable: jest.fn(() => _encryptionAvailable),
+
+    // Return opaque "encrypted" bytes (mock implementation uses a plain UTF-8 buffer).
+    encryptString: jest.fn((plaintext: string): Buffer => Buffer.from(plaintext, "utf8")),
+
+    // Decode the mock "encrypted" bytes (mirrors encryptString above).
+    decryptString: jest.fn((buffer: Buffer): string => buffer.toString("utf8")),
+};
+
+// ---------------------------------------------------------------------------
+// app mock
+// ---------------------------------------------------------------------------
+export const app = {
+    getPath: jest.fn((name: string) => `/tmp/electron-mock/${name}`),
+    getVersion: jest.fn(() => "0.0.0-test"),
+    getName: jest.fn(() => "PowerPlatformToolbox-test"),
+    isReady: jest.fn(() => true),
+    whenReady: jest.fn(() => Promise.resolve()),
+    quit: jest.fn(),
+    on: jest.fn(),
+    once: jest.fn(),
+    emit: jest.fn(),
+};
+
+// ---------------------------------------------------------------------------
+// BrowserWindow mock
+// ---------------------------------------------------------------------------
+export class BrowserWindow {
+    webContents = {
+        send: jest.fn(),
+        on: jest.fn(),
+        executeJavaScript: jest.fn(() => Promise.resolve()),
+    };
+    on = jest.fn();
+    once = jest.fn();
+    loadURL = jest.fn(() => Promise.resolve());
+    loadFile = jest.fn(() => Promise.resolve());
+    show = jest.fn();
+    hide = jest.fn();
+    close = jest.fn();
+    isDestroyed = jest.fn(() => false);
+    addBrowserView = jest.fn();
+    removeBrowserView = jest.fn();
+    getBrowserViews = jest.fn(() => [] as BrowserView[]);
+    static getAllWindows = jest.fn(() => []);
+    static fromWebContents = jest.fn(() => null);
+}
+
+// ---------------------------------------------------------------------------
+// ipcMain mock
+// ---------------------------------------------------------------------------
+export const ipcMain = {
+    handle: jest.fn(),
+    on: jest.fn(),
+    once: jest.fn(),
+    removeHandler: jest.fn(),
+    removeAllListeners: jest.fn(),
+};
+
+// ---------------------------------------------------------------------------
+// shell mock
+// ---------------------------------------------------------------------------
+export const shell = {
+    openExternal: jest.fn(() => Promise.resolve()),
+    openPath: jest.fn(() => Promise.resolve("")),
+};
+
+// ---------------------------------------------------------------------------
+// clipboard mock
+// ---------------------------------------------------------------------------
+export const clipboard = {
+    writeText: jest.fn(),
+    readText: jest.fn(() => ""),
+};
+
+// ---------------------------------------------------------------------------
+// dialog mock
+// ---------------------------------------------------------------------------
+export const dialog = {
+    showOpenDialog: jest.fn(() => Promise.resolve({ canceled: true, filePaths: [] })),
+    showSaveDialog: jest.fn(() => Promise.resolve({ canceled: true })),
+    showMessageBox: jest.fn(() => Promise.resolve({ response: 0 })),
+};
+
+// ---------------------------------------------------------------------------
+// protocol mock
+// ---------------------------------------------------------------------------
+export const protocol = {
+    registerFileProtocol: jest.fn(),
+    registerHttpProtocol: jest.fn(),
+    interceptFileProtocol: jest.fn(),
+    unregisterProtocol: jest.fn(),
+    handle: jest.fn(),
+};
+
+// ---------------------------------------------------------------------------
+// nativeImage mock
+// ---------------------------------------------------------------------------
+export const nativeImage = {
+    createFromPath: jest.fn(() => ({ isEmpty: () => true })),
+    createEmpty: jest.fn(() => ({ isEmpty: () => true })),
+};
+
+// ---------------------------------------------------------------------------
+// Tray mock
+// ---------------------------------------------------------------------------
+export class Tray {
+    setToolTip = jest.fn();
+    setContextMenu = jest.fn();
+    on = jest.fn();
+    destroy = jest.fn();
+}
+
+// ---------------------------------------------------------------------------
+// Menu mock
+// ---------------------------------------------------------------------------
+export const Menu = {
+    buildFromTemplate: jest.fn(() => ({})),
+    setApplicationMenu: jest.fn(),
+};
+
+// ---------------------------------------------------------------------------
+// BrowserView mock
+// ---------------------------------------------------------------------------
+export class BrowserView {
+    webContents = {
+        send: jest.fn(),
+        on: jest.fn(),
+        loadURL: jest.fn(() => Promise.resolve()),
+        executeJavaScript: jest.fn(() => Promise.resolve()),
+        setWindowOpenHandler: jest.fn(),
+        isDestroyed: jest.fn(() => false),
+    };
+    setBounds = jest.fn();
+    setAutoResize = jest.fn();
+}
diff --git a/tests/e2e/app.spec.ts b/tests/e2e/app.spec.ts
new file mode 100644
index 00000000..f5ba39ab
--- /dev/null
+++ b/tests/e2e/app.spec.ts
@@ -0,0 +1,61 @@
+import { expect, test } from "./fixtures";
+
+/**
+ * E2E: basic application launch and window visibility.
+ *
+ * These tests verify that the app starts without errors, the main window
+ * renders, and essential UI regions are present.
+ *
+ * Prerequisites: run `pnpm run build` before executing these tests.
+ */
+
+test.describe("App launch", () => {
+    test("main window is visible after launch", async ({ window }) => {
+        await expect(window).toHaveTitle(/Power Platform ToolBox/i, { timeout: 30_000 });
+    });
+
+    test("main window has content (body is not empty)", async ({ window }) => {
+        const body = window.locator("body");
+        await expect(body).not.toBeEmpty();
+    });
+
+    test("sidebar navigation is present", async ({ window }) => {
+        // The sidebar element should exist in the DOM
+        const sidebar = window.locator("#sidebar, .sidebar, nav");
+        await expect(sidebar.first()).toBeVisible({ timeout: 15_000 });
+    });
+
+    test("no JavaScript errors thrown at startup", async ({ electronApp }) => {
+        const jsErrors: string[] = [];
+        const consoleErrors: string[] = [];
+
+        const win = await electronApp.firstWindow();
+
+        // Track actual unhandled JS exceptions in the renderer.
+        win.on("pageerror", (error) => {
+            jsErrors.push(error.message);
+        });
+
+        // Keep console error tracking for diagnostics only.
+        win.on("console", (msg) => {
+            if (msg.type() === "error") {
+                consoleErrors.push(msg.text());
+            }
+        });
+
+        // Allow the page to fully load and execute
+        await win.waitForLoadState("networkidle").catch(() => {
+            // networkidle can time out in Electron — that's OK
+        });
+
+        // Assert only on true JavaScript startup errors.
+        expect(jsErrors).toHaveLength(0);
+
+        // Optional sanity check: keep known noisy resource/network console errors out of signal.
+        const significantConsoleErrors = consoleErrors.filter(
+            (e) => !e.includes("favicon") && !e.includes("net::ERR_") && !e.includes("Mixed Content") && !e.includes("Failed to load resource: the server responded with a status of 404"),
+        );
+
+        expect(significantConsoleErrors).toHaveLength(0);
+    });
+});
diff --git a/tests/e2e/fixtures.ts b/tests/e2e/fixtures.ts
new file mode 100644
index 00000000..c788cd57
--- /dev/null
+++ b/tests/e2e/fixtures.ts
@@ -0,0 +1,78 @@
+import { test as base, expect } from "@playwright/test";
+import path from "path";
+import type { ElectronApplication, Page } from "playwright";
+import { _electron as electron } from "playwright";
+
+/**
+ * Extended Playwright test fixture that launches and tears down the Electron app.
+ *
+ * Each test file that imports `test` from this module gets a fresh Electron
+ * process so tests are fully isolated.
+ */
+
+interface AppFixtures {
+    electronApp: ElectronApplication;
+    window: Page;
+}
+
+async function resolveMainWindow(electronApp: ElectronApplication): Promise<Page> {
+    const deadline = Date.now() + 30_000;
+
+    while (Date.now() < deadline) {
+        for (const candidate of electronApp.windows()) {
+            try {
+                const title = await candidate.title();
+                const url = candidate.url();
+                if (/Power Platform ToolBox/i.test(title) || /index\.html/i.test(url)) {
+                    await candidate.waitForLoadState("domcontentloaded");
+                    await expect(candidate.locator(".app-container")).toBeVisible({ timeout: 10_000 });
+                    return candidate;
+                }
+            } catch {
+                // Ignore transient windows that are not ready and keep scanning.
+            }
+        }
+
+        await electronApp
+            .waitForEvent("window", {
+                timeout: 1_000,
+            })
+            .catch(() => {
+                // A new window is not guaranteed on every iteration.
+            });
+    }
+
+    const fallback = await electronApp.firstWindow();
+    await fallback.waitForLoadState("domcontentloaded");
+    await expect(fallback.locator(".app-container")).toBeVisible({ timeout: 10_000 });
+    return fallback;
+}
+
+export const test = base.extend<AppFixtures>({
+    // Playwright fixtures require object destructuring for the first argument.
+    // eslint-disable-next-line no-empty-pattern
+    electronApp: async ({}, use) => {
+        const mainEntry = path.resolve(__dirname, "../../dist/main/index.js");
+
+        const app = await electron.launch({
+            args: [mainEntry],
+            env: {
+                ...process.env,
+                // Prevent the app from opening the real OS keychain in CI
+                NODE_ENV: "test",
+                // Suppress update checks during e2e
+                PPTB_DISABLE_AUTO_UPDATE: "1",
+            },
+        });
+
+        await use(app);
+        await app.close();
+    },
+
+    window: async ({ electronApp }, use) => {
+        const win = await resolveMainWindow(electronApp);
+        await use(win);
+    },
+});
+
+export { expect };
diff --git a/tests/e2e/navigation.spec.ts b/tests/e2e/navigation.spec.ts
new file mode 100644
index 00000000..5e869a50
--- /dev/null
+++ b/tests/e2e/navigation.spec.ts
@@ -0,0 +1,99 @@
+import { expect, test } from "./fixtures";
+
+/**
+ * E2E: basic navigation between app sections.
+ *
+ * Verifies that clicking sidebar items transitions the UI to the
+ * corresponding section without crashes.
+ *
+ * Note: selector strings are intentionally broad to accommodate future UI
+ * changes. Update them alongside any structural HTML changes.
+ */
+
+test.describe("Navigation", () => {
+    test("activity bar toggles sidebar collapse when active item is clicked", async ({ window }) => {
+        const sidebar = window.locator("#sidebar");
+        const toolsActivity = window.locator('[data-sidebar="tools"]');
+
+        await expect(toolsActivity).toBeVisible({ timeout: 10_000 });
+        await expect(sidebar).not.toHaveClass(/collapsed/);
+
+        await toolsActivity.click();
+        await expect(sidebar).toHaveClass(/collapsed/);
+
+        await toolsActivity.click();
+        await expect(sidebar).not.toHaveClass(/collapsed/);
+    });
+
+    test("settings panel opens when settings button is clicked", async ({ window }) => {
+        const settingsButton = window.locator("#settings-activity-btn");
+        await expect(settingsButton).toBeVisible({ timeout: 10_000 });
+        await settingsButton.click();
+        const settingsTab = window.locator("#settings-tab-scroll-area");
+        await expect(settingsTab).toBeVisible({ timeout: 10_000 });
+    });
+
+    test("settings tab smoke renders key controls", async ({ window }) => {
+        const settingsButton = window.locator("#settings-activity-btn");
+        await settingsButton.click();
+
+        await expect(window.locator("#settings-tab-scroll-area")).toBeVisible({ timeout: 10_000 });
+        await expect(window.locator("#sidebar-theme-select")).toBeVisible({ timeout: 10_000 });
+        await expect(window.locator("#sidebar-save-settings-btn")).toBeVisible({ timeout: 10_000 });
+    });
+
+    test("marketplace section is reachable", async ({ window }) => {
+        const marketplaceButton = window.locator('[data-sidebar="marketplace"]');
+        await expect(marketplaceButton).toBeVisible({ timeout: 10_000 });
+
+        await marketplaceButton.click();
+        const section = window.locator("#sidebar-marketplace.sidebar-content.active");
+        await expect(section).toBeVisible({ timeout: 10_000 });
+    });
+
+    test("marketplace shows loaded content or empty state", async ({ window }) => {
+        const marketplaceButton = window.locator('[data-sidebar="marketplace"]');
+        await marketplaceButton.click();
+
+        await expect(window.locator("#marketplace-search-input")).toBeVisible({ timeout: 10_000 });
+        const marketplaceList = window.locator("#marketplace-tools-list");
+        await expect(marketplaceList).toBeVisible({ timeout: 10_000 });
+
+        await expect
+            .poll(async () => {
+                const itemCount = await marketplaceList.locator(".marketplace-item-pptb").count();
+                const emptyStateCount = await marketplaceList.locator(".empty-state").count();
+                return itemCount + emptyStateCount;
+            })
+            .toBeGreaterThan(0);
+    });
+
+    test("connections add flow opens and closes modal window", async ({ electronApp, window }) => {
+        const connectionsButton = window.locator('[data-sidebar="connections"]');
+        await connectionsButton.click();
+
+        const addConnectionButton = window.locator("#sidebar-add-connection-btn");
+        await expect(addConnectionButton).toBeVisible({ timeout: 10_000 });
+
+        const [modalWindow] = await Promise.all([electronApp.waitForEvent("window", { timeout: 10_000 }), addConnectionButton.click()]);
+
+        await modalWindow.waitForLoadState("domcontentloaded");
+        await expect(modalWindow.locator("#connection-name")).toBeVisible({ timeout: 10_000 });
+        await expect(modalWindow.locator("#connection-url")).toBeVisible({ timeout: 10_000 });
+
+        await modalWindow.locator("#cancel-connection-btn").click();
+        await expect(window.locator("#modal-backdrop")).toBeHidden({ timeout: 10_000 });
+    });
+
+    test("global search opens with keyboard shortcut and closes with escape", async ({ window }) => {
+        await window.keyboard.press("Meta+Shift+P");
+
+        const overlay = window.locator("#global-search-overlay");
+        const input = window.locator("#global-search-input");
+        await expect(overlay).toBeVisible({ timeout: 10_000 });
+        await expect(input).toBeFocused({ timeout: 10_000 });
+
+        await window.keyboard.press("Escape");
+        await expect(overlay).toBeHidden({ timeout: 10_000 });
+    });
+});
diff --git a/tests/e2e/notificationHistory.spec.ts b/tests/e2e/notificationHistory.spec.ts
new file mode 100644
index 00000000..7b1235cd
--- /dev/null
+++ b/tests/e2e/notificationHistory.spec.ts
@@ -0,0 +1,122 @@
+import type { ElectronApplication, Page } from "playwright";
+import { test, expect } from "./fixtures";
+
+/**
+ * E2E: Notification history bell button in the footer.
+ *
+ * The history panel is now a separate always-on-top BrowserWindow managed by
+ * the main process (NotificationHistoryWindowManager).  Clicking the bell
+ * button in the footer opens/closes that window.
+ *
+ * Prerequisites: run `pnpm run build` before executing these tests.
+ */
+
+/**
+ * Click the bell button and wait for the newly-created history BrowserWindow
+ * to appear.  The history window is created lazily on first click.
+ */
+async function openHistoryWindow(electronApp: ElectronApplication, window: Page): Promise<Page> {
+    const bellBtn = window.locator("#footer-notification-bell-btn");
+    await expect(bellBtn).toBeVisible({ timeout: 15_000 });
+
+    const historyWindowPromise = electronApp.waitForEvent("window", { timeout: 10_000 });
+    await bellBtn.click();
+    const historyWindow = await historyWindowPromise;
+    await historyWindow.waitForLoadState("domcontentloaded");
+    return historyWindow;
+}
+
+/** Check whether the Notification History BrowserWindow is currently visible. */
+async function isHistoryWindowVisible(electronApp: ElectronApplication): Promise<boolean> {
+    return electronApp.evaluate(({ BrowserWindow }) => {
+        const win = BrowserWindow.getAllWindows().find((w) => w.getTitle() === "Notification History");
+        return win?.isVisible() ?? false;
+    });
+}
+
+test.describe("Notification history panel", () => {
+    test("bell button is visible in the footer", async ({ window }) => {
+        const bellBtn = window.locator("#footer-notification-bell-btn");
+        await expect(bellBtn).toBeVisible({ timeout: 15_000 });
+    });
+
+    test("notification badge is initially hidden", async ({ window }) => {
+        const badge = window.locator("#notification-badge");
+        await expect(badge).toBeHidden({ timeout: 15_000 });
+    });
+
+    test("bell button aria-pressed is false initially", async ({ window }) => {
+        const bellBtn = window.locator("#footer-notification-bell-btn");
+        await expect(bellBtn).toBeVisible({ timeout: 15_000 });
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "false");
+    });
+
+    test("clicking the bell button opens the history window", async ({ electronApp, window }) => {
+        await openHistoryWindow(electronApp, window);
+
+        const isVisible = await isHistoryWindowVisible(electronApp);
+        expect(isVisible).toBe(true);
+    });
+
+    test("clicking the bell button again closes the history window", async ({ electronApp, window }) => {
+        const bellBtn = window.locator("#footer-notification-bell-btn");
+        await expect(bellBtn).toBeVisible({ timeout: 15_000 });
+
+        // Open the history window
+        await openHistoryWindow(electronApp, window);
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "true", { timeout: 5_000 });
+
+        // Click bell again to close
+        await bellBtn.click();
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "false", { timeout: 5_000 });
+
+        const isVisible = await isHistoryWindowVisible(electronApp);
+        expect(isVisible).toBe(false);
+    });
+
+    test("pressing Escape in the history window closes it", async ({ electronApp, window }) => {
+        const bellBtn = window.locator("#footer-notification-bell-btn");
+        await expect(bellBtn).toBeVisible({ timeout: 15_000 });
+
+        const historyWindow = await openHistoryWindow(electronApp, window);
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "true", { timeout: 5_000 });
+
+        await historyWindow.keyboard.press("Escape");
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "false", { timeout: 5_000 });
+    });
+
+    test("empty state is shown when there are no notifications", async ({ electronApp, window }) => {
+        const historyWindow = await openHistoryWindow(electronApp, window);
+
+        const emptyState = historyWindow.locator("#notification-history-empty");
+        await expect(emptyState).toBeVisible({ timeout: 5_000 });
+        await expect(emptyState).toHaveText(/no notifications yet/i);
+    });
+
+    test("history window has a Clear All button", async ({ electronApp, window }) => {
+        const historyWindow = await openHistoryWindow(electronApp, window);
+
+        const clearBtn = historyWindow.locator("#notification-clear-all-btn");
+        await expect(clearBtn).toBeVisible({ timeout: 5_000 });
+    });
+
+    test("bell button aria-pressed reflects window open state", async ({ electronApp, window }) => {
+        const bellBtn = window.locator("#footer-notification-bell-btn");
+        await expect(bellBtn).toBeVisible({ timeout: 15_000 });
+
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "false");
+
+        await openHistoryWindow(electronApp, window);
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "true", { timeout: 5_000 });
+
+        await bellBtn.click();
+        await expect(bellBtn).toHaveAttribute("aria-pressed", "false", { timeout: 5_000 });
+    });
+
+    test("notification list is present inside the history window", async ({ electronApp, window }) => {
+        const historyWindow = await openHistoryWindow(electronApp, window);
+
+        const list = historyWindow.locator("#notification-history-list");
+        await expect(list).toBeAttached({ timeout: 5_000 });
+    });
+});
diff --git a/tests/e2e/splitLayout.spec.ts b/tests/e2e/splitLayout.spec.ts
new file mode 100644
index 00000000..c17b25ef
--- /dev/null
+++ b/tests/e2e/splitLayout.spec.ts
@@ -0,0 +1,168 @@
+import { expect, test } from "./fixtures";
+
+/**
+ * E2E: Split-layout DOM structure and initial state.
+ *
+ * These tests verify that the split-layout HTML elements are present in the
+ * document with their correct initial (inactive) state.  They do NOT require
+ * any tools to be installed or running — the split UI is structurally present
+ * but hidden until two tools are opened and the user activates the split.
+ *
+ * Prerequisites: run `pnpm run build` before executing these tests.
+ */
+
+// ---------------------------------------------------------------------------
+// Helper: evaluate a style property even when the element's ancestor is hidden.
+// Playwright's toBeVisible() checks the full visibility chain, so we use
+// JavaScript evaluation to inspect the element directly.
+// ---------------------------------------------------------------------------
+async function getInlineStyle(window: import("playwright").Page, selector: string, prop: string): Promise<string> {
+    return window.evaluate(
+        ([sel, p]) => {
+            const el = document.querySelector(sel as string) as HTMLElement | null;
+            return el ? el.style.getPropertyValue(p as string) : "";
+        },
+        [selector, prop],
+    );
+}
+
+async function getAttribute(window: import("playwright").Page, selector: string, attr: string): Promise<string | null> {
+    return window.evaluate(
+        ([sel, a]) => {
+            const el = document.querySelector(sel as string);
+            return el ? el.getAttribute(a as string) : null;
+        },
+        [selector, attr],
+    );
+}
+
+test.describe("Split Layout — initial DOM state", () => {
+    // -----------------------------------------------------------------------
+    // Structural presence
+    // -----------------------------------------------------------------------
+    test("left-tabs-container exists in the DOM", async ({ window }) => {
+        // Wait for the app to be ready before querying DOM
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#left-tabs-container").count();
+        expect(count).toBe(1);
+    });
+
+    test("right-tabs-container exists in the DOM", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#right-tabs-container").count();
+        expect(count).toBe(1);
+    });
+
+    test("split-tabs-bar-divider exists in the DOM", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#split-tabs-bar-divider").count();
+        expect(count).toBe(1);
+    });
+
+    test("split-pane-divider exists in the DOM", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#split-pane-divider").count();
+        expect(count).toBe(1);
+    });
+
+    test("right-tool-tabs container exists in the DOM", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#right-tool-tabs").count();
+        expect(count).toBe(1);
+    });
+
+    test("tool-panel-header exists in the DOM", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#tool-panel-header").count();
+        expect(count).toBe(1);
+    });
+
+    // -----------------------------------------------------------------------
+    // Initial hidden state
+    // -----------------------------------------------------------------------
+    test("right-tabs-container has display:none initially", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const display = await getInlineStyle(window, "#right-tabs-container", "display");
+        expect(display).toBe("none");
+    });
+
+    test("split-tabs-bar-divider has display:none initially", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const display = await getInlineStyle(window, "#split-tabs-bar-divider", "display");
+        expect(display).toBe("none");
+    });
+
+    test("split-pane-divider has display:none initially", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const display = await getInlineStyle(window, "#split-pane-divider", "display");
+        expect(display).toBe("none");
+    });
+
+    // -----------------------------------------------------------------------
+    // ARIA attributes
+    // -----------------------------------------------------------------------
+    test("split-tabs-bar-divider has aria-hidden=true", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const ariaHidden = await getAttribute(window, "#split-tabs-bar-divider", "aria-hidden");
+        expect(ariaHidden).toBe("true");
+    });
+
+    test("split-pane-divider has role=separator", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const role = await getAttribute(window, "#split-pane-divider", "role");
+        expect(role).toBe("separator");
+    });
+
+    test("split-pane-divider has aria-orientation=vertical", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const orientation = await getAttribute(window, "#split-pane-divider", "aria-orientation");
+        expect(orientation).toBe("vertical");
+    });
+
+    test("right-tabs-container has role=tablist", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const role = await getAttribute(window, "#right-tabs-container", "role");
+        expect(role).toBe("tablist");
+    });
+
+    // -----------------------------------------------------------------------
+    // Class state
+    // -----------------------------------------------------------------------
+    test("tool-panel-header does not have split-active class initially", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const hasSplitActive = await window.evaluate(() => {
+            const el = document.getElementById("tool-panel-header");
+            return el?.classList.contains("split-active") ?? false;
+        });
+        expect(hasSplitActive).toBe(false);
+    });
+
+    test("left-tabs-container is always present without split-active on header", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#tool-tabs").count();
+        expect(count).toBe(1);
+    });
+});
+
+// ---------------------------------------------------------------------------
+// Split Layout — tool panel controls
+// ---------------------------------------------------------------------------
+test.describe("Split Layout — tool panel controls", () => {
+    test("close-all-tools button is present inside the tool panel header", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#close-all-tools").count();
+        expect(count).toBe(1);
+    });
+
+    test("tool-panel-content wrapper is present in the DOM", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#tool-panel-content-wrapper").count();
+        expect(count).toBe(1);
+    });
+
+    test("tool-panel-content is present in the DOM", async ({ window }) => {
+        await window.waitForLoadState("domcontentloaded");
+        const count = await window.locator("#tool-panel-content").count();
+        expect(count).toBe(1);
+    });
+});
diff --git a/tests/unit/common/cspUtils.test.ts b/tests/unit/common/cspUtils.test.ts
new file mode 100644
index 00000000..1abe7c02
--- /dev/null
+++ b/tests/unit/common/cspUtils.test.ts
@@ -0,0 +1,31 @@
+/// <reference types="jest" />
+
+import type { CspExceptionEntry, CspExceptionSource } from "../../../src/common/types/common";
+import { normalizeCspExceptionSource } from "../../../src/common/types/common";
+
+describe("normalizeCspExceptionSource", () => {
+    it("wraps a plain string into a CspExceptionEntry", () => {
+        const result: CspExceptionEntry = normalizeCspExceptionSource("api.example.com");
+        expect(result).toEqual({ domain: "api.example.com" });
+    });
+
+    it("passes through a CspExceptionEntry unchanged", () => {
+        const entry: CspExceptionSource = {
+            domain: "cdn.example.com",
+            exceptionReason: "CDN for assets",
+            optional: true,
+        };
+        const result = normalizeCspExceptionSource(entry);
+        expect(result).toEqual(entry);
+    });
+
+    it("preserves optional flag when present", () => {
+        const result = normalizeCspExceptionSource({ domain: "x.com", optional: true });
+        expect(result.optional).toBe(true);
+    });
+
+    it("preserves exceptionReason when present", () => {
+        const result = normalizeCspExceptionSource({ domain: "x.com", exceptionReason: "needed for auth" });
+        expect(result.exceptionReason).toBe("needed for auth");
+    });
+});
diff --git a/tests/unit/main/managers/connectionsManager.test.ts b/tests/unit/main/managers/connectionsManager.test.ts
new file mode 100644
index 00000000..e5082df7
--- /dev/null
+++ b/tests/unit/main/managers/connectionsManager.test.ts
@@ -0,0 +1,221 @@
+/// <reference types="jest" />
+
+import type { Connection } from "../../../../src/common/types";
+import { ConnectionsManager } from "../../../../src/main/managers/connectionsManager";
+
+// electron and electron-store are mocked via tests/__mocks__/
+
+/** Helper: create a minimal valid DataverseConnection object */
+function makeConnection(overrides: Partial<Connection> = {}): Connection {
+    return {
+        id: "conn-1",
+        name: "Test Connection",
+        url: "https://org.crm.dynamics.com",
+        environment: "Dev",
+        authenticationType: "interactive",
+        ...overrides,
+    } as Connection;
+}
+
+describe("ConnectionsManager", () => {
+    let manager: ConnectionsManager;
+
+    beforeEach(() => {
+        manager = new ConnectionsManager();
+    });
+
+    // -----------------------------------------------------------------------
+    // addConnection / getConnections
+    // -----------------------------------------------------------------------
+    describe("addConnection / getConnections", () => {
+        it("starts with no connections", () => {
+            expect(manager.getConnections()).toHaveLength(0);
+        });
+
+        it("adds a connection and retrieves it", () => {
+            const conn = makeConnection();
+            manager.addConnection(conn);
+            const stored = manager.getConnections();
+            expect(stored).toHaveLength(1);
+            expect(stored[0].id).toBe("conn-1");
+            expect(stored[0].name).toBe("Test Connection");
+        });
+
+        it("decrypts sensitive fields on retrieval (mock passthrough)", () => {
+            const conn = makeConnection({ clientSecret: "secret-value" });
+            manager.addConnection(conn);
+            const retrieved = manager.getConnections()[0];
+            expect(retrieved.clientSecret).toBe("secret-value");
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // getConnectionById
+    // -----------------------------------------------------------------------
+    describe("getConnectionById", () => {
+        it("returns the matching connection", () => {
+            manager.addConnection(makeConnection({ id: "abc" }));
+            const found = manager.getConnectionById("abc");
+            expect(found).not.toBeNull();
+            expect(found!.id).toBe("abc");
+        });
+
+        it("returns null for unknown id", () => {
+            expect(manager.getConnectionById("no-such-id")).toBeNull();
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // updateConnection
+    // -----------------------------------------------------------------------
+    describe("updateConnection", () => {
+        it("updates an existing connection field", () => {
+            manager.addConnection(makeConnection({ id: "c1", name: "Old Name" }));
+            manager.updateConnection("c1", { name: "New Name" });
+            const updated = manager.getConnectionById("c1");
+            expect(updated!.name).toBe("New Name");
+        });
+
+        it("does nothing for unknown id", () => {
+            // Should not throw
+            expect(() => manager.updateConnection("missing", { name: "x" })).not.toThrow();
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // deleteConnection
+    // -----------------------------------------------------------------------
+    describe("deleteConnection", () => {
+        it("removes a connection by id", () => {
+            manager.addConnection(makeConnection({ id: "del-me" }));
+            manager.deleteConnection("del-me");
+            expect(manager.getConnectionById("del-me")).toBeNull();
+        });
+
+        it("does not throw for unknown id", () => {
+            expect(() => manager.deleteConnection("ghost")).not.toThrow();
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // exportConnections
+    // -----------------------------------------------------------------------
+    describe("exportConnections", () => {
+        it("exports all connections when no ids provided", () => {
+            manager.addConnection(makeConnection({ id: "e1", name: "Conn A" }));
+            manager.addConnection(makeConnection({ id: "e2", name: "Conn B" }));
+            const exported = manager.exportConnections();
+            expect(exported.version).toBe(1);
+            expect(exported.connections).toHaveLength(2);
+        });
+
+        it("exports only specified connections", () => {
+            manager.addConnection(makeConnection({ id: "e1", name: "Conn A" }));
+            manager.addConnection(makeConnection({ id: "e2", name: "Conn B" }));
+            const exported = manager.exportConnections(["e1"]);
+            expect(exported.connections).toHaveLength(1);
+            expect(exported.connections[0].name).toBe("Conn A");
+        });
+
+        it("strips secret fields from export", () => {
+            manager.addConnection(makeConnection({ id: "e1", clientSecret: "s3cr3t", accessToken: "tok3n" }));
+            const exported = manager.exportConnections(["e1"]);
+            const conn = exported.connections[0];
+            expect(conn.clientSecret).toBeUndefined();
+            expect(conn.accessToken).toBeUndefined();
+        });
+
+        it("includes exportedAt timestamp", () => {
+            manager.addConnection(makeConnection());
+            const exported = manager.exportConnections();
+            expect(typeof exported.exportedAt).toBe("string");
+            expect(new Date(exported.exportedAt).getTime()).not.toBeNaN();
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // importConnections
+    // -----------------------------------------------------------------------
+    describe("importConnections", () => {
+        const validPayload = {
+            version: 1,
+            exportedAt: new Date().toISOString(),
+            connections: [
+                {
+                    id: "imp-1",
+                    name: "Imported Conn",
+                    url: "https://org.crm.dynamics.com",
+                    environment: "Dev",
+                    authenticationType: "interactive",
+                },
+            ],
+        };
+
+        it("imports a valid payload", () => {
+            const result = manager.importConnections(validPayload);
+            expect(result.imported).toBe(1);
+            expect(result.skipped).toBe(0);
+            expect(manager.getConnectionById("imp-1")).not.toBeNull();
+        });
+
+        it("throws for non-object payload", () => {
+            expect(() => manager.importConnections("bad")).toThrow("Invalid import file");
+        });
+
+        it("throws for unsupported version", () => {
+            expect(() => manager.importConnections({ version: 99, connections: [] })).toThrow("Unsupported export version");
+        });
+
+        it("throws for empty connections array", () => {
+            expect(() => manager.importConnections({ version: 1, connections: [] })).toThrow("no connections");
+        });
+
+        it("skips connections with invalid environment", () => {
+            const payload = {
+                ...validPayload,
+                connections: [
+                    {
+                        id: "bad-env",
+                        name: "Bad Env",
+                        url: "https://org.crm.dynamics.com",
+                        environment: "Staging", // invalid
+                        authenticationType: "interactive",
+                    },
+                ],
+            };
+            const result = manager.importConnections(payload);
+            expect(result.skipped).toBe(1);
+            expect(result.imported).toBe(0);
+        });
+
+        it("skips connections with missing required fields", () => {
+            const payload = {
+                version: 1,
+                exportedAt: new Date().toISOString(),
+                connections: [{ id: "missing-fields" }],
+            };
+            const result = manager.importConnections(payload);
+            expect(result.skipped).toBe(1);
+        });
+
+        it("warns for clientSecret auth type with missing clientSecret", () => {
+            const payload = {
+                version: 1,
+                exportedAt: new Date().toISOString(),
+                connections: [
+                    {
+                        id: "cs-1",
+                        name: "CS Conn",
+                        url: "https://org.crm.dynamics.com",
+                        environment: "Production",
+                        authenticationType: "clientSecret",
+                        // no clientSecret provided
+                    },
+                ],
+            };
+            const result = manager.importConnections(payload);
+            expect(result.imported).toBe(1);
+            expect(result.warnings.some((w) => w.includes("clientSecret"))).toBe(true);
+        });
+    });
+});
diff --git a/tests/unit/main/managers/encryptionManager.test.ts b/tests/unit/main/managers/encryptionManager.test.ts
new file mode 100644
index 00000000..8319ea13
--- /dev/null
+++ b/tests/unit/main/managers/encryptionManager.test.ts
@@ -0,0 +1,115 @@
+/// <reference types="jest" />
+
+import { safeStorage } from "electron";
+import { EncryptionManager } from "../../../../src/main/managers/encryptionManager";
+
+// The electron mock at tests/__mocks__/electron.ts implements safeStorage with
+// Buffer.from(plaintext, "utf8") as "encrypt" and buffer.toString("utf8") as "decrypt",
+// so round-trip tests work without a real OS keychain.
+
+describe("EncryptionManager", () => {
+    let manager: EncryptionManager;
+
+    beforeEach(() => {
+        // resetAllMocks clears implementations (including mockReturnValue) so tests
+        // don't bleed into each other. Re-apply the default "available" return value.
+        jest.resetAllMocks();
+        (safeStorage.isEncryptionAvailable as jest.Mock).mockReturnValue(true);
+        (safeStorage.encryptString as jest.Mock).mockImplementation((plaintext: string) => Buffer.from(plaintext, "utf8"));
+        (safeStorage.decryptString as jest.Mock).mockImplementation((buffer: Buffer) => buffer.toString("utf8"));
+        manager = new EncryptionManager();
+    });
+
+    // -----------------------------------------------------------------------
+    // isEncryptionAvailable
+    // -----------------------------------------------------------------------
+    describe("isEncryptionAvailable", () => {
+        it("returns true when safeStorage is available", () => {
+            (safeStorage.isEncryptionAvailable as jest.Mock).mockReturnValue(true);
+            expect(manager.isEncryptionAvailable()).toBe(true);
+        });
+
+        it("returns false when safeStorage is unavailable", () => {
+            (safeStorage.isEncryptionAvailable as jest.Mock).mockReturnValue(false);
+            expect(manager.isEncryptionAvailable()).toBe(false);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // encrypt / decrypt round-trip
+    // -----------------------------------------------------------------------
+    describe("encrypt", () => {
+        it("returns a non-empty base64 string for non-empty input", () => {
+            const encrypted = manager.encrypt("my-secret");
+            expect(encrypted).toBeTruthy();
+            // Base64 charset
+            expect(encrypted).toMatch(/^[A-Za-z0-9+/]+=*$/);
+        });
+
+        it("returns empty string for empty input", () => {
+            expect(manager.encrypt("")).toBe("");
+        });
+
+        it("returns plaintext when encryption is unavailable", () => {
+            (safeStorage.isEncryptionAvailable as jest.Mock).mockReturnValue(false);
+            expect(manager.encrypt("plain")).toBe("plain");
+        });
+    });
+
+    describe("decrypt", () => {
+        it("round-trips a value through encrypt→decrypt", () => {
+            const plaintext = "super-secret-value";
+            const encrypted = manager.encrypt(plaintext);
+            const decrypted = manager.decrypt(encrypted);
+            expect(decrypted).toBe(plaintext);
+        });
+
+        it("returns empty string for empty input", () => {
+            expect(manager.decrypt("")).toBe("");
+        });
+
+        it("returns the input value when encryption is unavailable", () => {
+            (safeStorage.isEncryptionAvailable as jest.Mock).mockReturnValue(false);
+            expect(manager.decrypt("already-plain")).toBe("already-plain");
+        });
+
+        it("returns input as-is when decryption throws (backward compat)", () => {
+            (safeStorage.decryptString as jest.Mock).mockImplementation(() => {
+                throw new Error("decrypt failed");
+            });
+            // Should not throw, returns the input
+            const result = manager.decrypt("bad-data");
+            expect(result).toBe("bad-data");
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // encryptFields / decryptFields
+    // -----------------------------------------------------------------------
+    describe("encryptFields", () => {
+        it("encrypts specified fields and leaves others untouched", () => {
+            const obj = { name: "My Connection", clientSecret: "top-secret", url: "https://example.com" } as Record<string, string>;
+            const encrypted = manager.encryptFields(obj, ["clientSecret"] as never[]);
+            expect(encrypted.name).toBe("My Connection");
+            expect(encrypted.url).toBe("https://example.com");
+            // clientSecret must be different from original (encrypted)
+            expect(encrypted.clientSecret).not.toBe("top-secret");
+        });
+
+        it("skips falsy field values", () => {
+            const obj = { name: "conn", clientSecret: "" } as Record<string, string>;
+            const encrypted = manager.encryptFields(obj, ["clientSecret"] as never[]);
+            expect(encrypted.clientSecret).toBe("");
+        });
+    });
+
+    describe("decryptFields", () => {
+        it("decryptFields reverses encryptFields", () => {
+            const original = { name: "conn", clientSecret: "my-password" } as Record<string, string>;
+            const encrypted = manager.encryptFields(original, ["clientSecret"] as never[]);
+            const decrypted = manager.decryptFields(encrypted, ["clientSecret"] as never[]);
+            expect(decrypted.clientSecret).toBe("my-password");
+            expect(decrypted.name).toBe("conn");
+        });
+    });
+});
diff --git a/tests/unit/main/managers/installIdManager.test.ts b/tests/unit/main/managers/installIdManager.test.ts
new file mode 100644
index 00000000..96773811
--- /dev/null
+++ b/tests/unit/main/managers/installIdManager.test.ts
@@ -0,0 +1,49 @@
+/// <reference types="jest" />
+
+import { InstallIdManager } from "../../../../src/main/managers/installIdManager";
+import { SettingsManager } from "../../../../src/main/managers/settingsManager";
+
+describe("InstallIdManager", () => {
+    let settingsManager: SettingsManager;
+    let manager: InstallIdManager;
+
+    beforeEach(() => {
+        settingsManager = new SettingsManager();
+        manager = new InstallIdManager(settingsManager);
+    });
+
+    it("generates a UUID on first call", () => {
+        const id = manager.getInstallId();
+        expect(id).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
+    });
+
+    it("returns the same ID on subsequent calls (in-memory cache)", () => {
+        const first = manager.getInstallId();
+        const second = manager.getInstallId();
+        expect(second).toBe(first);
+    });
+
+    it("persists the ID to settings", () => {
+        const id = manager.getInstallId();
+        expect(settingsManager.getSetting("installId")).toBe(id);
+    });
+
+    it("reuses an existing ID from settings", () => {
+        const existingId = "11111111-2222-3333-4444-555555555555";
+        // Pre-seed the settings store so the manager picks it up
+        settingsManager.setSetting("installId", existingId);
+
+        const freshManager = new InstallIdManager(settingsManager);
+        expect(freshManager.getInstallId()).toBe(existingId);
+    });
+
+    it("migrates a legacy machineId to installId", () => {
+        const legacyId = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
+        settingsManager.setSetting("machineId", legacyId);
+
+        const freshManager = new InstallIdManager(settingsManager);
+        expect(freshManager.getInstallId()).toBe(legacyId);
+        // Verify it was promoted to installId
+        expect(settingsManager.getSetting("installId")).toBe(legacyId);
+    });
+});
diff --git a/tests/unit/main/managers/settingsManager.test.ts b/tests/unit/main/managers/settingsManager.test.ts
new file mode 100644
index 00000000..c7d49eb2
--- /dev/null
+++ b/tests/unit/main/managers/settingsManager.test.ts
@@ -0,0 +1,218 @@
+/// <reference types="jest" />
+
+import { SettingsManager } from "../../../../src/main/managers/settingsManager";
+
+// electron-store is replaced by the manual mock at tests/__mocks__/electron-store.ts
+
+describe("SettingsManager", () => {
+    let manager: SettingsManager;
+
+    beforeEach(() => {
+        manager = new SettingsManager();
+    });
+
+    // -----------------------------------------------------------------------
+    // Default settings
+    // -----------------------------------------------------------------------
+    describe("default settings", () => {
+        it("returns defaults on first access", () => {
+            const settings = manager.getUserSettings();
+            expect(settings.theme).toBe("system");
+            expect(settings.autoUpdate).toBe(true);
+            expect(settings.installedTools).toEqual([]);
+            expect(settings.favoriteTools).toEqual([]);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // updateUserSettings / getSetting / setSetting
+    // -----------------------------------------------------------------------
+    describe("updateUserSettings", () => {
+        it("persists theme change", () => {
+            manager.updateUserSettings({ theme: "dark" });
+            expect(manager.getSetting("theme")).toBe("dark");
+        });
+
+        it("persists multiple settings at once", () => {
+            manager.updateUserSettings({ theme: "light", autoUpdate: false });
+            expect(manager.getSetting("theme")).toBe("light");
+            expect(manager.getSetting("autoUpdate")).toBe(false);
+        });
+    });
+
+    describe("setSetting / getSetting", () => {
+        it("round-trips a setting value", () => {
+            manager.setSetting("notificationDuration", 3000);
+            expect(manager.getSetting("notificationDuration")).toBe(3000);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // Favorite tools
+    // -----------------------------------------------------------------------
+    describe("favorite tools", () => {
+        it("adds and retrieves a favorite tool", () => {
+            manager.addFavoriteTool("tool-a");
+            expect(manager.getFavoriteTools()).toContain("tool-a");
+        });
+
+        it("does not duplicate favorite tools", () => {
+            manager.addFavoriteTool("tool-a");
+            manager.addFavoriteTool("tool-a");
+            expect(manager.getFavoriteTools().filter((t) => t === "tool-a")).toHaveLength(1);
+        });
+
+        it("removes a favorite tool", () => {
+            manager.addFavoriteTool("tool-a");
+            manager.removeFavoriteTool("tool-a");
+            expect(manager.getFavoriteTools()).not.toContain("tool-a");
+        });
+
+        it("isFavoriteTool returns correct boolean", () => {
+            expect(manager.isFavoriteTool("tool-x")).toBe(false);
+            manager.addFavoriteTool("tool-x");
+            expect(manager.isFavoriteTool("tool-x")).toBe(true);
+        });
+
+        it("toggleFavoriteTool adds then removes", () => {
+            expect(manager.toggleFavoriteTool("tool-toggle")).toBe(true);
+            expect(manager.isFavoriteTool("tool-toggle")).toBe(true);
+            expect(manager.toggleFavoriteTool("tool-toggle")).toBe(false);
+            expect(manager.isFavoriteTool("tool-toggle")).toBe(false);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // Installed tools
+    // -----------------------------------------------------------------------
+    describe("installed tools", () => {
+        it("adds and retrieves installed tools", () => {
+            manager.addInstalledTool("@pptb/my-tool");
+            expect(manager.getInstalledTools()).toContain("@pptb/my-tool");
+        });
+
+        it("does not duplicate installed tools", () => {
+            manager.addInstalledTool("@pptb/my-tool");
+            manager.addInstalledTool("@pptb/my-tool");
+            expect(manager.getInstalledTools().filter((t) => t === "@pptb/my-tool")).toHaveLength(1);
+        });
+
+        it("removes an installed tool", () => {
+            manager.addInstalledTool("@pptb/my-tool");
+            manager.removeInstalledTool("@pptb/my-tool");
+            expect(manager.getInstalledTools()).not.toContain("@pptb/my-tool");
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // CSP consents
+    // -----------------------------------------------------------------------
+    describe("CSP consents", () => {
+        it("hasCspConsent returns false for unknown tool", () => {
+            expect(manager.hasCspConsent("unknown-tool")).toBe(false);
+        });
+
+        it("grantCspConsent sets consent and hasCspConsent returns true", () => {
+            manager.grantCspConsent("tool-a", ["api.example.com"], ["cdn.example.com"]);
+            expect(manager.hasCspConsent("tool-a")).toBe(true);
+        });
+
+        it("getApprovedRequiredDomains returns granted required domains", () => {
+            manager.grantCspConsent("tool-a", ["api.example.com"]);
+            expect(manager.getApprovedRequiredDomains("tool-a")).toEqual(["api.example.com"]);
+        });
+
+        it("getApprovedOptionalDomains returns granted optional domains", () => {
+            manager.grantCspConsent("tool-a", [], ["cdn.example.com"]);
+            expect(manager.getApprovedOptionalDomains("tool-a")).toEqual(["cdn.example.com"]);
+        });
+
+        it("revokeCspConsent removes consent", () => {
+            manager.grantCspConsent("tool-a");
+            manager.revokeCspConsent("tool-a");
+            expect(manager.hasCspConsent("tool-a")).toBe(false);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // Tool connections
+    // -----------------------------------------------------------------------
+    describe("tool connections", () => {
+        it("sets and retrieves a tool connection", () => {
+            manager.setToolConnection("tool-a", "conn-1");
+            expect(manager.getToolConnection("tool-a")).toBe("conn-1");
+        });
+
+        it("returns null for unknown tool connection", () => {
+            expect(manager.getToolConnection("tool-unknown")).toBeNull();
+        });
+
+        it("removes a tool connection", () => {
+            manager.setToolConnection("tool-a", "conn-1");
+            manager.removeToolConnection("tool-a");
+            expect(manager.getToolConnection("tool-a")).toBeNull();
+        });
+
+        it("getAllToolConnections returns all mappings", () => {
+            manager.setToolConnection("tool-a", "conn-1");
+            manager.setToolConnection("tool-b", "conn-2");
+            const all = manager.getAllToolConnections();
+            expect(all["tool-a"]).toBe("conn-1");
+            expect(all["tool-b"]).toBe("conn-2");
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // Secondary tool connections
+    // -----------------------------------------------------------------------
+    describe("secondary tool connections", () => {
+        it("sets and retrieves a secondary connection", () => {
+            manager.setToolSecondaryConnection("tool-a", "conn-sec-1");
+            expect(manager.getToolSecondaryConnection("tool-a")).toBe("conn-sec-1");
+        });
+
+        it("returns null for missing secondary connection", () => {
+            expect(manager.getToolSecondaryConnection("tool-unknown")).toBeNull();
+        });
+
+        it("removes a secondary connection", () => {
+            manager.setToolSecondaryConnection("tool-a", "conn-sec-1");
+            manager.removeToolSecondaryConnection("tool-a");
+            expect(manager.getToolSecondaryConnection("tool-a")).toBeNull();
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // Last used tools
+    // -----------------------------------------------------------------------
+    describe("last used tools", () => {
+        it("starts empty", () => {
+            expect(manager.getLastUsedTools()).toEqual([]);
+        });
+
+        it("addLastUsedTool appends an entry", () => {
+            manager.addLastUsedTool({ toolId: "tool-a" });
+            const entries = manager.getLastUsedTools();
+            expect(entries).toHaveLength(1);
+            expect(entries[0].toolId).toBe("tool-a");
+        });
+
+        it("deduplicates entries with same toolId and connections", () => {
+            manager.addLastUsedTool({ toolId: "tool-a" });
+            manager.addLastUsedTool({ toolId: "tool-a" });
+            expect(manager.getLastUsedTools()).toHaveLength(1);
+        });
+
+        it("clearLastUsedTools empties the list", () => {
+            manager.addLastUsedTool({ toolId: "tool-a" });
+            manager.clearLastUsedTools();
+            expect(manager.getLastUsedTools()).toEqual([]);
+        });
+
+        it("ignores entries without toolId", () => {
+            // @ts-expect-error — intentionally testing bad input
+            manager.addLastUsedTool({ toolId: undefined });
+            expect(manager.getLastUsedTools()).toHaveLength(0);
+        });
+    });
+});
diff --git a/tests/unit/main/managers/splitLayoutManager.test.ts b/tests/unit/main/managers/splitLayoutManager.test.ts
new file mode 100644
index 00000000..f593ddd6
--- /dev/null
+++ b/tests/unit/main/managers/splitLayoutManager.test.ts
@@ -0,0 +1,614 @@
+/// <reference types="jest" />
+
+import { BrowserView, BrowserWindow } from "electron";
+import { SPLIT_LAYOUT_CHANNELS } from "../../../../src/common/ipc/channels";
+import { SettingsManager } from "../../../../src/main/managers/settingsManager";
+import { SPLIT_DIVIDER_WIDTH, SplitLayoutManager } from "../../../../src/main/managers/splitLayoutManager";
+
+// electron and electron-store are replaced by manual mocks in tests/__mocks__/
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/** Create a mock BrowserView registered in the shared toolViews map. */
+function makeBrowserView(): InstanceType<typeof BrowserView> {
+    return new BrowserView();
+}
+
+/**
+ * Create a BrowserWindow mock instance.
+ * The module-level mock class is re-instantiated so jest.fn() counters are fresh.
+ */
+function makeMainWindow(): InstanceType<typeof BrowserWindow> {
+    return new BrowserWindow();
+}
+
+interface TestContext {
+    mainWindow: InstanceType<typeof BrowserWindow>;
+    settingsManager: SettingsManager;
+    toolViews: Map<string, InstanceType<typeof BrowserView>>;
+    manager: SplitLayoutManager;
+}
+
+function buildContext(): TestContext {
+    const mainWindow = makeMainWindow();
+    const settingsManager = new SettingsManager();
+    const toolViews = new Map<string, InstanceType<typeof BrowserView>>();
+    const manager = new SplitLayoutManager(mainWindow as unknown as import("electron").BrowserWindow, settingsManager, toolViews as unknown as Map<string, import("electron").BrowserView>);
+    return { mainWindow, settingsManager, toolViews, manager };
+}
+
+/** Register a BrowserView in the toolViews map under the given id and return it. */
+function registerView(toolViews: Map<string, InstanceType<typeof BrowserView>>, id: string): InstanceType<typeof BrowserView> {
+    const view = makeBrowserView();
+    toolViews.set(id, view);
+    return view;
+}
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("SplitLayoutManager", () => {
+    let ctx: TestContext;
+
+    beforeEach(() => {
+        ctx = buildContext();
+    });
+
+    // -----------------------------------------------------------------------
+    // Initial state
+    // -----------------------------------------------------------------------
+    describe("initial state", () => {
+        it("is not active after construction", () => {
+            expect(ctx.manager.isActive).toBe(false);
+        });
+
+        it("getState() returns an inactive snapshot with empty groups", () => {
+            const state = ctx.manager.getState();
+            expect(state.isActive).toBe(false);
+            expect(state.leftGroup).toEqual([]);
+            expect(state.rightGroup).toEqual([]);
+            expect(state.activeLeftInstanceId).toBeNull();
+            expect(state.activeRightInstanceId).toBeNull();
+            expect(state.focusedPane).toBe("left");
+        });
+
+        it("restores a valid persisted ratio from settings", () => {
+            ctx.settingsManager.setSetting("splitDividerRatio", 0.65);
+            // Rebuild manager so constructor picks up the persisted value
+            const mgr = new SplitLayoutManager(
+                ctx.mainWindow as unknown as import("electron").BrowserWindow,
+                ctx.settingsManager,
+                ctx.toolViews as unknown as Map<string, import("electron").BrowserView>,
+            );
+            expect(mgr.getState().ratio).toBe(0.65);
+        });
+
+        it("falls back to 0.5 for out-of-range persisted ratio", () => {
+            ctx.settingsManager.setSetting("splitDividerRatio", 0.05); // below MIN (0.15)
+            const mgr = new SplitLayoutManager(
+                ctx.mainWindow as unknown as import("electron").BrowserWindow,
+                ctx.settingsManager,
+                ctx.toolViews as unknown as Map<string, import("electron").BrowserView>,
+            );
+            expect(mgr.getState().ratio).toBe(0.5);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // activate()
+    // -----------------------------------------------------------------------
+    describe("activate()", () => {
+        it("activates split mode with two distinct instance ids", () => {
+            registerView(ctx.toolViews, "tool-a");
+            registerView(ctx.toolViews, "tool-b");
+            const result = ctx.manager.activate("tool-a", "tool-b");
+            expect(result).toBe(true);
+            expect(ctx.manager.isActive).toBe(true);
+        });
+
+        it("sets left and right groups to single-item arrays", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            const state = ctx.manager.getState();
+            expect(state.leftGroup).toEqual(["tool-a"]);
+            expect(state.rightGroup).toEqual(["tool-b"]);
+        });
+
+        it("sets both active ids on activation", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            const state = ctx.manager.getState();
+            expect(state.activeLeftInstanceId).toBe("tool-a");
+            expect(state.activeRightInstanceId).toBe("tool-b");
+        });
+
+        it("sets focusedPane to 'left' on activation", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.manager.getState().focusedPane).toBe("left");
+        });
+
+        it("returns false when both instance ids are the same", () => {
+            const result = ctx.manager.activate("tool-a", "tool-a");
+            expect(result).toBe(false);
+            expect(ctx.manager.isActive).toBe(false);
+        });
+
+        it("notifies the renderer after activation", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.mainWindow.webContents.send).toHaveBeenCalledWith(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, expect.objectContaining({ isActive: true }));
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // deactivate()
+    // -----------------------------------------------------------------------
+    describe("deactivate()", () => {
+        beforeEach(() => {
+            ctx.manager.activate("tool-a", "tool-b");
+            (ctx.mainWindow.webContents.send as jest.Mock).mockClear();
+        });
+
+        it("deactivates split mode", () => {
+            ctx.manager.deactivate();
+            expect(ctx.manager.isActive).toBe(false);
+        });
+
+        it("clears all groups and active ids", () => {
+            ctx.manager.deactivate();
+            const state = ctx.manager.getState();
+            expect(state.leftGroup).toEqual([]);
+            expect(state.rightGroup).toEqual([]);
+            expect(state.activeLeftInstanceId).toBeNull();
+            expect(state.activeRightInstanceId).toBeNull();
+        });
+
+        it("resets focusedPane to 'left'", () => {
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.deactivate();
+            expect(ctx.manager.getState().focusedPane).toBe("left");
+        });
+
+        it("returns false when not active", () => {
+            ctx.manager.deactivate(); // first deactivate
+            const result = ctx.manager.deactivate(); // second call
+            expect(result).toBe(false);
+        });
+
+        it("notifies the renderer after deactivation", () => {
+            ctx.manager.deactivate();
+            expect(ctx.mainWindow.webContents.send).toHaveBeenCalledWith(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, expect.objectContaining({ isActive: false }));
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // getPaneForInstance()
+    // -----------------------------------------------------------------------
+    describe("getPaneForInstance()", () => {
+        it("returns null when split is not active", () => {
+            expect(ctx.manager.getPaneForInstance("tool-a")).toBeNull();
+        });
+
+        it("returns 'left' for a member of the left group", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.manager.getPaneForInstance("tool-a")).toBe("left");
+        });
+
+        it("returns 'right' for a member of the right group", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.manager.getPaneForInstance("tool-b")).toBe("right");
+        });
+
+        it("returns null for an id not in any group", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.manager.getPaneForInstance("tool-c")).toBeNull();
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // isInstanceInSplit()
+    // -----------------------------------------------------------------------
+    describe("isInstanceInSplit()", () => {
+        it("returns false when not active", () => {
+            expect(ctx.manager.isInstanceInSplit("tool-a")).toBe(false);
+        });
+
+        it("returns true for left-pane members", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.manager.isInstanceInSplit("tool-a")).toBe(true);
+        });
+
+        it("returns true for right-pane members", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.manager.isInstanceInSplit("tool-b")).toBe(true);
+        });
+
+        it("returns false for tools not in split", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            expect(ctx.manager.isInstanceInSplit("tool-c")).toBe(false);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // addToolToFocusedPane()
+    // -----------------------------------------------------------------------
+    describe("addToolToFocusedPane()", () => {
+        beforeEach(() => {
+            ctx.manager.activate("tool-a", "tool-b");
+            (ctx.mainWindow.webContents.send as jest.Mock).mockClear();
+        });
+
+        it("adds a new tool to the left pane when focusedPane is 'left'", () => {
+            ctx.manager.setFocusedPane("left");
+            ctx.manager.addToolToFocusedPane("tool-c");
+            expect(ctx.manager.getState().leftGroup).toContain("tool-c");
+        });
+
+        it("adds a new tool to the right pane when focusedPane is 'right'", () => {
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.addToolToFocusedPane("tool-c");
+            expect(ctx.manager.getState().rightGroup).toContain("tool-c");
+        });
+
+        it("makes the newly added tool the active one in its pane", () => {
+            ctx.manager.setFocusedPane("left");
+            ctx.manager.addToolToFocusedPane("tool-c");
+            expect(ctx.manager.getState().activeLeftInstanceId).toBe("tool-c");
+        });
+
+        it("makes the newly added right-pane tool active", () => {
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.addToolToFocusedPane("tool-c");
+            expect(ctx.manager.getState().activeRightInstanceId).toBe("tool-c");
+        });
+
+        it("does not duplicate an instance already in the pane", () => {
+            ctx.manager.setFocusedPane("left");
+            ctx.manager.addToolToFocusedPane("tool-a"); // tool-a is already in left group
+            const leftGroup = ctx.manager.getState().leftGroup;
+            expect(leftGroup.filter((id) => id === "tool-a")).toHaveLength(1);
+        });
+
+        it("does nothing when split is not active", () => {
+            const inactiveCtx = buildContext();
+            inactiveCtx.manager.addToolToFocusedPane("tool-x");
+            expect(inactiveCtx.manager.getState().leftGroup).toEqual([]);
+        });
+
+        it("notifies the renderer after adding a tool", () => {
+            ctx.manager.addToolToFocusedPane("tool-c");
+            expect(ctx.mainWindow.webContents.send).toHaveBeenCalledWith(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, expect.any(Object));
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // setActiveInPane()
+    // -----------------------------------------------------------------------
+    describe("setActiveInPane()", () => {
+        beforeEach(() => {
+            ctx.manager.activate("tool-a", "tool-b");
+            ctx.manager.addToolToFocusedPane("tool-c"); // tool-c in left group
+            (ctx.mainWindow.webContents.send as jest.Mock).mockClear();
+        });
+
+        it("switches the active tool in the left pane", () => {
+            ctx.manager.setActiveInPane("left", "tool-a");
+            expect(ctx.manager.getState().activeLeftInstanceId).toBe("tool-a");
+        });
+
+        it("switches the active tool in the right pane", () => {
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.addToolToFocusedPane("tool-d");
+            ctx.manager.setActiveInPane("right", "tool-b");
+            expect(ctx.manager.getState().activeRightInstanceId).toBe("tool-b");
+        });
+
+        it("updates focusedPane to the pane being switched", () => {
+            ctx.manager.setFocusedPane("left");
+            ctx.manager.setActiveInPane("right", "tool-b");
+            expect(ctx.manager.getState().focusedPane).toBe("right");
+        });
+
+        it("returns false when the instance is not in the target pane", () => {
+            // tool-b is in the right pane, not left
+            const result = ctx.manager.setActiveInPane("left", "tool-b");
+            expect(result).toBe(false);
+        });
+
+        it("returns true on success", () => {
+            const result = ctx.manager.setActiveInPane("left", "tool-c");
+            expect(result).toBe(true);
+        });
+
+        it("notifies the renderer on success", () => {
+            ctx.manager.setActiveInPane("left", "tool-c");
+            expect(ctx.mainWindow.webContents.send).toHaveBeenCalledWith(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, expect.any(Object));
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // setFocusedPane()
+    // -----------------------------------------------------------------------
+    describe("setFocusedPane()", () => {
+        it("updates the focusedPane to 'right'", () => {
+            ctx.manager.setFocusedPane("right");
+            expect(ctx.manager.focusedPane).toBe("right");
+        });
+
+        it("updates the focusedPane back to 'left'", () => {
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.setFocusedPane("left");
+            expect(ctx.manager.focusedPane).toBe("left");
+        });
+
+        it("notifies the renderer", () => {
+            (ctx.mainWindow.webContents.send as jest.Mock).mockClear();
+            ctx.manager.setFocusedPane("right");
+            expect(ctx.mainWindow.webContents.send).toHaveBeenCalledWith(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, expect.objectContaining({ focusedPane: "right" }));
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // setRatio()
+    // -----------------------------------------------------------------------
+    describe("setRatio()", () => {
+        it("accepts a valid ratio within bounds", () => {
+            ctx.manager.setRatio(0.6);
+            expect(ctx.manager.getState().ratio).toBe(0.6);
+        });
+
+        it("clamps values below MIN_RATIO (0.15) to 0.15", () => {
+            ctx.manager.setRatio(0.05);
+            expect(ctx.manager.getState().ratio).toBe(0.15);
+        });
+
+        it("clamps values above MAX_RATIO (0.85) to 0.85", () => {
+            ctx.manager.setRatio(0.99);
+            expect(ctx.manager.getState().ratio).toBe(0.85);
+        });
+
+        it("persists the clamped ratio to settings", () => {
+            ctx.manager.setRatio(0.7);
+            expect(ctx.settingsManager.getSetting("splitDividerRatio")).toBe(0.7);
+        });
+
+        it("persists clamped value — not raw input", () => {
+            ctx.manager.setRatio(0.0);
+            expect(ctx.settingsManager.getSetting("splitDividerRatio")).toBe(0.15);
+        });
+
+        it("notifies the renderer", () => {
+            (ctx.mainWindow.webContents.send as jest.Mock).mockClear();
+            ctx.manager.setRatio(0.6);
+            expect(ctx.mainWindow.webContents.send).toHaveBeenCalledWith(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, expect.objectContaining({ ratio: 0.6 }));
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // moveToPane()
+    // -----------------------------------------------------------------------
+    describe("moveToPane()", () => {
+        beforeEach(() => {
+            ctx.manager.activate("tool-a", "tool-b");
+        });
+
+        it("moves a tool from the left pane to the right pane", () => {
+            // Add a second tool to left so the pane won't become empty after the move
+            ctx.manager.addToolToFocusedPane("tool-c");
+            ctx.manager.moveToPane("tool-a", "right");
+            const state = ctx.manager.getState();
+            expect(state.rightGroup).toContain("tool-a");
+            expect(state.leftGroup).not.toContain("tool-a");
+        });
+
+        it("moves a tool from the right pane to the left pane", () => {
+            // Add a second tool to right so the pane won't become empty after the move
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.addToolToFocusedPane("tool-d");
+            ctx.manager.moveToPane("tool-b", "left");
+            const state = ctx.manager.getState();
+            expect(state.leftGroup).toContain("tool-b");
+            expect(state.rightGroup).not.toContain("tool-b");
+        });
+
+        it("makes the moved tool the active one in the target pane", () => {
+            // Add a second tool to right so the pane stays alive
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.addToolToFocusedPane("tool-d");
+            ctx.manager.moveToPane("tool-b", "left");
+            expect(ctx.manager.getState().activeLeftInstanceId).toBe("tool-b");
+        });
+
+        it("updates focusedPane to the target pane", () => {
+            // Add a second tool to left so the pane stays alive after moving tool-a
+            ctx.manager.addToolToFocusedPane("tool-c");
+            ctx.manager.moveToPane("tool-a", "right");
+            expect(ctx.manager.getState().focusedPane).toBe("right");
+        });
+
+        it("returns false when the instance is not in any group", () => {
+            const result = ctx.manager.moveToPane("tool-unknown", "right");
+            expect(result).toBe(false);
+        });
+
+        it("returns true without changing state when already in target pane", () => {
+            const result = ctx.manager.moveToPane("tool-a", "left");
+            expect(result).toBe(true);
+            expect(ctx.manager.getState().leftGroup).toContain("tool-a");
+        });
+
+        it("deactivates split when moving the only tool out of the left pane", () => {
+            // left has only tool-a; move it to right → left becomes empty → deactivate
+            ctx.manager.moveToPane("tool-a", "right");
+            expect(ctx.manager.isActive).toBe(false);
+        });
+
+        it("deactivates split when moving the only tool out of the right pane", () => {
+            // right has only tool-b; move it to left → right becomes empty → deactivate
+            ctx.manager.moveToPane("tool-b", "left");
+            expect(ctx.manager.isActive).toBe(false);
+        });
+
+        it("updates the source pane's activeId to the previous item when active tool is moved", () => {
+            // Add tool-c to left first, make it active
+            ctx.manager.addToolToFocusedPane("tool-c"); // left: [tool-a, tool-c], active=tool-c
+            // Move tool-c to right — activeLeftId should fall back to tool-a
+            ctx.manager.moveToPane("tool-c", "right");
+            expect(ctx.manager.getState().activeLeftInstanceId).toBe("tool-a");
+        });
+
+        it("returns true after a successful move", () => {
+            // Add another tool to left so the pane won't be empty after move
+            ctx.manager.addToolToFocusedPane("tool-c");
+            const result = ctx.manager.moveToPane("tool-a", "right");
+            expect(result).toBe(true);
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // handleToolClosed()
+    // -----------------------------------------------------------------------
+    describe("handleToolClosed()", () => {
+        beforeEach(() => {
+            ctx.manager.activate("tool-a", "tool-b");
+        });
+
+        it("does nothing when split is not active", () => {
+            const inactiveCtx = buildContext();
+            inactiveCtx.manager.handleToolClosed("tool-x"); // should not throw
+            expect(inactiveCtx.manager.isActive).toBe(false);
+        });
+
+        it("does nothing for a tool not in any group", () => {
+            ctx.manager.handleToolClosed("tool-unknown");
+            expect(ctx.manager.isActive).toBe(true);
+        });
+
+        it("removes a closed tool from the left group", () => {
+            // Add a second tool to left so it won't collapse
+            ctx.manager.addToolToFocusedPane("tool-c");
+            ctx.manager.handleToolClosed("tool-a");
+            expect(ctx.manager.getState().leftGroup).not.toContain("tool-a");
+        });
+
+        it("removes a closed tool from the right group", () => {
+            // Add a second tool to right so it won't collapse
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.addToolToFocusedPane("tool-d");
+            ctx.manager.handleToolClosed("tool-b");
+            expect(ctx.manager.getState().rightGroup).not.toContain("tool-b");
+        });
+
+        it("deactivates split when the left group becomes empty", () => {
+            // left has only tool-a; closing it collapses split
+            ctx.manager.handleToolClosed("tool-a");
+            expect(ctx.manager.isActive).toBe(false);
+        });
+
+        it("deactivates split when the right group becomes empty", () => {
+            // right has only tool-b; closing it collapses split
+            ctx.manager.handleToolClosed("tool-b");
+            expect(ctx.manager.isActive).toBe(false);
+        });
+
+        it("updates activeLeftId to the previous item when the active left tool is closed", () => {
+            ctx.manager.addToolToFocusedPane("tool-c"); // left: [tool-a, tool-c], active=tool-c
+            ctx.manager.handleToolClosed("tool-c");
+            expect(ctx.manager.getState().activeLeftInstanceId).toBe("tool-a");
+        });
+
+        it("updates activeRightId when the active right tool is closed", () => {
+            ctx.manager.setFocusedPane("right");
+            ctx.manager.addToolToFocusedPane("tool-d"); // right: [tool-b, tool-d], active=tool-d
+            ctx.manager.handleToolClosed("tool-d");
+            expect(ctx.manager.getState().activeRightInstanceId).toBe("tool-b");
+        });
+
+        it("does not change activeLeftId when a non-active left tool is closed", () => {
+            ctx.manager.addToolToFocusedPane("tool-c"); // left: [tool-a, tool-c], active=tool-c
+            ctx.manager.handleToolClosed("tool-a"); // close non-active left tool
+            expect(ctx.manager.getState().activeLeftInstanceId).toBe("tool-c");
+        });
+
+        it("notifies the renderer after closing a tool (no collapse)", () => {
+            ctx.manager.addToolToFocusedPane("tool-c"); // ensure left group stays non-empty
+            (ctx.mainWindow.webContents.send as jest.Mock).mockClear();
+            ctx.manager.handleToolClosed("tool-a");
+            expect(ctx.mainWindow.webContents.send).toHaveBeenCalledWith(SPLIT_LAYOUT_CHANNELS.STATE_CHANGED, expect.any(Object));
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // getState() snapshot immutability
+    // -----------------------------------------------------------------------
+    describe("getState() snapshot immutability", () => {
+        it("returns a copy of the group arrays, not live references", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            const state = ctx.manager.getState();
+            // Mutating the snapshot should not affect internal state
+            state.leftGroup.push("intruder");
+            expect(ctx.manager.getState().leftGroup).toEqual(["tool-a"]);
+        });
+
+        it("reflects the most-recent active tool after setActiveInPane", () => {
+            ctx.manager.activate("tool-a", "tool-b");
+            ctx.manager.addToolToFocusedPane("tool-c");
+            ctx.manager.setActiveInPane("left", "tool-a");
+            expect(ctx.manager.getState().activeLeftInstanceId).toBe("tool-a");
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // applyLayout() — bounds calculation
+    // -----------------------------------------------------------------------
+    describe("applyLayout()", () => {
+        it("calls setBounds on both active BrowserViews", () => {
+            const leftView = registerView(ctx.toolViews, "tool-a");
+            const rightView = registerView(ctx.toolViews, "tool-b");
+            ctx.manager.activate("tool-a", "tool-b");
+
+            const bounds = { x: 0, y: 40, width: 1000, height: 600 };
+            ctx.manager.applyLayout(bounds);
+
+            expect(leftView.setBounds).toHaveBeenCalledTimes(1);
+            expect(rightView.setBounds).toHaveBeenCalledTimes(1);
+        });
+
+        it("left pane width + divider + right pane width equals total width", () => {
+            const leftView = registerView(ctx.toolViews, "tool-a");
+            const rightView = registerView(ctx.toolViews, "tool-b");
+            ctx.manager.activate("tool-a", "tool-b");
+            ctx.manager.setRatio(0.5);
+
+            const bounds = { x: 0, y: 40, width: 1000, height: 600 };
+            ctx.manager.applyLayout(bounds);
+
+            const leftCall = (leftView.setBounds as jest.Mock).mock.calls[0][0] as { width: number };
+            const rightCall = (rightView.setBounds as jest.Mock).mock.calls[0][0] as { width: number };
+
+            expect(leftCall.width + SPLIT_DIVIDER_WIDTH + rightCall.width).toBe(bounds.width);
+        });
+
+        it("skips layout when BrowserViews are not in the toolViews map", () => {
+            // Don't register views
+            ctx.manager.activate("tool-a", "tool-b");
+            // applyLayout should not throw even with missing views
+            expect(() => ctx.manager.applyLayout({ x: 0, y: 0, width: 800, height: 600 })).not.toThrow();
+        });
+
+        it("does nothing when split is not active", () => {
+            registerView(ctx.toolViews, "tool-a");
+            ctx.manager.applyLayout({ x: 0, y: 0, width: 800, height: 600 }); // should not throw
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // SPLIT_DIVIDER_WIDTH export
+    // -----------------------------------------------------------------------
+    describe("SPLIT_DIVIDER_WIDTH", () => {
+        it("is exported and is a positive integer", () => {
+            expect(SPLIT_DIVIDER_WIDTH).toBeGreaterThan(0);
+            expect(Number.isInteger(SPLIT_DIVIDER_WIDTH)).toBe(true);
+        });
+    });
+});
diff --git a/tests/unit/main/managers/terminalManager.test.ts b/tests/unit/main/managers/terminalManager.test.ts
new file mode 100644
index 00000000..0eae3f92
--- /dev/null
+++ b/tests/unit/main/managers/terminalManager.test.ts
@@ -0,0 +1,73 @@
+/// <reference types="jest" />
+
+import { terminalManagerTestUtils } from "../../../../src/main/managers/terminalManager";
+
+describe("terminalManager command hardening", () => {
+    describe("parseTerminalCommand", () => {
+        it("blocks node inline eval payloads", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand('node -e "console.log(1)"')).toThrow('Blocked unsafe terminal command "node"');
+        });
+
+        it("blocks node when invoked by absolute path", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand('/usr/local/bin/node -e "console.log(1)"')).toThrow('Blocked unsafe terminal command "/usr/local/bin/node"');
+        });
+
+        it("blocks quoted Windows node.exe absolute path payloads", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand('"C:\\Program Files\\nodejs\\node.exe" -e "console.log(1)"')).toThrow(
+                'Blocked unsafe terminal command "C:\\Program Files\\nodejs\\node.exe"',
+            );
+        });
+
+        it("blocks start cmd process spawn payloads", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand("start cmd")).toThrow('Blocked unsafe terminal command "start"');
+        });
+
+        it("blocks conhost process spawn payloads", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand("conhost.exe cmd /c echo hi")).toThrow('Blocked unsafe terminal command "conhost.exe"');
+        });
+
+        it("blocks dotnet inline compile/execute payloads", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand("dotnet hello.cs")).toThrow('Blocked unsafe terminal command "dotnet"');
+        });
+
+        it("blocks blocked executables in compound commands", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand('echo "safe" && node -e "console.log(1)"')).toThrow('Blocked unsafe terminal command "node"');
+        });
+
+        it("still allows non-blocked commands", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand("git status")).not.toThrow();
+        });
+
+        it("allows npm scripts with safe args", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand("npm run lint -- --fix")).not.toThrow();
+        });
+
+        it("allows npx when shell-execution flags are not used", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand("npx prettier --version")).not.toThrow();
+        });
+
+        it("allows compound commands when all segments are safe", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand("echo ok && git status || npm -v")).not.toThrow();
+        });
+
+        it("allows quoted literals containing shell metacharacters", () => {
+            expect(() => terminalManagerTestUtils.parseTerminalCommand('echo "a|b;c&&d"')).not.toThrow();
+        });
+
+        it("trims whitespace and preserves the raw command text", () => {
+            const parsed = terminalManagerTestUtils.parseTerminalCommand("   git status   ");
+            expect(parsed.executable).toBe("git");
+            expect(parsed.args).toEqual(["status"]);
+            expect(parsed.rawCommand).toBe("git status");
+        });
+    });
+
+    describe("getNormalizedExecutableCandidates", () => {
+        it("normalizes full executable paths to basename variants", () => {
+            const candidates = terminalManagerTestUtils.getNormalizedExecutableCandidates("C:\\Windows\\System32\\conhost.exe");
+            expect(candidates.has("c:\\windows\\system32\\conhost.exe")).toBe(true);
+            expect(candidates.has("conhost.exe")).toBe(true);
+            expect(candidates.has("conhost")).toBe(true);
+        });
+    });
+});
diff --git a/tests/unit/renderer/modalFeedback.test.ts b/tests/unit/renderer/modalFeedback.test.ts
new file mode 100644
index 00000000..1b4e036d
--- /dev/null
+++ b/tests/unit/renderer/modalFeedback.test.ts
@@ -0,0 +1,48 @@
+/// <reference types="jest" />
+
+import { getAddConnectionModalControllerScript } from "../../../src/renderer/modals/addConnection/controller";
+import { getEditConnectionModalControllerScript } from "../../../src/renderer/modals/editConnection/controller";
+import { getModalStyles } from "../../../src/renderer/modals/sharedStyles";
+
+const SUCCESS_FEEDBACK_BACKGROUND = "rgba(16, 124, 16, 0.12)";
+const ERROR_FEEDBACK_BACKGROUND = "rgba(255, 77, 109, 0.12)";
+
+describe("modal feedback styling", () => {
+    it("includes explicit success and error feedback variants", () => {
+        const styles = getModalStyles(false);
+
+        expect(styles).toContain(".modal-feedback.success");
+        expect(styles).toContain(".modal-feedback.error");
+        expect(styles).toContain(SUCCESS_FEEDBACK_BACKGROUND);
+        expect(styles).toContain(ERROR_FEEDBACK_BACKGROUND);
+    });
+});
+
+describe("connection modal feedback controllers", () => {
+    const channels = {
+        submit: "submit",
+        submitReady: "submitReady",
+        test: "test",
+        testReady: "testReady",
+        testFeedback: "testFeedback",
+        populateConnection: "populateConnection",
+    };
+
+    it("applies success/error classes in the add connection modal controller", () => {
+        const script = getAddConnectionModalControllerScript(channels);
+
+        expect(script).toMatch(/data\.type === "success"/);
+        expect(script).toContain('? "success" : "error";');
+        expect(script).toContain('testFeedback.className = "modal-feedback " + feedbackType;');
+        expect(script).toContain('updateTestFeedback(payload.data);');
+    });
+
+    it("applies success/error classes in the edit connection modal controller", () => {
+        const script = getEditConnectionModalControllerScript(channels);
+
+        expect(script).toMatch(/data\.type === "success"/);
+        expect(script).toContain('? "success" : "error";');
+        expect(script).toContain('testFeedback.className = "modal-feedback " + feedbackType;');
+        expect(script).toContain('updateTestFeedback(payload.data);');
+    });
+});
diff --git a/tests/unit/renderer/toolSourceIcon.test.ts b/tests/unit/renderer/toolSourceIcon.test.ts
new file mode 100644
index 00000000..0586ee26
--- /dev/null
+++ b/tests/unit/renderer/toolSourceIcon.test.ts
@@ -0,0 +1,47 @@
+/// <reference types="jest" />
+
+import { getToolDetailSourceIconHtml, getToolSourceIconHtml } from "../../../src/renderer/utils/toolSourceIcon";
+
+describe("toolSourceIcon utilities", () => {
+    // -----------------------------------------------------------------------
+    // getToolSourceIconHtml
+    // -----------------------------------------------------------------------
+    describe("getToolSourceIconHtml", () => {
+        it("returns empty string for a registry tool (no prefix)", () => {
+            expect(getToolSourceIconHtml("some-registry-tool-id")).toBe("");
+        });
+
+        it("returns HTML for a local- prefixed tool", () => {
+            const html = getToolSourceIconHtml("local-my-tool");
+            expect(html).toContain("tool-source-icon");
+            expect(html).toContain("Locally Developed Tool");
+            expect(html).toContain("<svg");
+        });
+
+        it("returns HTML for an npm- prefixed tool", () => {
+            const html = getToolSourceIconHtml("npm-@pptb/some-tool");
+            expect(html).toContain("tool-source-icon");
+            expect(html).toContain("NPM Package Tool");
+            expect(html).toContain("<svg");
+        });
+    });
+
+    // -----------------------------------------------------------------------
+    // getToolDetailSourceIconHtml
+    // -----------------------------------------------------------------------
+    describe("getToolDetailSourceIconHtml", () => {
+        it("returns empty string for a registry tool", () => {
+            expect(getToolDetailSourceIconHtml("registry-tool")).toBe("");
+        });
+
+        it("uses tool-detail-source-icon CSS class for local tools", () => {
+            const html = getToolDetailSourceIconHtml("local-tool");
+            expect(html).toContain("tool-detail-source-icon");
+        });
+
+        it("uses tool-detail-source-icon CSS class for npm tools", () => {
+            const html = getToolDetailSourceIconHtml("npm-tool");
+            expect(html).toContain("tool-detail-source-icon");
+        });
+    });
+});
diff --git a/tsconfig.cli.json b/tsconfig.cli.json
new file mode 100644
index 00000000..54524029
--- /dev/null
+++ b/tsconfig.cli.json
@@ -0,0 +1,12 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "./dist/cli",
+        "rootDir": "./src/cli",
+        "declaration": false,
+        "declarationMap": false,
+        "sourceMap": true
+    },
+    "include": ["src/cli/**/*"],
+    "exclude": ["node_modules", "dist", "build"]
+}
diff --git a/tsconfig.test.json b/tsconfig.test.json
new file mode 100644
index 00000000..a025bbf3
--- /dev/null
+++ b/tsconfig.test.json
@@ -0,0 +1,11 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "module": "CommonJS",
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "isolatedModules": false,
+        "types": ["node", "jest", "playwright"]
+    },
+    "include": ["src/main/**/*", "src/common/**/*", "src/renderer/utils/**/*", "tests/**/*"]
+}