diff --git a/.github/READMEmd b/.github/READMEmd
index 47ff11b..10f0b99 100644
--- a/.github/READMEmd
+++ b/.github/READMEmd
@@ -87,20 +87,23 @@ dotnet new install LanMountainDesktop.PluginTemplate
 dotnet new lmd-plugin -n MyPlugin
 ```
 
-- **Plugin SDK**: `LanMountainDesktop.PluginSdk` (API 4.0.0)
-- **共享契约**: `LanMountainDesktop.Shared.Contracts`
-- **迁移指南**: [PLUGIN_SDK_V4_MIGRATION.md](docs/PLUGIN_SDK_V4_MIGRATION.md)
+- **Plugin SDK**: `LanMountainDesktop.PluginSdk` (API 6.0.0)
+- **共享契约**: `LanMountainDesktop.Core`
+- **迁移指南**: [PLUGIN_SDK_V5_MIGRATION.md](docs/PLUGIN_SDK_V5_MIGRATION.md)
 
 ## 项目结构
 
 ```
 LanMountainDesktop/
-├── LanMountainDesktop/              # 桌面宿主应用
-├── LanMountainDesktop.PluginSdk/    # 官方插件 SDK
-├── LanMountainDesktop.Shared.Contracts/  # 宿主与插件共享契约
-├── LanMountainDesktop.Appearance/   # 主题与外观基础设施
-├── LanMountainDesktop.Settings.Core/# 设置持久化基础设施
-└── LanMountainDesktop.Tests/        # 测试项目
+├── desktop/LanMountainDesktop/            # 桌面宿主应用
+├── desktop/LanMountainDesktop.Launcher/   # 启动器
+├── airapp/LanMountainDesktop.PluginSdk/   # 官方插件 SDK（含隔离、设置、外观）
+├── core/LanMountainDesktop.Core/          # 共享契约、IPC、插件打包
+├── platform/LanMountainDesktop.Platform/  # 平台差异层
+├── airapp/LanMountainDesktop.AirAppRuntime/  # Air APP 运行时
+├── airapp/LanMountainDesktop.AirAppHost/     # Air APP 渲染进程
+├── install/LanDesktopPLONDS.installer/    # 在线安装器
+└── tests/LanMountainDesktop.Tests/        # 测试项目
 ```
 
 ## 生态边界
diff --git a/.github/VERSION_SYNC_INFO.md b/.github/VERSION_SYNC_INFO.md
index 0fe8885..b105250 100644
--- a/.github/VERSION_SYNC_INFO.md
+++ b/.github/VERSION_SYNC_INFO.md
@@ -13,11 +13,11 @@
 仓库内的静态版本现在故意保留为开发占位值：
 
 - `Directory.Build.props`
-- `LanMountainDesktop/LanMountainDesktop.csproj`
-- `LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj`
-- `LanMountainDesktop.Shared.Contracts/LanMountainDesktop.Shared.Contracts.csproj`
-- `LanMountainDesktop/app.manifest`
-- `LanMountainDesktop.Launcher/app.manifest`
+- `desktop/LanMountainDesktop/LanMountainDesktop.csproj`
+- `desktop/LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj`
+- `core/LanMountainDesktop.Core/LanMountainDesktop.Core.csproj`
+- `desktop/LanMountainDesktop/app.manifest`
+- `desktop/LanMountainDesktop.Launcher/app.manifest`
 
 这些值只是提醒“当前不是正式注入构建”，不能代表发布版本。
 
@@ -36,7 +36,7 @@ Release 工作流会先从 tag 提取版本：
 
 - 主程序 `.csproj` 的 `Version`
 - Launcher `.csproj` 的 `Version`
-- Shared.Contracts `.csproj` 的 `Version`
+- Core `.csproj` 的 `Version`
 - `Directory.Build.props`
 - 主程序 `app.manifest`
 - Launcher `app.manifest`
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 148ed86..90edbee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           name: build-windows-${{ matrix.configuration }}
           path: |
-            LanMountainDesktop/bin/${{ matrix.configuration }}/
+            desktop/LanMountainDesktop/bin/${{ matrix.configuration }}/
           retention-days: 7
 
   build-linux:
@@ -117,7 +117,7 @@ jobs:
         with:
           name: build-linux
           path: |
-            LanMountainDesktop/bin/Release/
+            desktop/LanMountainDesktop/bin/Release/
           retention-days: 7
 
   build-macos:
@@ -162,7 +162,7 @@ jobs:
         with:
           name: build-macos
           path: |
-            LanMountainDesktop/bin/Release/
+            desktop/LanMountainDesktop/bin/Release/
           retention-days: 7
 
   build-android:
diff --git a/.github/workflows/installer-build.yml b/.github/workflows/installer-build.yml
index 3c37be3..1623cfb 100644
--- a/.github/workflows/installer-build.yml
+++ b/.github/workflows/installer-build.yml
@@ -7,19 +7,19 @@ on:
     paths:
       - '.github/workflows/installer-build.yml'
       - 'Directory.Packages.props'
-      - 'LanDesktopPLONDS.installer/**'
-      - 'LanMountainDesktop.Shared.Contracts/**'
+      - 'install/LanDesktopPLONDS.installer/**'
+      - 'core/LanMountainDesktop.Core/**'
   pull_request:
     paths:
       - '.github/workflows/installer-build.yml'
       - 'Directory.Packages.props'
-      - 'LanDesktopPLONDS.installer/**'
-      - 'LanMountainDesktop.Shared.Contracts/**'
+      - 'install/LanDesktopPLONDS.installer/**'
+      - 'core/LanMountainDesktop.Core/**'
   workflow_dispatch:
 
 env:
   DOTNET_VERSION: '10.0.x'
-  INSTALLER_PROJECT: LanDesktopPLONDS.installer/LanDesktopPLONDS.installer.csproj
+  INSTALLER_PROJECT: install/LanDesktopPLONDS.installer/LanDesktopPLONDS.installer.csproj
   INSTALLER_RUNTIME: win-x64
   INSTALLER_ARTIFACT_DIR: artifacts/installer-online/win-x64
   DOTNET_gcServer: 1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fa3f05f..550a19f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -143,7 +143,7 @@ jobs:
           $arch = "${{ matrix.arch }}"
           $launcherPublishDir = "publish/launcher-win-$arch"
 
-          dotnet publish LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj `
+          dotnet publish desktop/LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj `
             -c Release `
             -o ./$launcherPublishDir `
             --self-contained `
@@ -192,7 +192,7 @@ jobs:
           $arch = "${{ matrix.arch }}"
           $publishDir = "publish/airapp-runtime-win-$arch"
 
-          dotnet publish LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj `
+          dotnet publish airapp/LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj `
             -c Release `
             -o ./$publishDir `
             --self-contained:false `
@@ -215,7 +215,7 @@ jobs:
           $arch = "${{ matrix.arch }}"
           $publishDir = "publish/windows-$arch"
 
-          dotnet publish LanMountainDesktop.AirAppHost/LanMountainDesktop.AirAppHost.csproj `
+          dotnet publish airapp/LanMountainDesktop.AirAppHost/LanMountainDesktop.AirAppHost.csproj `
             -c Release `
             -o ./$publishDir `
             --self-contained:false `
@@ -467,7 +467,7 @@ jobs:
 
       - name: Publish Launcher (AOT)
         run: |
-          dotnet publish LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj \
+          dotnet publish desktop/LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj \
             -c Release \
             -o ./publish/launcher-linux-x64 \
             --self-contained \
@@ -504,7 +504,7 @@ jobs:
 
       - name: Publish AirAppRuntime
         run: |
-          dotnet publish LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj \
+          dotnet publish airapp/LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj \
             -c Release \
             -o ./publish/airapp-runtime-linux-x64 \
             --self-contained false \
@@ -950,7 +950,7 @@ jobs:
 
       - name: Publish Launcher (AOT)
         run: |
-          dotnet publish LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj \
+          dotnet publish desktop/LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj \
             -c Release \
             -o ./publish/launcher-macos-${{ matrix.arch }} \
             --self-contained \
@@ -987,7 +987,7 @@ jobs:
 
       - name: Publish AirAppRuntime
         run: |
-          dotnet publish LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj \
+          dotnet publish airapp/LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj \
             -c Release \
             -o ./publish/airapp-runtime-macos-${{ matrix.arch }} \
             --self-contained false \
diff --git a/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/canvas.json b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/canvas.json
new file mode 100644
index 0000000..fd98540
--- /dev/null
+++ b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/canvas.json
@@ -0,0 +1,194 @@
+{
+  "schemaVersion": 1,
+  "summary": {
+    "evidenceMode": "session-limited",
+    "evidenceBoundary": {
+      "manifest": {
+        "schemaVersion": 2,
+        "sourceFingerprint": "75cebb1a53875ab1",
+        "adapterVersion": "qoder-task-loop-source-v2",
+        "platform": "qoder",
+        "selection": {
+          "strategy": "all-eligible",
+          "eligibleCount": 1,
+          "analyzedCount": 1,
+          "confidence": "High"
+        }
+      },
+      "episodeCoverage": {
+        "episodeCount": 0,
+        "editedEpisodeCount": 0,
+        "closedEpisodeCount": 0,
+        "recoveredEpisodeCount": 0
+      },
+      "deliveryEvidenceLevels": [],
+      "sourceGaps": []
+    },
+    "semanticFacets": {
+      "schemaVersion": 1,
+      "status": "supplementary",
+      "entries": [
+        {
+          "id": "session-insight:source-coverage",
+          "kind": "redacted-summary",
+          "episodeRef": null,
+          "status": "candidate",
+          "labels": [
+            "source-coverage",
+            "High"
+          ],
+          "summary": "Analyzed 1 of 1 sessions; 1/5 enabled source roots exist. Use this as the current workspace evidence boundary for final insight cards.",
+          "evidenceRefs": [],
+          "modelVersion": "session-insights-v1"
+        },
+        {
+          "id": "session-insight:validation-behavior",
+          "kind": "redacted-summary",
+          "episodeRef": null,
+          "status": "candidate",
+          "labels": [
+            "validation-behavior",
+            "Low"
+          ],
+          "summary": "No validation command category was observed in the analyzed session sample. Inspect more sessions or add explicit validation guidance before claiming validation-after-edit behavior.",
+          "evidenceRefs": [],
+          "modelVersion": "session-insights-v1"
+        },
+        {
+          "id": "session-insight:post-edit-validation",
+          "kind": "rework-correction",
+          "episodeRef": null,
+          "status": "candidate",
+          "labels": [
+            "post-edit-validation",
+            "Low"
+          ],
+          "summary": "No edit event was observed in the analyzed sample. Inspect more sessions before making claims about edit or validation habits.",
+          "evidenceRefs": [],
+          "modelVersion": "session-insights-v1"
+        },
+        {
+          "id": "session-insight:execution-friction",
+          "kind": "friction-taxonomy",
+          "episodeRef": null,
+          "status": "candidate",
+          "labels": [
+            "execution-friction",
+            "Low"
+          ],
+          "summary": "No strong execution friction signal in the analyzed sample. Keep friction claims narrow unless additional failed commands, rejected actions, or warnings are inspected.",
+          "evidenceRefs": [],
+          "modelVersion": "session-insights-v1"
+        },
+        {
+          "id": "session-insight:session-usage-efficiency",
+          "kind": "redacted-summary",
+          "episodeRef": null,
+          "status": "candidate",
+          "labels": [
+            "session-usage-efficiency",
+            "High"
+          ],
+          "summary": "本次分析覆盖 1 个会话，未发现达到阈值的活跃长会话。 这些活动证据只描述投入；当前 token 或 credit 证据不足，不能据此推断模型偏好、质量或节省。",
+          "evidenceRefs": [],
+          "modelVersion": "session-insights-v1"
+        }
+      ]
+    },
+    "usageActivity": {
+      "schemaVersion": 2,
+      "dateBasis": "UTC",
+      "measurementBasis": "session-starts-active-estimate-model-active-session-days-skill-invocations-and-loads",
+      "truncated": false,
+      "dates": [
+        "2026-08-04"
+      ],
+      "sessions": {
+        "total": 1,
+        "starts": [
+          1
+        ],
+        "activeMinutes": [
+          0.9
+        ]
+      },
+      "models": [],
+      "skills": []
+    },
+    "usageEfficiency": {
+      "schemaVersion": 2,
+      "selection": {
+        "strategy": "all-eligible",
+        "eligibleSessionCount": 1,
+        "analyzedSessionCount": 1,
+        "complete": true
+      },
+      "roles": {
+        "userThreadCandidateCount": 0,
+        "childAgentCandidateCount": 1
+      },
+      "longSessions": {
+        "activeCount": 0,
+        "wallOnlyCount": 0,
+        "longestActiveMinutes": 0,
+        "activeRatio": 0,
+        "estimate": {
+          "method": "capped-event-gap",
+          "activeThresholdMinutes": 45,
+          "gapCapMinutes": 5,
+          "idleGapMinutes": 30
+        },
+        "samples": []
+      },
+      "accounting": {
+        "mode": "effort-proxy",
+        "responseCount": 0,
+        "modelAttributedResponseCount": 0,
+        "unattributedResponseCount": 0,
+        "usageFieldObservedCount": 0,
+        "nonZeroUsageCount": 0,
+        "exactCreditsAvailable": false,
+        "pricingVersion": null
+      },
+      "modelUsage": [],
+      "outcomeReview": {
+        "status": "not-applicable",
+        "reviewedCandidateCount": 0,
+        "reviewedActiveLongCount": 0,
+        "comparableModelOutcomeEvidence": false,
+        "recommendation": "controlled-a-b-required"
+      }
+    },
+    "learningCapture": {
+      "schemaVersion": 1,
+      "state": "N/A",
+      "summary": "暂不适用——需要两个可比的观察窗口和一次改进对比。",
+      "interventions": []
+    }
+  },
+  "dimensions": [
+    {
+      "id": "task-understanding"
+    },
+    {
+      "id": "controlled-execution"
+    },
+    {
+      "id": "change-validation"
+    },
+    {
+      "id": "reliable-delivery"
+    },
+    {
+      "id": "learning-capture"
+    }
+  ],
+  "findings": [
+    {
+      "id": "zero-test-files"
+    },
+    {
+      "id": "candidate-skill-unconfigured"
+    }
+  ]
+}
diff --git a/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/findings.json b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/findings.json
new file mode 100644
index 0000000..1c2a016
--- /dev/null
+++ b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/findings.json
@@ -0,0 +1,132 @@
+{
+  "summary": {
+    "projectName": "阑山桌面LanMountainDesktop",
+    "locale": "zh-CN",
+    "modelId": "agent-work-loop-v4",
+    "reportContractVersion": 25,
+    "overview": "项目拥有完善的文档指导和 CI/CD 工作流，但编码代理缺少可复用的 Skill 配置且项目无专用测试文件，限制了变更验证和持续学习能力。",
+    "aiAgentPractice": {
+      "inspectedSurfaces": [
+        "Rules",
+        "Skills",
+        "Workflows",
+        "Custom Agents"
+      ],
+      "coverageRows": [
+        {
+          "surface": "Rules",
+          "scopes": [
+            "Project"
+          ],
+          "count": 1,
+          "paths": [
+            "AGENTS.md"
+          ]
+        },
+        {
+          "surface": "Skills",
+          "scopes": [
+            "Project"
+          ],
+          "count": 0,
+          "paths": []
+        },
+        {
+          "surface": "Workflows",
+          "scopes": [
+            "Project"
+          ],
+          "count": 7,
+          "paths": [
+            ".github/workflows/build.yml",
+            ".github/workflows/code-quality.yml",
+            ".github/workflows/installer-build.yml",
+            ".github/workflows/issue-management.yml",
+            ".github/workflows/plonds-comparator.yml",
+            ".github/workflows/plonds-uploader.yml",
+            ".github/workflows/release.yml"
+          ]
+        },
+        {
+          "surface": "Custom Agents",
+          "scopes": [
+            "Project"
+          ],
+          "count": 0
+        }
+      ]
+    },
+    "assignmentSummaries": [],
+    "dimensions": [
+      {
+        "id": "task-understanding",
+        "label": "任务理解",
+        "score": 70,
+        "summary": "AGENTS.md 提供了全面的架构指引和规范，104 个规格文档使任务边界清晰，但工作流指引未与 CI 直接关联。",
+        "findingRefs": []
+      },
+      {
+        "id": "controlled-execution",
+        "label": "可控执行",
+        "score": 45,
+        "summary": "启动和构建命令在 AGENTS.md 中有文档，但无 Skill、Command 或 Agent 配置，操作能力受限。",
+        "findingRefs": []
+      },
+      {
+        "id": "change-validation",
+        "label": "改动验证",
+        "score": 45,
+        "summary": "CI 工作流提供了验证管道，但项目缺少专用测试文件（990 源文件 vs 0 测试文件），限制了变更验证覆盖。",
+        "findingRefs": [
+          "zero-test-files"
+        ]
+      },
+      {
+        "id": "reliable-delivery",
+        "label": "可靠交付",
+        "score": 48,
+        "summary": "7 个 CI/CD 工作流覆盖了构建、发布和代码质量，但分析窗口内无实际交付证据。",
+        "findingRefs": []
+      },
+      {
+        "id": "learning-capture",
+        "label": "经验沉淀",
+        "score": 35,
+        "summary": "无 Skill 配置、无学习事件、无重复模式检测，持续改进机制尚未建立。",
+        "findingRefs": [
+          "candidate-skill-unconfigured"
+        ]
+      }
+    ]
+  },
+  "findings": [
+    {
+      "id": "zero-test-files",
+      "title": "项目无专用测试文件，变更验证依赖有限",
+      "severity": "Medium",
+      "reason": "项目有 990 个源文件但 0 个专用测试文件。尽管 CI 管道存在，变更验证覆盖受到根本性限制，无法在交付前验证受影响的行为。",
+      "expectedOutput": [
+        "为核心模块添加专用测试文件，确保 dotnet test 可以执行并验证关键行为。"
+      ],
+      "expectedArtifact": "Test files",
+      "aiFixPrompt": "/better-harness fix this issue\n\n为项目的核心模块添加最小但有效的测试覆盖，优先覆盖高频变更的核心路径。\n\n## 验证\n\n- 运行 dotnet test 确认测试通过\n- 确认测试覆盖了至少一个核心业务路径",
+      "dimensionRefs": [
+        "change-validation"
+      ]
+    },
+    {
+      "id": "candidate-skill-unconfigured",
+      "title": "候选 Skill 文件缺少触发和验证配置",
+      "severity": "Low",
+      "reason": ".trae/skills/refactoring-insight/SKILL.md 存在但触发条件为 no、验证为 no、路由为 no。即使激活也无法被自动路由或在正确时机触发。",
+      "expectedOutput": [
+        "补全候选 Skill 的触发条件和验证配置，使其可被正确路由和激活。"
+      ],
+      "expectedArtifact": "Skill configuration",
+      "aiFixPrompt": "/better-harness fix this issue\n\n检查 .trae/skills/refactoring-insight/SKILL.md 的配置，补充触发条件和输出验证。\n\n## 验证\n\n- 确认 Skill 的 trigger 字段已正确配置\n- 确认 Skill 的输出有明确的验证方法",
+      "dimensionRefs": [
+        "learning-capture"
+      ]
+    }
+  ]
+}
diff --git a/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/report.canvas.status.json b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/report.canvas.status.json
new file mode 100644
index 0000000..1e5bf06
--- /dev/null
+++ b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/report.canvas.status.json
@@ -0,0 +1,3 @@
+{
+  "status": "ready"
+}
diff --git a/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/report.canvas.tsx b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/report.canvas.tsx
new file mode 100644
index 0000000..2084dfd
--- /dev/null
+++ b/.qoder/better-harness/2026-08-05/001011-lanmountaindesktop/report.canvas.tsx
@@ -0,0 +1,1788 @@
+import {
+  AreaChart,
+  Button,
+  Callout,
+  Card,
+  CardBody,
+  CardHeader,
+  CollapsibleSection,
+  Dialog,
+  Divider,
+  Fluency,
+  Grid,
+  H1,
+  H2,
+  MetricsGrid,
+  Row,
+  RiskHeatmap,
+  SendToChatButton,
+  Stack,
+  Table,
+  Tag,
+  Text,
+} from "qoder/canvas";
+import hostReportData from "./findings.json";
+import canvasData from "./canvas.json";
+
+function mergeCanvasRows(hostRows, canvasRows) {
+  const detailById = new Map(
+    (Array.isArray(canvasRows) ? canvasRows : [])
+      .filter((row) => row && typeof row === "object" && typeof row.id === "string")
+      .map((row) => [row.id, row]),
+  );
+  return (Array.isArray(hostRows) ? hostRows : []).map((row) => ({ ...detailById.get(row?.id), ...row }));
+}
+
+function mergeCanvasObjects(host, detail) {
+  if (!host || typeof host !== "object" || Array.isArray(host)) return detail;
+  if (!detail || typeof detail !== "object" || Array.isArray(detail)) return host;
+  const merged = { ...host };
+  for (const [key, value] of Object.entries(detail)) {
+    merged[key] = value && typeof value === "object" && !Array.isArray(value)
+      ? mergeCanvasObjects(host[key], value)
+      : value;
+  }
+  return merged;
+}
+
+function mergeCanvasReport(host, detail) {
+  const summary = host?.summary ?? {};
+  if (!detail || typeof detail !== "object" || Array.isArray(detail)) return host;
+  return {
+    summary: {
+      ...(detail?.summary ?? {}),
+      ...summary,
+      atAGlance: mergeCanvasObjects(detail?.summary?.atAGlance, summary.atAGlance),
+      dimensions: mergeCanvasRows(summary.dimensions, detail?.dimensions),
+    },
+    findings: mergeCanvasRows(host?.findings, detail?.findings),
+  };
+}
+
+const report = mergeCanvasReport(hostReportData, canvasData);
+
+const pageStyle = { maxWidth: 960, margin: "0 auto", padding: 16, boxSizing: "border-box" };
+const taskLoopPageStyle = { ...pageStyle, padding: 20 };
+const taskLoopReaderCopyStyle = { maxWidth: 940 };
+
+const DIMENSION_SUMMARY_EXAMPLE = "Example: project guidance makes the main workflow clear, but ownership for cross-cutting changes is not documented.";
+
+function list(value) {
+  return Array.isArray(value) ? value : [];
+}
+
+function clampScore(value) {
+  const score = Number(value);
+  if (!Number.isFinite(score)) return 0;
+  return Math.max(0, Math.min(100, score));
+}
+
+function projectName() {
+  return report.summary?.projectName ?? "Better Harness Report";
+}
+
+function textValue(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function openingStrengths() {
+  const explicit = list(report.summary?.strengths).map(textValue).filter(Boolean);
+  return explicit.length ? explicit.slice(0, 3) : ["Reviewed project signals are organized into dimensions and issue findings."];
+}
+
+function averageScore(dimensions) {
+  if (dimensions.length === 0) return 0;
+  return Math.round(dimensions.reduce((sum, row) => sum + clampScore(row.score), 0) / dimensions.length);
+}
+
+function scoreTone(score) {
+  if (score >= 70) return "success";
+  if (score >= 40) return "warning";
+  return "danger";
+}
+
+function stageStatus(score) {
+  if (score >= 70) return "high";
+  if (score >= 40) return "medium";
+  if (score > 0) return "low";
+  return "blocked";
+}
+
+function fluencyReason(row) {
+  return textValue(row?.summary) || taskLoopCopy(
+    "No reviewed score explanation is available for this dimension.",
+    "这个维度暂时没有经过复核的评分说明。",
+  );
+}
+
+function splitFluencyTooltipReason(value) {
+  let remaining = textValue(value).replace(/\s+/g, " ");
+  const chunks = [];
+  const limits = /[\u3400-\u9fff]/.test(remaining) ? [20, 20, 20, 20] : [34, 30, 30, 30];
+  for (const limit of limits) {
+    if (!remaining) break;
+    if (remaining.length <= limit) {
+      chunks.push(remaining);
+      remaining = "";
+      break;
+    }
+    let cut = remaining.lastIndexOf(" ", limit);
+    if (cut < Math.floor(limit * 0.55)) cut = limit;
+    chunks.push(remaining.slice(0, cut).trim());
+    remaining = remaining.slice(cut).trim();
+  }
+  if (remaining && chunks.length) {
+    chunks[chunks.length - 1] = `${chunks[chunks.length - 1].slice(0, 29)}…`;
+  }
+  return chunks;
+}
+
+function dimensionFluencyStages(dimensions) {
+  return dimensions.map((row) => {
+    const score = clampScore(row.score);
+    const usesGenericBand = row.id !== "learning-capture";
+    return {
+      id: row.id,
+      name: taskLoopDimensionLabel(row.id),
+      score,
+      ...(usesGenericBand ? { status: stageStatus(score), blocker: score <= 20 } : {}),
+    };
+  });
+}
+
+function dimensionFluencyTooltip(row) {
+  const [title, ...rows] = splitFluencyTooltipReason(fluencyReason(row));
+  return {
+    title,
+    rows: rows.map((value) => ({ value })),
+  };
+}
+
+function severityTone(value) {
+  if (value === "Critical" || value === "High") return "danger";
+  if (value === "Medium") return "warning";
+  if (value === "Low") return "success";
+  return "neutral";
+}
+
+function severityRank(value) {
+  if (value === "Critical") return 0;
+  if (value === "High") return 1;
+  if (value === "Medium") return 2;
+  if (value === "Low") return 3;
+  return 4;
+}
+
+function dimensionLabel(id, dimensions) {
+  const match = dimensions.find((row) => row.id === id);
+  return match?.label ?? id.replace(/-/g, " ");
+}
+
+function aiAgentPractice() {
+  return report.summary?.aiAgentPractice ?? {};
+}
+
+function practiceRows() {
+  const rows = aiAgentPractice().coverageRows;
+  return Array.isArray(rows) ? rows : [];
+}
+
+function inspectedSurfaces() {
+  const surfaces = aiAgentPractice().inspectedSurfaces;
+  return Array.isArray(surfaces) ? surfaces : [];
+}
+
+function visiblePracticePaths(value) {
+  return list(value).map(textValue).filter((candidate) => candidate
+    && !candidate.includes("SharedClientCache/projects/")
+    && !candidate.startsWith("/")
+    && !/^[A-Za-z]:[\\/]/.test(candidate)
+    && !candidate.split(/[\\/]/).includes(".."));
+}
+
+function practiceDescription(surface) {
+  const descriptions = {
+    Rules: ["Standing project guidance and task-routing instructions.", "项目常驻指引与任务路由说明。"],
+    Skills: ["Reusable agent workflows available to the project.", "项目可用的可复用 Agent 工作流。"],
+    "Custom Agents": ["Specialized agent profiles available for delegated work.", "可用于委派工作的专用 Agent 配置。"],
+    Hooks: ["Lifecycle automation around agent and delivery events.", "围绕 Agent 与交付事件的生命周期自动化。"],
+    MCP: ["External tools and resources exposed through MCP.", "通过 MCP 暴露的外部工具与资源。"],
+    Commands: ["Named command entry points for repeatable agent work.", "可重复 Agent 工作的命令入口。"],
+    Workflows: ["Reusable multi-step project workflows.", "可复用的多步骤项目工作流。"],
+    Plugins: ["Installed packages that contribute agent capabilities.", "提供 Agent 能力的已安装插件。"],
+    "Session Insights": ["Task-session evidence available for report analysis.", "可用于报告分析的任务会话证据。"],
+    Memories: ["Representative project or global Memory note files.", "项目级或全局 Memory 的代表性笔记文件。"],
+  };
+  const copy = descriptions[surface] ?? ["Recorded agent capability sources.", "已记录的 Agent 能力来源。"];
+  return taskLoopCopy(copy[0], copy[1]);
+}
+
+function TaskLoopPracticePaths({ paths }) {
+  if (paths.length === 0) return null;
+  const preview = paths.slice(0, 2);
+  const remaining = paths.slice(2);
+  return (
+    <Stack gap={4}>
+      {preview.map((path, index) => (
+        <Text key={`${path}-${index}`} size="sm" tone="tertiary" truncate>{path}</Text>
+      ))}
+      {remaining.length ? (
+        <CollapsibleSection
+          size="sm"
+          defaultOpen={false}
+          title={(
+            <Text size="sm" weight="semibold">
+              {taskLoopCopy(`View ${remaining.length} more locations`, `查看其余 ${remaining.length} 个位置`)}
+            </Text>
+          )}
+          bodyStyle={{ padding: "4px 0 0 16px" }}
+          headerStyle={{ borderBottom: "none", minHeight: 24 }}
+        >
+          <Stack gap={4} style={{ maxHeight: 240, overflowY: "auto", paddingRight: 4 }}>
+            {remaining.map((path, index) => (
+              <Text key={`${path}-${index}`} size="sm" tone="tertiary" style={{ overflowWrap: "anywhere" }}>{path}</Text>
+            ))}
+          </Stack>
+        </CollapsibleSection>
+      ) : null}
+    </Stack>
+  );
+}
+
+function PracticeSourceCard({ row }) {
+  const paths = visiblePracticePaths(row.paths);
+  const scopes = list(row.scopes);
+  return (
+    <Card size="sm">
+      <CardHeader
+        title={(
+          <Row gap={7} align="center" style={{ minWidth: 0 }}>
+            <PracticeSurfaceIcon row={row} />
+            <Text weight="semibold" truncate>{row.surface ?? taskLoopCopy("Surface", "能力面")}</Text>
+          </Row>
+        )}
+        trailing={Number.isInteger(Number(row.count)) ? <Tag size="sm" tone="neutral">{row.count}</Tag> : undefined}
+      />
+      <CardBody style={{ height: "100%" }}>
+        <Stack gap={10} style={{ height: "100%" }}>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.5 }}>{practiceDescription(row.surface)}</Text>
+          {scopes.length || paths.length ? (
+            <Stack gap={6} style={{ marginTop: "auto" }}>
+              {scopes.length ? (
+                <Row gap={5} wrap>
+                  {scopes.map((scope) => <Tag key={scope} size="sm" tone="info">{scope}</Tag>)}
+                </Row>
+              ) : null}
+              {paths.length ? (
+                <Stack gap={4}>
+                  <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Sources", "来源")}</Text>
+                  <TaskLoopPracticePaths paths={paths} />
+                </Stack>
+              ) : null}
+            </Stack>
+          ) : null}
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function OpeningStrengths() {
+  const strengths = openingStrengths();
+  return (
+    <Callout tone="success" title="What is working">
+      <Stack gap={6}>
+        {strengths.map((strength, index) => (
+          <Text key={index} size="sm">{strength}</Text>
+        ))}
+      </Stack>
+    </Callout>
+  );
+}
+
+function DimensionSummary({ dimensions }) {
+  return (
+    <Stack gap={8}>
+      {dimensions.map((row) => {
+        const score = clampScore(row.score);
+        return (
+          <Card key={row.id} size="sm">
+            <CardHeader
+              title={<Text weight="semibold">{taskLoopDimensionLabel(row.id)}</Text>}
+              trailing={<Tag tone={scoreTone(score)}>{score}%</Tag>}
+            />
+            <CardBody>
+              <Stack gap={4}>
+                <Text size="sm" tone="secondary">{textValue(row.summary) || DIMENSION_SUMMARY_EXAMPLE}</Text>
+                {list(row.findingRefs).length ? (
+                  <Text size="sm" tone="secondary">Linked findings: {row.findingRefs.join(", ")}</Text>
+                ) : null}
+              </Stack>
+            </CardBody>
+          </Card>
+        );
+      })}
+    </Stack>
+  );
+}
+
+function FindingItem({ row, dimensions }) {
+  return (
+    <Card size="sm">
+      <CardHeader
+        title={<Text weight="semibold">{row.title ?? row.id}</Text>}
+        trailing={<Tag tone={severityTone(row.severity)}>{row.severity ?? "Unrated"}</Tag>}
+      />
+      <CardBody>
+        <Stack gap={8}>
+          <Row gap={8} align="center" wrap>
+            {list(row.dimensionRefs).slice(0, 1).map((ref) => (
+              <Tag key={ref} tone="neutral">{dimensionLabel(ref, dimensions)}</Tag>
+            ))}
+          </Row>
+          <Row gap={12} align="center" justify="end" wrap>
+            <SendToChatButton text={row.aiFixPrompt} options={{ submit: false }} disabled={!row.aiFixPrompt}>
+              AI Fix
+            </SendToChatButton>
+          </Row>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function PracticeCoverage() {
+  const rows = practiceRows();
+  const surfaces = inspectedSurfaces();
+
+  return (
+    <Stack gap={8}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <Text weight="semibold">AI Agent Practices</Text>
+        {surfaces.length ? <Tag tone="neutral">{surfaces.length} surfaces</Tag> : null}
+      </Row>
+      {rows.length ? (
+        <Grid columns={3} minColumnWidth={260} gap={10} align="stretch">
+          {rows.map((row, index) => <PracticeSourceCard key={row.surface ?? index} row={row} />)}
+        </Grid>
+      ) : <Text tone="secondary">No AI Agent practice rows recorded.</Text>}
+    </Stack>
+  );
+}
+
+function usesChineseReaderCopy() {
+  const locale = textValue(report.summary?.locale);
+  if (locale) return locale.toLowerCase().startsWith("zh");
+  const readerSample = [
+    ...list(report.summary?.strengths),
+    ...list(report.findings).slice(0, 3).flatMap((row) => [row?.title, row?.reason, row?.reader]),
+  ].map(textValue).join(" ");
+  return /[\u3400-\u9fff]/.test(readerSample);
+}
+
+function taskLoopCopy(english, chinese) {
+  return usesChineseReaderCopy() ? chinese : english;
+}
+
+function taskLoopDimensionLabel(id) {
+  if (!id) return taskLoopCopy("not observed", "未观察到");
+  return dimensionLabel(id, list(report.summary?.dimensions));
+}
+
+function learningStateLabel(value) {
+  const labels = {
+    "N/A": ["Needs a comparison", "需要比较"],
+    pending: ["Comparison planned", "已计划比较"],
+    improving: ["Improving", "正在改善"],
+    unchanged: ["No clear change", "没有明显变化"],
+    regressing: ["Worse — stop or revert", "变差——停止或回退"],
+    "outcome-supported": ["A later result supports it", "后续结果支持它"],
+  }[value];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : taskLoopCopy("Not observed", "未观察到");
+}
+
+function taskLoopSummary() {
+  return report.summary?.atAGlance ?? {};
+}
+
+function taskLoopUsageActivity() {
+  const activity = report.summary?.usageActivity;
+  return activity && list(activity.dates).length ? activity : null;
+}
+
+function taskLoopUsageEfficiency() {
+  const usage = report.summary?.usageEfficiency;
+  if (!usage || typeof usage !== "object" || Array.isArray(usage)) return null;
+  return usage.selection || usage.accounting || usage.longSessions || usage.modelUsage || usage.reviewLead
+    ? usage
+    : null;
+}
+
+function usageSeriesTotal(series) {
+  return list(series).reduce((sum, row) => sum + Number(row?.total ?? 0), 0);
+}
+
+function usageActivityMatrix(activity) {
+  const sourceDates = list(activity?.dates);
+  if (!sourceDates.length) return null;
+  const last = new Date(`${sourceDates.at(-1)}T00:00:00.000Z`);
+  const windowStart = new Date(last.getTime() - (364 * 86_400_000));
+  const start = new Date(windowStart);
+  start.setUTCDate(start.getUTCDate() - start.getUTCDay());
+  const weekCount = 53;
+  const columns = Array.from({ length: weekCount }, (_, index) => {
+    const date = new Date(start.getTime() + (index * 7 * 86_400_000));
+    const previous = index > 0 ? new Date(start.getTime() + ((index - 1) * 7 * 86_400_000)) : null;
+    if (!previous || previous.getUTCMonth() === date.getUTCMonth()) return "";
+    return usesChineseReaderCopy()
+      ? `${date.getUTCMonth() + 1}月`
+      : date.toLocaleDateString("en-US", { month: "short", timeZone: "UTC" });
+  });
+  const values = Array.from({ length: 7 }, () => Array(weekCount).fill(null));
+  for (let dayOffset = 0; dayOffset < 365; dayOffset += 1) {
+    const date = new Date(windowStart.getTime() + (dayOffset * 86_400_000));
+    const week = Math.floor((date.getTime() - start.getTime()) / (7 * 86_400_000));
+    const dateKey = date.toISOString().slice(0, 10);
+    values[date.getUTCDay()][week] = {
+      id: dateKey,
+      value: 0,
+      ariaLabel: taskLoopCopy(`${dateKey}: no observed activity`, `${dateKey}：未观察到活动`),
+    };
+  }
+  sourceDates.forEach((date, index) => {
+    const parsed = new Date(`${date}T00:00:00.000Z`);
+    const week = Math.floor((parsed.getTime() - start.getTime()) / (7 * 86_400_000));
+    if (week < 0 || week >= weekCount) return;
+    const active = Number(activity?.sessions?.activeMinutes?.[index] ?? 0);
+    values[parsed.getUTCDay()][week] = {
+      id: date,
+      value: active,
+      ariaLabel: taskLoopCopy(`${date}: ${formatActivityMinutes(active)}`, `${date}：${formatActivityMinutes(active)}`),
+    };
+  });
+  return { columns, values, start: windowStart.toISOString().slice(0, 10), end: sourceDates.at(-1) };
+}
+
+function usageChartWindow(activity) {
+  const dates = list(activity?.dates);
+  const offset = Math.max(0, dates.length - 30);
+  return { offset, categories: dates.slice(offset).map((date) => String(date).slice(5)) };
+}
+
+function visibleUsageSeries(series, offset, limit = 5) {
+  const rows = list(series);
+  const named = rows.filter((row) => row?.name !== "Other");
+  const primary = named.slice(0, limit).map((row) => ({ name: usageSeriesLabel(row.name), data: list(row.daily).slice(offset), total: Number(row.total ?? 0) }));
+  const remainder = [...named.slice(limit), ...rows.filter((row) => row?.name === "Other")];
+  if (remainder.length > 0) {
+    const length = primary[0]?.data.length ?? list(remainder[0]?.daily).slice(offset).length;
+    primary.push({
+      name: "Other",
+      total: remainder.reduce((sum, row) => sum + Number(row?.total ?? 0), 0),
+      data: Array.from({ length }, (_, index) => remainder.reduce((sum, row) => sum + Number(list(row?.daily).slice(offset)[index] ?? 0), 0)),
+    });
+  }
+  return primary;
+}
+
+function formatUsageNumber(value) {
+  return Math.round(Number(value ?? 0)).toLocaleString(usesChineseReaderCopy() ? "zh-CN" : "en-US");
+}
+
+function usageSeriesLabel(value) {
+  if (value === "Unknown model") return taskLoopCopy("Unattributed model", "未归属模型");
+  if (value === "Unknown Skill") return taskLoopCopy("Unattributed Skill", "未归属 Skill");
+  return value;
+}
+
+function formatActivityMinutes(value) {
+  const formatted = Number(value ?? 0).toLocaleString(usesChineseReaderCopy() ? "zh-CN" : "en-US", {
+    maximumFractionDigits: 1,
+  });
+  return `${formatted} ${taskLoopCopy("min", "分钟")}`;
+}
+
+function taskLoopCoverage() {
+  return taskLoopSummary().coverage ?? {};
+}
+
+function confidenceLabel(value) {
+  const normalized = textValue(value).toLowerCase();
+  const labels = {
+    high: ["High confidence", "高可信度"],
+    medium: ["Medium confidence", "中等可信度"],
+    low: ["Low confidence", "低可信度"],
+  }[normalized];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : taskLoopCopy("Confidence not recorded", "未记录可信度");
+}
+
+function confidenceTone(value) {
+  const normalized = textValue(value).toLowerCase();
+  if (normalized === "high") return "success";
+  if (normalized === "medium") return "warning";
+  return "neutral";
+}
+
+function taskLoopStateLabel(value) {
+  const labels = {
+    Wired: ["Wired", "机制已接入"],
+    Present: ["Present", "已发现机制"],
+    Unobserved: ["Unobserved", "未观察到"],
+    observed: ["Observed", "已观察到"],
+    "Not applicable": ["Not applicable", "暂不适用"],
+    "N/A": ["Needs a comparison", "需要比较"],
+  }[value];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : textValue(value) || "—";
+}
+
+function taskLoopSubdimensionLabel(id) {
+  for (const dimension of list(report.summary?.dimensions)) {
+    const match = list(dimension?.subdimensions).find((row) => row?.id === id);
+    if (match) return match.label ?? id;
+  }
+  return id;
+}
+
+function evidenceReferenceLabel(item) {
+  return textValue(item?.label) || textValue(item?.id) || taskLoopCopy("Unnamed evidence", "未命名证据");
+}
+
+function evidenceReferenceMeta(item) {
+  return [
+    textValue(item?.status),
+    textValue(item?.type),
+    Number.isFinite(Number(item?.line)) ? `${taskLoopCopy("line", "行")} ${item.line}` : "",
+  ].filter(Boolean).join(" · ");
+}
+
+function EvidenceReferenceList({ items }) {
+  return (
+    <Stack gap={7} style={{ maxHeight: 260, overflowY: "auto", paddingRight: 4 }}>
+      {items.map((item, index) => (
+        <Stack key={`${item?.group ?? item?.kind}-${item?.id ?? index}`} gap={3}>
+          <Row gap={6} align="center" wrap>
+            {item?.group ? <Tag size="sm" tone="neutral">{item.group}</Tag> : null}
+            {item?.kind ? <Tag size="sm" tone="info">{item.kind}</Tag> : null}
+            <Text size="sm" tone="secondary" style={{ overflowWrap: "anywhere" }}>{evidenceReferenceLabel(item)}</Text>
+          </Row>
+          {evidenceReferenceMeta(item) ? <Text size="sm" tone="tertiary">{evidenceReferenceMeta(item)}</Text> : null}
+        </Stack>
+      ))}
+    </Stack>
+  );
+}
+
+function severityLabel(value) {
+  const labels = {
+    Critical: ["Critical", "紧急"],
+    High: ["High", "高"],
+    Medium: ["Medium", "中"],
+    Low: ["Low", "低"],
+  }[value];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : value ?? "—";
+}
+
+function practiceSurfaceGlyph(surface) {
+  return ({ Rules: "R", Skills: "S", "Custom Agents": "A", Hooks: "H", MCP: "M" })[surface] ?? textValue(surface).slice(0, 1).toUpperCase() ?? "?";
+}
+
+function PracticeSurfaceIcon({ row }) {
+  return <Tag size="sm" tone="neutral">{practiceSurfaceGlyph(row?.surface)}</Tag>;
+}
+
+function TaskLoopReportHeader({ findings }) {
+  const sources = practiceRows().filter((row) => Number(row?.count) > 0);
+  const overview = textValue(report.summary?.overview);
+  return (
+    <Stack gap={8}>
+      <H1>{projectName()}</H1>
+      {overview ? <Text tone="secondary" style={{ ...taskLoopReaderCopyStyle, lineHeight: 1.5 }}>{overview}</Text> : null}
+      <Row gap={10} align="center" wrap>
+        <Text size="sm" tone="secondary">
+          {taskLoopCopy(`${findings.length} prioritized improvements`, `${findings.length} 项优先优化`)}
+        </Text>
+        {sources.length ? (
+          <Text size="sm" tone="secondary">
+            {taskLoopCopy(`${sources.length} practice source types`, `${sources.length} 类实践来源`)}
+          </Text>
+        ) : null}
+      </Row>
+    </Stack>
+  );
+}
+
+function TaskLoopFluency({ dimensions }) {
+  if (dimensions.length === 0) return null;
+  return (
+    <Stack gap={8}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <H2>{taskLoopCopy("Agent Work Loop", "Agent 工作流")}</H2>
+        <Text size="sm" tone="secondary">{dimensions.length} {taskLoopCopy("dimensions", "个维度")}</Text>
+      </Row>
+      <Stack style={{ maxHeight: 200, overflow: "hidden" }}>
+        <Fluency
+          projectName={projectName()}
+          stages={dimensionFluencyStages(dimensions)}
+          tooltip={(_stage, index) => dimensionFluencyTooltip(dimensions[index])}
+          height={180}
+          highThreshold={70}
+          mediumThreshold={40}
+          showStageLabels
+        />
+      </Stack>
+    </Stack>
+  );
+}
+
+function practiceCount(row) {
+  const value = Number(row?.count);
+  return Number.isInteger(value) ? value : "—";
+}
+
+function practiceScopeCell(row) {
+  const scopes = list(row?.scopes).map(textValue).filter(Boolean);
+  if (!scopes.length) return <Text size="sm" tone="tertiary">—</Text>;
+  return (
+    <Row gap={5} wrap>
+      {scopes.map((scope) => <Tag key={scope} size="sm" tone="info">{scope}</Tag>)}
+    </Row>
+  );
+}
+
+function practiceSourceCell(row) {
+  const [firstPath] = visiblePracticePaths(row?.paths);
+  return firstPath
+    ? <Text size="sm" tone="secondary" style={{ overflowWrap: "anywhere" }}>{firstPath}</Text>
+    : <Text size="sm" tone="tertiary">{taskLoopCopy("No source location recorded", "未记录来源位置")}</Text>;
+}
+
+function practiceSourceDetail(row) {
+  const remaining = visiblePracticePaths(row?.paths).slice(1);
+  if (!remaining.length) return null;
+  const pathListStyle = remaining.length > 8
+    ? { maxHeight: 220, overflowY: "auto", paddingRight: 4 }
+    : { paddingRight: 4 };
+  return (
+    <CollapsibleSection
+      size="sm"
+      defaultOpen={false}
+      title={(
+        <Text size="sm" weight="semibold">
+          {taskLoopCopy(`View ${remaining.length} more locations`, `查看其余 ${remaining.length} 个位置`)}
+        </Text>
+      )}
+      bodyStyle={{ padding: "6px 0 2px 16px" }}
+      headerStyle={{ borderBottom: "none", minHeight: 24 }}
+    >
+      <Stack gap={4} style={pathListStyle}>
+        {remaining.map((path, index) => (
+          <Text key={`${path}-${index}`} size="sm" tone="tertiary" style={{ overflowWrap: "anywhere" }}>{path}</Text>
+        ))}
+      </Stack>
+    </CollapsibleSection>
+  );
+}
+
+function taskLoopPracticeColumns() {
+  return [
+    {
+      key: "surface",
+      title: taskLoopCopy("Asset", "资产"),
+      minWidth: "300px",
+      render: (row) => (
+        <Stack gap={3}>
+          <Row gap={7} align="center">
+            <PracticeSurfaceIcon row={row} />
+            <Text size="sm" weight="semibold">{row.surface ?? taskLoopCopy("Surface", "能力面")}</Text>
+          </Row>
+          <Text size="sm" tone="secondary">{practiceDescription(row.surface)}</Text>
+        </Stack>
+      ),
+    },
+    {
+      key: "coverage",
+      title: taskLoopCopy("Coverage", "覆盖范围"),
+      width: "170px",
+      minWidth: "150px",
+      render: (row) => (
+        <Stack gap={4}>
+          <Text size="sm" weight="semibold">
+            {taskLoopCopy(`${practiceCount(row)} sources`, `${practiceCount(row)} 个来源`)}
+          </Text>
+          {practiceScopeCell(row)}
+        </Stack>
+      ),
+    },
+    {
+      key: "source",
+      title: taskLoopCopy("Representative source", "代表来源"),
+      minWidth: "260px",
+      render: practiceSourceCell,
+    },
+  ];
+}
+
+function TaskLoopPracticeTable({ rows = practiceRows() }) {
+  if (rows.length === 0) {
+    return <Text tone="secondary">{taskLoopCopy("No Agent assets recorded.", "未记录 Agent 工程资产。")}</Text>;
+  }
+  return (
+    <Table
+      columns={taskLoopPracticeColumns()}
+      rows={rows}
+      rowKey={(row) => row.surface ?? "surface"}
+      density="compact"
+      renderDetail={practiceSourceDetail}
+      emptyText={taskLoopCopy("No Agent asset coverage recorded", "未记录 Agent 工程资产覆盖")}
+    />
+  );
+}
+
+function TaskLoopActivityHeatmap({ activity }) {
+  const matrix = usageActivityMatrix(activity);
+  if (!matrix) return <Text tone="secondary">{taskLoopCopy("No dated session activity was observed.", "没有观察到带日期的会话活动。")}</Text>;
+  return (
+    <Stack gap={6}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <Text size="sm" weight="semibold">{taskLoopCopy("Daily activity (active minutes)", "每日活动（活跃分钟）")}</Text>
+        <Text size="sm" tone="tertiary">{matrix.start} — {matrix.end}</Text>
+      </Row>
+      <RiskHeatmap
+        rows={taskLoopCopy(["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], ["日", "一", "二", "三", "四", "五", "六"])}
+        columns={matrix.columns}
+        values={matrix.values}
+        variant="swatch"
+        showValues={false}
+        showLegend={false}
+        valueFormatter={(value) => formatActivityMinutes(value)}
+        cellSize={16}
+        columnWidth={16}
+        rowLabelWidth={34}
+        responsive
+        minCellSize={8}
+        minGap={2}
+        initialScrollPosition="end"
+        colorTemplate={{
+          none: { background: "rgba(127, 127, 127, 0.1)", border: "transparent" },
+          low: { background: "rgba(64, 166, 103, 0.22)", border: "transparent" },
+          medium: { background: "rgba(54, 158, 94, 0.42)", border: "transparent" },
+          high: { background: "rgba(38, 139, 78, 0.66)", border: "transparent" },
+          critical: { background: "rgba(24, 115, 63, 0.9)", border: "transparent" },
+        }}
+        maxHeight={190}
+        labels={{ ariaLabel: taskLoopCopy("Daily session activity", "每日会话活动") }}
+      />
+    </Stack>
+  );
+}
+
+function UsageStatRow({ label, value }) {
+  if (value === undefined || value === null || value === "") return null;
+  return (
+    <Row justify="space-between" align="start" gap={12} style={{ minWidth: 0 }}>
+      <Text size="sm" tone="secondary" style={{ flexShrink: 0 }}>{label}</Text>
+      <Text size="sm" weight="semibold" style={{ minWidth: 0, overflowWrap: "anywhere", textAlign: "right" }}>{value}</Text>
+    </Row>
+  );
+}
+
+function UsageRankList({ series, limit = 5 }) {
+  const rows = list(series).slice(0, limit);
+  if (!rows.length) return <Text size="sm" tone="secondary">{taskLoopCopy("No usage observed.", "未观察到用量。")}</Text>;
+  return (
+    <Stack gap={7}>
+      {rows.map((row, index) => (
+        <Row key={`${row.name}-${index}`} justify="space-between" align="center" gap={12}>
+          <Row gap={8} align="center" style={{ minWidth: 0 }}>
+            <Text size="sm" tone="tertiary" style={{ width: 18 }}>{index + 1}</Text>
+            <Text size="sm" truncate>{usageSeriesLabel(row.name)}</Text>
+          </Row>
+          <Text size="sm" tone="secondary">{formatUsageNumber(row.total)}</Text>
+        </Row>
+      ))}
+    </Stack>
+  );
+}
+
+function taskLoopModelUsageColumns() {
+  return [
+    {
+      key: "model",
+      title: taskLoopCopy("Model", "模型"),
+      minWidth: "180px",
+      render: (row) => <Text size="sm" weight="semibold">{usageSeriesLabel(row.model)}</Text>,
+    },
+    {
+      key: "responseCount",
+      title: taskLoopCopy("Responses", "响应数"),
+      width: "110px",
+      align: "right",
+      render: (row) => <Text size="sm">{formatUsageNumber(row.responseCount)}</Text>,
+    },
+    {
+      key: "usageFieldObservedCount",
+      title: taskLoopCopy("Usage fields observed", "观察到用量字段"),
+      minWidth: "160px",
+      align: "right",
+      render: (row) => <Text size="sm">{formatUsageNumber(row.usageFieldObservedCount)}</Text>,
+    },
+    {
+      key: "nonZeroUsageCount",
+      title: taskLoopCopy("Non-zero usage", "非零用量记录"),
+      minWidth: "140px",
+      align: "right",
+      render: (row) => <Text size="sm">{formatUsageNumber(row.nonZeroUsageCount)}</Text>,
+    },
+  ];
+}
+
+function TaskLoopModelUsageTable({ rows }) {
+  if (!rows.length) return null;
+  return (
+    <Stack gap={7}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <Text weight="semibold">{taskLoopCopy("Model response accounting", "模型响应明细")}</Text>
+        <Tag tone="neutral">{rows.length} {taskLoopCopy("models", "个模型")}</Tag>
+      </Row>
+      <Text size="sm" tone="tertiary">
+        {taskLoopCopy(
+          "These are response counts, not model-active session counts or a quality comparison.",
+          "这里统计的是响应次数，不是模型活跃会话数，也不代表模型质量对比。",
+        )}
+      </Text>
+      <Table
+        columns={taskLoopModelUsageColumns()}
+        rows={rows}
+        rowKey={(row) => row.model}
+        density="compact"
+      />
+    </Stack>
+  );
+}
+
+function TaskLoopLongSessionReview({ usage }) {
+  const lead = usage?.reviewLead;
+  const samples = list(usage?.longSessions?.samples);
+  if (!lead || !samples.length) return null;
+  const estimate = usage.longSessions?.estimate;
+  const coverage = lead.sampleCoverage;
+  const pendingCount = coverage?.shown ?? samples.length;
+  const analyzedCount = usage.selection?.analyzedSessionCount ?? 0;
+  const longestActiveMinutes = usage.longSessions?.longestActiveMinutes ?? Math.max(...samples.map((sample) => Number(sample.activeMinutes ?? 0)));
+  return (
+    <Stack gap={14}>
+      <Row justify="space-between" align="start" wrap gap={12}>
+        <Stack gap={5} style={{ flex: "1 1 620px", minWidth: 0 }}>
+          <Row gap={8} align="center" wrap>
+            <H2 style={{ fontSize: 18, lineHeight: 1.35 }}>{taskLoopCopy(`${pendingCount} long sessions need review`, `${pendingCount} 个长会话待复核`)}</H2>
+            <Tag size="sm" tone="warning">{pendingCount} {taskLoopCopy("pending", "待复核")}</Tag>
+          </Row>
+          <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+            {taskLoopCopy(
+              `${pendingCount} of ${formatUsageNumber(analyzedCount)} analyzed sessions crossed the ${estimate?.activeThresholdMinutes ?? 45}-minute estimate threshold; the longest estimate is ${formatActivityMinutes(longestActiveMinutes)}. Treat them as investigation leads until reviewed.`,
+              `${formatUsageNumber(analyzedCount)} 个已分析会话中有 ${pendingCount} 个超过 ${estimate?.activeThresholdMinutes ?? 45} 分钟估算阈值，最长估算为 ${formatActivityMinutes(longestActiveMinutes)}。在人工复核前，只将其视为调查线索。`,
+            )}
+          </Text>
+        </Stack>
+        <SendToChatButton text={lead.aiFixPrompt} options={{ submit: false }}>
+          {taskLoopCopy(`Review ${pendingCount} sessions`, `复核 ${pendingCount} 个会话`)}
+        </SendToChatButton>
+      </Row>
+      <Stack gap={0}>
+        {samples.map((sample, index) => {
+          const failureCount = Number(sample.failureCount ?? 0);
+          const roleLabel = sample.role === "user-thread-candidate"
+            ? taskLoopCopy("Main-thread candidate", "主线程候选")
+            : sample.role === "child-agent-candidate"
+              ? taskLoopCopy("Child-Agent candidate", "子 Agent 候选")
+              : sample.role;
+          return (
+            <Stack key={sample.alias} gap={0}>
+              <Row justify="space-between" align="center" wrap gap={14} style={{ padding: "13px 0" }}>
+                <Row gap={12} align="start" style={{ flex: "1 1 540px", minWidth: 0 }}>
+                  <Tag size="sm" tone="neutral">{sample.alias}</Tag>
+                  <Stack gap={4} style={{ minWidth: 0 }}>
+                    <Text weight="semibold" style={{ lineHeight: 1.45 }}>
+                      {taskLoopCopy("Anonymized review candidate", "匿名复核候选")}
+                    </Text>
+                    <Text size="sm" tone="secondary">{taskLoopCopy("Role", "角色")}: {roleLabel}</Text>
+                  </Stack>
+                </Row>
+                <Stack gap={3} style={{ flex: "0 1 190px" }}>
+                  <Text size="sm" tone="tertiary">{taskLoopCopy("Estimated active time", "估算活跃时长")}</Text>
+                  <Text size="sm" weight="semibold">{formatActivityMinutes(sample.activeMinutes)}</Text>
+                </Stack>
+                <Tag size="sm" tone="warning">
+                  {formatUsageNumber(failureCount)} {taskLoopCopy("failures", "失败事件")}
+                </Tag>
+              </Row>
+              {index < samples.length - 1 ? <Divider style={{ margin: "1px 0" }} /> : null}
+            </Stack>
+          );
+        })}
+      </Stack>
+      {estimate ? (
+        <Text size="sm" tone="tertiary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            `Estimate boundary: event gaps are capped at ${estimate.gapCapMinutes} minutes and gaps over ${estimate.idleGapMinutes} minutes are treated as idle.`,
+            `估算边界：事件间隔最多计 ${estimate.gapCapMinutes} 分钟，超过 ${estimate.idleGapMinutes} 分钟按空闲处理。`,
+          )}
+        </Text>
+      ) : null}
+    </Stack>
+  );
+}
+
+function TaskLoopProjectUsage({ activity, usage }) {
+  if (!activity && !usage) return null;
+  const activeMinutes = list(activity?.sessions?.activeMinutes).reduce((sum, value) => sum + Number(value ?? 0), 0);
+  const census = usage?.selection;
+  const longSessions = usage?.longSessions;
+  const skillUses = usageSeriesTotal(activity?.skills);
+  const analyzedSessions = census
+    ? `${formatUsageNumber(census.analyzedSessionCount)} / ${formatUsageNumber(census.eligibleSessionCount)}`
+    : activity ? formatUsageNumber(activity.sessions?.total) : null;
+  return (
+    <Stack gap={12}>
+      {activity ? <TaskLoopActivityHeatmap activity={activity} /> : null}
+      {activity ? <Divider style={{ margin: "2px 0" }} /> : null}
+      <Grid columns="repeat(auto-fit, minmax(min(100%, 260px), 1fr))" gap={24} align="start">
+        <Stack gap={9}>
+          <Text weight="semibold">{taskLoopCopy("Activity insights", "使用概览")}</Text>
+          <UsageStatRow label={taskLoopCopy("Sessions analyzed", "已分析会话")} value={analyzedSessions} />
+          {activity ? <UsageStatRow label={taskLoopCopy("Estimated active minutes", "估算活跃分钟数")} value={formatUsageNumber(activeMinutes)} /> : null}
+          {activity ? <UsageStatRow label={taskLoopCopy("Skills used", "Skill 使用")} value={formatUsageNumber(skillUses)} /> : null}
+          {longSessions ? <UsageStatRow label={taskLoopCopy("Estimated active-long sessions", "估算活跃长会话")} value={formatUsageNumber(longSessions.activeCount)} /> : null}
+        </Stack>
+        <Stack gap={9}>
+          <Text weight="semibold">{taskLoopCopy("Most used Skills", "最常使用的 Skills")}</Text>
+          <UsageRankList series={activity?.skills} />
+        </Stack>
+      </Grid>
+    </Stack>
+  );
+}
+
+function TaskLoopUsageMethodology({ usage }) {
+  if (!usage) return null;
+  const census = usage.selection;
+  const accounting = usage.accounting;
+  const roles = usage.roles;
+  const outcomeReview = usage.outcomeReview;
+  const taskSelection = taskLoopCoverage().selection ?? {};
+  const modelUsage = list(usage.modelUsage);
+  const hasCoverage = census || Object.keys(taskSelection).length || roles || accounting;
+  if (!hasCoverage && !modelUsage.length && !usage.reviewLead) return null;
+
+  return (
+    <Stack gap={12}>
+      {census || Object.keys(taskSelection).length ? (
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopMeasurementBoundaryText(taskSelection, census)}
+        </Text>
+      ) : null}
+      {roles || accounting ? (
+        <Grid columns="repeat(auto-fit, minmax(min(100%, 240px), 1fr))" gap={20} align="start">
+          {roles ? (
+            <Stack gap={7}>
+              <Text size="sm" weight="semibold">{taskLoopCopy("Session composition", "会话构成")}</Text>
+              <UsageStatRow label={taskLoopCopy("User-thread candidates", "用户任务候选")} value={formatUsageNumber(roles.userThreadCandidateCount)} />
+              <UsageStatRow label={taskLoopCopy("Child-agent candidates", "子 Agent 候选")} value={formatUsageNumber(roles.childAgentCandidateCount)} />
+            </Stack>
+          ) : null}
+          {accounting ? (
+            <Stack gap={7}>
+              <Text size="sm" weight="semibold">{taskLoopCopy("Measurement coverage", "计量覆盖")}</Text>
+              <UsageStatRow label={taskLoopCopy("Responses", "响应数")} value={formatUsageNumber(accounting.responseCount)} />
+              <UsageStatRow label={taskLoopCopy("Model-attributed responses", "已归属模型响应")} value={formatUsageNumber(accounting.modelAttributedResponseCount)} />
+              <UsageStatRow label={taskLoopCopy("Usage fields observed", "观察到用量字段")} value={formatUsageNumber(accounting.usageFieldObservedCount)} />
+              <UsageStatRow label={taskLoopCopy("Non-zero usage records", "非零用量记录")} value={formatUsageNumber(accounting.nonZeroUsageCount)} />
+              <UsageStatRow label={taskLoopCopy("Exact credits available", "可精确计算 credit")} value={accounting.exactCreditsAvailable ? taskLoopCopy("Yes", "是") : taskLoopCopy("No", "否")} />
+            </Stack>
+          ) : null}
+        </Grid>
+      ) : null}
+      {modelUsage.length ? <TaskLoopModelUsageTable rows={modelUsage} /> : null}
+      <Text size="sm" tone="tertiary" style={taskLoopReaderCopyStyle}>
+        {accounting?.mode === "effort-proxy"
+          ? taskLoopCopy("Active time and model-session counts are effort proxies; exact token or credit savings are unavailable.", "活跃时间和模型会话数仅代表投入；目前无法精确计算 token 或 credit 节省。")
+          : taskLoopCopy("Usage totals describe observed activity, not counterfactual savings.", "用量只描述已观察活动，不代表反事实节省。")}
+        {outcomeReview && !outcomeReview.comparableModelOutcomeEvidence
+          ? taskLoopCopy(" Model outcomes need a controlled A/B before comparison.", " 模型效果需要通过受控 A/B 后才能比较。")
+          : ""}
+      </Text>
+    </Stack>
+  );
+}
+
+function usageTrendLeader(series) {
+  return series.reduce((leader, row) => Number(row.total ?? 0) > Number(leader?.total ?? -1) ? row : leader, null);
+}
+
+function usageTrendRange(categories) {
+  if (!categories.length) return taskLoopCopy("Latest observations", "最近观测");
+  if (categories.length === 1) return categories[0];
+  return `${categories[0]} – ${categories[categories.length - 1]}`;
+}
+
+function TaskLoopUsageTrend({ title, totalLabel, leaderDescription, series, categories }) {
+  if (!series.length) return null;
+  const total = series.reduce((sum, row) => sum + Number(row.total ?? 0), 0);
+  const leader = usageTrendLeader(series);
+  const range = usageTrendRange(categories);
+  return (
+    <Card size="sm">
+      <CardBody>
+        <Stack gap={14}>
+          <Stack gap={3}>
+            <Text weight="semibold" style={{ fontSize: 16, lineHeight: "24px" }}>{title}</Text>
+            <Text tone="secondary" style={{ lineHeight: 1.5 }}>
+              {taskLoopCopy(
+                `${range} · ${formatUsageNumber(total)} ${totalLabel}`,
+                `${range} · 共 ${formatUsageNumber(total)} ${totalLabel}`,
+              )}
+            </Text>
+          </Stack>
+          <AreaChart categories={categories} series={series} height={190} showYAxis legendPosition="bottom" />
+          {leader ? (
+            <Stack gap={2}>
+              <Text weight="semibold">{usageSeriesLabel(leader.name)} · {formatUsageNumber(leader.total)} {totalLabel}</Text>
+              <Text size="sm" tone="tertiary">{leaderDescription}</Text>
+            </Stack>
+          ) : null}
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopUsageTrends({ activity }) {
+  if (!activity) return null;
+  const chartWindow = usageChartWindow(activity);
+  const categories = chartWindow.categories;
+  const modelSeries = visibleUsageSeries(activity.models, chartWindow.offset);
+  const skillSeries = visibleUsageSeries(activity.skills, chartWindow.offset);
+  if (!modelSeries.length && !skillSeries.length) return null;
+  return (
+    <Stack gap={12}>
+      <H2>{taskLoopCopy("Usage trends", "用量趋势")}</H2>
+      <Grid columns="repeat(auto-fit, minmax(min(100%, 360px), 1fr))" gap={12} align="start">
+        <TaskLoopUsageTrend
+          title={taskLoopCopy("Model session trend", "模型会话趋势")}
+          totalLabel={taskLoopCopy("model-session observations", "个模型会话")}
+          leaderDescription={taskLoopCopy("Most observed model in this window", "当前时间窗口内记录最多的模型")}
+          series={modelSeries}
+          categories={categories}
+        />
+        <TaskLoopUsageTrend
+          title={taskLoopCopy("Skill use trend", "Skill 使用趋势")}
+          totalLabel={taskLoopCopy("observations", "次记录")}
+          leaderDescription={taskLoopCopy("Most observed Skill in this window", "当前时间窗口内记录次数最多的 Skill")}
+          series={skillSeries}
+          categories={categories}
+        />
+      </Grid>
+    </Stack>
+  );
+}
+
+function taskLoopSessionInsightTitle(id) {
+  const labels = {
+    "session-insight:source-coverage": ["Source coverage", "数据覆盖"],
+    "session-insight:validation-behavior": ["Validation behavior", "验证行为"],
+    "session-insight:post-edit-validation": ["Post-edit validation", "改动后验证"],
+    "session-insight:execution-friction": ["Execution friction", "执行摩擦"],
+    "session-insight:tool-mix": ["Tool mix", "工具使用"],
+    "session-insight:observed-hooks": ["Observed hooks", "Hook 执行"],
+    "session-insight:planning-workflow": ["Planning workflow", "规划工作流"],
+    "session-insight:session-complexity": ["Session complexity", "会话复杂度"],
+    "session-insight:session-usage-efficiency": ["Session effort", "会话投入"],
+  }[id];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : id;
+}
+
+function taskLoopSessionInsightConfidence(row) {
+  return list(row?.labels).map(textValue).find((value) => ["High", "Medium", "Low"].includes(value)) ?? "";
+}
+
+function taskLoopSessionInsightColumns() {
+  return [
+    {
+      key: "id",
+      title: taskLoopCopy("Observation", "观察主题"),
+      minWidth: "150px",
+      render: (row) => <Text size="sm" weight="semibold">{taskLoopSessionInsightTitle(row.id)}</Text>,
+    },
+    {
+      key: "summary",
+      title: taskLoopCopy("What was observed", "观察说明"),
+      minWidth: "420px",
+      render: (row) => <Text size="sm" tone="secondary">{row.summary ?? "—"}</Text>,
+    },
+    {
+      key: "confidence",
+      title: taskLoopCopy("Confidence", "可信度"),
+      minWidth: "120px",
+      render: (row) => {
+        const confidence = taskLoopSessionInsightConfidence(row);
+        return confidence ? <Tag size="sm" tone={confidenceTone(confidence)}>{confidenceLabel(confidence)}</Tag> : <Text size="sm" tone="tertiary">—</Text>;
+      },
+    },
+    {
+      key: "evidenceRefs",
+      title: taskLoopCopy("Evidence", "证据"),
+      width: "80px",
+      align: "right",
+      render: (row) => <Text size="sm" weight="semibold">{list(row.evidenceRefs).length}</Text>,
+    },
+  ];
+}
+
+function taskLoopSessionInsightDetail(row) {
+  const evidenceRefs = list(row?.evidenceRefs);
+  return (
+    <CollapsibleSection
+      size="sm"
+      defaultOpen={false}
+      title={<Text size="sm" weight="semibold">{taskLoopCopy("View raw observation metadata", "查看原始观察元数据")}</Text>}
+      bodyStyle={{ padding: "6px 0 2px 16px" }}
+      headerStyle={{ borderBottom: "none", minHeight: 24 }}
+    >
+      <Stack gap={7}>
+        <Text size="sm" tone="tertiary">
+          {taskLoopCopy("Insight ID", "洞察 ID")}: {row.id} · {taskLoopCopy("Status", "状态")}: {row.status ?? "—"} · {taskLoopCopy("Kind", "类型")}: {row.kind ?? "—"} · {taskLoopCopy("Model", "模型版本")}: {row.modelVersion ?? "—"}
+        </Text>
+        {list(row.labels).length ? (
+          <Row gap={5} wrap>{row.labels.map((label) => <Tag key={label} size="sm" tone="neutral">{label}</Tag>)}</Row>
+        ) : null}
+        {evidenceRefs.length ? <EvidenceReferenceList items={evidenceRefs} /> : <Text size="sm" tone="tertiary">{taskLoopCopy("No raw evidence references recorded.", "未记录原始证据引用。")}</Text>}
+      </Stack>
+    </CollapsibleSection>
+  );
+}
+
+function taskLoopRepresentativeSessionInsights(entries) {
+  const preferredIds = [
+    "session-insight:post-edit-validation",
+    "session-insight:execution-friction",
+    "session-insight:tool-mix",
+  ];
+  const preferred = preferredIds
+    .map((id) => entries.find((entry) => entry?.id === id))
+    .filter((entry) => entry && list(entry.evidenceRefs).length > 0);
+  const remaining = entries
+    .filter((entry) => list(entry?.evidenceRefs).length > 0 && !preferred.includes(entry))
+    .sort((left, right) => list(right.evidenceRefs).length - list(left.evidenceRefs).length);
+  return [...preferred, ...remaining].slice(0, 3);
+}
+
+function TaskLoopSessionInsightsDialog({ entries }) {
+  return (
+    <Dialog
+      trigger={(
+        <Button variant="ghost">
+          {taskLoopCopy(`View all ${entries.length}`, `查看全部 ${entries.length} 条`)}
+        </Button>
+      )}
+      title={taskLoopCopy("All session observations", "全部会话观察")}
+      closeLabel={taskLoopCopy("Close", "关闭")}
+      maxWidth={1040}
+    >
+      <Stack gap={10}>
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            "These are candidate observations projected from session evidence. Read them as investigation leads, not confirmed user intent or outcome claims.",
+            "这些是从会话证据投影出的候选观察，用于指引后续调查，不等同于已确认的用户意图或结果结论。",
+          )}
+        </Text>
+        <Table
+          columns={taskLoopSessionInsightColumns()}
+          rows={entries}
+          rowKey={(row) => row.id}
+          density="compact"
+          renderDetail={taskLoopSessionInsightDetail}
+        />
+      </Stack>
+    </Dialog>
+  );
+}
+
+function TaskLoopSessionInsights() {
+  const entries = list(report.summary?.semanticFacets?.entries);
+  if (!entries.length) return null;
+  const representativeEntries = taskLoopRepresentativeSessionInsights(entries);
+  const rowTones = ["success", "warning", "info"];
+  return (
+    <Stack gap={10}>
+      <Row gap={8} align="center" wrap>
+        <H2 style={{ fontSize: 18, lineHeight: 1.35 }}>{taskLoopCopy("Session observations", "会话观察")}</H2>
+        <Tag size="sm" tone="neutral">{entries.length} {taskLoopCopy("observations", "条观察")}</Tag>
+      </Row>
+      <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+        {taskLoopCopy(
+          "Representative evidence-bearing observations for follow-up investigation and priority judgment.",
+          "按主题呈现的代表性观察，用于指引后续调查与优先级判断。",
+        )}
+      </Text>
+      <Grid columns={3} minColumnWidth={220} gap={8} align="stretch">
+        {representativeEntries.map((row, index) => {
+          const confidence = taskLoopSessionInsightConfidence(row);
+          const evidenceCount = list(row.evidenceRefs).length;
+          return (
+            <Card key={row.id} size="sm">
+              <CardBody style={{ padding: 12, height: 142 }}>
+                <Stack gap={8} style={{ height: "100%" }}>
+                  <Row gap={7} align="center" style={{ minWidth: 0 }}>
+                    <Tag size="sm" tone={rowTones[index]}>{index + 1}</Tag>
+                    <Text size="sm" weight="semibold" truncate>{taskLoopSessionInsightTitle(row.id)}</Text>
+                  </Row>
+                  <Text
+                    size="sm"
+                    tone="secondary"
+                    style={{
+                      display: "-webkit-box",
+                      WebkitLineClamp: 2,
+                      WebkitBoxOrient: "vertical",
+                      overflow: "hidden",
+                      lineHeight: 1.5,
+                    }}
+                  >
+                    {row.summary ?? "—"}
+                  </Text>
+                  <Row justify="space-between" align="center" wrap gap={6} style={{ marginTop: "auto" }}>
+                    {confidence ? <Tag size="sm" tone={confidenceTone(confidence)}>{confidenceLabel(confidence)}</Tag> : null}
+                    <Text size="sm" tone="tertiary">
+                      {evidenceCount} {taskLoopCopy(evidenceCount === 1 ? "evidence item" : "evidence items", "条证据")}
+                    </Text>
+                  </Row>
+                </Stack>
+              </CardBody>
+            </Card>
+          );
+        })}
+      </Grid>
+      <Row justify="flex-end">
+        <TaskLoopSessionInsightsDialog entries={entries} />
+      </Row>
+    </Stack>
+  );
+}
+
+function TaskLoopFindingDialog({ row }) {
+  const expectedOutput = list(row.expectedOutput).filter((item) => textValue(item));
+  const dimensionRefs = list(row.dimensionRefs);
+  return (
+    <Dialog
+      trigger={(
+        <Button variant="ghost">{taskLoopCopy("View details", "查看详情")}</Button>
+      )}
+      title={row.title ?? row.id}
+      closeLabel={taskLoopCopy("Close", "关闭")}
+      maxWidth={880}
+      footer={(
+        <Row justify="space-between" align="center" wrap gap={10}>
+          <SendToChatButton variant="secondary" text={row.aiFixPrompt} options={{ submit: false }} disabled={!row.aiFixPrompt}>
+            {taskLoopCopy("Plan AI Fix", "规划 AI 修复")}
+          </SendToChatButton>
+        </Row>
+      )}
+    >
+      <Stack gap={16}>
+        <Row gap={6} align="center" wrap>
+          <Tag size="sm" tone={severityTone(row.severity)}>{severityLabel(row.severity)}</Tag>
+          {dimensionRefs.map((dimensionRef) => (
+            <Tag key={dimensionRef} size="sm" tone="neutral">{taskLoopDimensionLabel(dimensionRef)}</Tag>
+          ))}
+        </Row>
+        <Stack gap={6} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Cause", "原因")}</Text>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>
+            {textValue(row.reason) || taskLoopCopy("No cause was recorded.", "未记录原因。")}
+          </Text>
+        </Stack>
+        <Divider style={{ margin: "2px 0" }} />
+        <Stack gap={8} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Expected Output", "预期结果")}</Text>
+          {expectedOutput.length ? expectedOutput.map((output, index) => (
+            <Row key={`${row.id}-dialog-output-${index}`} gap={8} align="start">
+              <Tag size="sm" tone="neutral">{index + 1}</Tag>
+              <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>{output}</Text>
+            </Row>
+          )) : (
+            <Text size="sm" tone="tertiary">{taskLoopCopy("No expected output was recorded.", "未记录预期结果。")}</Text>
+          )}
+        </Stack>
+      </Stack>
+    </Dialog>
+  );
+}
+
+function TaskLoopFindingCard({ row }) {
+  const [dimensionRef] = list(row.dimensionRefs);
+  return (
+    <Card size="sm">
+      <CardBody style={{ padding: 14, height: 190 }}>
+        <Stack gap={10} style={{ height: "100%" }}>
+          <Stack gap={7} style={{ minWidth: 0 }}>
+            <Row gap={6} align="center" wrap>
+              <Tag size="sm" tone={severityTone(row.severity)}>{severityLabel(row.severity)}</Tag>
+              {dimensionRef ? <Tag size="sm" tone="neutral">{taskLoopDimensionLabel(dimensionRef)}</Tag> : null}
+            </Row>
+            <Text
+              weight="semibold"
+              style={{
+                fontSize: 15,
+                lineHeight: "21px",
+                display: "-webkit-box",
+                WebkitLineClamp: 2,
+                WebkitBoxOrient: "vertical",
+                overflow: "hidden",
+              }}
+            >
+              {row.title ?? row.id}
+            </Text>
+            {textValue(row.reason) ? (
+              <Text
+                size="sm"
+                tone="secondary"
+                style={{
+                  ...taskLoopReaderCopyStyle,
+                  display: "-webkit-box",
+                  WebkitLineClamp: 2,
+                  WebkitBoxOrient: "vertical",
+                  overflow: "hidden",
+                  lineHeight: 1.5,
+                }}
+              >
+                {row.reason}
+              </Text>
+            ) : null}
+          </Stack>
+          <Stack gap={10} style={{ marginTop: "auto" }}>
+            <Divider style={{ margin: "2px 0" }} />
+            <Row justify="space-between" align="center" wrap gap={10}>
+              <SendToChatButton variant="secondary" text={row.aiFixPrompt} options={{ submit: false }} disabled={!row.aiFixPrompt}>
+                {taskLoopCopy("Plan AI Fix", "规划 AI 修复")}
+              </SendToChatButton>
+              <TaskLoopFindingDialog row={row} />
+            </Row>
+          </Stack>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopFindingCards({ findings }) {
+  return (
+    <Grid columns={3} minColumnWidth={300} gap={8} align="stretch">
+      {findings.map((row) => <TaskLoopFindingCard key={row.id} row={row} />)}
+    </Grid>
+  );
+}
+
+function taskLoopSuggestionKindLabel(kind) {
+  const labels = {
+    "try-existing": ["Try existing", "试用已有能力"],
+    "working-pattern": ["Working pattern", "有效模式"],
+    "loop-candidate": ["Loop candidate", "循环候选"],
+    horizon: ["Horizon", "中长期"],
+  }[kind] ?? ["Suggestion", "建议"];
+  return taskLoopCopy(labels[0], labels[1]);
+}
+
+function TaskLoopSuggestionDialog({ row }) {
+  const prerequisites = list(row.prerequisites).map(textValue).filter(Boolean);
+  const blockedBy = list(row.blockedBy).map(textValue).filter(Boolean);
+  return (
+    <Dialog
+      trigger={<Button variant="ghost">{taskLoopCopy("Review suggestion", "查看建议")}</Button>}
+      title={row.title ?? row.id}
+      closeLabel={taskLoopCopy("Close", "关闭")}
+      maxWidth={760}
+    >
+      <Stack gap={16}>
+        <Row gap={6} align="center" wrap>
+          <Tag size="sm" tone="info">{taskLoopSuggestionKindLabel(row.kind)}</Tag>
+          <Tag size="sm" tone={confidenceTone(row.confidence)}>{confidenceLabel(row.confidence)}</Tag>
+        </Row>
+        <Stack gap={6} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Why this is worth trying", "为什么值得尝试")}</Text>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>{row.reason}</Text>
+        </Stack>
+        <Divider style={{ margin: "2px 0" }} />
+        <Grid columns={2} minColumnWidth={240} gap={12}>
+          <Stack gap={5}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Owner", "负责人")}</Text>
+            <Text size="sm" tone="secondary">{row.owner}</Text>
+          </Stack>
+          <Stack gap={5}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Validation", "验证")}</Text>
+            <Text size="sm" tone="secondary">{row.validation}</Text>
+          </Stack>
+        </Grid>
+        <Stack gap={5} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Next step", "下一步")}</Text>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>{row.nextStep}</Text>
+        </Stack>
+        {prerequisites.length ? (
+          <Stack gap={6}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Prerequisites", "前置条件")}</Text>
+            {prerequisites.map((item, index) => (
+              <Row key={`${row.id}-prerequisite-${index}`} gap={8} align="start">
+                <Tag size="sm" tone="neutral">{index + 1}</Tag>
+                <Text size="sm" tone="secondary">{item}</Text>
+              </Row>
+            ))}
+          </Stack>
+        ) : null}
+        {blockedBy.length ? (
+          <Stack gap={6}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Blocked by", "阻塞项")}</Text>
+            {blockedBy.map((item, index) => (
+              <Row key={`${row.id}-blocker-${index}`} gap={8} align="start">
+                <Tag size="sm" tone="warning">{index + 1}</Tag>
+                <Text size="sm" tone="secondary">{item}</Text>
+              </Row>
+            ))}
+          </Stack>
+        ) : null}
+      </Stack>
+    </Dialog>
+  );
+}
+
+function TaskLoopSuggestionCard({ row }) {
+  return (
+    <Card size="sm">
+      <CardBody style={{ padding: 14, minHeight: 260, height: "100%" }}>
+        <Stack gap={9} style={{ height: "100%" }}>
+          <Row gap={6} align="center" wrap>
+            <Tag size="sm" tone="info">{taskLoopSuggestionKindLabel(row.kind)}</Tag>
+            <Tag size="sm" tone={confidenceTone(row.confidence)}>{confidenceLabel(row.confidence)}</Tag>
+          </Row>
+          <Text
+            weight="semibold"
+            style={{ fontSize: 15, lineHeight: "21px", display: "-webkit-box", WebkitLineClamp: 2, WebkitBoxOrient: "vertical", overflow: "hidden" }}
+          >
+            {row.title ?? row.id}
+          </Text>
+          <Text
+            size="sm"
+            tone="secondary"
+            style={{ display: "-webkit-box", WebkitLineClamp: 2, WebkitBoxOrient: "vertical", overflow: "hidden", lineHeight: 1.5 }}
+          >
+            {row.reason}
+          </Text>
+          <Stack gap={3} style={{ marginTop: "auto" }}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Next step", "下一步")}</Text>
+            <Text size="sm" tone="secondary" truncate>{row.nextStep}</Text>
+          </Stack>
+          <Divider style={{ margin: "2px 0" }} />
+          <Row justify="space-between" align="center" wrap gap={8}>
+            <Text size="sm" tone="tertiary" truncate>{row.owner}</Text>
+            <TaskLoopSuggestionDialog row={row} />
+          </Row>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopSuggestionCards({ suggestions }) {
+  return (
+    <Grid columns={3} minColumnWidth={280} gap={8} align="stretch">
+      {suggestions.map((row) => <TaskLoopSuggestionCard key={row.id} row={row} />)}
+    </Grid>
+  );
+}
+
+function taskLoopDeliveryOutcomeLabel(boundary) {
+  if (!boundary || !Object.hasOwn(boundary, "deliveryEvidenceLevels")) {
+    return taskLoopCopy("Not supplied", "未提供");
+  }
+  const levels = list(boundary?.deliveryEvidenceLevels).map(textValue).filter(Boolean);
+  if (!levels.length || levels.every((value) => ["none", "unobserved", "not-observed"].includes(value.toLowerCase()))) {
+    return taskLoopCopy("Not observed", "未观察到");
+  }
+  return levels.join(", ");
+}
+
+function taskLoopCoverageFraction(value, analyzedField, eligibleField) {
+  if (!value || !Object.hasOwn(value, analyzedField) || !Object.hasOwn(value, eligibleField)) return null;
+  const analyzed = Number(value[analyzedField]);
+  const eligible = Number(value[eligibleField]);
+  return Number.isInteger(analyzed) && analyzed >= 0 && Number.isInteger(eligible) && eligible >= 0
+    ? `${formatUsageNumber(analyzed)}/${formatUsageNumber(eligible)}`
+    : null;
+}
+
+function taskLoopMeasurementBoundaryText(selection, usageSelection) {
+  const sample = taskLoopCoverageFraction(selection, "analyzedCount", "eligibleCount");
+  const activity = taskLoopCoverageFraction(usageSelection, "analyzedSessionCount", "eligibleSessionCount");
+  if (sample && activity) {
+    return taskLoopCopy(
+      `Work-stage conclusions use ${sample} stratified sample sessions; activity accounting covers ${activity}. Use this evidence to locate review leads, not to prove efficiency or model quality.`,
+      `工作环节结论来自 ${sample} 个分层抽样会话；活动统计覆盖 ${activity}。当前证据可用于定位线索，不足以证明效率或模型质量。`,
+    );
+  }
+  if (sample) {
+    return taskLoopCopy(
+      `Work-stage conclusions use ${sample} stratified sample sessions. Activity and model accounting were not supplied, so no usage conclusion is available.`,
+      `工作环节结论来自 ${sample} 个分层抽样会话。未提供活动与模型统计，因此无法形成用量结论。`,
+    );
+  }
+  if (activity) {
+    return taskLoopCopy(
+      `Activity accounting covers ${activity}. Sampling provenance was not supplied, so usage is shown without a work-stage sampling conclusion.`,
+      `活动统计覆盖 ${activity}。未提供抽样来源，因此这里只展示用量，不形成工作环节抽样结论。`,
+    );
+  }
+  return taskLoopCopy(
+    "Session measurement context was not supplied, so no sampling, usage, or model conclusion is available.",
+    "未提供会话计量上下文，因此无法形成抽样、用量或模型结论。",
+  );
+}
+
+function taskLoopMeasurementModelLabel(usage, modelUsage) {
+  if (!usage) return taskLoopCopy("Usage unavailable", "用量不可用");
+  return `${modelUsage.length} ${taskLoopCopy("models", "个模型")}`;
+}
+
+function taskLoopSelectionDetailText(selection) {
+  const coverage = taskLoopCoverageFraction(selection, "analyzedCount", "eligibleCount");
+  if (!coverage) return taskLoopCopy("Not supplied", "未提供");
+  return taskLoopCopy(
+    `${textValue(selection.strategy) || "unknown"}; ${coverage} eligible sessions analyzed.`,
+    `${textValue(selection.strategy) || "未知"}；已分析 ${coverage} 个符合条件的会话。`,
+  );
+}
+
+function taskLoopTaskEvidenceText(coverage) {
+  const fields = ["episodeCount", "editedEpisodeCount", "closedEpisodeCount", "recoveredEpisodeCount"];
+  if (!fields.every((field) => Object.hasOwn(coverage, field))) return taskLoopCopy("Not supplied", "未提供");
+  const [episodes, edited, closed, recovered] = fields.map((field) => Number(coverage[field]));
+  if (![episodes, edited, closed, recovered].every((value) => Number.isInteger(value) && value >= 0)) {
+    return taskLoopCopy("Not supplied", "未提供");
+  }
+  return taskLoopCopy(
+    `${episodes} episodes; ${edited} with changes; ${closed} closed; ${recovered} repaired and passed.`,
+    `${episodes} 个任务片段；${edited} 个包含改动；${closed} 个已闭环；${recovered} 个修复并通过。`,
+  );
+}
+
+function taskLoopLearningDetailText(learning) {
+  if (!Object.hasOwn(learning, "state") && !Array.isArray(learning.interventions)) {
+    return taskLoopCopy("Not supplied", "未提供");
+  }
+  return taskLoopCopy(
+    `${learningStateLabel(learning.state)}; ${list(learning.interventions).length} declared intervention(s).`,
+    `${learningStateLabel(learning.state)}；${list(learning.interventions).length} 项已声明的改进。`,
+  );
+}
+
+function TaskLoopEvidenceFact({ label, value, tone = "neutral" }) {
+  return (
+    <Card size="sm">
+      <CardBody style={{ padding: "10px 12px" }}>
+        <Stack gap={6}>
+          <Text size="sm" tone="tertiary">{label}</Text>
+          <Row>
+            <Tag size="sm" tone={tone}>{value}</Tag>
+          </Row>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopEvidenceDetails({ usage, boundary, manifest, selection, learning, coverage }) {
+  const hasDetailedBoundary = Object.keys(boundary).length > 0
+    || Object.keys(coverage).length > 0
+    || Object.keys(learning).length > 0;
+  return (
+    <Stack gap={14}>
+      {hasDetailedBoundary ? (
+        <Stack gap={7} style={taskLoopReaderCopyStyle}>
+          <Text weight="semibold">{taskLoopCopy("Sampling and provenance", "抽样与来源")}</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Session selection", "会话抽样")}: {taskLoopSelectionDetailText(selection)}</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Task evidence", "任务证据")}: {taskLoopTaskEvidenceText(coverage)}</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Delivery outcomes", "交付结果")}: {taskLoopDeliveryOutcomeLabel(boundary)}.</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Learning comparison", "学习循环比较")}: {taskLoopLearningDetailText(learning)}</Text>
+          {textValue(learning.summary) ? <Text size="sm" tone="secondary">{learning.summary}</Text> : null}
+        </Stack>
+      ) : (
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            "This run did not supply task-episode or delivery-outcome evidence, so the report only shows repository signals it could verify.",
+            "本次运行没有提供任务片段或交付结果证据，因此报告只展示能够验证的仓库信号。",
+          )}
+        </Text>
+      )}
+      <Grid columns={3} minColumnWidth={260} gap={12} align="start">
+        <UsageStatRow label={taskLoopCopy("Evidence mode", "证据模式")} value={report.summary?.evidenceMode ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Platform", "平台")} value={manifest.platform ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Adapter version", "适配器版本")} value={manifest.adapterVersion ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Manifest schema", "清单版本")} value={manifest.schemaVersion ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Source fingerprint", "来源指纹")} value={manifest.sourceFingerprint ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Source gaps", "来源缺口")} value={Array.isArray(boundary.sourceGaps) ? boundary.sourceGaps.length : "—"} />
+      </Grid>
+      {usage ? (
+        <>
+          <Divider style={{ margin: "2px 0" }} />
+          <TaskLoopUsageMethodology usage={usage} />
+        </>
+      ) : null}
+    </Stack>
+  );
+}
+
+function TaskLoopEvidenceBoundary({ usage }) {
+  const boundary = report.summary?.evidenceBoundary ?? {};
+  const manifest = boundary.manifest ?? {};
+  const selection = manifest.selection ?? {};
+  const learning = report.summary?.learningCapture ?? {};
+  const coverage = taskLoopCoverage();
+  const modelUsage = list(usage?.modelUsage);
+  const longSessionSamples = list(usage?.longSessions?.samples);
+  const sessionInsights = list(report.summary?.semanticFacets?.entries);
+  const activitySelection = usage?.selection ?? {};
+  const samplingConfidence = textValue(selection.confidence)
+    || taskLoopCopy("Not supplied", "未提供");
+  const sourceGapValue = Array.isArray(boundary.sourceGaps) ? boundary.sourceGaps.length : "—";
+
+  return (
+    <Stack gap={12}>
+      <H2 style={{ fontSize: 20, lineHeight: 1.35 }}>{taskLoopCopy("Evidence and methodology", "证据与方法")}</H2>
+      <Callout
+        tone="warning"
+        style={{
+          background: "rgba(245, 158, 11, 0.06)",
+          border: "1px solid rgba(245, 158, 11, 0.28)",
+          borderRadius: 8,
+          padding: "10px 12px",
+        }}
+      >
+        <Text size="sm" style={{ lineHeight: 1.5 }}>
+          {taskLoopMeasurementBoundaryText(selection, activitySelection)}
+        </Text>
+      </Callout>
+      <Grid columns={3} minColumnWidth={180} gap={8} align="stretch">
+        <TaskLoopEvidenceFact label={taskLoopCopy("Sampling confidence", "抽样可信度")} value={samplingConfidence} tone={confidenceTone(selection.confidence)} />
+        <TaskLoopEvidenceFact label={taskLoopCopy("Source gaps", "来源缺口")} value={sourceGapValue} tone={Array.isArray(boundary.sourceGaps) && boundary.sourceGaps.length ? "warning" : "neutral"} />
+        <TaskLoopEvidenceFact label={taskLoopCopy("Delivery outcome", "交付结果")} value={taskLoopDeliveryOutcomeLabel(boundary)} />
+      </Grid>
+      {usage?.reviewLead && longSessionSamples.length ? (
+        <>
+          <Divider style={{ margin: "2px 0" }} />
+          <TaskLoopLongSessionReview usage={usage} />
+        </>
+      ) : null}
+      {sessionInsights.length ? (
+        <>
+          <Divider style={{ margin: "2px 0" }} />
+          <TaskLoopSessionInsights />
+        </>
+      ) : null}
+      <Divider style={{ margin: "2px 0" }} />
+      <CollapsibleSection
+        size="sm"
+        defaultOpen={false}
+        title={(
+          <Row gap={12} align="center" wrap>
+            <Text weight="semibold">{taskLoopCopy("View measurement and model details", "查看计量与模型明细")}</Text>
+            <Text size="sm" tone="secondary">
+              {taskLoopCopy("Response accounting, model detail, and sampling method", "响应计量、模型明细与抽样方法")}
+            </Text>
+          </Row>
+        )}
+        trailing={<Text size="sm" tone="secondary">{taskLoopMeasurementModelLabel(usage, modelUsage)}</Text>}
+        bodyStyle={{ padding: "12px 0 2px 16px" }}
+        headerStyle={{ minHeight: 44 }}
+      >
+        <TaskLoopEvidenceDetails
+          usage={usage}
+          boundary={boundary}
+          manifest={manifest}
+          selection={selection}
+          learning={learning}
+          coverage={coverage}
+        />
+      </CollapsibleSection>
+    </Stack>
+  );
+}
+
+function TaskLoopReport() {
+  const dimensions = list(report.summary?.dimensions);
+  const findings = list(report.findings).sort((left, right) => severityRank(left.severity) - severityRank(right.severity));
+  const suggestions = list(report.summary?.suggestions);
+  const activity = taskLoopUsageActivity();
+  const usage = taskLoopUsageEfficiency();
+  const highFindings = findings.filter((row) => row.severity === "Critical" || row.severity === "High");
+  const mediumFindings = findings.filter((row) => row.severity === "Medium");
+  return (
+    <Stack gap={24} style={taskLoopPageStyle}>
+      <TaskLoopReportHeader findings={findings} />
+
+      <TaskLoopFluency dimensions={dimensions} />
+
+      {activity || usage ? (
+        <Stack gap={8}>
+          <H2>{taskLoopCopy("Project usage", "项目用量")}</H2>
+          <TaskLoopProjectUsage activity={activity} usage={usage} />
+        </Stack>
+      ) : null}
+
+      <Stack gap={8}>
+        <Row justify="space-between" align="center" wrap gap={8}>
+          <H2>{taskLoopCopy("Prioritized improvements", "优先优化项")}</H2>
+          <Text size="sm" tone="secondary">
+            {taskLoopCopy(
+              `${findings.length} total · ${highFindings.length} high · ${mediumFindings.length} medium`,
+              `共 ${findings.length} 项 · ${highFindings.length} 个高优先级 · ${mediumFindings.length} 个中优先级`,
+            )}
+          </Text>
+        </Row>
+        <TaskLoopFindingCards findings={findings} />
+        {suggestions.length ? (
+          <>
+            <Divider style={{ margin: "8px 0 2px" }} />
+            <Row justify="space-between" align="center" wrap gap={8}>
+              <Stack gap={3}>
+                <Text weight="semibold">{taskLoopCopy("Suggestions", "建议")}</Text>
+                <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+                  {taskLoopCopy(
+                    "Evidence-bound capabilities and patterns worth trying next. Suggestions are advisory and do not include an AI Fix action.",
+                    "基于证据、值得下一步尝试的能力与模式。建议仅供参考，不包含 AI 修复动作。",
+                  )}
+                </Text>
+              </Stack>
+              <Tag size="sm" tone="neutral">{suggestions.length} {taskLoopCopy("suggestions", "条建议")}</Tag>
+            </Row>
+            <TaskLoopSuggestionCards suggestions={suggestions} />
+          </>
+        ) : null}
+      </Stack>
+
+      <Stack gap={8}>
+        <H2>{taskLoopCopy("Agent Customize", "Agent 自定义")}</H2>
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            "Discovered sources, not a quality or maturity score.",
+            "这里只展示已发现来源，不代表质量或成熟度评分。",
+          )}
+        </Text>
+        <TaskLoopPracticeTable rows={practiceRows()} />
+      </Stack>
+
+      <TaskLoopUsageTrends activity={activity} />
+
+      <TaskLoopEvidenceBoundary usage={usage} />
+    </Stack>
+  );
+}
+
+export default function QoderHarnessReport() {
+  return <TaskLoopReport />;
+}
diff --git a/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/canvas.json b/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/canvas.json
new file mode 100644
index 0000000..b82d03f
--- /dev/null
+++ b/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/canvas.json
@@ -0,0 +1,47 @@
+{
+  "schemaVersion": 1,
+  "summary": {},
+  "dimensions": [
+    {
+      "id": "task-understanding"
+    },
+    {
+      "id": "controlled-execution"
+    },
+    {
+      "id": "change-validation"
+    },
+    {
+      "id": "reliable-delivery"
+    },
+    {
+      "id": "learning-capture"
+    }
+  ],
+  "findings": [
+    {
+      "id": "zero-project-skill-coverage",
+      "subdimensionRefs": [
+        "loop-engineering"
+      ]
+    },
+    {
+      "id": "no-validation-commands-observed",
+      "subdimensionRefs": [
+        "relevant-check"
+      ]
+    },
+    {
+      "id": "unreviewed-execution-friction",
+      "subdimensionRefs": [
+        "lifecycle-repeat-detection"
+      ]
+    },
+    {
+      "id": "unevaluated-lifecycle-demand",
+      "subdimensionRefs": [
+        "lifecycle-repeat-detection"
+      ]
+    }
+  ]
+}
diff --git a/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/findings.json b/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/findings.json
new file mode 100644
index 0000000..76f66ec
--- /dev/null
+++ b/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/findings.json
@@ -0,0 +1,184 @@
+{
+  "summary": {
+    "projectName": "阑山桌面LanMountainDesktop",
+    "locale": "zh-CN",
+    "modelId": "agent-work-loop-v4",
+    "reportContractVersion": 25,
+    "overview": "项目拥有全面的 AGENTS.md 指导文档和 7 个 CI 工作流，但项目级可执行 Agent 能力完全缺失（零 Skills、零 Commands、零 MCP），且 12 个会话中未观察到任何变更验证行为，学习捕获机制尚未从线索阶段推进到可复用改进。",
+    "aiAgentPractice": {
+      "inspectedSurfaces": [
+        "Rules",
+        "Workflows"
+      ],
+      "coverageRows": [
+        {
+          "surface": "Rules",
+          "scopes": [
+            "Project"
+          ],
+          "count": 1,
+          "paths": [
+            "AGENTS.md"
+          ]
+        },
+        {
+          "surface": "Workflows",
+          "scopes": [
+            "Project"
+          ],
+          "count": 7,
+          "paths": [
+            ".github/workflows/build.yml",
+            ".github/workflows/code-quality.yml",
+            ".github/workflows/installer-build.yml",
+            ".github/workflows/issue-management.yml",
+            ".github/workflows/plonds-comparator.yml",
+            ".github/workflows/plonds-uploader.yml",
+            ".github/workflows/release.yml"
+          ]
+        },
+        {
+          "surface": "Skills",
+          "scopes": [
+            "Project"
+          ],
+          "count": 0
+        },
+        {
+          "surface": "MCP",
+          "scopes": [
+            "Project"
+          ],
+          "count": 0
+        },
+        {
+          "surface": "Commands",
+          "scopes": [
+            "Project"
+          ],
+          "count": 0
+        },
+        {
+          "surface": "Custom Agents",
+          "scopes": [
+            "Project"
+          ],
+          "count": 0
+        },
+        {
+          "surface": "Plugins",
+          "scopes": [
+            "Project"
+          ],
+          "count": 0
+        }
+      ]
+    },
+    "assignmentSummaries": [],
+    "dimensions": [
+      {
+        "id": "task-understanding",
+        "label": "任务理解",
+        "score": 76,
+        "summary": "AGENTS.md 提供了全面的 AI 指导，涵盖架构、视觉规范、插件 SDK 等关键领域；24 份架构文档和 80 份规格文件为上下文路由提供了充足依据，但部分会话仍出现执行摩擦，说明指导到执行的转化路径存在断裂。",
+        "findingRefs": []
+      },
+      {
+        "id": "controlled-execution",
+        "label": "可控执行",
+        "score": 50,
+        "summary": "项目有明确的启动和构建命令（AGENTS.md 中记录），但项目级可执行能力为零——无 Skills、Commands、MCP、Agents 或 Plugins 配置。Agent 只能依赖通用工具能力，无法通过项目专属的可复用工作流执行任务。",
+        "findingRefs": []
+      },
+      {
+        "id": "change-validation",
+        "label": "改动验证",
+        "score": 35,
+        "summary": "12 个已分析会话中未观察到任何验证命令执行。证据包报告 990 个源文件中零测试文件，仅 3 个跟踪测试文件。变更验证维度所有三项检查均处于 Unobserved 状态。",
+        "findingRefs": [
+          "no-validation-commands-observed"
+        ]
+      },
+      {
+        "id": "reliable-delivery",
+        "label": "可靠交付",
+        "score": 55,
+        "summary": "7 个 CI 工作流覆盖了构建、代码质量、安装程序、发布等交付路径，机制已 Present。但在分析窗口内未观察到会话级别的交付验收或回滚恢复行为，证据强度停留在 Present 未达 Wired。",
+        "findingRefs": []
+      },
+      {
+        "id": "learning-capture",
+        "label": "经验沉淀",
+        "score": 40,
+        "summary": "检测到 3 次执行摩擦信号和 1 个重复工作候选，但均未完成语义复核。2 条 episode 记录未产生任何可复用候选。学习捕获处于线索收集阶段，尚未推进到 Loop Engineering 或纵向验证。",
+        "findingRefs": [
+          "zero-project-skill-coverage",
+          "unreviewed-execution-friction",
+          "unevaluated-lifecycle-demand"
+        ]
+      }
+    ]
+  },
+  "findings": [
+    {
+      "id": "zero-project-skill-coverage",
+      "title": "项目级 Skill 为零，已检测到的可复用流程候选无持久所有者",
+      "severity": "Low",
+      "reason": "资产清单确认项目级 Skills 为零，而分析器检测到 `.trae/skills/refactoring-insight/SKILL.md` 作为 Skill 候选存在（触发条件、流程、输出均已具备，仅缺验证和路由）。重复程序或知识需求没有通过覆盖检查梯级（observed → built-in → configured → extend → create）进行路由，导致可复用能力无法被 Agent 发现和调用。",
+      "expectedOutput": [
+        "通过 Loop Discovery 为每个检测到的 Skill 候选选择最小持久所有者（observed → built-in → configured → extend → create）",
+        "记录路由决策和覆盖梯级检查结果"
+      ],
+      "expectedArtifact": "Skill 覆盖路由决策记录",
+      "aiFixPrompt": "/better-harness fix this issue\n\n为检测到的 Skill 候选执行覆盖检查梯级路由。\n\n## 先检查的覆盖梯级\n\n1. 检查是否存在 observed 覆盖（Agent 已在会话中自发执行的流程）\n2. 检查 built-in 覆盖（Qoder 内置能力是否已满足）\n3. 检查 configured 覆盖（已配置但未激活的 Skill）\n4. 评估 extend 或 create 的必要性\n\n## 候选 Skill\n\n- `.trae/skills/refactoring-insight/SKILL.md`：触发条件 yes，流程 yes，输出 yes，验证 no，路由 no\n\n## 验证\n\n- 运行 `node scripts/better-harness.mjs coding-agent-practices asset-baseline qoder --workspace . --language zh-CN --json` 确认 Skill 覆盖变化\n- 确认 Loop Discovery 已为候选选择了最小持久所有者",
+      "dimensionRefs": [
+        "learning-capture"
+      ]
+    },
+    {
+      "id": "no-validation-commands-observed",
+      "title": "12 个会话中未执行任何验证命令，变更验证完全缺失",
+      "severity": "Low",
+      "reason": "12 个已分析会话中没有任何验证命令类别被观察到。证据包报告 990 个源文件中零测试文件（由证据包统计），仅 3 个跟踪测试文件存在于 LanMountainDesktop.Tests 项目中。AGENTS.md 记录了 `dotnet test LanMountainDesktop.slnx -c Debug` 命令，但该命令未在分析窗口内的任何会话中被执行。变更验证维度的三项检查（相关验证、失败诊断与修复、修复后重新验证）均处于 Unobserved 状态，维度分数上限为 59。",
+      "expectedOutput": [
+        "确认 `dotnet test` 命令可执行并覆盖核心变更路径",
+        "如果验证路由存在障碍（如测试项目不完整），记录具体阻塞原因"
+      ],
+      "expectedArtifact": "验证路由检查报告",
+      "aiFixPrompt": "/better-harness fix this issue\n\n在 AGENTS.md 的「改动后必做检查」中已记录验证命令，但会话中未观察到执行。检查验证路由是否可发现且可执行。\n\n## 先核对的命令\n\n- `dotnet build LanMountainDesktop.slnx -c Debug`\n- `dotnet test LanMountainDesktop.slnx -c Debug`\n\n## 验证\n\n- 确认 `dotnet test` 在本地可执行且返回有意义的结果\n- 确认 AGENTS.md 中的测试命令与实际测试项目路径一致\n- 检查是否需要添加 Hook 在编辑后自动触发验证",
+      "dimensionRefs": [
+        "change-validation"
+      ]
+    },
+    {
+      "id": "unreviewed-execution-friction",
+      "title": "3 次执行摩擦信号未完成语义复核，无法区分真实问题与噪音",
+      "severity": "Low",
+      "reason": "分析器聚合了 3 次 failed-event 摩擦信号（来源：2 次 disabled-source-root 警告、2 次 missing-optional-root 警告），但对应的有界会话尚未打开进行语义复核。当前无法判断这些摩擦是否导致了实际的任务失败、重试或工作丢失，还是仅为配置噪音。摩擦信号是调查线索，不是已确认的后果，但长期不复核会导致真实问题被淹没。",
+      "expectedOutput": [
+        "每个摩擦信号完成 taskFamily、outcome、friction 分类",
+        "区分配置噪音与真实执行障碍，对真实障碍记录修复路由"
+      ],
+      "expectedArtifact": "摩擦信号语义复核报告",
+      "aiFixPrompt": "/better-harness fix this issue\n\n对 3 次 failed-event 摩擦信号执行有界语义复核。\n\n## 先做什么\n\n1. 运行 session-analysis insights 获取完整会话洞察\n2. 为每个摩擦信号分类：taskFamily、outcome、friction、confidence、evidenceReason\n3. 区分配置缺失（disabled-source-root、missing-optional-root）与真实执行失败\n\n## 验证\n\n- 运行 `node scripts/session-analysis.mjs insights --platform qoder --workspace . --selection all-eligible --limit 1000 --format json`\n- 确认每个摩擦信号已有分类结论\n- 对于确认为配置问题的信号，修复配置或记录为已知噪音",
+      "dimensionRefs": [
+        "learning-capture"
+      ]
+    },
+    {
+      "id": "unevaluated-lifecycle-demand",
+      "title": "1 个重复工作候选未通过覆盖梯级路由，学习捕获停留在线索阶段",
+      "severity": "Low",
+      "reason": "工作流需求诊断检测到 1 个重复工作候选（repeated candidate），但当前手off 数量为零。该候选未被追踪通过 Skill 覆盖梯级（observed → built-in → configured → extend → create），也未通过 Loop Discovery 选择最小持久所有者。2 条 episode 记录未产生任何循环候选。学习捕获维度的 Lifecycle Opportunity Detection 处于线索阶段，Loop Engineering 和 Longitudinal Validation 均无法推进。",
+      "expectedOutput": [
+        "重复工作候选通过 Loop Discovery 选择了最小持久所有者",
+        "记录覆盖梯级检查结果和路由决策依据"
+      ],
+      "expectedArtifact": "Loop Discovery 路由决策记录",
+      "aiFixPrompt": "/better-harness fix this issue\n\n对检测到的重复工作候选执行 Loop Discovery 路由。\n\n## 先做什么\n\n1. 运行 session-analysis 获取工作流需求诊断详情\n2. 识别重复候选的具体意图和范围\n3. 通过覆盖梯级检查现有覆盖\n4. 如无现有覆盖，通过 Loop Discovery 选择最小持久所有者\n\n## 验证\n\n- 确认重复候选已有明确的覆盖路由决策\n- 如果选择 Skill 形状的所有者，确认触发条件、流程、输出和验证器已定义\n- 运行 `node scripts/better-harness.mjs coding-agent-practices asset-baseline qoder --workspace . --language zh-CN --json` 确认资产变化",
+      "dimensionRefs": [
+        "learning-capture"
+      ]
+    }
+  ]
+}
diff --git a/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/report.canvas.tsx b/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/report.canvas.tsx
new file mode 100644
index 0000000..2084dfd
--- /dev/null
+++ b/.qoder/better-harness/2026-08-06/174449-lanmountaindesktop/report.canvas.tsx
@@ -0,0 +1,1788 @@
+import {
+  AreaChart,
+  Button,
+  Callout,
+  Card,
+  CardBody,
+  CardHeader,
+  CollapsibleSection,
+  Dialog,
+  Divider,
+  Fluency,
+  Grid,
+  H1,
+  H2,
+  MetricsGrid,
+  Row,
+  RiskHeatmap,
+  SendToChatButton,
+  Stack,
+  Table,
+  Tag,
+  Text,
+} from "qoder/canvas";
+import hostReportData from "./findings.json";
+import canvasData from "./canvas.json";
+
+function mergeCanvasRows(hostRows, canvasRows) {
+  const detailById = new Map(
+    (Array.isArray(canvasRows) ? canvasRows : [])
+      .filter((row) => row && typeof row === "object" && typeof row.id === "string")
+      .map((row) => [row.id, row]),
+  );
+  return (Array.isArray(hostRows) ? hostRows : []).map((row) => ({ ...detailById.get(row?.id), ...row }));
+}
+
+function mergeCanvasObjects(host, detail) {
+  if (!host || typeof host !== "object" || Array.isArray(host)) return detail;
+  if (!detail || typeof detail !== "object" || Array.isArray(detail)) return host;
+  const merged = { ...host };
+  for (const [key, value] of Object.entries(detail)) {
+    merged[key] = value && typeof value === "object" && !Array.isArray(value)
+      ? mergeCanvasObjects(host[key], value)
+      : value;
+  }
+  return merged;
+}
+
+function mergeCanvasReport(host, detail) {
+  const summary = host?.summary ?? {};
+  if (!detail || typeof detail !== "object" || Array.isArray(detail)) return host;
+  return {
+    summary: {
+      ...(detail?.summary ?? {}),
+      ...summary,
+      atAGlance: mergeCanvasObjects(detail?.summary?.atAGlance, summary.atAGlance),
+      dimensions: mergeCanvasRows(summary.dimensions, detail?.dimensions),
+    },
+    findings: mergeCanvasRows(host?.findings, detail?.findings),
+  };
+}
+
+const report = mergeCanvasReport(hostReportData, canvasData);
+
+const pageStyle = { maxWidth: 960, margin: "0 auto", padding: 16, boxSizing: "border-box" };
+const taskLoopPageStyle = { ...pageStyle, padding: 20 };
+const taskLoopReaderCopyStyle = { maxWidth: 940 };
+
+const DIMENSION_SUMMARY_EXAMPLE = "Example: project guidance makes the main workflow clear, but ownership for cross-cutting changes is not documented.";
+
+function list(value) {
+  return Array.isArray(value) ? value : [];
+}
+
+function clampScore(value) {
+  const score = Number(value);
+  if (!Number.isFinite(score)) return 0;
+  return Math.max(0, Math.min(100, score));
+}
+
+function projectName() {
+  return report.summary?.projectName ?? "Better Harness Report";
+}
+
+function textValue(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function openingStrengths() {
+  const explicit = list(report.summary?.strengths).map(textValue).filter(Boolean);
+  return explicit.length ? explicit.slice(0, 3) : ["Reviewed project signals are organized into dimensions and issue findings."];
+}
+
+function averageScore(dimensions) {
+  if (dimensions.length === 0) return 0;
+  return Math.round(dimensions.reduce((sum, row) => sum + clampScore(row.score), 0) / dimensions.length);
+}
+
+function scoreTone(score) {
+  if (score >= 70) return "success";
+  if (score >= 40) return "warning";
+  return "danger";
+}
+
+function stageStatus(score) {
+  if (score >= 70) return "high";
+  if (score >= 40) return "medium";
+  if (score > 0) return "low";
+  return "blocked";
+}
+
+function fluencyReason(row) {
+  return textValue(row?.summary) || taskLoopCopy(
+    "No reviewed score explanation is available for this dimension.",
+    "这个维度暂时没有经过复核的评分说明。",
+  );
+}
+
+function splitFluencyTooltipReason(value) {
+  let remaining = textValue(value).replace(/\s+/g, " ");
+  const chunks = [];
+  const limits = /[\u3400-\u9fff]/.test(remaining) ? [20, 20, 20, 20] : [34, 30, 30, 30];
+  for (const limit of limits) {
+    if (!remaining) break;
+    if (remaining.length <= limit) {
+      chunks.push(remaining);
+      remaining = "";
+      break;
+    }
+    let cut = remaining.lastIndexOf(" ", limit);
+    if (cut < Math.floor(limit * 0.55)) cut = limit;
+    chunks.push(remaining.slice(0, cut).trim());
+    remaining = remaining.slice(cut).trim();
+  }
+  if (remaining && chunks.length) {
+    chunks[chunks.length - 1] = `${chunks[chunks.length - 1].slice(0, 29)}…`;
+  }
+  return chunks;
+}
+
+function dimensionFluencyStages(dimensions) {
+  return dimensions.map((row) => {
+    const score = clampScore(row.score);
+    const usesGenericBand = row.id !== "learning-capture";
+    return {
+      id: row.id,
+      name: taskLoopDimensionLabel(row.id),
+      score,
+      ...(usesGenericBand ? { status: stageStatus(score), blocker: score <= 20 } : {}),
+    };
+  });
+}
+
+function dimensionFluencyTooltip(row) {
+  const [title, ...rows] = splitFluencyTooltipReason(fluencyReason(row));
+  return {
+    title,
+    rows: rows.map((value) => ({ value })),
+  };
+}
+
+function severityTone(value) {
+  if (value === "Critical" || value === "High") return "danger";
+  if (value === "Medium") return "warning";
+  if (value === "Low") return "success";
+  return "neutral";
+}
+
+function severityRank(value) {
+  if (value === "Critical") return 0;
+  if (value === "High") return 1;
+  if (value === "Medium") return 2;
+  if (value === "Low") return 3;
+  return 4;
+}
+
+function dimensionLabel(id, dimensions) {
+  const match = dimensions.find((row) => row.id === id);
+  return match?.label ?? id.replace(/-/g, " ");
+}
+
+function aiAgentPractice() {
+  return report.summary?.aiAgentPractice ?? {};
+}
+
+function practiceRows() {
+  const rows = aiAgentPractice().coverageRows;
+  return Array.isArray(rows) ? rows : [];
+}
+
+function inspectedSurfaces() {
+  const surfaces = aiAgentPractice().inspectedSurfaces;
+  return Array.isArray(surfaces) ? surfaces : [];
+}
+
+function visiblePracticePaths(value) {
+  return list(value).map(textValue).filter((candidate) => candidate
+    && !candidate.includes("SharedClientCache/projects/")
+    && !candidate.startsWith("/")
+    && !/^[A-Za-z]:[\\/]/.test(candidate)
+    && !candidate.split(/[\\/]/).includes(".."));
+}
+
+function practiceDescription(surface) {
+  const descriptions = {
+    Rules: ["Standing project guidance and task-routing instructions.", "项目常驻指引与任务路由说明。"],
+    Skills: ["Reusable agent workflows available to the project.", "项目可用的可复用 Agent 工作流。"],
+    "Custom Agents": ["Specialized agent profiles available for delegated work.", "可用于委派工作的专用 Agent 配置。"],
+    Hooks: ["Lifecycle automation around agent and delivery events.", "围绕 Agent 与交付事件的生命周期自动化。"],
+    MCP: ["External tools and resources exposed through MCP.", "通过 MCP 暴露的外部工具与资源。"],
+    Commands: ["Named command entry points for repeatable agent work.", "可重复 Agent 工作的命令入口。"],
+    Workflows: ["Reusable multi-step project workflows.", "可复用的多步骤项目工作流。"],
+    Plugins: ["Installed packages that contribute agent capabilities.", "提供 Agent 能力的已安装插件。"],
+    "Session Insights": ["Task-session evidence available for report analysis.", "可用于报告分析的任务会话证据。"],
+    Memories: ["Representative project or global Memory note files.", "项目级或全局 Memory 的代表性笔记文件。"],
+  };
+  const copy = descriptions[surface] ?? ["Recorded agent capability sources.", "已记录的 Agent 能力来源。"];
+  return taskLoopCopy(copy[0], copy[1]);
+}
+
+function TaskLoopPracticePaths({ paths }) {
+  if (paths.length === 0) return null;
+  const preview = paths.slice(0, 2);
+  const remaining = paths.slice(2);
+  return (
+    <Stack gap={4}>
+      {preview.map((path, index) => (
+        <Text key={`${path}-${index}`} size="sm" tone="tertiary" truncate>{path}</Text>
+      ))}
+      {remaining.length ? (
+        <CollapsibleSection
+          size="sm"
+          defaultOpen={false}
+          title={(
+            <Text size="sm" weight="semibold">
+              {taskLoopCopy(`View ${remaining.length} more locations`, `查看其余 ${remaining.length} 个位置`)}
+            </Text>
+          )}
+          bodyStyle={{ padding: "4px 0 0 16px" }}
+          headerStyle={{ borderBottom: "none", minHeight: 24 }}
+        >
+          <Stack gap={4} style={{ maxHeight: 240, overflowY: "auto", paddingRight: 4 }}>
+            {remaining.map((path, index) => (
+              <Text key={`${path}-${index}`} size="sm" tone="tertiary" style={{ overflowWrap: "anywhere" }}>{path}</Text>
+            ))}
+          </Stack>
+        </CollapsibleSection>
+      ) : null}
+    </Stack>
+  );
+}
+
+function PracticeSourceCard({ row }) {
+  const paths = visiblePracticePaths(row.paths);
+  const scopes = list(row.scopes);
+  return (
+    <Card size="sm">
+      <CardHeader
+        title={(
+          <Row gap={7} align="center" style={{ minWidth: 0 }}>
+            <PracticeSurfaceIcon row={row} />
+            <Text weight="semibold" truncate>{row.surface ?? taskLoopCopy("Surface", "能力面")}</Text>
+          </Row>
+        )}
+        trailing={Number.isInteger(Number(row.count)) ? <Tag size="sm" tone="neutral">{row.count}</Tag> : undefined}
+      />
+      <CardBody style={{ height: "100%" }}>
+        <Stack gap={10} style={{ height: "100%" }}>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.5 }}>{practiceDescription(row.surface)}</Text>
+          {scopes.length || paths.length ? (
+            <Stack gap={6} style={{ marginTop: "auto" }}>
+              {scopes.length ? (
+                <Row gap={5} wrap>
+                  {scopes.map((scope) => <Tag key={scope} size="sm" tone="info">{scope}</Tag>)}
+                </Row>
+              ) : null}
+              {paths.length ? (
+                <Stack gap={4}>
+                  <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Sources", "来源")}</Text>
+                  <TaskLoopPracticePaths paths={paths} />
+                </Stack>
+              ) : null}
+            </Stack>
+          ) : null}
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function OpeningStrengths() {
+  const strengths = openingStrengths();
+  return (
+    <Callout tone="success" title="What is working">
+      <Stack gap={6}>
+        {strengths.map((strength, index) => (
+          <Text key={index} size="sm">{strength}</Text>
+        ))}
+      </Stack>
+    </Callout>
+  );
+}
+
+function DimensionSummary({ dimensions }) {
+  return (
+    <Stack gap={8}>
+      {dimensions.map((row) => {
+        const score = clampScore(row.score);
+        return (
+          <Card key={row.id} size="sm">
+            <CardHeader
+              title={<Text weight="semibold">{taskLoopDimensionLabel(row.id)}</Text>}
+              trailing={<Tag tone={scoreTone(score)}>{score}%</Tag>}
+            />
+            <CardBody>
+              <Stack gap={4}>
+                <Text size="sm" tone="secondary">{textValue(row.summary) || DIMENSION_SUMMARY_EXAMPLE}</Text>
+                {list(row.findingRefs).length ? (
+                  <Text size="sm" tone="secondary">Linked findings: {row.findingRefs.join(", ")}</Text>
+                ) : null}
+              </Stack>
+            </CardBody>
+          </Card>
+        );
+      })}
+    </Stack>
+  );
+}
+
+function FindingItem({ row, dimensions }) {
+  return (
+    <Card size="sm">
+      <CardHeader
+        title={<Text weight="semibold">{row.title ?? row.id}</Text>}
+        trailing={<Tag tone={severityTone(row.severity)}>{row.severity ?? "Unrated"}</Tag>}
+      />
+      <CardBody>
+        <Stack gap={8}>
+          <Row gap={8} align="center" wrap>
+            {list(row.dimensionRefs).slice(0, 1).map((ref) => (
+              <Tag key={ref} tone="neutral">{dimensionLabel(ref, dimensions)}</Tag>
+            ))}
+          </Row>
+          <Row gap={12} align="center" justify="end" wrap>
+            <SendToChatButton text={row.aiFixPrompt} options={{ submit: false }} disabled={!row.aiFixPrompt}>
+              AI Fix
+            </SendToChatButton>
+          </Row>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function PracticeCoverage() {
+  const rows = practiceRows();
+  const surfaces = inspectedSurfaces();
+
+  return (
+    <Stack gap={8}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <Text weight="semibold">AI Agent Practices</Text>
+        {surfaces.length ? <Tag tone="neutral">{surfaces.length} surfaces</Tag> : null}
+      </Row>
+      {rows.length ? (
+        <Grid columns={3} minColumnWidth={260} gap={10} align="stretch">
+          {rows.map((row, index) => <PracticeSourceCard key={row.surface ?? index} row={row} />)}
+        </Grid>
+      ) : <Text tone="secondary">No AI Agent practice rows recorded.</Text>}
+    </Stack>
+  );
+}
+
+function usesChineseReaderCopy() {
+  const locale = textValue(report.summary?.locale);
+  if (locale) return locale.toLowerCase().startsWith("zh");
+  const readerSample = [
+    ...list(report.summary?.strengths),
+    ...list(report.findings).slice(0, 3).flatMap((row) => [row?.title, row?.reason, row?.reader]),
+  ].map(textValue).join(" ");
+  return /[\u3400-\u9fff]/.test(readerSample);
+}
+
+function taskLoopCopy(english, chinese) {
+  return usesChineseReaderCopy() ? chinese : english;
+}
+
+function taskLoopDimensionLabel(id) {
+  if (!id) return taskLoopCopy("not observed", "未观察到");
+  return dimensionLabel(id, list(report.summary?.dimensions));
+}
+
+function learningStateLabel(value) {
+  const labels = {
+    "N/A": ["Needs a comparison", "需要比较"],
+    pending: ["Comparison planned", "已计划比较"],
+    improving: ["Improving", "正在改善"],
+    unchanged: ["No clear change", "没有明显变化"],
+    regressing: ["Worse — stop or revert", "变差——停止或回退"],
+    "outcome-supported": ["A later result supports it", "后续结果支持它"],
+  }[value];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : taskLoopCopy("Not observed", "未观察到");
+}
+
+function taskLoopSummary() {
+  return report.summary?.atAGlance ?? {};
+}
+
+function taskLoopUsageActivity() {
+  const activity = report.summary?.usageActivity;
+  return activity && list(activity.dates).length ? activity : null;
+}
+
+function taskLoopUsageEfficiency() {
+  const usage = report.summary?.usageEfficiency;
+  if (!usage || typeof usage !== "object" || Array.isArray(usage)) return null;
+  return usage.selection || usage.accounting || usage.longSessions || usage.modelUsage || usage.reviewLead
+    ? usage
+    : null;
+}
+
+function usageSeriesTotal(series) {
+  return list(series).reduce((sum, row) => sum + Number(row?.total ?? 0), 0);
+}
+
+function usageActivityMatrix(activity) {
+  const sourceDates = list(activity?.dates);
+  if (!sourceDates.length) return null;
+  const last = new Date(`${sourceDates.at(-1)}T00:00:00.000Z`);
+  const windowStart = new Date(last.getTime() - (364 * 86_400_000));
+  const start = new Date(windowStart);
+  start.setUTCDate(start.getUTCDate() - start.getUTCDay());
+  const weekCount = 53;
+  const columns = Array.from({ length: weekCount }, (_, index) => {
+    const date = new Date(start.getTime() + (index * 7 * 86_400_000));
+    const previous = index > 0 ? new Date(start.getTime() + ((index - 1) * 7 * 86_400_000)) : null;
+    if (!previous || previous.getUTCMonth() === date.getUTCMonth()) return "";
+    return usesChineseReaderCopy()
+      ? `${date.getUTCMonth() + 1}月`
+      : date.toLocaleDateString("en-US", { month: "short", timeZone: "UTC" });
+  });
+  const values = Array.from({ length: 7 }, () => Array(weekCount).fill(null));
+  for (let dayOffset = 0; dayOffset < 365; dayOffset += 1) {
+    const date = new Date(windowStart.getTime() + (dayOffset * 86_400_000));
+    const week = Math.floor((date.getTime() - start.getTime()) / (7 * 86_400_000));
+    const dateKey = date.toISOString().slice(0, 10);
+    values[date.getUTCDay()][week] = {
+      id: dateKey,
+      value: 0,
+      ariaLabel: taskLoopCopy(`${dateKey}: no observed activity`, `${dateKey}：未观察到活动`),
+    };
+  }
+  sourceDates.forEach((date, index) => {
+    const parsed = new Date(`${date}T00:00:00.000Z`);
+    const week = Math.floor((parsed.getTime() - start.getTime()) / (7 * 86_400_000));
+    if (week < 0 || week >= weekCount) return;
+    const active = Number(activity?.sessions?.activeMinutes?.[index] ?? 0);
+    values[parsed.getUTCDay()][week] = {
+      id: date,
+      value: active,
+      ariaLabel: taskLoopCopy(`${date}: ${formatActivityMinutes(active)}`, `${date}：${formatActivityMinutes(active)}`),
+    };
+  });
+  return { columns, values, start: windowStart.toISOString().slice(0, 10), end: sourceDates.at(-1) };
+}
+
+function usageChartWindow(activity) {
+  const dates = list(activity?.dates);
+  const offset = Math.max(0, dates.length - 30);
+  return { offset, categories: dates.slice(offset).map((date) => String(date).slice(5)) };
+}
+
+function visibleUsageSeries(series, offset, limit = 5) {
+  const rows = list(series);
+  const named = rows.filter((row) => row?.name !== "Other");
+  const primary = named.slice(0, limit).map((row) => ({ name: usageSeriesLabel(row.name), data: list(row.daily).slice(offset), total: Number(row.total ?? 0) }));
+  const remainder = [...named.slice(limit), ...rows.filter((row) => row?.name === "Other")];
+  if (remainder.length > 0) {
+    const length = primary[0]?.data.length ?? list(remainder[0]?.daily).slice(offset).length;
+    primary.push({
+      name: "Other",
+      total: remainder.reduce((sum, row) => sum + Number(row?.total ?? 0), 0),
+      data: Array.from({ length }, (_, index) => remainder.reduce((sum, row) => sum + Number(list(row?.daily).slice(offset)[index] ?? 0), 0)),
+    });
+  }
+  return primary;
+}
+
+function formatUsageNumber(value) {
+  return Math.round(Number(value ?? 0)).toLocaleString(usesChineseReaderCopy() ? "zh-CN" : "en-US");
+}
+
+function usageSeriesLabel(value) {
+  if (value === "Unknown model") return taskLoopCopy("Unattributed model", "未归属模型");
+  if (value === "Unknown Skill") return taskLoopCopy("Unattributed Skill", "未归属 Skill");
+  return value;
+}
+
+function formatActivityMinutes(value) {
+  const formatted = Number(value ?? 0).toLocaleString(usesChineseReaderCopy() ? "zh-CN" : "en-US", {
+    maximumFractionDigits: 1,
+  });
+  return `${formatted} ${taskLoopCopy("min", "分钟")}`;
+}
+
+function taskLoopCoverage() {
+  return taskLoopSummary().coverage ?? {};
+}
+
+function confidenceLabel(value) {
+  const normalized = textValue(value).toLowerCase();
+  const labels = {
+    high: ["High confidence", "高可信度"],
+    medium: ["Medium confidence", "中等可信度"],
+    low: ["Low confidence", "低可信度"],
+  }[normalized];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : taskLoopCopy("Confidence not recorded", "未记录可信度");
+}
+
+function confidenceTone(value) {
+  const normalized = textValue(value).toLowerCase();
+  if (normalized === "high") return "success";
+  if (normalized === "medium") return "warning";
+  return "neutral";
+}
+
+function taskLoopStateLabel(value) {
+  const labels = {
+    Wired: ["Wired", "机制已接入"],
+    Present: ["Present", "已发现机制"],
+    Unobserved: ["Unobserved", "未观察到"],
+    observed: ["Observed", "已观察到"],
+    "Not applicable": ["Not applicable", "暂不适用"],
+    "N/A": ["Needs a comparison", "需要比较"],
+  }[value];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : textValue(value) || "—";
+}
+
+function taskLoopSubdimensionLabel(id) {
+  for (const dimension of list(report.summary?.dimensions)) {
+    const match = list(dimension?.subdimensions).find((row) => row?.id === id);
+    if (match) return match.label ?? id;
+  }
+  return id;
+}
+
+function evidenceReferenceLabel(item) {
+  return textValue(item?.label) || textValue(item?.id) || taskLoopCopy("Unnamed evidence", "未命名证据");
+}
+
+function evidenceReferenceMeta(item) {
+  return [
+    textValue(item?.status),
+    textValue(item?.type),
+    Number.isFinite(Number(item?.line)) ? `${taskLoopCopy("line", "行")} ${item.line}` : "",
+  ].filter(Boolean).join(" · ");
+}
+
+function EvidenceReferenceList({ items }) {
+  return (
+    <Stack gap={7} style={{ maxHeight: 260, overflowY: "auto", paddingRight: 4 }}>
+      {items.map((item, index) => (
+        <Stack key={`${item?.group ?? item?.kind}-${item?.id ?? index}`} gap={3}>
+          <Row gap={6} align="center" wrap>
+            {item?.group ? <Tag size="sm" tone="neutral">{item.group}</Tag> : null}
+            {item?.kind ? <Tag size="sm" tone="info">{item.kind}</Tag> : null}
+            <Text size="sm" tone="secondary" style={{ overflowWrap: "anywhere" }}>{evidenceReferenceLabel(item)}</Text>
+          </Row>
+          {evidenceReferenceMeta(item) ? <Text size="sm" tone="tertiary">{evidenceReferenceMeta(item)}</Text> : null}
+        </Stack>
+      ))}
+    </Stack>
+  );
+}
+
+function severityLabel(value) {
+  const labels = {
+    Critical: ["Critical", "紧急"],
+    High: ["High", "高"],
+    Medium: ["Medium", "中"],
+    Low: ["Low", "低"],
+  }[value];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : value ?? "—";
+}
+
+function practiceSurfaceGlyph(surface) {
+  return ({ Rules: "R", Skills: "S", "Custom Agents": "A", Hooks: "H", MCP: "M" })[surface] ?? textValue(surface).slice(0, 1).toUpperCase() ?? "?";
+}
+
+function PracticeSurfaceIcon({ row }) {
+  return <Tag size="sm" tone="neutral">{practiceSurfaceGlyph(row?.surface)}</Tag>;
+}
+
+function TaskLoopReportHeader({ findings }) {
+  const sources = practiceRows().filter((row) => Number(row?.count) > 0);
+  const overview = textValue(report.summary?.overview);
+  return (
+    <Stack gap={8}>
+      <H1>{projectName()}</H1>
+      {overview ? <Text tone="secondary" style={{ ...taskLoopReaderCopyStyle, lineHeight: 1.5 }}>{overview}</Text> : null}
+      <Row gap={10} align="center" wrap>
+        <Text size="sm" tone="secondary">
+          {taskLoopCopy(`${findings.length} prioritized improvements`, `${findings.length} 项优先优化`)}
+        </Text>
+        {sources.length ? (
+          <Text size="sm" tone="secondary">
+            {taskLoopCopy(`${sources.length} practice source types`, `${sources.length} 类实践来源`)}
+          </Text>
+        ) : null}
+      </Row>
+    </Stack>
+  );
+}
+
+function TaskLoopFluency({ dimensions }) {
+  if (dimensions.length === 0) return null;
+  return (
+    <Stack gap={8}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <H2>{taskLoopCopy("Agent Work Loop", "Agent 工作流")}</H2>
+        <Text size="sm" tone="secondary">{dimensions.length} {taskLoopCopy("dimensions", "个维度")}</Text>
+      </Row>
+      <Stack style={{ maxHeight: 200, overflow: "hidden" }}>
+        <Fluency
+          projectName={projectName()}
+          stages={dimensionFluencyStages(dimensions)}
+          tooltip={(_stage, index) => dimensionFluencyTooltip(dimensions[index])}
+          height={180}
+          highThreshold={70}
+          mediumThreshold={40}
+          showStageLabels
+        />
+      </Stack>
+    </Stack>
+  );
+}
+
+function practiceCount(row) {
+  const value = Number(row?.count);
+  return Number.isInteger(value) ? value : "—";
+}
+
+function practiceScopeCell(row) {
+  const scopes = list(row?.scopes).map(textValue).filter(Boolean);
+  if (!scopes.length) return <Text size="sm" tone="tertiary">—</Text>;
+  return (
+    <Row gap={5} wrap>
+      {scopes.map((scope) => <Tag key={scope} size="sm" tone="info">{scope}</Tag>)}
+    </Row>
+  );
+}
+
+function practiceSourceCell(row) {
+  const [firstPath] = visiblePracticePaths(row?.paths);
+  return firstPath
+    ? <Text size="sm" tone="secondary" style={{ overflowWrap: "anywhere" }}>{firstPath}</Text>
+    : <Text size="sm" tone="tertiary">{taskLoopCopy("No source location recorded", "未记录来源位置")}</Text>;
+}
+
+function practiceSourceDetail(row) {
+  const remaining = visiblePracticePaths(row?.paths).slice(1);
+  if (!remaining.length) return null;
+  const pathListStyle = remaining.length > 8
+    ? { maxHeight: 220, overflowY: "auto", paddingRight: 4 }
+    : { paddingRight: 4 };
+  return (
+    <CollapsibleSection
+      size="sm"
+      defaultOpen={false}
+      title={(
+        <Text size="sm" weight="semibold">
+          {taskLoopCopy(`View ${remaining.length} more locations`, `查看其余 ${remaining.length} 个位置`)}
+        </Text>
+      )}
+      bodyStyle={{ padding: "6px 0 2px 16px" }}
+      headerStyle={{ borderBottom: "none", minHeight: 24 }}
+    >
+      <Stack gap={4} style={pathListStyle}>
+        {remaining.map((path, index) => (
+          <Text key={`${path}-${index}`} size="sm" tone="tertiary" style={{ overflowWrap: "anywhere" }}>{path}</Text>
+        ))}
+      </Stack>
+    </CollapsibleSection>
+  );
+}
+
+function taskLoopPracticeColumns() {
+  return [
+    {
+      key: "surface",
+      title: taskLoopCopy("Asset", "资产"),
+      minWidth: "300px",
+      render: (row) => (
+        <Stack gap={3}>
+          <Row gap={7} align="center">
+            <PracticeSurfaceIcon row={row} />
+            <Text size="sm" weight="semibold">{row.surface ?? taskLoopCopy("Surface", "能力面")}</Text>
+          </Row>
+          <Text size="sm" tone="secondary">{practiceDescription(row.surface)}</Text>
+        </Stack>
+      ),
+    },
+    {
+      key: "coverage",
+      title: taskLoopCopy("Coverage", "覆盖范围"),
+      width: "170px",
+      minWidth: "150px",
+      render: (row) => (
+        <Stack gap={4}>
+          <Text size="sm" weight="semibold">
+            {taskLoopCopy(`${practiceCount(row)} sources`, `${practiceCount(row)} 个来源`)}
+          </Text>
+          {practiceScopeCell(row)}
+        </Stack>
+      ),
+    },
+    {
+      key: "source",
+      title: taskLoopCopy("Representative source", "代表来源"),
+      minWidth: "260px",
+      render: practiceSourceCell,
+    },
+  ];
+}
+
+function TaskLoopPracticeTable({ rows = practiceRows() }) {
+  if (rows.length === 0) {
+    return <Text tone="secondary">{taskLoopCopy("No Agent assets recorded.", "未记录 Agent 工程资产。")}</Text>;
+  }
+  return (
+    <Table
+      columns={taskLoopPracticeColumns()}
+      rows={rows}
+      rowKey={(row) => row.surface ?? "surface"}
+      density="compact"
+      renderDetail={practiceSourceDetail}
+      emptyText={taskLoopCopy("No Agent asset coverage recorded", "未记录 Agent 工程资产覆盖")}
+    />
+  );
+}
+
+function TaskLoopActivityHeatmap({ activity }) {
+  const matrix = usageActivityMatrix(activity);
+  if (!matrix) return <Text tone="secondary">{taskLoopCopy("No dated session activity was observed.", "没有观察到带日期的会话活动。")}</Text>;
+  return (
+    <Stack gap={6}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <Text size="sm" weight="semibold">{taskLoopCopy("Daily activity (active minutes)", "每日活动（活跃分钟）")}</Text>
+        <Text size="sm" tone="tertiary">{matrix.start} — {matrix.end}</Text>
+      </Row>
+      <RiskHeatmap
+        rows={taskLoopCopy(["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], ["日", "一", "二", "三", "四", "五", "六"])}
+        columns={matrix.columns}
+        values={matrix.values}
+        variant="swatch"
+        showValues={false}
+        showLegend={false}
+        valueFormatter={(value) => formatActivityMinutes(value)}
+        cellSize={16}
+        columnWidth={16}
+        rowLabelWidth={34}
+        responsive
+        minCellSize={8}
+        minGap={2}
+        initialScrollPosition="end"
+        colorTemplate={{
+          none: { background: "rgba(127, 127, 127, 0.1)", border: "transparent" },
+          low: { background: "rgba(64, 166, 103, 0.22)", border: "transparent" },
+          medium: { background: "rgba(54, 158, 94, 0.42)", border: "transparent" },
+          high: { background: "rgba(38, 139, 78, 0.66)", border: "transparent" },
+          critical: { background: "rgba(24, 115, 63, 0.9)", border: "transparent" },
+        }}
+        maxHeight={190}
+        labels={{ ariaLabel: taskLoopCopy("Daily session activity", "每日会话活动") }}
+      />
+    </Stack>
+  );
+}
+
+function UsageStatRow({ label, value }) {
+  if (value === undefined || value === null || value === "") return null;
+  return (
+    <Row justify="space-between" align="start" gap={12} style={{ minWidth: 0 }}>
+      <Text size="sm" tone="secondary" style={{ flexShrink: 0 }}>{label}</Text>
+      <Text size="sm" weight="semibold" style={{ minWidth: 0, overflowWrap: "anywhere", textAlign: "right" }}>{value}</Text>
+    </Row>
+  );
+}
+
+function UsageRankList({ series, limit = 5 }) {
+  const rows = list(series).slice(0, limit);
+  if (!rows.length) return <Text size="sm" tone="secondary">{taskLoopCopy("No usage observed.", "未观察到用量。")}</Text>;
+  return (
+    <Stack gap={7}>
+      {rows.map((row, index) => (
+        <Row key={`${row.name}-${index}`} justify="space-between" align="center" gap={12}>
+          <Row gap={8} align="center" style={{ minWidth: 0 }}>
+            <Text size="sm" tone="tertiary" style={{ width: 18 }}>{index + 1}</Text>
+            <Text size="sm" truncate>{usageSeriesLabel(row.name)}</Text>
+          </Row>
+          <Text size="sm" tone="secondary">{formatUsageNumber(row.total)}</Text>
+        </Row>
+      ))}
+    </Stack>
+  );
+}
+
+function taskLoopModelUsageColumns() {
+  return [
+    {
+      key: "model",
+      title: taskLoopCopy("Model", "模型"),
+      minWidth: "180px",
+      render: (row) => <Text size="sm" weight="semibold">{usageSeriesLabel(row.model)}</Text>,
+    },
+    {
+      key: "responseCount",
+      title: taskLoopCopy("Responses", "响应数"),
+      width: "110px",
+      align: "right",
+      render: (row) => <Text size="sm">{formatUsageNumber(row.responseCount)}</Text>,
+    },
+    {
+      key: "usageFieldObservedCount",
+      title: taskLoopCopy("Usage fields observed", "观察到用量字段"),
+      minWidth: "160px",
+      align: "right",
+      render: (row) => <Text size="sm">{formatUsageNumber(row.usageFieldObservedCount)}</Text>,
+    },
+    {
+      key: "nonZeroUsageCount",
+      title: taskLoopCopy("Non-zero usage", "非零用量记录"),
+      minWidth: "140px",
+      align: "right",
+      render: (row) => <Text size="sm">{formatUsageNumber(row.nonZeroUsageCount)}</Text>,
+    },
+  ];
+}
+
+function TaskLoopModelUsageTable({ rows }) {
+  if (!rows.length) return null;
+  return (
+    <Stack gap={7}>
+      <Row justify="space-between" align="center" wrap gap={8}>
+        <Text weight="semibold">{taskLoopCopy("Model response accounting", "模型响应明细")}</Text>
+        <Tag tone="neutral">{rows.length} {taskLoopCopy("models", "个模型")}</Tag>
+      </Row>
+      <Text size="sm" tone="tertiary">
+        {taskLoopCopy(
+          "These are response counts, not model-active session counts or a quality comparison.",
+          "这里统计的是响应次数，不是模型活跃会话数，也不代表模型质量对比。",
+        )}
+      </Text>
+      <Table
+        columns={taskLoopModelUsageColumns()}
+        rows={rows}
+        rowKey={(row) => row.model}
+        density="compact"
+      />
+    </Stack>
+  );
+}
+
+function TaskLoopLongSessionReview({ usage }) {
+  const lead = usage?.reviewLead;
+  const samples = list(usage?.longSessions?.samples);
+  if (!lead || !samples.length) return null;
+  const estimate = usage.longSessions?.estimate;
+  const coverage = lead.sampleCoverage;
+  const pendingCount = coverage?.shown ?? samples.length;
+  const analyzedCount = usage.selection?.analyzedSessionCount ?? 0;
+  const longestActiveMinutes = usage.longSessions?.longestActiveMinutes ?? Math.max(...samples.map((sample) => Number(sample.activeMinutes ?? 0)));
+  return (
+    <Stack gap={14}>
+      <Row justify="space-between" align="start" wrap gap={12}>
+        <Stack gap={5} style={{ flex: "1 1 620px", minWidth: 0 }}>
+          <Row gap={8} align="center" wrap>
+            <H2 style={{ fontSize: 18, lineHeight: 1.35 }}>{taskLoopCopy(`${pendingCount} long sessions need review`, `${pendingCount} 个长会话待复核`)}</H2>
+            <Tag size="sm" tone="warning">{pendingCount} {taskLoopCopy("pending", "待复核")}</Tag>
+          </Row>
+          <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+            {taskLoopCopy(
+              `${pendingCount} of ${formatUsageNumber(analyzedCount)} analyzed sessions crossed the ${estimate?.activeThresholdMinutes ?? 45}-minute estimate threshold; the longest estimate is ${formatActivityMinutes(longestActiveMinutes)}. Treat them as investigation leads until reviewed.`,
+              `${formatUsageNumber(analyzedCount)} 个已分析会话中有 ${pendingCount} 个超过 ${estimate?.activeThresholdMinutes ?? 45} 分钟估算阈值，最长估算为 ${formatActivityMinutes(longestActiveMinutes)}。在人工复核前，只将其视为调查线索。`,
+            )}
+          </Text>
+        </Stack>
+        <SendToChatButton text={lead.aiFixPrompt} options={{ submit: false }}>
+          {taskLoopCopy(`Review ${pendingCount} sessions`, `复核 ${pendingCount} 个会话`)}
+        </SendToChatButton>
+      </Row>
+      <Stack gap={0}>
+        {samples.map((sample, index) => {
+          const failureCount = Number(sample.failureCount ?? 0);
+          const roleLabel = sample.role === "user-thread-candidate"
+            ? taskLoopCopy("Main-thread candidate", "主线程候选")
+            : sample.role === "child-agent-candidate"
+              ? taskLoopCopy("Child-Agent candidate", "子 Agent 候选")
+              : sample.role;
+          return (
+            <Stack key={sample.alias} gap={0}>
+              <Row justify="space-between" align="center" wrap gap={14} style={{ padding: "13px 0" }}>
+                <Row gap={12} align="start" style={{ flex: "1 1 540px", minWidth: 0 }}>
+                  <Tag size="sm" tone="neutral">{sample.alias}</Tag>
+                  <Stack gap={4} style={{ minWidth: 0 }}>
+                    <Text weight="semibold" style={{ lineHeight: 1.45 }}>
+                      {taskLoopCopy("Anonymized review candidate", "匿名复核候选")}
+                    </Text>
+                    <Text size="sm" tone="secondary">{taskLoopCopy("Role", "角色")}: {roleLabel}</Text>
+                  </Stack>
+                </Row>
+                <Stack gap={3} style={{ flex: "0 1 190px" }}>
+                  <Text size="sm" tone="tertiary">{taskLoopCopy("Estimated active time", "估算活跃时长")}</Text>
+                  <Text size="sm" weight="semibold">{formatActivityMinutes(sample.activeMinutes)}</Text>
+                </Stack>
+                <Tag size="sm" tone="warning">
+                  {formatUsageNumber(failureCount)} {taskLoopCopy("failures", "失败事件")}
+                </Tag>
+              </Row>
+              {index < samples.length - 1 ? <Divider style={{ margin: "1px 0" }} /> : null}
+            </Stack>
+          );
+        })}
+      </Stack>
+      {estimate ? (
+        <Text size="sm" tone="tertiary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            `Estimate boundary: event gaps are capped at ${estimate.gapCapMinutes} minutes and gaps over ${estimate.idleGapMinutes} minutes are treated as idle.`,
+            `估算边界：事件间隔最多计 ${estimate.gapCapMinutes} 分钟，超过 ${estimate.idleGapMinutes} 分钟按空闲处理。`,
+          )}
+        </Text>
+      ) : null}
+    </Stack>
+  );
+}
+
+function TaskLoopProjectUsage({ activity, usage }) {
+  if (!activity && !usage) return null;
+  const activeMinutes = list(activity?.sessions?.activeMinutes).reduce((sum, value) => sum + Number(value ?? 0), 0);
+  const census = usage?.selection;
+  const longSessions = usage?.longSessions;
+  const skillUses = usageSeriesTotal(activity?.skills);
+  const analyzedSessions = census
+    ? `${formatUsageNumber(census.analyzedSessionCount)} / ${formatUsageNumber(census.eligibleSessionCount)}`
+    : activity ? formatUsageNumber(activity.sessions?.total) : null;
+  return (
+    <Stack gap={12}>
+      {activity ? <TaskLoopActivityHeatmap activity={activity} /> : null}
+      {activity ? <Divider style={{ margin: "2px 0" }} /> : null}
+      <Grid columns="repeat(auto-fit, minmax(min(100%, 260px), 1fr))" gap={24} align="start">
+        <Stack gap={9}>
+          <Text weight="semibold">{taskLoopCopy("Activity insights", "使用概览")}</Text>
+          <UsageStatRow label={taskLoopCopy("Sessions analyzed", "已分析会话")} value={analyzedSessions} />
+          {activity ? <UsageStatRow label={taskLoopCopy("Estimated active minutes", "估算活跃分钟数")} value={formatUsageNumber(activeMinutes)} /> : null}
+          {activity ? <UsageStatRow label={taskLoopCopy("Skills used", "Skill 使用")} value={formatUsageNumber(skillUses)} /> : null}
+          {longSessions ? <UsageStatRow label={taskLoopCopy("Estimated active-long sessions", "估算活跃长会话")} value={formatUsageNumber(longSessions.activeCount)} /> : null}
+        </Stack>
+        <Stack gap={9}>
+          <Text weight="semibold">{taskLoopCopy("Most used Skills", "最常使用的 Skills")}</Text>
+          <UsageRankList series={activity?.skills} />
+        </Stack>
+      </Grid>
+    </Stack>
+  );
+}
+
+function TaskLoopUsageMethodology({ usage }) {
+  if (!usage) return null;
+  const census = usage.selection;
+  const accounting = usage.accounting;
+  const roles = usage.roles;
+  const outcomeReview = usage.outcomeReview;
+  const taskSelection = taskLoopCoverage().selection ?? {};
+  const modelUsage = list(usage.modelUsage);
+  const hasCoverage = census || Object.keys(taskSelection).length || roles || accounting;
+  if (!hasCoverage && !modelUsage.length && !usage.reviewLead) return null;
+
+  return (
+    <Stack gap={12}>
+      {census || Object.keys(taskSelection).length ? (
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopMeasurementBoundaryText(taskSelection, census)}
+        </Text>
+      ) : null}
+      {roles || accounting ? (
+        <Grid columns="repeat(auto-fit, minmax(min(100%, 240px), 1fr))" gap={20} align="start">
+          {roles ? (
+            <Stack gap={7}>
+              <Text size="sm" weight="semibold">{taskLoopCopy("Session composition", "会话构成")}</Text>
+              <UsageStatRow label={taskLoopCopy("User-thread candidates", "用户任务候选")} value={formatUsageNumber(roles.userThreadCandidateCount)} />
+              <UsageStatRow label={taskLoopCopy("Child-agent candidates", "子 Agent 候选")} value={formatUsageNumber(roles.childAgentCandidateCount)} />
+            </Stack>
+          ) : null}
+          {accounting ? (
+            <Stack gap={7}>
+              <Text size="sm" weight="semibold">{taskLoopCopy("Measurement coverage", "计量覆盖")}</Text>
+              <UsageStatRow label={taskLoopCopy("Responses", "响应数")} value={formatUsageNumber(accounting.responseCount)} />
+              <UsageStatRow label={taskLoopCopy("Model-attributed responses", "已归属模型响应")} value={formatUsageNumber(accounting.modelAttributedResponseCount)} />
+              <UsageStatRow label={taskLoopCopy("Usage fields observed", "观察到用量字段")} value={formatUsageNumber(accounting.usageFieldObservedCount)} />
+              <UsageStatRow label={taskLoopCopy("Non-zero usage records", "非零用量记录")} value={formatUsageNumber(accounting.nonZeroUsageCount)} />
+              <UsageStatRow label={taskLoopCopy("Exact credits available", "可精确计算 credit")} value={accounting.exactCreditsAvailable ? taskLoopCopy("Yes", "是") : taskLoopCopy("No", "否")} />
+            </Stack>
+          ) : null}
+        </Grid>
+      ) : null}
+      {modelUsage.length ? <TaskLoopModelUsageTable rows={modelUsage} /> : null}
+      <Text size="sm" tone="tertiary" style={taskLoopReaderCopyStyle}>
+        {accounting?.mode === "effort-proxy"
+          ? taskLoopCopy("Active time and model-session counts are effort proxies; exact token or credit savings are unavailable.", "活跃时间和模型会话数仅代表投入；目前无法精确计算 token 或 credit 节省。")
+          : taskLoopCopy("Usage totals describe observed activity, not counterfactual savings.", "用量只描述已观察活动，不代表反事实节省。")}
+        {outcomeReview && !outcomeReview.comparableModelOutcomeEvidence
+          ? taskLoopCopy(" Model outcomes need a controlled A/B before comparison.", " 模型效果需要通过受控 A/B 后才能比较。")
+          : ""}
+      </Text>
+    </Stack>
+  );
+}
+
+function usageTrendLeader(series) {
+  return series.reduce((leader, row) => Number(row.total ?? 0) > Number(leader?.total ?? -1) ? row : leader, null);
+}
+
+function usageTrendRange(categories) {
+  if (!categories.length) return taskLoopCopy("Latest observations", "最近观测");
+  if (categories.length === 1) return categories[0];
+  return `${categories[0]} – ${categories[categories.length - 1]}`;
+}
+
+function TaskLoopUsageTrend({ title, totalLabel, leaderDescription, series, categories }) {
+  if (!series.length) return null;
+  const total = series.reduce((sum, row) => sum + Number(row.total ?? 0), 0);
+  const leader = usageTrendLeader(series);
+  const range = usageTrendRange(categories);
+  return (
+    <Card size="sm">
+      <CardBody>
+        <Stack gap={14}>
+          <Stack gap={3}>
+            <Text weight="semibold" style={{ fontSize: 16, lineHeight: "24px" }}>{title}</Text>
+            <Text tone="secondary" style={{ lineHeight: 1.5 }}>
+              {taskLoopCopy(
+                `${range} · ${formatUsageNumber(total)} ${totalLabel}`,
+                `${range} · 共 ${formatUsageNumber(total)} ${totalLabel}`,
+              )}
+            </Text>
+          </Stack>
+          <AreaChart categories={categories} series={series} height={190} showYAxis legendPosition="bottom" />
+          {leader ? (
+            <Stack gap={2}>
+              <Text weight="semibold">{usageSeriesLabel(leader.name)} · {formatUsageNumber(leader.total)} {totalLabel}</Text>
+              <Text size="sm" tone="tertiary">{leaderDescription}</Text>
+            </Stack>
+          ) : null}
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopUsageTrends({ activity }) {
+  if (!activity) return null;
+  const chartWindow = usageChartWindow(activity);
+  const categories = chartWindow.categories;
+  const modelSeries = visibleUsageSeries(activity.models, chartWindow.offset);
+  const skillSeries = visibleUsageSeries(activity.skills, chartWindow.offset);
+  if (!modelSeries.length && !skillSeries.length) return null;
+  return (
+    <Stack gap={12}>
+      <H2>{taskLoopCopy("Usage trends", "用量趋势")}</H2>
+      <Grid columns="repeat(auto-fit, minmax(min(100%, 360px), 1fr))" gap={12} align="start">
+        <TaskLoopUsageTrend
+          title={taskLoopCopy("Model session trend", "模型会话趋势")}
+          totalLabel={taskLoopCopy("model-session observations", "个模型会话")}
+          leaderDescription={taskLoopCopy("Most observed model in this window", "当前时间窗口内记录最多的模型")}
+          series={modelSeries}
+          categories={categories}
+        />
+        <TaskLoopUsageTrend
+          title={taskLoopCopy("Skill use trend", "Skill 使用趋势")}
+          totalLabel={taskLoopCopy("observations", "次记录")}
+          leaderDescription={taskLoopCopy("Most observed Skill in this window", "当前时间窗口内记录次数最多的 Skill")}
+          series={skillSeries}
+          categories={categories}
+        />
+      </Grid>
+    </Stack>
+  );
+}
+
+function taskLoopSessionInsightTitle(id) {
+  const labels = {
+    "session-insight:source-coverage": ["Source coverage", "数据覆盖"],
+    "session-insight:validation-behavior": ["Validation behavior", "验证行为"],
+    "session-insight:post-edit-validation": ["Post-edit validation", "改动后验证"],
+    "session-insight:execution-friction": ["Execution friction", "执行摩擦"],
+    "session-insight:tool-mix": ["Tool mix", "工具使用"],
+    "session-insight:observed-hooks": ["Observed hooks", "Hook 执行"],
+    "session-insight:planning-workflow": ["Planning workflow", "规划工作流"],
+    "session-insight:session-complexity": ["Session complexity", "会话复杂度"],
+    "session-insight:session-usage-efficiency": ["Session effort", "会话投入"],
+  }[id];
+  return labels ? taskLoopCopy(labels[0], labels[1]) : id;
+}
+
+function taskLoopSessionInsightConfidence(row) {
+  return list(row?.labels).map(textValue).find((value) => ["High", "Medium", "Low"].includes(value)) ?? "";
+}
+
+function taskLoopSessionInsightColumns() {
+  return [
+    {
+      key: "id",
+      title: taskLoopCopy("Observation", "观察主题"),
+      minWidth: "150px",
+      render: (row) => <Text size="sm" weight="semibold">{taskLoopSessionInsightTitle(row.id)}</Text>,
+    },
+    {
+      key: "summary",
+      title: taskLoopCopy("What was observed", "观察说明"),
+      minWidth: "420px",
+      render: (row) => <Text size="sm" tone="secondary">{row.summary ?? "—"}</Text>,
+    },
+    {
+      key: "confidence",
+      title: taskLoopCopy("Confidence", "可信度"),
+      minWidth: "120px",
+      render: (row) => {
+        const confidence = taskLoopSessionInsightConfidence(row);
+        return confidence ? <Tag size="sm" tone={confidenceTone(confidence)}>{confidenceLabel(confidence)}</Tag> : <Text size="sm" tone="tertiary">—</Text>;
+      },
+    },
+    {
+      key: "evidenceRefs",
+      title: taskLoopCopy("Evidence", "证据"),
+      width: "80px",
+      align: "right",
+      render: (row) => <Text size="sm" weight="semibold">{list(row.evidenceRefs).length}</Text>,
+    },
+  ];
+}
+
+function taskLoopSessionInsightDetail(row) {
+  const evidenceRefs = list(row?.evidenceRefs);
+  return (
+    <CollapsibleSection
+      size="sm"
+      defaultOpen={false}
+      title={<Text size="sm" weight="semibold">{taskLoopCopy("View raw observation metadata", "查看原始观察元数据")}</Text>}
+      bodyStyle={{ padding: "6px 0 2px 16px" }}
+      headerStyle={{ borderBottom: "none", minHeight: 24 }}
+    >
+      <Stack gap={7}>
+        <Text size="sm" tone="tertiary">
+          {taskLoopCopy("Insight ID", "洞察 ID")}: {row.id} · {taskLoopCopy("Status", "状态")}: {row.status ?? "—"} · {taskLoopCopy("Kind", "类型")}: {row.kind ?? "—"} · {taskLoopCopy("Model", "模型版本")}: {row.modelVersion ?? "—"}
+        </Text>
+        {list(row.labels).length ? (
+          <Row gap={5} wrap>{row.labels.map((label) => <Tag key={label} size="sm" tone="neutral">{label}</Tag>)}</Row>
+        ) : null}
+        {evidenceRefs.length ? <EvidenceReferenceList items={evidenceRefs} /> : <Text size="sm" tone="tertiary">{taskLoopCopy("No raw evidence references recorded.", "未记录原始证据引用。")}</Text>}
+      </Stack>
+    </CollapsibleSection>
+  );
+}
+
+function taskLoopRepresentativeSessionInsights(entries) {
+  const preferredIds = [
+    "session-insight:post-edit-validation",
+    "session-insight:execution-friction",
+    "session-insight:tool-mix",
+  ];
+  const preferred = preferredIds
+    .map((id) => entries.find((entry) => entry?.id === id))
+    .filter((entry) => entry && list(entry.evidenceRefs).length > 0);
+  const remaining = entries
+    .filter((entry) => list(entry?.evidenceRefs).length > 0 && !preferred.includes(entry))
+    .sort((left, right) => list(right.evidenceRefs).length - list(left.evidenceRefs).length);
+  return [...preferred, ...remaining].slice(0, 3);
+}
+
+function TaskLoopSessionInsightsDialog({ entries }) {
+  return (
+    <Dialog
+      trigger={(
+        <Button variant="ghost">
+          {taskLoopCopy(`View all ${entries.length}`, `查看全部 ${entries.length} 条`)}
+        </Button>
+      )}
+      title={taskLoopCopy("All session observations", "全部会话观察")}
+      closeLabel={taskLoopCopy("Close", "关闭")}
+      maxWidth={1040}
+    >
+      <Stack gap={10}>
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            "These are candidate observations projected from session evidence. Read them as investigation leads, not confirmed user intent or outcome claims.",
+            "这些是从会话证据投影出的候选观察，用于指引后续调查，不等同于已确认的用户意图或结果结论。",
+          )}
+        </Text>
+        <Table
+          columns={taskLoopSessionInsightColumns()}
+          rows={entries}
+          rowKey={(row) => row.id}
+          density="compact"
+          renderDetail={taskLoopSessionInsightDetail}
+        />
+      </Stack>
+    </Dialog>
+  );
+}
+
+function TaskLoopSessionInsights() {
+  const entries = list(report.summary?.semanticFacets?.entries);
+  if (!entries.length) return null;
+  const representativeEntries = taskLoopRepresentativeSessionInsights(entries);
+  const rowTones = ["success", "warning", "info"];
+  return (
+    <Stack gap={10}>
+      <Row gap={8} align="center" wrap>
+        <H2 style={{ fontSize: 18, lineHeight: 1.35 }}>{taskLoopCopy("Session observations", "会话观察")}</H2>
+        <Tag size="sm" tone="neutral">{entries.length} {taskLoopCopy("observations", "条观察")}</Tag>
+      </Row>
+      <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+        {taskLoopCopy(
+          "Representative evidence-bearing observations for follow-up investigation and priority judgment.",
+          "按主题呈现的代表性观察，用于指引后续调查与优先级判断。",
+        )}
+      </Text>
+      <Grid columns={3} minColumnWidth={220} gap={8} align="stretch">
+        {representativeEntries.map((row, index) => {
+          const confidence = taskLoopSessionInsightConfidence(row);
+          const evidenceCount = list(row.evidenceRefs).length;
+          return (
+            <Card key={row.id} size="sm">
+              <CardBody style={{ padding: 12, height: 142 }}>
+                <Stack gap={8} style={{ height: "100%" }}>
+                  <Row gap={7} align="center" style={{ minWidth: 0 }}>
+                    <Tag size="sm" tone={rowTones[index]}>{index + 1}</Tag>
+                    <Text size="sm" weight="semibold" truncate>{taskLoopSessionInsightTitle(row.id)}</Text>
+                  </Row>
+                  <Text
+                    size="sm"
+                    tone="secondary"
+                    style={{
+                      display: "-webkit-box",
+                      WebkitLineClamp: 2,
+                      WebkitBoxOrient: "vertical",
+                      overflow: "hidden",
+                      lineHeight: 1.5,
+                    }}
+                  >
+                    {row.summary ?? "—"}
+                  </Text>
+                  <Row justify="space-between" align="center" wrap gap={6} style={{ marginTop: "auto" }}>
+                    {confidence ? <Tag size="sm" tone={confidenceTone(confidence)}>{confidenceLabel(confidence)}</Tag> : null}
+                    <Text size="sm" tone="tertiary">
+                      {evidenceCount} {taskLoopCopy(evidenceCount === 1 ? "evidence item" : "evidence items", "条证据")}
+                    </Text>
+                  </Row>
+                </Stack>
+              </CardBody>
+            </Card>
+          );
+        })}
+      </Grid>
+      <Row justify="flex-end">
+        <TaskLoopSessionInsightsDialog entries={entries} />
+      </Row>
+    </Stack>
+  );
+}
+
+function TaskLoopFindingDialog({ row }) {
+  const expectedOutput = list(row.expectedOutput).filter((item) => textValue(item));
+  const dimensionRefs = list(row.dimensionRefs);
+  return (
+    <Dialog
+      trigger={(
+        <Button variant="ghost">{taskLoopCopy("View details", "查看详情")}</Button>
+      )}
+      title={row.title ?? row.id}
+      closeLabel={taskLoopCopy("Close", "关闭")}
+      maxWidth={880}
+      footer={(
+        <Row justify="space-between" align="center" wrap gap={10}>
+          <SendToChatButton variant="secondary" text={row.aiFixPrompt} options={{ submit: false }} disabled={!row.aiFixPrompt}>
+            {taskLoopCopy("Plan AI Fix", "规划 AI 修复")}
+          </SendToChatButton>
+        </Row>
+      )}
+    >
+      <Stack gap={16}>
+        <Row gap={6} align="center" wrap>
+          <Tag size="sm" tone={severityTone(row.severity)}>{severityLabel(row.severity)}</Tag>
+          {dimensionRefs.map((dimensionRef) => (
+            <Tag key={dimensionRef} size="sm" tone="neutral">{taskLoopDimensionLabel(dimensionRef)}</Tag>
+          ))}
+        </Row>
+        <Stack gap={6} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Cause", "原因")}</Text>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>
+            {textValue(row.reason) || taskLoopCopy("No cause was recorded.", "未记录原因。")}
+          </Text>
+        </Stack>
+        <Divider style={{ margin: "2px 0" }} />
+        <Stack gap={8} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Expected Output", "预期结果")}</Text>
+          {expectedOutput.length ? expectedOutput.map((output, index) => (
+            <Row key={`${row.id}-dialog-output-${index}`} gap={8} align="start">
+              <Tag size="sm" tone="neutral">{index + 1}</Tag>
+              <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>{output}</Text>
+            </Row>
+          )) : (
+            <Text size="sm" tone="tertiary">{taskLoopCopy("No expected output was recorded.", "未记录预期结果。")}</Text>
+          )}
+        </Stack>
+      </Stack>
+    </Dialog>
+  );
+}
+
+function TaskLoopFindingCard({ row }) {
+  const [dimensionRef] = list(row.dimensionRefs);
+  return (
+    <Card size="sm">
+      <CardBody style={{ padding: 14, height: 190 }}>
+        <Stack gap={10} style={{ height: "100%" }}>
+          <Stack gap={7} style={{ minWidth: 0 }}>
+            <Row gap={6} align="center" wrap>
+              <Tag size="sm" tone={severityTone(row.severity)}>{severityLabel(row.severity)}</Tag>
+              {dimensionRef ? <Tag size="sm" tone="neutral">{taskLoopDimensionLabel(dimensionRef)}</Tag> : null}
+            </Row>
+            <Text
+              weight="semibold"
+              style={{
+                fontSize: 15,
+                lineHeight: "21px",
+                display: "-webkit-box",
+                WebkitLineClamp: 2,
+                WebkitBoxOrient: "vertical",
+                overflow: "hidden",
+              }}
+            >
+              {row.title ?? row.id}
+            </Text>
+            {textValue(row.reason) ? (
+              <Text
+                size="sm"
+                tone="secondary"
+                style={{
+                  ...taskLoopReaderCopyStyle,
+                  display: "-webkit-box",
+                  WebkitLineClamp: 2,
+                  WebkitBoxOrient: "vertical",
+                  overflow: "hidden",
+                  lineHeight: 1.5,
+                }}
+              >
+                {row.reason}
+              </Text>
+            ) : null}
+          </Stack>
+          <Stack gap={10} style={{ marginTop: "auto" }}>
+            <Divider style={{ margin: "2px 0" }} />
+            <Row justify="space-between" align="center" wrap gap={10}>
+              <SendToChatButton variant="secondary" text={row.aiFixPrompt} options={{ submit: false }} disabled={!row.aiFixPrompt}>
+                {taskLoopCopy("Plan AI Fix", "规划 AI 修复")}
+              </SendToChatButton>
+              <TaskLoopFindingDialog row={row} />
+            </Row>
+          </Stack>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopFindingCards({ findings }) {
+  return (
+    <Grid columns={3} minColumnWidth={300} gap={8} align="stretch">
+      {findings.map((row) => <TaskLoopFindingCard key={row.id} row={row} />)}
+    </Grid>
+  );
+}
+
+function taskLoopSuggestionKindLabel(kind) {
+  const labels = {
+    "try-existing": ["Try existing", "试用已有能力"],
+    "working-pattern": ["Working pattern", "有效模式"],
+    "loop-candidate": ["Loop candidate", "循环候选"],
+    horizon: ["Horizon", "中长期"],
+  }[kind] ?? ["Suggestion", "建议"];
+  return taskLoopCopy(labels[0], labels[1]);
+}
+
+function TaskLoopSuggestionDialog({ row }) {
+  const prerequisites = list(row.prerequisites).map(textValue).filter(Boolean);
+  const blockedBy = list(row.blockedBy).map(textValue).filter(Boolean);
+  return (
+    <Dialog
+      trigger={<Button variant="ghost">{taskLoopCopy("Review suggestion", "查看建议")}</Button>}
+      title={row.title ?? row.id}
+      closeLabel={taskLoopCopy("Close", "关闭")}
+      maxWidth={760}
+    >
+      <Stack gap={16}>
+        <Row gap={6} align="center" wrap>
+          <Tag size="sm" tone="info">{taskLoopSuggestionKindLabel(row.kind)}</Tag>
+          <Tag size="sm" tone={confidenceTone(row.confidence)}>{confidenceLabel(row.confidence)}</Tag>
+        </Row>
+        <Stack gap={6} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Why this is worth trying", "为什么值得尝试")}</Text>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>{row.reason}</Text>
+        </Stack>
+        <Divider style={{ margin: "2px 0" }} />
+        <Grid columns={2} minColumnWidth={240} gap={12}>
+          <Stack gap={5}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Owner", "负责人")}</Text>
+            <Text size="sm" tone="secondary">{row.owner}</Text>
+          </Stack>
+          <Stack gap={5}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Validation", "验证")}</Text>
+            <Text size="sm" tone="secondary">{row.validation}</Text>
+          </Stack>
+        </Grid>
+        <Stack gap={5} style={taskLoopReaderCopyStyle}>
+          <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Next step", "下一步")}</Text>
+          <Text size="sm" tone="secondary" style={{ lineHeight: 1.6 }}>{row.nextStep}</Text>
+        </Stack>
+        {prerequisites.length ? (
+          <Stack gap={6}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Prerequisites", "前置条件")}</Text>
+            {prerequisites.map((item, index) => (
+              <Row key={`${row.id}-prerequisite-${index}`} gap={8} align="start">
+                <Tag size="sm" tone="neutral">{index + 1}</Tag>
+                <Text size="sm" tone="secondary">{item}</Text>
+              </Row>
+            ))}
+          </Stack>
+        ) : null}
+        {blockedBy.length ? (
+          <Stack gap={6}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Blocked by", "阻塞项")}</Text>
+            {blockedBy.map((item, index) => (
+              <Row key={`${row.id}-blocker-${index}`} gap={8} align="start">
+                <Tag size="sm" tone="warning">{index + 1}</Tag>
+                <Text size="sm" tone="secondary">{item}</Text>
+              </Row>
+            ))}
+          </Stack>
+        ) : null}
+      </Stack>
+    </Dialog>
+  );
+}
+
+function TaskLoopSuggestionCard({ row }) {
+  return (
+    <Card size="sm">
+      <CardBody style={{ padding: 14, minHeight: 260, height: "100%" }}>
+        <Stack gap={9} style={{ height: "100%" }}>
+          <Row gap={6} align="center" wrap>
+            <Tag size="sm" tone="info">{taskLoopSuggestionKindLabel(row.kind)}</Tag>
+            <Tag size="sm" tone={confidenceTone(row.confidence)}>{confidenceLabel(row.confidence)}</Tag>
+          </Row>
+          <Text
+            weight="semibold"
+            style={{ fontSize: 15, lineHeight: "21px", display: "-webkit-box", WebkitLineClamp: 2, WebkitBoxOrient: "vertical", overflow: "hidden" }}
+          >
+            {row.title ?? row.id}
+          </Text>
+          <Text
+            size="sm"
+            tone="secondary"
+            style={{ display: "-webkit-box", WebkitLineClamp: 2, WebkitBoxOrient: "vertical", overflow: "hidden", lineHeight: 1.5 }}
+          >
+            {row.reason}
+          </Text>
+          <Stack gap={3} style={{ marginTop: "auto" }}>
+            <Text size="sm" weight="semibold" tone="tertiary">{taskLoopCopy("Next step", "下一步")}</Text>
+            <Text size="sm" tone="secondary" truncate>{row.nextStep}</Text>
+          </Stack>
+          <Divider style={{ margin: "2px 0" }} />
+          <Row justify="space-between" align="center" wrap gap={8}>
+            <Text size="sm" tone="tertiary" truncate>{row.owner}</Text>
+            <TaskLoopSuggestionDialog row={row} />
+          </Row>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopSuggestionCards({ suggestions }) {
+  return (
+    <Grid columns={3} minColumnWidth={280} gap={8} align="stretch">
+      {suggestions.map((row) => <TaskLoopSuggestionCard key={row.id} row={row} />)}
+    </Grid>
+  );
+}
+
+function taskLoopDeliveryOutcomeLabel(boundary) {
+  if (!boundary || !Object.hasOwn(boundary, "deliveryEvidenceLevels")) {
+    return taskLoopCopy("Not supplied", "未提供");
+  }
+  const levels = list(boundary?.deliveryEvidenceLevels).map(textValue).filter(Boolean);
+  if (!levels.length || levels.every((value) => ["none", "unobserved", "not-observed"].includes(value.toLowerCase()))) {
+    return taskLoopCopy("Not observed", "未观察到");
+  }
+  return levels.join(", ");
+}
+
+function taskLoopCoverageFraction(value, analyzedField, eligibleField) {
+  if (!value || !Object.hasOwn(value, analyzedField) || !Object.hasOwn(value, eligibleField)) return null;
+  const analyzed = Number(value[analyzedField]);
+  const eligible = Number(value[eligibleField]);
+  return Number.isInteger(analyzed) && analyzed >= 0 && Number.isInteger(eligible) && eligible >= 0
+    ? `${formatUsageNumber(analyzed)}/${formatUsageNumber(eligible)}`
+    : null;
+}
+
+function taskLoopMeasurementBoundaryText(selection, usageSelection) {
+  const sample = taskLoopCoverageFraction(selection, "analyzedCount", "eligibleCount");
+  const activity = taskLoopCoverageFraction(usageSelection, "analyzedSessionCount", "eligibleSessionCount");
+  if (sample && activity) {
+    return taskLoopCopy(
+      `Work-stage conclusions use ${sample} stratified sample sessions; activity accounting covers ${activity}. Use this evidence to locate review leads, not to prove efficiency or model quality.`,
+      `工作环节结论来自 ${sample} 个分层抽样会话；活动统计覆盖 ${activity}。当前证据可用于定位线索，不足以证明效率或模型质量。`,
+    );
+  }
+  if (sample) {
+    return taskLoopCopy(
+      `Work-stage conclusions use ${sample} stratified sample sessions. Activity and model accounting were not supplied, so no usage conclusion is available.`,
+      `工作环节结论来自 ${sample} 个分层抽样会话。未提供活动与模型统计，因此无法形成用量结论。`,
+    );
+  }
+  if (activity) {
+    return taskLoopCopy(
+      `Activity accounting covers ${activity}. Sampling provenance was not supplied, so usage is shown without a work-stage sampling conclusion.`,
+      `活动统计覆盖 ${activity}。未提供抽样来源，因此这里只展示用量，不形成工作环节抽样结论。`,
+    );
+  }
+  return taskLoopCopy(
+    "Session measurement context was not supplied, so no sampling, usage, or model conclusion is available.",
+    "未提供会话计量上下文，因此无法形成抽样、用量或模型结论。",
+  );
+}
+
+function taskLoopMeasurementModelLabel(usage, modelUsage) {
+  if (!usage) return taskLoopCopy("Usage unavailable", "用量不可用");
+  return `${modelUsage.length} ${taskLoopCopy("models", "个模型")}`;
+}
+
+function taskLoopSelectionDetailText(selection) {
+  const coverage = taskLoopCoverageFraction(selection, "analyzedCount", "eligibleCount");
+  if (!coverage) return taskLoopCopy("Not supplied", "未提供");
+  return taskLoopCopy(
+    `${textValue(selection.strategy) || "unknown"}; ${coverage} eligible sessions analyzed.`,
+    `${textValue(selection.strategy) || "未知"}；已分析 ${coverage} 个符合条件的会话。`,
+  );
+}
+
+function taskLoopTaskEvidenceText(coverage) {
+  const fields = ["episodeCount", "editedEpisodeCount", "closedEpisodeCount", "recoveredEpisodeCount"];
+  if (!fields.every((field) => Object.hasOwn(coverage, field))) return taskLoopCopy("Not supplied", "未提供");
+  const [episodes, edited, closed, recovered] = fields.map((field) => Number(coverage[field]));
+  if (![episodes, edited, closed, recovered].every((value) => Number.isInteger(value) && value >= 0)) {
+    return taskLoopCopy("Not supplied", "未提供");
+  }
+  return taskLoopCopy(
+    `${episodes} episodes; ${edited} with changes; ${closed} closed; ${recovered} repaired and passed.`,
+    `${episodes} 个任务片段；${edited} 个包含改动；${closed} 个已闭环；${recovered} 个修复并通过。`,
+  );
+}
+
+function taskLoopLearningDetailText(learning) {
+  if (!Object.hasOwn(learning, "state") && !Array.isArray(learning.interventions)) {
+    return taskLoopCopy("Not supplied", "未提供");
+  }
+  return taskLoopCopy(
+    `${learningStateLabel(learning.state)}; ${list(learning.interventions).length} declared intervention(s).`,
+    `${learningStateLabel(learning.state)}；${list(learning.interventions).length} 项已声明的改进。`,
+  );
+}
+
+function TaskLoopEvidenceFact({ label, value, tone = "neutral" }) {
+  return (
+    <Card size="sm">
+      <CardBody style={{ padding: "10px 12px" }}>
+        <Stack gap={6}>
+          <Text size="sm" tone="tertiary">{label}</Text>
+          <Row>
+            <Tag size="sm" tone={tone}>{value}</Tag>
+          </Row>
+        </Stack>
+      </CardBody>
+    </Card>
+  );
+}
+
+function TaskLoopEvidenceDetails({ usage, boundary, manifest, selection, learning, coverage }) {
+  const hasDetailedBoundary = Object.keys(boundary).length > 0
+    || Object.keys(coverage).length > 0
+    || Object.keys(learning).length > 0;
+  return (
+    <Stack gap={14}>
+      {hasDetailedBoundary ? (
+        <Stack gap={7} style={taskLoopReaderCopyStyle}>
+          <Text weight="semibold">{taskLoopCopy("Sampling and provenance", "抽样与来源")}</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Session selection", "会话抽样")}: {taskLoopSelectionDetailText(selection)}</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Task evidence", "任务证据")}: {taskLoopTaskEvidenceText(coverage)}</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Delivery outcomes", "交付结果")}: {taskLoopDeliveryOutcomeLabel(boundary)}.</Text>
+          <Text size="sm" tone="secondary">{taskLoopCopy("Learning comparison", "学习循环比较")}: {taskLoopLearningDetailText(learning)}</Text>
+          {textValue(learning.summary) ? <Text size="sm" tone="secondary">{learning.summary}</Text> : null}
+        </Stack>
+      ) : (
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            "This run did not supply task-episode or delivery-outcome evidence, so the report only shows repository signals it could verify.",
+            "本次运行没有提供任务片段或交付结果证据，因此报告只展示能够验证的仓库信号。",
+          )}
+        </Text>
+      )}
+      <Grid columns={3} minColumnWidth={260} gap={12} align="start">
+        <UsageStatRow label={taskLoopCopy("Evidence mode", "证据模式")} value={report.summary?.evidenceMode ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Platform", "平台")} value={manifest.platform ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Adapter version", "适配器版本")} value={manifest.adapterVersion ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Manifest schema", "清单版本")} value={manifest.schemaVersion ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Source fingerprint", "来源指纹")} value={manifest.sourceFingerprint ?? "—"} />
+        <UsageStatRow label={taskLoopCopy("Source gaps", "来源缺口")} value={Array.isArray(boundary.sourceGaps) ? boundary.sourceGaps.length : "—"} />
+      </Grid>
+      {usage ? (
+        <>
+          <Divider style={{ margin: "2px 0" }} />
+          <TaskLoopUsageMethodology usage={usage} />
+        </>
+      ) : null}
+    </Stack>
+  );
+}
+
+function TaskLoopEvidenceBoundary({ usage }) {
+  const boundary = report.summary?.evidenceBoundary ?? {};
+  const manifest = boundary.manifest ?? {};
+  const selection = manifest.selection ?? {};
+  const learning = report.summary?.learningCapture ?? {};
+  const coverage = taskLoopCoverage();
+  const modelUsage = list(usage?.modelUsage);
+  const longSessionSamples = list(usage?.longSessions?.samples);
+  const sessionInsights = list(report.summary?.semanticFacets?.entries);
+  const activitySelection = usage?.selection ?? {};
+  const samplingConfidence = textValue(selection.confidence)
+    || taskLoopCopy("Not supplied", "未提供");
+  const sourceGapValue = Array.isArray(boundary.sourceGaps) ? boundary.sourceGaps.length : "—";
+
+  return (
+    <Stack gap={12}>
+      <H2 style={{ fontSize: 20, lineHeight: 1.35 }}>{taskLoopCopy("Evidence and methodology", "证据与方法")}</H2>
+      <Callout
+        tone="warning"
+        style={{
+          background: "rgba(245, 158, 11, 0.06)",
+          border: "1px solid rgba(245, 158, 11, 0.28)",
+          borderRadius: 8,
+          padding: "10px 12px",
+        }}
+      >
+        <Text size="sm" style={{ lineHeight: 1.5 }}>
+          {taskLoopMeasurementBoundaryText(selection, activitySelection)}
+        </Text>
+      </Callout>
+      <Grid columns={3} minColumnWidth={180} gap={8} align="stretch">
+        <TaskLoopEvidenceFact label={taskLoopCopy("Sampling confidence", "抽样可信度")} value={samplingConfidence} tone={confidenceTone(selection.confidence)} />
+        <TaskLoopEvidenceFact label={taskLoopCopy("Source gaps", "来源缺口")} value={sourceGapValue} tone={Array.isArray(boundary.sourceGaps) && boundary.sourceGaps.length ? "warning" : "neutral"} />
+        <TaskLoopEvidenceFact label={taskLoopCopy("Delivery outcome", "交付结果")} value={taskLoopDeliveryOutcomeLabel(boundary)} />
+      </Grid>
+      {usage?.reviewLead && longSessionSamples.length ? (
+        <>
+          <Divider style={{ margin: "2px 0" }} />
+          <TaskLoopLongSessionReview usage={usage} />
+        </>
+      ) : null}
+      {sessionInsights.length ? (
+        <>
+          <Divider style={{ margin: "2px 0" }} />
+          <TaskLoopSessionInsights />
+        </>
+      ) : null}
+      <Divider style={{ margin: "2px 0" }} />
+      <CollapsibleSection
+        size="sm"
+        defaultOpen={false}
+        title={(
+          <Row gap={12} align="center" wrap>
+            <Text weight="semibold">{taskLoopCopy("View measurement and model details", "查看计量与模型明细")}</Text>
+            <Text size="sm" tone="secondary">
+              {taskLoopCopy("Response accounting, model detail, and sampling method", "响应计量、模型明细与抽样方法")}
+            </Text>
+          </Row>
+        )}
+        trailing={<Text size="sm" tone="secondary">{taskLoopMeasurementModelLabel(usage, modelUsage)}</Text>}
+        bodyStyle={{ padding: "12px 0 2px 16px" }}
+        headerStyle={{ minHeight: 44 }}
+      >
+        <TaskLoopEvidenceDetails
+          usage={usage}
+          boundary={boundary}
+          manifest={manifest}
+          selection={selection}
+          learning={learning}
+          coverage={coverage}
+        />
+      </CollapsibleSection>
+    </Stack>
+  );
+}
+
+function TaskLoopReport() {
+  const dimensions = list(report.summary?.dimensions);
+  const findings = list(report.findings).sort((left, right) => severityRank(left.severity) - severityRank(right.severity));
+  const suggestions = list(report.summary?.suggestions);
+  const activity = taskLoopUsageActivity();
+  const usage = taskLoopUsageEfficiency();
+  const highFindings = findings.filter((row) => row.severity === "Critical" || row.severity === "High");
+  const mediumFindings = findings.filter((row) => row.severity === "Medium");
+  return (
+    <Stack gap={24} style={taskLoopPageStyle}>
+      <TaskLoopReportHeader findings={findings} />
+
+      <TaskLoopFluency dimensions={dimensions} />
+
+      {activity || usage ? (
+        <Stack gap={8}>
+          <H2>{taskLoopCopy("Project usage", "项目用量")}</H2>
+          <TaskLoopProjectUsage activity={activity} usage={usage} />
+        </Stack>
+      ) : null}
+
+      <Stack gap={8}>
+        <Row justify="space-between" align="center" wrap gap={8}>
+          <H2>{taskLoopCopy("Prioritized improvements", "优先优化项")}</H2>
+          <Text size="sm" tone="secondary">
+            {taskLoopCopy(
+              `${findings.length} total · ${highFindings.length} high · ${mediumFindings.length} medium`,
+              `共 ${findings.length} 项 · ${highFindings.length} 个高优先级 · ${mediumFindings.length} 个中优先级`,
+            )}
+          </Text>
+        </Row>
+        <TaskLoopFindingCards findings={findings} />
+        {suggestions.length ? (
+          <>
+            <Divider style={{ margin: "8px 0 2px" }} />
+            <Row justify="space-between" align="center" wrap gap={8}>
+              <Stack gap={3}>
+                <Text weight="semibold">{taskLoopCopy("Suggestions", "建议")}</Text>
+                <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+                  {taskLoopCopy(
+                    "Evidence-bound capabilities and patterns worth trying next. Suggestions are advisory and do not include an AI Fix action.",
+                    "基于证据、值得下一步尝试的能力与模式。建议仅供参考，不包含 AI 修复动作。",
+                  )}
+                </Text>
+              </Stack>
+              <Tag size="sm" tone="neutral">{suggestions.length} {taskLoopCopy("suggestions", "条建议")}</Tag>
+            </Row>
+            <TaskLoopSuggestionCards suggestions={suggestions} />
+          </>
+        ) : null}
+      </Stack>
+
+      <Stack gap={8}>
+        <H2>{taskLoopCopy("Agent Customize", "Agent 自定义")}</H2>
+        <Text size="sm" tone="secondary" style={taskLoopReaderCopyStyle}>
+          {taskLoopCopy(
+            "Discovered sources, not a quality or maturity score.",
+            "这里只展示已发现来源，不代表质量或成熟度评分。",
+          )}
+        </Text>
+        <TaskLoopPracticeTable rows={practiceRows()} />
+      </Stack>
+
+      <TaskLoopUsageTrends activity={activity} />
+
+      <TaskLoopEvidenceBoundary usage={usage} />
+    </Stack>
+  );
+}
+
+export default function QoderHarnessReport() {
+  return <TaskLoopReport />;
+}
diff --git a/.trae/skills/refactoring-insight/SKILL.md b/.trae/skills/refactoring-insight/SKILL.md
index a7110d7..141d190 100644
--- a/.trae/skills/refactoring-insight/SKILL.md
+++ b/.trae/skills/refactoring-insight/SKILL.md
@@ -1,6 +1,14 @@
 ---
 name: "refactoring-insight"
-description: "Analyzes codebase for refactoring opportunities: large files, code duplication, god classes, naming inconsistencies, tight coupling, and missing abstractions. Invoke when user asks for refactoring insight/analysis or wants to improve code architecture."
+description: "Use when /refactoring-insight analyzes the codebase for refactoring opportunities including large files, code duplication, god classes, naming inconsistencies, tight coupling, and missing abstractions. Invoke when the user asks for refactoring insight, refactoring analysis, code quality analysis, architecture review, or wants to improve code architecture."
+trigger:
+  - "/refactoring-insight"
+  - "refactoring insight"
+  - "refactoring analysis"
+  - "code quality analysis"
+  - "architecture review"
+  - "code smells"
+  - "what needs refactoring"
 ---
 
 # Refactoring Insight
@@ -9,9 +17,13 @@ Deep codebase analysis skill that identifies structural problems and produces pr
 
 ## When to Invoke
 
-- User asks for "refactoring insight", "refactoring analysis", "code quality analysis", "architecture review"
-- User wants to understand what should be refactored in the codebase
-- User asks "where are the code smells?" or "what needs refactoring?"
+This Skill is triggered when the user:
+
+- Uses the slash command `/refactoring-insight`
+- Asks for "refactoring insight", "refactoring analysis", "code quality analysis", or "architecture review"
+- Asks "where are the code smells?" or "what needs refactoring?"
+- Wants to understand what should be refactored in the codebase
+- Requests a structural or architectural health check of the project
 
 ## Analysis Dimensions
 
@@ -80,6 +92,20 @@ Search for these specific duplication patterns:
 
 **Output**: List of misplaced files/classes with recommended new locations.
 
+## Output Validation
+
+Before delivering the report, verify ALL of the following:
+
+1. **Completeness**: All 6 analysis dimensions have been executed and have findings or an explicit "no issues found" statement.
+2. **Priority assignment**: Every finding has exactly one priority level (P0/P1/P2/P3) with justification matching the priority criteria.
+3. **File references**: Every finding includes at least one affected file path that exists in the codebase (verify via file lookup).
+4. **Line numbers**: Every file reference includes specific line numbers or ranges that point to the described problem.
+5. **Actionable recommendation**: Every finding includes a concrete recommended action (not just "fix this" — specify what to extract, rename, merge, or move).
+6. **Summary table**: The report begins with a summary table containing total metrics (file count analyzed, duplication instances, coupling violations, etc.).
+7. **No false positives**: Cross-check at least P0 and P1 findings by reading the referenced code to confirm the problem actually exists.
+
+If any validation check fails, correct the finding before including it in the final report.
+
 ## Output Format
 
 Produce a structured report with:
@@ -95,6 +121,44 @@ Produce a structured report with:
 - **P2**: Patterns duplicated 3-4 times; naming inconsistencies affecting readability; misplaced files
 - **P3**: Minor naming variations; single-instance duplications; organizational improvements
 
+## Verification
+
+After completing the analysis, run ALL of the following checks before delivering the report:
+
+1. **Dimension coverage**: Confirm all 6 analysis dimensions produced findings or an explicit "no issues found" statement. Count: exactly 6 dimension sections must appear in the output.
+2. **File existence**: For every file path referenced in a finding, verify the file exists via `Glob` or `Read`. Remove or correct any finding whose primary file path does not resolve.
+3. **Priority consistency**: Confirm every finding has exactly one priority (P0/P1/P2/P3) and that the priority matches the criteria in the Priority Criteria section (e.g., P0 requires 1000+ lines or 10+ duplications).
+4. **Line number accuracy**: For P0 and P1 findings, re-read the referenced code at the cited line numbers to confirm the described problem actually exists at that location.
+5. **Actionable check**: Every recommendation must specify a concrete action (extract to base class, rename X to Y, merge file A into file B, add interface I). Reject vague recommendations like "improve this" or "consider refactoring".
+6. **Summary metrics match**: The summary table totals must equal the actual count of findings per dimension. Cross-check: sum of duplication instances in summary = count of duplication findings, etc.
+
+If any check fails, correct the finding before including it. If correction is not possible, remove the finding and note the gap.
+
+## Routing
+
+### Stop Conditions
+
+- All 6 dimensions have been analyzed and the report passes all Verification checks.
+- The user explicitly stops the analysis early.
+- The target workspace contains fewer than 10 source files (report "codebase too small for meaningful analysis" with a brief summary instead of the full report).
+
+### After Completion
+
+1. **If P0 findings exist**: Recommend the user address P0 items first. Suggest invoking `/refactoring-insight` again after P0 fixes to re-evaluate.
+2. **If the user wants to act on findings**: For each accepted finding, the concrete recommendation already specifies the action (extract, rename, merge, move). Execute the action in a separate task — do not mix refactoring execution with this analysis Skill.
+3. **If no significant issues found (P2/P3 only)**: Report that the codebase structure is healthy. List P2/P3 items as optional improvements. No follow-up needed.
+4. **If the user requests deeper analysis on a specific dimension**: Re-invoke this Skill with a scoped target (e.g., "analyze only the Services/ directory for tight coupling"). Do not create a new Skill for scoped analysis.
+5. **Handoff to other Skills**: If findings reveal needs for other workflows, route as follows:
+   - Security concerns → `/security-scan`
+   - Test coverage gaps → suggest adding tests (not owned by this Skill)
+   - Architecture documentation gaps → update `docs/ARCHITECTURE.md` (not owned by this Skill)
+
+### Failure Boundary
+
+- This Skill is read-only analysis. It does not modify source code, create files, or change project configuration.
+- If the codebase is not a .NET/C# project, this Skill's project-specific context does not apply. Adapt dimension targets or report "not applicable".
+- If search tools return no results for a dimension, report "no data available" for that dimension rather than guessing.
+
 ## Project-Specific Context
 
 This skill is aware of the LanMountainDesktop project structure:
diff --git a/AGENTS.md b/AGENTS.md
index 441e85b..fb6a6d6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -16,19 +16,17 @@
 
 ## 2. 关键目录地图
 
-- `LanMountainDesktop/`: 主宿主应用，包含 UI、服务、组件系统、主题与插件运行时接入
-- `LanMountainDesktop/ComponentSystem/`: 内置组件定义、注册、扩展加载
-- `LanMountainDesktop/plugins/`: 宿主侧插件运行时、安装与 market 集成
-- `LanMountainDesktop/Views/` and `ViewModels/`: UI 页面、窗口与视图模型
-- `LanMountainDesktop/Services/`: 设置、遥测、启动、持久化、业务服务
-- `LanMountainDesktop.PluginSdk/`: 插件 SDK 公共接口和默认打包行为
-- `LanMountainDesktop.Platform.Abstractions/`: 平台差异层接口（跨平台契约，禁止平台专属 API）
-- `LanMountainDesktop.Platform.Windows/`: Windows 平台实现（P/Invoke、桌面层、点击穿透等）
-- `LanMountainDesktop.Platform.Android/`: Android 平台实现
-- `LanMountainDesktop.Mobile/`: 共享移动 UI 壳（组件面板）
-- `LanMountainDesktop.Mobile.Android/`: Android head（入口）
-- `LanMountainDesktop.Shared.Contracts/`: 宿主/插件共享契约
-- `LanMountainDesktop.Tests/`: 宿主与 SDK 测试
+- `desktop/LanMountainDesktop/`: 主宿主应用，包含 UI、服务、组件系统、主题与插件运行时接入
+- `desktop/LanMountainDesktop/ComponentSystem/`: 内置组件定义、注册、扩展加载
+- `desktop/LanMountainDesktop/plugins/`: 宿主侧插件运行时、安装与 market 集成
+- `desktop/LanMountainDesktop/Views/` and `ViewModels/`: UI 页面、窗口与视图模型
+- `desktop/LanMountainDesktop/Services/`: 设置、遥测、启动、持久化、业务服务
+- `airapp/LanMountainDesktop.PluginSdk/`: 插件 SDK 公共接口和默认打包行为（含 PluginIsolation、Host.Abstractions、Settings.Core、Appearance）
+- `platform/LanMountainDesktop.Platform/`: 平台差异层（接口 + Windows/macOS 实现）
+- `core/LanMountainDesktop.Core/`: 宿主/插件共享契约、IPC 基础设施与插件打包
+- `mobile/LanMountainDesktop.Mobile/`: 共享移动 UI 壳（组件面板）
+- `mobile/LanMountainDesktop.Mobile.Android/`: Android head（入口）
+- `tests/LanMountainDesktop.Tests/`: 宿主与 SDK 测试
 - `.trae/specs/`: feature 级规格、任务拆解和验收清单
 
 更详细映射看 `docs/ai/CODEBASE_MAP.md`。
@@ -38,7 +36,7 @@
 ```bash
 dotnet restore
 dotnet build LanMountainDesktop.slnx -c Debug
-dotnet run --project LanMountainDesktop/LanMountainDesktop.csproj
+dotnet run --project desktop/LanMountainDesktop/LanMountainDesktop.csproj
 dotnet test LanMountainDesktop.slnx -c Debug
 ```
 
@@ -76,15 +74,15 @@ dotnet test LanMountainDesktop.slnx -c Debug
 
 ### 插件
 
-- SDK 公共 API 以 `LanMountainDesktop.PluginSdk/` 为准
-- 共享契约以 `LanMountainDesktop.Shared.Contracts/` 为准
+- SDK 公共 API 以 `airapp/LanMountainDesktop.PluginSdk/` 为准
+- 共享契约以 `core/LanMountainDesktop.Core/` 为准
 - market 数据来源默认是兄弟仓库 `..\\LanAirApp`
 - 迁移或 breaking change 优先同步 `docs/PLUGIN_SDK_V5_MIGRATION.md`
 
 ### 设置与主题
 
-- 设置持久化和 scope 变化优先检查 `LanMountainDesktop.Settings.Core/`
-- 外观、圆角、主题资源优先检查 `LanMountainDesktop.Appearance/` 与专题规范
+- 设置持久化和 scope 变化优先检查 `airapp/LanMountainDesktop.PluginSdk/`（合并自 `LanMountainDesktop.Settings.Core`）
+- 外观、圆角、主题资源优先检查 `airapp/LanMountainDesktop.PluginSdk/`（合并自 `LanMountainDesktop.Appearance`）与专题规范
 - **圆角统一**：桌面组件（Widget）必须统一使用动态资源 `DesignCornerRadiusComponent`。严禁在组件根容器使用硬编码数值或非组件级令牌（如 `Xs`, `Md` 等），以确保全局圆角缩放设置能正确应用到所有组件。
 
 ## 6. 权威来源
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0521c14..74b953f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -16,9 +16,7 @@
     <PackageVersion Include="ClassIsland.Markdown.Avalonia" Version="12.0.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageVersion Include="dotnetCampus.Ipc" Version="2.0.0-alpha436" />
-    <PackageVersion Include="DotNetCampus.AvaloniaInkCanvas" Version="1.0.1" />
-    <PackageVersion Include="DotNetCampus.Logger" Version="1.3.1-alpha.3" />
-    <PackageVersion Include="DotNetCampus.Numerics.Geometry" Version="1.0.2-alpha.1" />
+    <PackageVersion Include="DotNetCampus.AvaloniaInkCanvas" Version="2.0.0" />
     <PackageVersion Include="Downloader" Version="5.9.4" />
     <PackageVersion Include="FluentAvaloniaUI" Version="3.0.1" />
     <PackageVersion Include="FluentIcons.Avalonia" Version="2.1.331" />
diff --git a/LanMountainDesktop.Appearance/LanMountainDesktop.Appearance.csproj b/LanMountainDesktop.Appearance/LanMountainDesktop.Appearance.csproj
deleted file mode 100644
index e202a92..0000000
--- a/LanMountainDesktop.Appearance/LanMountainDesktop.Appearance.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Shared.Contracts\LanMountainDesktop.Shared.Contracts.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Settings.Core\LanMountainDesktop.Settings.Core.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Host.Abstractions\LanMountainDesktop.Host.Abstractions.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.DesktopComponents.Runtime/LanMountainDesktop.DesktopComponents.Runtime.csproj b/LanMountainDesktop.DesktopComponents.Runtime/LanMountainDesktop.DesktopComponents.Runtime.csproj
deleted file mode 100644
index 14d25b6..0000000
--- a/LanMountainDesktop.DesktopComponents.Runtime/LanMountainDesktop.DesktopComponents.Runtime.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Shared.Contracts\LanMountainDesktop.Shared.Contracts.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Settings.Core\LanMountainDesktop.Settings.Core.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Appearance\LanMountainDesktop.Appearance.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Host.Abstractions\LanMountainDesktop.Host.Abstractions.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.DesktopHost/LanMountainDesktop.DesktopHost.csproj b/LanMountainDesktop.DesktopHost/LanMountainDesktop.DesktopHost.csproj
deleted file mode 100644
index 3de9b89..0000000
--- a/LanMountainDesktop.DesktopHost/LanMountainDesktop.DesktopHost.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Shared.Contracts\LanMountainDesktop.Shared.Contracts.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Settings.Core\LanMountainDesktop.Settings.Core.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Appearance\LanMountainDesktop.Appearance.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.DesktopComponents.Runtime\LanMountainDesktop.DesktopComponents.Runtime.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Host.Abstractions\LanMountainDesktop.Host.Abstractions.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.Host.Abstractions/LanMountainDesktop.Host.Abstractions.csproj b/LanMountainDesktop.Host.Abstractions/LanMountainDesktop.Host.Abstractions.csproj
deleted file mode 100644
index d88590a..0000000
--- a/LanMountainDesktop.Host.Abstractions/LanMountainDesktop.Host.Abstractions.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.Mobile/LanMountainDesktop.Mobile.csproj b/LanMountainDesktop.Mobile/LanMountainDesktop.Mobile.csproj
deleted file mode 100644
index 6daa19d..0000000
--- a/LanMountainDesktop.Mobile/LanMountainDesktop.Mobile.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.Shared.Contracts\LanMountainDesktop.Shared.Contracts.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Settings.Core\LanMountainDesktop.Settings.Core.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Appearance\LanMountainDesktop.Appearance.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.DesktopComponents.Runtime\LanMountainDesktop.DesktopComponents.Runtime.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="Avalonia.Themes.Fluent" />
-    <PackageReference Include="Avalonia.Fonts.Inter" />
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.Platform.Abstractions/LanMountainDesktop.Platform.Abstractions.csproj b/LanMountainDesktop.Platform.Abstractions/LanMountainDesktop.Platform.Abstractions.csproj
deleted file mode 100644
index 0a8d1e2..0000000
--- a/LanMountainDesktop.Platform.Abstractions/LanMountainDesktop.Platform.Abstractions.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.Platform.Android/LanMountainDesktop.Platform.Android.csproj b/LanMountainDesktop.Platform.Android/LanMountainDesktop.Platform.Android.csproj
deleted file mode 100644
index 04040b9..0000000
--- a/LanMountainDesktop.Platform.Android/LanMountainDesktop.Platform.Android.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0-android</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.Platform.Abstractions\LanMountainDesktop.Platform.Abstractions.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.Platform.MacOS/LanMountainDesktop.Platform.MacOS.csproj b/LanMountainDesktop.Platform.MacOS/LanMountainDesktop.Platform.MacOS.csproj
deleted file mode 100644
index 48063b7..0000000
--- a/LanMountainDesktop.Platform.MacOS/LanMountainDesktop.Platform.MacOS.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.Platform.Abstractions\LanMountainDesktop.Platform.Abstractions.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.PluginIsolation.Contracts/LanMountainDesktop.PluginIsolation.Contracts.csproj b/LanMountainDesktop.PluginIsolation.Contracts/LanMountainDesktop.PluginIsolation.Contracts.csproj
deleted file mode 100644
index 9f32f8f..0000000
--- a/LanMountainDesktop.PluginIsolation.Contracts/LanMountainDesktop.PluginIsolation.Contracts.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>5.0.0</Version>
-    <PackageId>LanMountainDesktop.PluginIsolation.Contracts</PackageId>
-    <IsPackable>true</IsPackable>
-    <Authors>LanMountainDesktop</Authors>
-    <Description>Transport-neutral IPC contracts for the LanMountainDesktop plugin isolation architecture.</Description>
-    <PackageTags>LanMountainDesktop;Plugin;IPC;Isolation;Contracts</PackageTags>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://github.com/wwiinnddyy/LanMountainDesktop</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
-    <Copyright>Copyright (c) LanMountainDesktop Contributors</Copyright>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.PluginIsolation.Contracts/README.md b/LanMountainDesktop.PluginIsolation.Contracts/README.md
deleted file mode 100644
index 9085ac1..0000000
--- a/LanMountainDesktop.PluginIsolation.Contracts/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# LanMountainDesktop.PluginIsolation.Contracts
-
-Transport-neutral DTOs, route constants, protocol versioning, and JSON serialization context for plugin process isolation.
-
-## Includes
-
-- route groups for session, lifecycle, settings, appearance, UI, heartbeat, log, and fault
-- explicit DTOs for routed request and notification payloads
-- source-generated `System.Text.Json` context for the IPC protocol
diff --git a/LanMountainDesktop.PluginIsolation.Ipc/LanMountainDesktop.PluginIsolation.Ipc.csproj b/LanMountainDesktop.PluginIsolation.Ipc/LanMountainDesktop.PluginIsolation.Ipc.csproj
deleted file mode 100644
index c3135cc..0000000
--- a/LanMountainDesktop.PluginIsolation.Ipc/LanMountainDesktop.PluginIsolation.Ipc.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>5.0.0</Version>
-    <PackageId>LanMountainDesktop.PluginIsolation.Ipc</PackageId>
-    <IsPackable>true</IsPackable>
-    <Authors>LanMountainDesktop</Authors>
-    <Description>ClassIsland-style IPC facade for LanMountainDesktop plugin process isolation, backed by dotnetCampus.Ipc.</Description>
-    <PackageTags>LanMountainDesktop;Plugin;IPC;Isolation;dotnetCampus.Ipc</PackageTags>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://github.com/wwiinnddyy/LanMountainDesktop</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
-    <Copyright>Copyright (c) LanMountainDesktop Contributors</Copyright>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="dotnetCampus.Ipc" />
-    <ProjectReference Include="..\LanMountainDesktop.PluginIsolation.Contracts\LanMountainDesktop.PluginIsolation.Contracts.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.PluginIsolation.Ipc/README.md b/LanMountainDesktop.PluginIsolation.Ipc/README.md
deleted file mode 100644
index 4c5318a..0000000
--- a/LanMountainDesktop.PluginIsolation.Ipc/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# LanMountainDesktop.PluginIsolation.Ipc
-
-ClassIsland-inspired IPC facade for LanMountainDesktop plugin isolation.
-
-## Includes
-
-- host and worker startup constants
-- centralized routed notification IDs
-- transport-neutral routed client and server wrappers
-- explicit dependency on `dotnetCampus.Ipc` for the eventual pipe transport binding
diff --git a/LanMountainDesktop.PluginPackaging/LanMountainDesktop.PluginPackaging.csproj b/LanMountainDesktop.PluginPackaging/LanMountainDesktop.PluginPackaging.csproj
deleted file mode 100644
index 6be9ed5..0000000
--- a/LanMountainDesktop.PluginPackaging/LanMountainDesktop.PluginPackaging.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Version>1.0.0</Version>
-    <RootNamespace>LanMountainDesktop.PluginPackaging</RootNamespace>
-  </PropertyGroup>
-
-</Project>
diff --git a/LanMountainDesktop.Settings.Core/LanMountainDesktop.Settings.Core.csproj b/LanMountainDesktop.Settings.Core/LanMountainDesktop.Settings.Core.csproj
deleted file mode 100644
index 05a9866..0000000
--- a/LanMountainDesktop.Settings.Core/LanMountainDesktop.Settings.Core.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
-    <ProjectReference Include="..\LanMountainDesktop.Shared.Contracts\LanMountainDesktop.Shared.Contracts.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.Shared.Contracts/LanMountainDesktop.Shared.Contracts.csproj b/LanMountainDesktop.Shared.Contracts/LanMountainDesktop.Shared.Contracts.csproj
deleted file mode 100644
index de5af00..0000000
--- a/LanMountainDesktop.Shared.Contracts/LanMountainDesktop.Shared.Contracts.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>5.0.0</Version>
-    <PackageId>LanMountainDesktop.Shared.Contracts</PackageId>
-    <IsPackable>true</IsPackable>
-    <Authors>LanMountainDesktop</Authors>
-    <Description>Shared contracts used by LanMountainDesktop host and plugins for cross-boundary communication.</Description>
-    <PackageTags>LanMountainDesktop;Plugin;SharedContracts;Avalonia</PackageTags>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://github.com/wwiinnddyy/LanMountainDesktop</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
-    <Copyright>Copyright (c) LanMountainDesktop Contributors</Copyright>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-</Project>
diff --git a/LanMountainDesktop.Shared.Contracts/README.md b/LanMountainDesktop.Shared.Contracts/README.md
deleted file mode 100644
index d2f94b3..0000000
--- a/LanMountainDesktop.Shared.Contracts/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# LanMountainDesktop.Shared.Contracts
-
-Shared contracts package for LanMountainDesktop host and plugin ecosystems.
-
-## Includes
-
-- cross-boundary records used by host/runtime and plugins
-- contract types intended for stable shared communication
-
-## Usage
-
-```xml
-<ItemGroup>
-  <PackageReference Include="LanMountainDesktop.Shared.Contracts" Version="1.0.0" />
-</ItemGroup>
-```
diff --git a/LanMountainDesktop.Shared.IPC/README.md b/LanMountainDesktop.Shared.IPC/README.md
deleted file mode 100644
index 5f6e101..0000000
--- a/LanMountainDesktop.Shared.IPC/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# LanMountainDesktop.Shared.IPC
-
-Public IPC abstractions and host/client helpers for LanMountainDesktop.
diff --git a/LanMountainDesktop.slnx b/LanMountainDesktop.slnx
index f607885..e1cdc40 100644
--- a/LanMountainDesktop.slnx
+++ b/LanMountainDesktop.slnx
@@ -1,25 +1,12 @@
 <Solution>
-  <Project Path="LanMountainDesktop.Platform.Abstractions/LanMountainDesktop.Platform.Abstractions.csproj" />
-  <Project Path="LanMountainDesktop.Platform.Windows/LanMountainDesktop.Platform.Windows.csproj" />
-  <Project Path="LanMountainDesktop.Platform.Android/LanMountainDesktop.Platform.Android.csproj" />
-  <Project Path="LanMountainDesktop.Platform.MacOS/LanMountainDesktop.Platform.MacOS.csproj" />
-  <Project Path="LanMountainDesktop.Host.Abstractions/LanMountainDesktop.Host.Abstractions.csproj" />
-  <Project Path="LanMountainDesktop.Shared.Contracts/LanMountainDesktop.Shared.Contracts.csproj" />
-  <Project Path="LanMountainDesktop.Shared.IPC/LanMountainDesktop.Shared.IPC.csproj" />
-  <Project Path="LanMountainDesktop.Settings.Core/LanMountainDesktop.Settings.Core.csproj" />
-  <Project Path="LanMountainDesktop.Appearance/LanMountainDesktop.Appearance.csproj" />
-  <Project Path="LanMountainDesktop.DesktopComponents.Runtime/LanMountainDesktop.DesktopComponents.Runtime.csproj" />
-  <Project Path="LanMountainDesktop.DesktopHost/LanMountainDesktop.DesktopHost.csproj" />
-  <Project Path="LanMountainDesktop.PluginIsolation.Contracts/LanMountainDesktop.PluginIsolation.Contracts.csproj" />
-  <Project Path="LanMountainDesktop.PluginIsolation.Ipc/LanMountainDesktop.PluginIsolation.Ipc.csproj" />
-  <Project Path="LanMountainDesktop.PluginPackaging/LanMountainDesktop.PluginPackaging.csproj" />
-  <Project Path="LanMountainDesktop.PluginSdk/LanMountainDesktop.PluginSdk.csproj" />
-  <Project Path="LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj" />
-  <Project Path="LanMountainDesktop.AirAppHost/LanMountainDesktop.AirAppHost.csproj" />
-  <Project Path="LanMountainDesktop.PluginTemplate/LanMountainDesktop.PluginTemplate.csproj" />
-  <Project Path="LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj" />
-  <Project Path="LanDesktopPLONDS.installer/LanDesktopPLONDS.installer.csproj" />
-  <Project Path="ThirdParty/DotNetCampus.InkCanvas/DotNetCampus.AvaloniaInkCanvas.Avalonia12.csproj" />
-  <Project Path="LanMountainDesktop/LanMountainDesktop.csproj" />
-  <Project Path="LanMountainDesktop.Tests/LanMountainDesktop.Tests.csproj" />
+  <Project Path="core/LanMountainDesktop.Core/LanMountainDesktop.Core.csproj" />
+  <Project Path="platform/LanMountainDesktop.Platform/LanMountainDesktop.Platform.csproj" />
+  <Project Path="airapp/LanMountainDesktop.PluginSdk/LanMountainDesktop.PluginSdk.csproj" />
+  <Project Path="airapp/LanMountainDesktop.AirAppRuntime/LanMountainDesktop.AirAppRuntime.csproj" />
+  <Project Path="airapp/LanMountainDesktop.AirAppHost/LanMountainDesktop.AirAppHost.csproj" />
+  <Project Path="airapp/LanMountainDesktop.PluginTemplate/LanMountainDesktop.PluginTemplate.csproj" />
+  <Project Path="desktop/LanMountainDesktop/LanMountainDesktop.csproj" />
+  <Project Path="desktop/LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj" />
+  <Project Path="install/LanDesktopPLONDS.installer/LanDesktopPLONDS.installer.csproj" />
+  <Project Path="tests/LanMountainDesktop.Tests/LanMountainDesktop.Tests.csproj" />
 </Solution>
diff --git a/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Core/Publishing/PlondsCommitDeltaBuilder.cs b/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Core/Publishing/PlondsCommitDeltaBuilder.cs
index 0293809..58f0d14 100644
--- a/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Core/Publishing/PlondsCommitDeltaBuilder.cs
+++ b/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Core/Publishing/PlondsCommitDeltaBuilder.cs
@@ -15,13 +15,10 @@ public sealed class PlondsCommitDeltaBuilder
 
     private static readonly Dictionary<string, string[]> SourceToArtifactMap = new(StringComparer.OrdinalIgnoreCase)
     {
-        ["LanMountainDesktop"] = ["LanMountainDesktop.dll", "LanMountainDesktop.exe"],
-        ["LanMountainDesktop.Launcher"] = ["LanMountainDesktop.Launcher.exe"],
-        ["LanMountainDesktop.Shared.Contracts"] = ["LanMountainDesktop.Shared.Contracts.dll"],
-        ["LanMountainDesktop.PluginSdk"] = ["LanMountainDesktop.PluginSdk.dll"],
-        ["LanMountainDesktop.Appearance"] = ["LanMountainDesktop.Appearance.dll"],
-        ["LanMountainDesktop.Settings.Core"] = ["LanMountainDesktop.Settings.Core.dll"],
-        ["LanMountainDesktop.ComponentSystem"] = ["LanMountainDesktop.ComponentSystem.dll"]
+        ["desktop/LanMountainDesktop"] = ["LanMountainDesktop.dll", "LanMountainDesktop.exe"],
+        ["desktop/LanMountainDesktop.Launcher"] = ["LanMountainDesktop.Launcher.exe"],
+        ["core/LanMountainDesktop.Core"] = ["LanMountainDesktop.Core.dll"],
+        ["airapp/LanMountainDesktop.PluginSdk"] = ["LanMountainDesktop.PluginSdk.dll"]
     };
 
     private static readonly string[] FallbackAllArtifacts =
@@ -29,11 +26,8 @@ public sealed class PlondsCommitDeltaBuilder
         "LanMountainDesktop.dll",
         "LanMountainDesktop.exe",
         "LanMountainDesktop.Launcher.exe",
-        "LanMountainDesktop.Shared.Contracts.dll",
-        "LanMountainDesktop.PluginSdk.dll",
-        "LanMountainDesktop.Appearance.dll",
-        "LanMountainDesktop.Settings.Core.dll",
-        "LanMountainDesktop.ComponentSystem.dll"
+        "LanMountainDesktop.Core.dll",
+        "LanMountainDesktop.PluginSdk.dll"
     ];
 
     public PlondsDeltaBuildResult Build(PlondsCommitDeltaBuildOptions options)
diff --git a/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Shared/PlondsConstants.cs b/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Shared/PlondsConstants.cs
index 7d110c3..0c17883 100644
--- a/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Shared/PlondsConstants.cs
+++ b/PenguinLogisticsOnlineNetworkDistributionSystem/src/Plonds.Shared/PlondsConstants.cs
@@ -35,12 +35,9 @@ public static class PlondsConstants
 
     public static readonly string[] DefaultSourceDirs =
     [
-        "LanMountainDesktop",
-        "LanMountainDesktop.Launcher",
-        "LanMountainDesktop.Shared.Contracts",
-        "LanMountainDesktop.PluginSdk",
-        "LanMountainDesktop.Appearance",
-        "LanMountainDesktop.Settings.Core",
-        "LanMountainDesktop.ComponentSystem"
+        "desktop/LanMountainDesktop",
+        "desktop/LanMountainDesktop.Launcher",
+        "core/LanMountainDesktop.Core",
+        "airapp/LanMountainDesktop.PluginSdk"
     ];
 }
diff --git a/README.md b/README.md
index a5414a0..430b9e4 100644
--- a/README.md
+++ b/README.md
@@ -96,21 +96,35 @@ dotnet new install LanMountainDesktop.PluginTemplate
 dotnet new lmd-plugin -n MyPlugin
 ```
 
-- **Plugin SDK**: `LanMountainDesktop.PluginSdk` (API 5.0.0)
-- **共享契约**: `LanMountainDesktop.Shared.Contracts`
+- **Plugin SDK**: `LanMountainDesktop.PluginSdk` (API 6.0.0)
+- **共享契约**: `LanMountainDesktop.Core`
 - **迁移指南**: [PLUGIN_SDK_V5_MIGRATION.md](docs/PLUGIN_SDK_V5_MIGRATION.md)
 
 ## 项目结构
 
 ```
 LanMountainDesktop/
-├── LanMountainDesktop/              # 桌面宿主应用
-├── LanMountainDesktop.Launcher/     # 启动器 (OOBE、Splash、版本管理、更新)
-├── LanMountainDesktop.PluginSdk/    # 官方插件 SDK
-├── LanMountainDesktop.Shared.Contracts/  # 宿主与插件共享契约
-├── LanMountainDesktop.Appearance/   # 主题与外观基础设施
-├── LanMountainDesktop.Settings.Core/# 设置持久化基础设施
-└── LanMountainDesktop.Tests/        # 测试项目
+├── core/                            # 共享基础：契约、IPC、插件打包
+│   └── LanMountainDesktop.Core/
+├── platform/                        # 平台差异层（接口 + Windows/macOS 实现）
+│   └── LanMountainDesktop.Platform/
+├── airappsdk/                       # AirApp 第三方 SDK 与工具
+│   └── LanMountainDesktop.AirAppSdk/ (+ AirAppDevServer / AirAppTemplate)
+├── airapp/                          # 插件 SDK 与 AirApp 运行时
+│   ├── LanMountainDesktop.PluginSdk/    # 官方插件 SDK
+│   ├── LanMountainDesktop.AirAppRuntime/
+│   ├── LanMountainDesktop.AirAppHost/
+│   └── LanMountainDesktop.PluginTemplate/
+├── desktop/                         # 桌面宿主
+│   ├── LanMountainDesktop/          # 桌面宿主应用
+│   └── LanMountainDesktop.Launcher/ # 启动器 (OOBE、Splash、版本管理、更新)
+├── mobile/                          # 移动端壳（不参与桌面构建）
+│   ├── LanMountainDesktop.Mobile/
+│   └── LanMountainDesktop.Mobile.Android/
+├── install/                         # 在线安装器
+│   └── LanDesktopPLONDS.installer/
+└── tests/                           # 测试项目
+    └── LanMountainDesktop.Tests/
 ```
 
 ## 生态边界
diff --git a/ThirdParty/DotNetCampus.InkCanvas/DotNetCampus.AvaloniaInkCanvas.Avalonia12.csproj b/ThirdParty/DotNetCampus.InkCanvas/DotNetCampus.AvaloniaInkCanvas.Avalonia12.csproj
deleted file mode 100644
index 1afe83c..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/DotNetCampus.AvaloniaInkCanvas.Avalonia12.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AssemblyName>DotNetCampus.AvaloniaInkCanvas</AssemblyName>
-    <RootNamespace>DotNetCampus.Inking</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <DefaultItemExcludes>$(DefaultItemExcludes);src/**/bin/**;src/**/obj/**</DefaultItemExcludes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="Avalonia.Skia" />
-    <PackageReference Include="DotNetCampus.Logger" />
-    <PackageReference Include="DotNetCampus.Numerics.Geometry" />
-    <PackageReference Include="SkiaSharp" />
-  </ItemGroup>
-</Project>
diff --git a/ThirdParty/DotNetCampus.InkCanvas/README.md b/ThirdParty/DotNetCampus.InkCanvas/README.md
deleted file mode 100644
index d5f5adc..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# DotNetCampus.InkCanvas Avalonia 12 Compatibility Fork
-
-This source is vendored from `dotnet-campus/DotNetCampus.InkCanvas` at commit
-`e4383cadc3ae206dd96f5b72ba889a007ebc44fa`, matching the
-`DotNetCampus.AvaloniaInkCanvas` 1.0.1 NuGet package previously used by the app.
-
-The local project keeps the assembly name `DotNetCampus.AvaloniaInkCanvas` so the
-host code can continue using the existing namespaces and APIs.
-
-Local compatibility changes:
-
-- Replace Avalonia 11 `Visual.VisualRoot` render scaling access with
-  `TopLevel.GetTopLevel(this)?.RenderScaling`.
-- Reference Avalonia 12 packages from a local project instead of the
-  Avalonia 11-targeted NuGet package.
-- Import the Avalonia 12 optional feature extension namespace for Skia custom
-  drawing operations.
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/API/InkCanvas.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/API/InkCanvas.cs
deleted file mode 100644
index 5b1a9b1..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/API/InkCanvas.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Layout;
-using Avalonia.Media;
-
-using DotNetCampus.Inking.Contexts;
-using DotNetCampus.Inking.Erasing;
-using DotNetCampus.Inking.Interactives;
-using DotNetCampus.Inking.Primitive;
-using DotNetCampus.Inking.Utils;
-
-namespace DotNetCampus.Inking;
-
-public class InkCanvas : Control
-{
-    public InkCanvas()
-    {
-        var avaloniaSkiaInkCanvas = new AvaloniaSkiaInkCanvas()
-        {
-            IsHitTestVisible = false
-        };
-        AddChild(avaloniaSkiaInkCanvas);
-        AvaloniaSkiaInkCanvas = avaloniaSkiaInkCanvas;
-        HorizontalAlignment = HorizontalAlignment.Stretch;
-        VerticalAlignment = VerticalAlignment.Stretch;
-    }
-
-    public InkCanvasEditingMode EditingMode
-    {
-        get => _editingMode;
-        set
-        {
-            if (IsDuringInput)
-            {
-                throw new InvalidOperationException($"EditingMode should not be switched during the input process.");
-            }
-
-            _editingMode = value;
-            EditingModeChanged?.Invoke(this, EventArgs.Empty);
-        }
-    }
-
-    public event EventHandler? EditingModeChanged;
-
-    public IReadOnlyList<SkiaStroke> Strokes => AvaloniaSkiaInkCanvas.StaticStrokeList;
-
-    private InkCanvasEditingMode _editingMode = InkCanvasEditingMode.Ink;
-
-    /// <summary>
-    /// 为 Avalonia 实现的基于 Skia 的 InkCanvas 笔迹画布
-    /// </summary>
-    public AvaloniaSkiaInkCanvas AvaloniaSkiaInkCanvas { get; }
-
-    private AvaloniaSkiaInkCanvasEraserMode EraserMode => AvaloniaSkiaInkCanvas.EraserMode;
-
-    /// <inheritdoc cref="AvaloniaSkiaInkCanvas.StrokeCollected"/>
-    public event EventHandler<AvaloniaSkiaInkCanvasStrokeCollectedEventArgs>? StrokeCollected
-    {
-        add => AvaloniaSkiaInkCanvas.StrokeCollected += value;
-        remove => AvaloniaSkiaInkCanvas.StrokeCollected -= value;
-    }
-
-    public event EventHandler<ErasingCompletedEventArgs>? StrokeErased
-    {
-        add => EraserMode.ErasingCompleted += value;
-        remove => EraserMode.ErasingCompleted -= value;
-    }
-
-    #region Input
-
-    protected override void OnPointerPressed(PointerPressedEventArgs e)
-    {
-        if (EditingMode == InkCanvasEditingMode.None)
-        {
-            return;
-        }
-
-        var args = ToArgs(e);
-        var wasDuringInput = IsDuringInput;
-        _inputDictionary[e.Pointer.Id] = new InputInfo(args.StylusPoint);
-        e.Pointer.Capture(this);
-
-        if (EditingMode == InkCanvasEditingMode.Ink)
-        {
-            if (!wasDuringInput)
-            {
-                AvaloniaSkiaInkCanvas.WritingStart();
-            }
-
-            AvaloniaSkiaInkCanvas.WritingDown(in args);
-        }
-        else if (EditingMode == InkCanvasEditingMode.EraseByPoint)
-        {
-            EraserMode.EraserDown(in args);
-        }
-
-        base.OnPointerPressed(e);
-    }
-
-    protected override void OnPointerMoved(PointerEventArgs e)
-    {
-        if (EditingMode == InkCanvasEditingMode.None)
-        {
-            return;
-        }
-
-        if (!_inputDictionary.TryGetValue(e.Pointer.Id, out var inputInfo))
-        {
-            // Mouse? Not pressed yet.
-            return;
-        }
-
-        var args = ToArgs(e, inputInfo);
-
-        if (EditingMode == InkCanvasEditingMode.Ink)
-        {
-            AvaloniaSkiaInkCanvas.WritingMove(in args);
-        }
-        else if (EditingMode == InkCanvasEditingMode.EraseByPoint)
-        {
-            EraserMode.EraserMove(in args);
-        }
-
-        inputInfo.LastStylusPoint = args.StylusPoint;
-        base.OnPointerMoved(e);
-    }
-
-    protected override void OnPointerReleased(PointerReleasedEventArgs e)
-    {
-        if (EditingMode == InkCanvasEditingMode.None)
-        {
-            return;
-        }
-
-        if (!_inputDictionary.Remove(e.Pointer.Id, out var inputInfo))
-        {
-            // Mouse? Not pressed yet.
-            return;
-        }
-
-        var args = ToArgs(e, inputInfo);
-        inputInfo.LastStylusPoint = args.StylusPoint;
-
-        if (EditingMode == InkCanvasEditingMode.Ink)
-        {
-            AvaloniaSkiaInkCanvas.WritingUp(in args);
-
-            if (!IsDuringInput)
-            {
-                AvaloniaSkiaInkCanvas.WritingCompleted();
-            }
-        }
-        else if (EditingMode == InkCanvasEditingMode.EraseByPoint)
-        {
-            EraserMode.EraserUp(in args);
-        }
-
-        e.Pointer.Capture(null);
-        base.OnPointerReleased(e);
-    }
-
-    protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
-    {
-        if (_inputDictionary.Remove(e.Pointer.Id, out var inputInfo))
-        {
-            var args = new InkingModeInputArgs(e.Pointer.Id, inputInfo.LastStylusPoint, 0);
-            if (EditingMode == InkCanvasEditingMode.Ink)
-            {
-                AvaloniaSkiaInkCanvas.WritingUp(in args);
-
-                if (!IsDuringInput)
-                {
-                    AvaloniaSkiaInkCanvas.WritingCompleted();
-                }
-            }
-            else if (EditingMode == InkCanvasEditingMode.EraseByPoint)
-            {
-                EraserMode.EraserUp(in args);
-            }
-        }
-
-        base.OnPointerCaptureLost(e);
-    }
-
-    class InputInfo
-    {
-        public InputInfo(InkStylusPoint lastStylusPoint)
-        {
-            LastStylusPoint = lastStylusPoint;
-        }
-
-        public InkStylusPoint LastStylusPoint { get; set; }
-    }
-
-    private readonly Dictionary<int /*Id*/, InputInfo> _inputDictionary = [];
-    private bool IsDuringInput => _inputDictionary.Count != 0;
-
-    private InkingModeInputArgs ToArgs(PointerEventArgs args, InputInfo? inputInfo = null)
-    {
-        PointerPoint currentPoint = args.GetCurrentPoint(AvaloniaSkiaInkCanvas);
-        InkStylusPoint? lastStylusPoint = inputInfo?.LastStylusPoint;
-
-        List<InkStylusPoint>? stylusPointList = null;
-        var intermediatePointList = args.GetIntermediatePoints(AvaloniaSkiaInkCanvas);
-        if (intermediatePointList.Count > 0)
-        {
-            var orderedIntermediatePointList = OrderIntermediatePoints(intermediatePointList, lastStylusPoint);
-            stylusPointList = new List<InkStylusPoint>(orderedIntermediatePointList.Count + 1);
-
-            foreach (var intermediatePoint in orderedIntermediatePointList)
-            {
-                var stylusPoint = ToInkStylusPoint(intermediatePoint, lastStylusPoint);
-                AddDistinctPoint(stylusPointList, stylusPoint);
-                lastStylusPoint = stylusPoint;
-            }
-        }
-
-        var inkStylusPoint = ToInkStylusPoint(currentPoint, lastStylusPoint);
-        if (stylusPointList is not null)
-        {
-            AddDistinctPoint(stylusPointList, inkStylusPoint);
-        }
-
-        return new InkingModeInputArgs(args.Pointer.Id, inkStylusPoint, args.Timestamp)
-        {
-            StylusPointList = stylusPointList is { Count: > 0 } ? stylusPointList : null,
-        };
-
-        InkStylusPoint ToInkStylusPoint(PointerPoint point, InkStylusPoint? previousPoint)
-        {
-            var pressure = EnsurePressure(point.Properties.Pressure, previousPoint);
-            var contactRect = point.Properties.ContactRect;
-            var width = contactRect.Width;
-            var height = contactRect.Height;
-
-            if (previousPoint is not null)
-            {
-                if (width == 0 && previousPoint.Value.Width is { } lastWidth)
-                {
-                    width = lastWidth;
-                }
-
-                if (height == 0 && previousPoint.Value.Height is { } lastHeight)
-                {
-                    height = lastHeight;
-                }
-            }
-
-            var stylusPoint = new InkStylusPoint(point.Position.ToPoint2D(), pressure)
-            {
-                Width = width != 0 ? width : null,
-                Height = height != 0 ? height : null,
-            };
-
-            return stylusPoint;
-        }
-
-        float EnsurePressure(float pressure, InkStylusPoint? previousPoint)
-        {
-            // 这是一个修复补丁。在 Linux X11 上，如果前后两个点的压力是相同的，则后点将不会报告压力，此时 Avalonia 上将使用默认压力值 0.5 来填充压力值
-            // 为了避免压力值抖动，将压力值修正为上一个点的压力值
-            const float defaultPressure = InkStylusPoint.DefaultPressure;
-            if (previousPoint is not null && (pressure == 0 || Math.Abs(pressure - defaultPressure) < 0.00001))
-            {
-                return previousPoint.Value.Pressure;
-            }
-
-            return pressure;
-        }
-    }
-
-    private static IReadOnlyList<PointerPoint> OrderIntermediatePoints(
-        IReadOnlyList<PointerPoint> intermediatePointList,
-        InkStylusPoint? previousPoint)
-    {
-        if (previousPoint is null || intermediatePointList.Count <= 1)
-        {
-            return intermediatePointList;
-        }
-
-        var firstDistance = GetDistanceSquared(previousPoint.Value, intermediatePointList[0]);
-        var lastDistance = GetDistanceSquared(previousPoint.Value, intermediatePointList[^1]);
-        if (lastDistance >= firstDistance)
-        {
-            return intermediatePointList;
-        }
-
-        var orderedList = intermediatePointList.ToList();
-        orderedList.Reverse();
-        return orderedList;
-    }
-
-    private static double GetDistanceSquared(InkStylusPoint point, PointerPoint pointerPoint)
-    {
-        var dx = point.X - pointerPoint.Position.X;
-        var dy = point.Y - pointerPoint.Position.Y;
-        return dx * dx + dy * dy;
-    }
-
-    private static void AddDistinctPoint(List<InkStylusPoint> pointList, InkStylusPoint point)
-    {
-        if (pointList.Count > 0 && AreSamePosition(pointList[^1], point))
-        {
-            return;
-        }
-
-        pointList.Add(point);
-    }
-
-    private static bool AreSamePosition(InkStylusPoint first, InkStylusPoint second)
-    {
-        const double tolerance = 0.001d;
-        return Math.Abs(first.X - second.X) < tolerance &&
-               Math.Abs(first.Y - second.Y) < tolerance;
-    }
-
-    #endregion
-
-    internal void AddChild(Control childControl)
-    {
-        LogicalChildren.Add(childControl);
-        VisualChildren.Add(childControl);
-    }
-
-    internal void RemoveChild(Control childControl)
-    {
-        LogicalChildren.Remove(childControl);
-        VisualChildren.Remove(childControl);
-    }
-
-    protected override Size MeasureCore(Size availableSize)
-    {
-        var width = availableSize.Width;
-        var height = availableSize.Height;
-
-        if (double.IsInfinity(width))
-        {
-            width = 0;
-        }
-
-        if (double.IsInfinity(height))
-        {
-            height = 0;
-        }
-
-        base.MeasureCore(availableSize);
-        return new Size(width, height);
-    }
-
-    protected override Size ArrangeOverride(Size finalSize)
-    {
-        var size = base.ArrangeOverride(finalSize);
-
-        return size;
-    }
-
-    public override void Render(DrawingContext context)
-    {
-        // to enable hit testing
-        context.DrawRectangle(Brushes.Transparent, null, new Rect(new Point(), Bounds.Size));
-    }
-
-
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/API/InkCanvasEditingMode.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/API/InkCanvasEditingMode.cs
deleted file mode 100644
index 2c04456..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/API/InkCanvasEditingMode.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace DotNetCampus.Inking;
-
-public enum InkCanvasEditingMode
-{
-    None = 0,
-    Ink = 1,
-    EraseByPoint = 5,
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Caching/InkBitmapCache.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Caching/InkBitmapCache.cs
deleted file mode 100644
index d0a3bc7..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Caching/InkBitmapCache.cs
+++ /dev/null
@@ -1,464 +0,0 @@
-using DotNetCampus.Inking.Contexts;
-using DotNetCampus.Logging;
-using DotNetCampus.Numerics;
-using DotNetCampus.Numerics.Geometry;
-
-using SkiaSharp;
-using System.Runtime.CompilerServices;
-using DotNetCampus.Inking.Utils;
-
-namespace DotNetCampus.Inking.Caching;
-
-/// <summary>
-/// 辅助绘制笔迹的位图缓存。
-/// </summary>
-internal sealed class InkBitmapCache : IDisposable
-{
-    private readonly object _lock = new();
-
-    private readonly AvaloniaSkiaInkCanvasSettings _settings;
-    private readonly int _uiThreadId;
-    private int _renderThreadId;
-    private bool _useCacheOnNextRender;
-    private InkBitmapCacheContext? _cacheContext;
-
-    /// <summary>
-    /// 笔迹缓存数据。
-    /// </summary>
-    /// <remarks>
-    /// isValid 由 UI 线程写入，渲染线程读取。<br/>
-    /// CachedData 由渲染线程写入，渲染线程读取。
-    /// </remarks>
-    private volatile ThreadSafeInkBitmapCachedData _threadSafeCachedData = new(false, null);
-
-    /// <summary>
-    /// 笔迹缓存上下文信息。
-    /// </summary>
-    /// <remarks>
-    /// 此字段由 UI 线程写入，由渲染线程读取。
-    /// </remarks>
-    private InkBitmapCacheContext? CacheContext
-    {
-        get => _cacheContext.VerifyOnRenderThread(_renderThreadId);
-        set => _cacheContext = value.VerifyOnUIThread(_uiThreadId);
-    }
-
-    /// <summary>
-    /// 将此值设置为 <see langword="true"/> 以在下次绘制时使用位图缓存；反之，设置为 <see langword="false"/> 将在下帧不使用位图缓存。
-    /// </summary>
-    /// <remarks>
-    /// 如果希望立即使用位图缓存，请在将此值设置为 <see langword="true"/> 后立即调用 <see cref="Avalonia.Visual.InvalidateVisual"/> 方法刷新渲染。
-    /// </remarks>
-    public bool UseCacheOnNextRender
-    {
-        get => _useCacheOnNextRender;
-        set
-        {
-            if (Equals(_useCacheOnNextRender, value))
-            {
-                return;
-            }
-
-            _useCacheOnNextRender = value.VerifyOnUIThread(_uiThreadId);
-            Log.Info($"[Ink][InkBitmapCache] 将在下一帧{(value ? "开启" : "关闭")}笔迹位图缓存。");
-            InvalidateCache();
-        }
-    }
-
-    /// <summary>
-    /// 创建 <see cref="InkBitmapCache"/> 的新实例。
-    /// </summary>
-    /// <param name="settings">包含位图缓存的设置。</param>
-    public InkBitmapCache(AvaloniaSkiaInkCanvasSettings settings)
-    {
-        _uiThreadId = Environment.CurrentManagedThreadId;
-        _settings = settings;
-    }
-
-    /// <summary>
-    /// 更新缓存所需的上下文信息，包括 DPI（画板到屏幕的缩放）和元素变换（元素到画板的变换矩阵）。
-    /// </summary>
-    /// <param name="dpi">画板相对于屏幕物理像素的缩放比例。</param>
-    /// <param name="visibleBounds">画板可见区域的边界（画板坐标系）。</param>
-    /// <param name="transformFromInkToRoot">笔迹变换到画板应使用的变换矩阵。</param>
-    public void UpdateCacheContext(double dpi, BoundingBox2D visibleBounds, SimilarityTransformation2D transformFromInkToRoot)
-    {
-        this.VerifyOnUIThread(_uiThreadId);
-        CacheContext = (dpi, visibleBounds, transformFromInkToRoot);
-        InvalidateCache();
-    }
-
-    public void Dispose() => InvalidateCache();
-
-    /// <summary>
-    /// 使缓存失效，如果下次绘制时缓存启用（<see cref="UseCacheOnNextRender"/> 为 <see langword="true"/>），则会重新生成缓存。
-    /// </summary>
-    /// <remarks>
-    /// 注意，虽然使用此方法可以使缓存失效，以便下次绘制时会使用缓存；但如果不调用 <see cref="UpdateCacheContext"/> 方法更新上下文信息，则生成的新缓存依旧会使用旧的信息。<br/>
-    /// 在此情况下，生成的新缓存图片在参数（清晰度、旋转方向、缩放等）上会跟旧缓存图片完全相同，只是新增和擦除的笔迹会在新的缓存图片上体现出来。<br/>
-    /// 如果你希望按照新的笔迹旋转方向、缩放等生成匹配此时应有清晰度的缓存图片，你应该调用 <see cref="UpdateCacheContext"/> 而不是本方法。那个方法本质上也会使缓存失效的。
-    /// </remarks>
-    internal void InvalidateCache()
-    {
-        this.VerifyOnUIThread(_uiThreadId);
-        lock (_lock)
-        {
-            var (_, data) = _threadSafeCachedData;
-            _threadSafeCachedData = new ThreadSafeInkBitmapCachedData(false, data);
-        }
-    }
-
-    /// <summary>
-    /// 以位图缓存的形式画出笔迹。
-    /// </summary>
-    /// <param name="paths">笔迹的路径。</param>
-    /// <param name="canvas">要绘制到的画布。</param>
-    /// <param name="skPaint">用于绘制的画笔。</param>
-    /// <exception cref="InvalidOperationException">在使用绘制的路径前，请先调用 <see cref="UpdateCacheContext"/> 方法。</exception>
-    internal void DrawBitmap(in ReadOnlySpan<SkiaStrokeDrawContext> paths, SKCanvas canvas, SKPaint skPaint)
-    {
-        _renderThreadId = Environment.CurrentManagedThreadId;
-
-        if (paths.Length is 0 || paths.HasNoPoints())
-        {
-            // 没有任何路径，不需要绘制。
-            // 所有的路径都没有点，无法被绘制。
-            return;
-        }
-
-        var context = CacheContext ?? throw new InvalidOperationException("在使用绘制的路径前，请先调用 UpdateCacheContext 方法。");
-
-        var threadSafeCachedData = _threadSafeCachedData;
-        var (isValid, cachedData) = threadSafeCachedData;
-        if (!isValid || cachedData is not { } data)
-        {
-            cachedData?.Dispose();
-            // 如果缓存已失效，则重新生成缓存。
-            data = CreateBitmapData(paths, skPaint, context, _settings);
-            lock (_lock)
-            {
-                _threadSafeCachedData = new ThreadSafeInkBitmapCachedData(true, data);
-            }
-        }
-
-        DrawBitmapData(canvas, context, data);
-    }
-
-    /// <summary>
-    /// 创建笔迹的位图缓存。
-    /// </summary>
-    /// <param name="paths">笔迹的路径。</param>
-    /// <param name="skPaint">用于绘制的画笔。</param>
-    /// <param name="context">缓存所用的上下文信息。</param>
-    /// <param name="settings">位图缓存的设置。</param>
-    /// <returns>缓存的位图数据。</returns>
-    private static InkBitmapCachedData CreateBitmapData(in ReadOnlySpan<SkiaStrokeDrawContext> paths, SKPaint skPaint, in InkBitmapCacheContext context, AvaloniaSkiaInkCanvasSettings settings)
-    {
-        // 将原始的笔迹数据（元素坐标系）转换为画板坐标系，并求取其边界。
-        var inkBounds = paths.GetTransformedBounds(context.TransformFromInkToRoot);
-        // 生成一个伪的可视区域，使其有画板区域的 41 倍大，以便生成全景笔迹图作为背景位图（将镂空前景位图）。放心最终不会有这么大的，一来会根据实际笔迹区域裁剪，二来会根据 settings.MaxBitmapCacheSize 限制位图大小。
-        var backVisibleBounds = context.VisibleBounds.Inflate(context.VisibleBounds.Width * 20, context.VisibleBounds.Height * 20);
-        // 生成一个真实的可视区域，使其在画板的周围扩大 100 个单位，以便生成高清前景位图。
-        var foreVisibleBounds = context.VisibleBounds.Inflate(100);
-
-        // 如果笔迹区域比可视区域小，那么全景笔迹图就是高清前景图。不再需要背景图了。
-        var isForeBitmapEnough = foreVisibleBounds.Contains(inkBounds);
-
-        // 创建低清背景位图，使其显示全景笔迹。
-        var backBitmap = isForeBitmapEnough
-            ? null
-            : CreateBitmapCore(paths, skPaint, context, settings, inkBounds, backVisibleBounds, foreVisibleBounds);
-
-        // 创建高清可见区域位图，使其高质量显示局部笔迹。
-        var foreBitmap = CreateBitmapCore(paths, skPaint, context, settings, inkBounds, foreVisibleBounds);
-
-        // 记录日志并返回数据。
-        var data = new InkBitmapCachedData(backBitmap, foreBitmap);
-        LogBitmapCached(data, inkBounds);
-        return data;
-    }
-
-    /// <summary>
-    /// 创建一张位图，使其显示笔迹的一部分。
-    /// </summary>
-    /// <param name="paths">要画的笔迹的路径。</param>
-    /// <param name="skPaint">用于绘制的画笔。</param>
-    /// <param name="context">位图缓存所用的上下文信息。</param>
-    /// <param name="settings">位图缓存的设置。</param>
-    /// <param name="inkBounds">所有笔迹的边界（画板坐标系）。</param>
-    /// <param name="visibleBounds">画板的可视区域（画板坐标系）。</param>
-    /// <param name="clipBounds">如果需要镂空一个区域，则传入此区域的边界（画板坐标系）。</param>
-    /// <returns>创建的位图数据。</returns>
-    /// <remarks>
-    /// 如果笔迹完全移出了可视区域，则不会创建位图，返回 <see langword="null"/>。<br/>
-    /// </remarks>
-    private static InkQualityBitmapData? CreateBitmapCore(
-        in ReadOnlySpan<SkiaStrokeDrawContext> paths, SKPaint skPaint,
-        in InkBitmapCacheContext context, AvaloniaSkiaInkCanvasSettings settings,
-        BoundingBox2D inkBounds, BoundingBox2D visibleBounds, BoundingBox2D? clipBounds = null)
-    {
-        // 笔迹和可视区域的交集。使用此交集可以避免笔迹区域没那么大时生成过大的位图。
-        var intersectedBounds = inkBounds.Intersect(visibleBounds);
-        if (clipBounds is { } cb1)
-        {
-            intersectedBounds = intersectedBounds.Exclude(cb1);
-        }
-        if (intersectedBounds.IsEmpty)
-        {
-            // 如果交集为空，则不需要绘制。
-            return null;
-        }
-        // 根据用户的设置，决定要显示多清晰的一张位图缓存。
-        var (bitmapWidth, bitmapHeight, scalingRootToBitmap, quality) =
-            CalculateBestBitmapScaling(intersectedBounds.Width, intersectedBounds.Height, context.DpiScaling, settings.MaxBitmapCacheSize);
-
-        // 创建位图。
-        var bitmap = new SKBitmap(bitmapWidth, bitmapHeight, SKColorType.Bgra8888, SKAlphaType.Premul);
-        using var canvas = new SKCanvas(bitmap);
-
-        // 将位图坐标系转换为笔迹坐标系，这样后面画笔迹时可以直接使用其数据。
-        canvas.Scale((float) scalingRootToBitmap, (float) scalingRootToBitmap);
-        canvas.Translate(-(float) intersectedBounds.MinX, -(float) intersectedBounds.MinY);
-        if (clipBounds is { } cb2)
-        {
-            // 如果有镂空需求，则镂空一个区域（画板坐标系）。
-            // 当我们期望用一个全景背景图和高清前景图拼接时，背景图就需要将前景图的区域镂空。
-            canvas.ClipRect(cb2, SKClipOperation.Difference);
-        }
-        var skMatrix = context.TransformFromInkToRoot.ToSkMatrix();
-        canvas.Concat(ref skMatrix);
-
-        // 使用笔迹坐标系绘制笔迹。
-        foreach (var c in paths)
-        {
-            skPaint.Color = c.Color;
-            canvas.DrawPath(c.Path, skPaint);
-        }
-
-        // 返回位图数据。
-        return new(bitmap, intersectedBounds, scalingRootToBitmap, quality);
-    }
-
-    /// <summary>
-    /// 画出参数 <paramref name="data"/> 中指定的多张缓存位图。
-    /// </summary>
-    /// <param name="canvas">要绘制到的画布。</param>
-    /// <param name="context">缓存所用的上下文信息。</param>
-    /// <param name="data">缓存的位图数据。</param>
-    private static void DrawBitmapData(SKCanvas canvas, in InkBitmapCacheContext context, in InkBitmapCachedData data)
-    {
-        // 绘制镂空的笔迹全景图。
-        if (data.BackBitmap is { } backBitmap)
-        {
-            DrawBitmapCore(canvas, in context, in backBitmap);
-        }
-
-        // 绘制高清的笔迹局部图。
-        if (data.ForeBitmap is { } foreBitmap)
-        {
-            DrawBitmapCore(canvas, in context, in foreBitmap);
-        }
-    }
-
-    /// <summary>
-    /// 画出参数 <paramref name="data"/> 中指定的单张缓存位图。
-    /// </summary>
-    /// <param name="canvas">要绘制到的画布。</param>
-    /// <param name="context">缓存所用的上下文信息。</param>
-    /// <param name="data">缓存的位图数据。</param>
-    private static void DrawBitmapCore(SKCanvas canvas, in InkBitmapCacheContext context, in InkQualityBitmapData data)
-    {
-        var numericMatrix = canvas.TotalMatrix.ToSimilarityTransformation();
-        var transform = SimilarityTransformation2D.Identity
-            .Scale(1 / data.ScalingRootToBitmap)
-            .Translate(new Vector2D(data.InkBounds.MinX, data.InkBounds.MinY))
-            .Apply(context.TransformFromInkToRoot.Inverse())
-            .Apply(numericMatrix);
-
-        canvas.Save();
-        canvas.SetMatrix(transform.ToSkMatrix());
-        try
-        {
-            using var paint = new SKPaint();
-            paint.IsAntialias = true;
-            var sampling = new SKSamplingOptions(SKCubicResampler.Mitchell);
-            canvas.DrawBitmap(data.Bitmap, 0, 0, sampling, paint);
-        }
-        finally
-        {
-            canvas.Restore();
-        }
-    }
-
-    /// <summary>
-    /// 计算最佳的位图缩放比例，以便在显示时不会产生过大的位图。
-    /// </summary>
-    /// <param name="inkWidth">笔迹在笔迹元素坐标系中的宽度。</param>
-    /// <param name="inkHeight">笔迹在笔迹元素坐标系中的高度。</param>
-    /// <param name="dpiScaling">画板到屏幕像素的缩放比例。</param>
-    /// <param name="maxBitmapPixelCount">缓存位图的最大像素数（避免过大导致性能问题）。</param>
-    /// <returns>
-    /// 在最佳缩放比例下的：<br/>
-    /// BitmapWidth：位图的宽度（像素）。<br/>
-    /// BitmapHeight：位图的高度（像素）。<br/>
-    /// Quality：位图的清晰度，即位图的像素数与最大像素数的比例的平方根。<br/>
-    /// ScalingInkToBitmap：笔迹/元素坐标系内的长度乘以此值，可以得到位图缓存中的像素长度。
-    /// </returns>
-    private static (int BitmapWidth, int BitmapHeight, double ScalingRootToBitmap, double Quality) CalculateBestBitmapScaling(
-        double inkWidth, double inkHeight, double dpiScaling, int maxBitmapPixelCount)
-    {
-        // 为防止计算溢出（当宽高足够大时），下面的像素数计算我们尽量使用 double 类型。
-        var desiredBitmapPixelWidth = (int) Math.Round(inkWidth * dpiScaling);
-        var desiredBitmapPixelHeight = (int) Math.Round(inkHeight * dpiScaling);
-        var totalBitmapPixelCount = desiredBitmapPixelWidth * (double) desiredBitmapPixelHeight;
-
-        // 如果原尺寸显示笔迹也不会产生太大的位图，则直接使用原尺寸。
-        if (totalBitmapPixelCount <= maxBitmapPixelCount)
-        {
-            return (desiredBitmapPixelWidth, desiredBitmapPixelHeight, dpiScaling, 1d);
-        }
-
-        // 如果原尺寸显示笔迹会产生过大的位图，则缩小位图，以更低清晰度来显示。
-        var quality = Math.Sqrt(maxBitmapPixelCount / totalBitmapPixelCount);
-        return (
-            (int) Math.Round(desiredBitmapPixelWidth * quality),
-            (int) Math.Round(desiredBitmapPixelHeight * quality),
-            dpiScaling * quality,
-            quality);
-    }
-
-    /// <summary>
-    /// 记录一条日志，表示笔迹位图缓存已更新。
-    /// </summary>
-    /// <param name="data"></param>
-    /// <param name="inkBounds"></param>
-    private static void LogBitmapCached(InkBitmapCachedData data, BoundingBox2D inkBounds) => Log.Info(data switch
-    {
-        ({ } bb, { } fb) =>
-            $"[Ink][InkBitmapCache] 笔迹位图缓存更新。笔迹 {inkBounds.Width}×{inkBounds.Height}，全景图 {bb.Bitmap.Width}×{bb.Bitmap.Height}（清晰度 {bb.Quality}），前景图 {fb.Bitmap.Width}×{fb.Bitmap.Height}（清晰度 {fb.Quality}）",
-        ({ } bb, null) =>
-            $"[Ink][InkBitmapCache] 笔迹位图缓存更新。笔迹 {inkBounds.Width}×{inkBounds.Height}，全景图 {bb.Bitmap.Width}×{bb.Bitmap.Height}（清晰度 {bb.Quality}）",
-        (null, { } fb) =>
-            $"[Ink][InkBitmapCache] 笔迹位图缓存更新。笔迹 {inkBounds.Width}×{inkBounds.Height}，前景图 {fb.Bitmap.Width}×{fb.Bitmap.Height}（清晰度 {fb.Quality}）",
-        _ =>
-            $"[Ink][InkBitmapCache] 笔迹位图缓存无需更新。笔迹 {inkBounds.Width}×{inkBounds.Height}，不在可视区域内。",
-    });
-
-    private record ThreadSafeInkBitmapCachedData(bool IsValid, InkBitmapCachedData? CachedData);
-}
-
-/// <summary>
-/// 包含一些用于 <see cref="InkBitmapCache"/> 的扩展方法。
-/// </summary>
-file static class Extensions
-{
-    internal static T VerifyOnUIThread<T>(this T field, int threadId, [CallerMemberName] string callerMemberName = "")
-    {
-        if (Environment.CurrentManagedThreadId != threadId)
-        {
-            throw new InvalidOperationException($"成员 {callerMemberName} 只能在 UI 线程访问。");
-        }
-        return field;
-    }
-
-    internal static T VerifyOnRenderThread<T>(this T field, int threadId, [CallerMemberName] string callerMemberName = "")
-    {
-        if (Environment.CurrentManagedThreadId != threadId)
-        {
-            throw new InvalidOperationException($"成员 {callerMemberName} 只能在渲染线程访问。");
-        }
-        return field;
-    }
-
-    internal static BoundingBox2D GetTransformedBounds(this in ReadOnlySpan<SkiaStrokeDrawContext> paths, SimilarityTransformation2D transform)
-    {
-        var bounds = paths[0].Path.GetTransformedBounds(transform);
-        for (var i = 1; i < paths.Length; i++)
-        {
-            var path = paths[i].Path;
-            if (path.Points.Length > 0)
-            {
-                bounds.Union(path.GetTransformedBounds(transform));
-            }
-        }
-        return BoundingBox2D.Create(bounds.Left, bounds.Top, bounds.Right, bounds.Bottom);
-    }
-
-    private static SKRect GetTransformedBounds(this SKPath path, SimilarityTransformation2D transform)
-    {
-        using var newPath = new SKPath(path);
-        newPath.Transform(transform.ToSkMatrix());
-        return newPath.Bounds;
-    }
-
-    internal static void ClipRect(this SKCanvas canvas, BoundingBox2D clipBounds, SKClipOperation operation = SKClipOperation.Intersect)
-    {
-        canvas.ClipRect(new SKRect(
-            (float) clipBounds.MinX,
-            (float) clipBounds.MinY,
-            (float) clipBounds.MaxX,
-            (float) clipBounds.MaxY
-        ), operation);
-    }
-
-    /// <summary>
-    /// 已知一个矩形边界，排除另一个矩形边界；返回排除后异形图形的边界。
-    /// </summary>
-    /// <param name="bounds">原始边界。</param>
-    /// <param name="excludeBounds">要排除掉的边界。</param>
-    /// <returns>排除后的边界。</returns>
-    internal static BoundingBox2D Exclude(this BoundingBox2D bounds, BoundingBox2D excludeBounds)
-    {
-        var includeTopLeft = excludeBounds.Contains(new Point2D(bounds.MinX, bounds.MinY));
-        var includeTopRight = excludeBounds.Contains(new Point2D(bounds.MaxX, bounds.MinY));
-        var includeBottomRight = excludeBounds.Contains(new Point2D(bounds.MaxX, bounds.MaxY));
-        var includeBottomLeft = excludeBounds.Contains(new Point2D(bounds.MinX, bounds.MaxY));
-
-        if (includeTopLeft && includeTopRight && includeBottomRight && includeBottomLeft)
-        {
-            return BoundingBox2D.Empty;
-        }
-
-        if (includeTopLeft && includeBottomLeft)
-        {
-            return BoundingBox2D.Create(excludeBounds.MaxX, bounds.MinY, bounds.MaxX, bounds.MaxY);
-        }
-
-        if (includeTopLeft && includeTopRight)
-        {
-            return BoundingBox2D.Create(bounds.MinX, excludeBounds.MaxY, bounds.MaxX, bounds.MaxY);
-        }
-
-        if (includeTopRight && includeBottomRight)
-        {
-            return BoundingBox2D.Create(bounds.MinX, bounds.MinY, excludeBounds.MinX, bounds.MaxY);
-        }
-
-        if (includeBottomRight && includeBottomLeft)
-        {
-            return BoundingBox2D.Create(bounds.MinX, bounds.MinY, bounds.MaxX, excludeBounds.MinY);
-        }
-
-        return bounds;
-    }
-
-    /// <summary>
-    /// 判断所有路径是否都没有点。（这种路径没有宽高，无法被绘制。）
-    /// </summary>
-    /// <param name="paths">要检查的路径。</param>
-    /// <returns>如果所有路径都没有点，则返回 <see langword="true"/>；否则返回 <see langword="false"/>。</returns>
-    public static bool HasNoPoints(this in ReadOnlySpan<SkiaStrokeDrawContext> paths)
-    {
-        var allZeroPoints = true;
-        for (var i = 0; i < paths.Length; i++)
-        {
-            var path = paths[i];
-            if (path.Path.Points.Length is not 0)
-            {
-                allZeroPoints = false;
-                break;
-            }
-        }
-        return allZeroPoints;
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Caching/InkBitmapCacheContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Caching/InkBitmapCacheContext.cs
deleted file mode 100644
index 58069f0..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Caching/InkBitmapCacheContext.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using DotNetCampus.Numerics.Geometry;
-
-using SkiaSharp;
-
-namespace DotNetCampus.Inking.Caching;
-
-/// <summary>
-/// 为 <see cref="InkBitmapCache"/> 的缓存提供上下文信息。
-/// </summary>
-/// <param name="DpiScaling">画板到屏幕像素的缩放量。</param>
-/// <param name="VisibleBounds">画板可见区域的边界</param>
-/// <param name="TransformFromInkToRoot">笔迹变换到画板（要求没有额外变换）的变换矩阵。</param>
-internal readonly record struct InkBitmapCacheContext(double DpiScaling, BoundingBox2D VisibleBounds, SimilarityTransformation2D TransformFromInkToRoot)
-{
-    public static implicit operator InkBitmapCacheContext((double ScalingFromRootToDevice, BoundingBox2D VisibleBounds, SimilarityTransformation2D TransformFromInkToRoot) tuple)
-        => new(tuple.ScalingFromRootToDevice, tuple.VisibleBounds, tuple.TransformFromInkToRoot);
-}
-
-/// <summary>
-/// 为 <see cref="InkBitmapCache"/> 的缓存提供数据。
-/// </summary>
-/// <param name="BackBitmap">低清背景位图，显示全景笔迹。（如果笔迹本身不大，则此全景笔迹位图是 <see langword="null"/>。）</param>
-/// <param name="ForeBitmap">高清可见区域位图，高质量显示局部笔迹。（如果笔迹本身不大，则此高清位图很有可能就是全景笔迹图。如果笔迹完全移出了可视区域，则此高清位图是 <see langword="null"/>。）</param>
-internal readonly record struct InkBitmapCachedData(InkQualityBitmapData? BackBitmap, InkQualityBitmapData? ForeBitmap) : IDisposable
-{
-    public void Dispose()
-    {
-        BackBitmap?.Dispose();
-        ForeBitmap?.Dispose();
-    }
-}
-
-/// <summary>
-/// 为 <see cref="InkBitmapCache"/> 的缓存提供数据。
-/// </summary>
-/// <param name="Bitmap">位图。</param>
-/// <param name="InkBounds">本次缓存的位图所使用的笔迹边界。</param>
-/// <param name="ScalingRootToBitmap">画板到位图的缩放量。</param>
-/// <param name="Quality">位图的清晰度，即位图的像素数与最大像素数的比例的平方根。</param>
-internal readonly record struct InkQualityBitmapData(SKBitmap Bitmap, BoundingBox2D InkBounds, double ScalingRootToBitmap, double Quality) : IDisposable
-{
-    public void Dispose()
-    {
-        Bitmap.Dispose();
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasContext.cs
deleted file mode 100644
index 8c525b1..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasContext.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DotNetCampus.Inking.Contexts;
-
-internal class AvaloniaSkiaInkCanvasContext
-{
-    private bool _isUsingBitmapCache;
-
-    /// <summary>
-    /// 获取可以由业务指定的笔迹设置。
-    /// </summary>
-    public AvaloniaSkiaInkCanvasSettings Settings { get; } = new();
-
-    /// <summary>
-    /// 如果指定为 <see langword="true"/>，则立即使用位图缓存替代真实的笔迹。<br/>
-    /// 否则，位图缓存将不会工作，而使用真实的笔迹渲染。
-    /// </summary>
-    /// <remarks>
-    /// 在合适的时机切换真实的笔迹和位图缓存，可能可以提高性能。<br/>
-    /// 例如，在书写时，使用真实的笔迹可以提高书写性能；在漫游时，使用位图缓存可以提高漫游性能。
-    /// </remarks>
-    public bool ShouldUseBitmapCache => Settings.IsBitmapCacheEnabled && _isUsingBitmapCache;
-
-    /// <summary>
-    /// 指定是否立即使用位图缓存替代真实的笔迹，或是使用真实的笔迹渲染。
-    /// </summary>
-    /// <param name="useBitmapCache">
-    /// 指定为 <see langword="true"/>，则立即使用位图缓存替代真实的笔迹；<br/>
-    /// 指定为 <see langword="false"/>，则位图缓存将不会工作，而使用真实的笔迹渲染。
-    /// </param>
-    /// <remarks>
-    /// 注意，使用此方法和修改用户设置方法 <see cref="AvaloniaSkiaInkCanvasSettings.IsBitmapCacheEnabled"/> 的本质不同为：
-    /// <list type="number">
-    /// <item>此方法决定在不同的程序状态下是否应使用位图缓存，例如书写时不应开启缓存，而漫游时应该开启缓存；</item>
-    /// <item>而修改用户设置则是一个开关选项，仅决定在上述合适的状态下是否应使用位图缓存。当遇到不合适的程序状态时位图缓存依然不会生效。</item>
-    /// </list>
-    /// 所以，正确的做法是：
-    /// <list type="bullet">
-    /// <item>应用开发者在应用程序初始化时设置用户设置 <see cref="AvaloniaSkiaInkCanvasSettings.IsBitmapCacheEnabled"/>；</item>
-    /// <item>框架开发者在实现位图缓存时，在适当的时机开启和关闭位图缓存，例如书写时关闭，漫游时开启。</item>
-    /// </list>
-    /// </remarks>
-    public void UseBitmapCache(bool useBitmapCache)
-    {
-        _isUsingBitmapCache = useBitmapCache;
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasSettings.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasSettings.cs
deleted file mode 100644
index 3e40525..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasSettings.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using Avalonia;
-using DotNetCampus.Inking.Erasing;
-using DotNetCampus.Inking.StrokeRenderers;
-using SkiaSharp;
-
-namespace DotNetCampus.Inking.Contexts;
-
-/// <summary>
-/// 笔迹画布设置
-/// </summary>
-public class AvaloniaSkiaInkCanvasSettings
-{
-    /// <summary>
-    /// 笔迹粗细。
-    /// </summary>
-    public float InkThickness { get; set; } = DefaultInkThickness;
-
-    /// <summary>
-    /// 默认的笔迹粗细
-    /// </summary>
-    public static float DefaultInkThickness => 10;
-
-    /// <summary>
-    /// 笔迹颜色。
-    /// </summary>
-    public SKColor InkColor { get; set; } = DefaultInkColor;
-
-    public static SKColor DefaultInkColor => SKColors.Red;
-
-    /// <summary>
-    /// 橡皮擦尺寸，可以在业务层，在手势橡皮擦过程中更改
-    /// </summary>
-    public Size EraserSize { get; set; } = DefaultEraserSize;
-
-    /// <summary>
-    /// 默认的橡皮擦尺寸
-    /// </summary>
-    public static Size DefaultEraserSize => new Size(48,
-        72);
-
-    /// <summary>
-    /// 橡皮擦界面的创建器，默认为空使用默认的橡皮擦界面创建器
-    /// </summary>
-    public IEraserViewCreator? EraserViewCreator { get; set; }
-
-    /// <summary>
-    /// 将触摸尺寸当成橡皮擦尺寸，即橡皮擦大小不完全跟随 <see cref="EraserSize"/> 尺寸，而是会根据 <see cref="DotNetCampus.Inking.Primitive.InkStylusPoint"/> 的触摸大小决定
-    /// </summary>
-    public bool EnableStylusSizeAsEraserSize { get; set; } = true;
-
-    /// <summary>
-    /// 橡皮擦是否可以一直按照触摸尺寸修改橡皮擦尺寸。属于演示效果较好，实际使用效果差。仅当 <see cref="EnableStylusSizeAsEraserSize"/> 为 true 时此属性才有效。为 false 时，将在超过 <see cref="EraserCanResizeDuringTimeSpan"/> 时间，设置为最后的触摸面积固定大小，即只允许在开始擦的时候根据触摸面积修改大小，之后将固定大小
-    /// </summary>
-    public bool CanEraserAlwaysFollowsTouchSize { set; get; } = false;
-
-    /// <summary>
-    /// 是否允许使用位图缓存在合适的时候替代真实的笔迹以提升部分场景下的笔迹性能。
-    /// </summary>
-    /// <remarks>
-    /// 如果指定为 <see langword="true"/>，则书写模块会在合适的时机切换真实的笔迹和位图缓存，可能可以提高性能。<br/>
-    /// 如果指定为 <see langword="false"/>，则位图缓存将不会工作，将一直使用真实的笔迹渲染。
-    /// </remarks>
-    public bool IsBitmapCacheEnabled { get; set; } = true;
-
-    /// <summary>
-    /// 橡皮擦可以根据触摸面积尺寸修改橡皮擦大小的时间。如果 <see cref="CanEraserAlwaysFollowsTouchSize"/> 为 true 则此属性无效。仅当 <see cref="EnableStylusSizeAsEraserSize"/> 为 true 时此属性才有效
-    /// </summary>
-    public TimeSpan EraserCanResizeDuringTimeSpan { set; get; } = TimeSpan.FromMilliseconds(600);
-
-    /// <summary>
-    /// 是否锁定最小橡皮擦尺寸，即要求橡皮擦尺寸最小为 <see cref="MinEraserSize"/> 大小
-    /// </summary>
-    public bool LockMinEraserSize { init; get; } = true;
-
-    /// <summary>
-    /// 最小橡皮擦尺寸。仅当 <see cref="LockMinEraserSize"/> 为 true 时生效
-    /// </summary>
-    public Size MinEraserSize { init; get; } = DefaultEraserSize;
-
-    /// <summary>
-    /// 最大橡皮擦尺寸。理论上用不着，只是用来限制尺寸而已
-    /// </summary>
-    public Size MaxEraserSize { init; get; } = new Size(600, 600);
-
-    /// <summary>
-    /// 当使用位图缓存（<see cref="IsBitmapCacheEnabled"/> 为 <see langword="true"/>）时，最大的位图缓存大小。单位为像素。
-    /// </summary>
-    public int MaxBitmapCacheSize { get; set; } =
-        // 兆芯上似乎 1920×1080 都扛不住？？？
-        OperatingSystem.IsLinux() ? 1080 * 1080 :
-        // 主流 Intel/AMD 上目前看性能还行。
-        OperatingSystem.IsWindows() ? 2560 * 1440 :
-        // 默认随便给个值吧。
-        1920 * 1080;
-
-    /// <summary>
-    /// 是否需要重新创建笔迹点，采用平滑滤波算法
-    /// </summary>
-    public bool ShouldReCreatePoint { get; set; }
-
-    /// <summary>
-    /// 笔迹渲染器。为空将使用默认的笔迹渲染器
-    /// </summary>
-    public ISkiaInkStrokeRenderer? InkStrokeRenderer { get; set; }
-
-    /// <summary>
-    /// 设置或获取是否需要忽略压感
-    /// </summary>
-    public bool IgnorePressure { get; set; }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasStrokeCollectedEventArgs.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasStrokeCollectedEventArgs.cs
deleted file mode 100644
index 46e764d..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/AvaloniaSkiaInkCanvasStrokeCollectedEventArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DotNetCampus.Inking.Contexts;
-
-public class AvaloniaSkiaInkCanvasStrokeCollectedEventArgs : EventArgs
-{
-    public AvaloniaSkiaInkCanvasStrokeCollectedEventArgs(int stylusDeviceId, SkiaStroke skiaStroke)
-    {
-        StylusDeviceId = stylusDeviceId;
-        SkiaStroke = skiaStroke;
-    }
-
-    public int StylusDeviceId { get; }
-    public SkiaStroke SkiaStroke { get; }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/DynamicStrokeContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/DynamicStrokeContext.cs
deleted file mode 100644
index e243d24..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/DynamicStrokeContext.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using DotNetCampus.Inking.Interactives;
-
-namespace DotNetCampus.Inking.Contexts;
-
-/// <summary>
-/// 动态笔迹层的上下文，一个手指落下一个对象
-/// </summary>
-class DynamicStrokeContext
-{
-    public DynamicStrokeContext(InkingModeInputArgs lastInputArgs, AvaloniaSkiaInkCanvas canvas)
-    {
-        LastInputArgs = lastInputArgs;
-
-        var settings = canvas.Context.Settings;
-
-        SkiaSimpleInkRender? simpleInkRender = null;
-
-        if(settings.InkStrokeRenderer is null)
-        {
-            simpleInkRender = canvas.SimpleInkRender;
-        }
-
-        Stroke = new SkiaStroke(InkId.NewId())
-        {
-            Color = settings.InkColor,
-            InkThickness = settings.InkThickness,
-            IgnorePressure = settings.IgnorePressure,
-            InkStrokeRenderer = settings.InkStrokeRenderer,
-            SimpleInkRender = simpleInkRender,
-        };
-    }
-
-    public InkingModeInputArgs LastInputArgs { get; }
-
-    public int Id => LastInputArgs.Id;
-
-    public SkiaStroke Stroke { get; }
-    public override string ToString() => $"DynamicStrokeContext_{Id}";
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/ErasingCompletedEventArgs.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/ErasingCompletedEventArgs.cs
deleted file mode 100644
index b4a6a04..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/ErasingCompletedEventArgs.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using DotNetCampus.Inking.Erasing;
-
-namespace DotNetCampus.Inking.Contexts;
-
-public class ErasingCompletedEventArgs : EventArgs
-{
-    public ErasingCompletedEventArgs(IReadOnlyList<ErasedSkiaStroke> erasingSkiaStrokeList)
-    {
-        ErasingSkiaStrokeList = erasingSkiaStrokeList;
-    }
-
-    public IReadOnlyList<ErasedSkiaStroke> ErasingSkiaStrokeList { get; }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/SkiaStrokeDrawContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/SkiaStrokeDrawContext.cs
deleted file mode 100644
index 81175e6..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Contexts/SkiaStrokeDrawContext.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Avalonia;
-using SkiaSharp;
-
-namespace DotNetCampus.Inking.Contexts;
-
-readonly record struct SkiaStrokeDrawContext(SKColor Color, SKPath Path, Rect DrawBounds, SKMatrix Transform, bool ShouldDisposePath) : IDisposable
-{
-    public void Dispose()
-    {
-        if (ShouldDisposePath)
-        {
-            Path.Dispose();
-        }
-    }
-}
-
-static class SkiaStrokeDrawContextExtension
-{
-    public static void DrawStroke(this SKCanvas canvas, in SkiaStrokeDrawContext skiaStrokeDrawContext, SKPaint skPaint)
-    {
-        skPaint.Color = skiaStrokeDrawContext.Color;
-        var transform = skiaStrokeDrawContext.Transform;
-        var useTransform = transform != SKMatrix.Empty && transform != SKMatrix.Identity;
-        if (useTransform)
-        {
-            canvas.Save();
-            canvas.Concat(ref transform);
-        }
-
-        canvas.DrawPath(skiaStrokeDrawContext.Path, skPaint);
-
-        if (useTransform)
-        {
-            canvas.Restore();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Core/AvaloniaSkiaInkCanvas.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Core/AvaloniaSkiaInkCanvas.cs
deleted file mode 100644
index 1e03cf0..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Core/AvaloniaSkiaInkCanvas.cs
+++ /dev/null
@@ -1,634 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering.Composition;
-using Avalonia.Rendering.Composition.Transport;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Skia;
-
-using DotNetCampus.Inking.Caching;
-using DotNetCampus.Inking.Contexts;
-using DotNetCampus.Inking.Erasing;
-using DotNetCampus.Logging;
-using DotNetCampus.Numerics.Geometry;
-
-using SkiaSharp;
-
-using System.Diagnostics;
-using DotNetCampus.Inking.Interactives;
-using DotNetCampus.Inking.Primitive;
-using DotNetCampus.Inking.Utils;
-using InkTransformContext = (DotNetCampus.Numerics.Geometry.BoundingBox2D VisibleBounds, DotNetCampus.Numerics.Geometry.SimilarityTransformation2D TransformToRoot);
-
-namespace DotNetCampus.Inking;
-
-/// <summary>
-/// 为 Avalonia 实现的基于 Skia 的 InkCanvas 笔迹画布，可提供动态和静态笔迹层
-/// </summary>
-/// 既可以单独用作笔迹绘制的接收输入层执行绘制，也可以作为静态笔迹层的承载
-public class AvaloniaSkiaInkCanvas : Control
-{
-    private readonly InkBitmapCache _cache;
-    private InkTransformContext? _inkTransformContext;
-
-    public AvaloniaSkiaInkCanvas()
-    {
-        _cache = new InkBitmapCache(Context.Settings);
-
-        // 以下是调试代码，用于从文件中读取点列表，绘制到画布上
-        // 测试文件要求： 一行一个点，使用逗号分隔，格式为 x,y
-        //#if DEBUG
-        //        var inkPointList = Path.Join(AppContext.BaseDirectory, "Assets", "Tests", "InkPointList.txt");
-        //        if (File.Exists(inkPointList))
-        //        {
-        //            List<(double x, double y)> pointList = [];
-        //            var lines = File.ReadAllLines(inkPointList);
-        //            foreach (var line in lines)
-        //            {
-        //                var point = line.Split(',');
-        //                var x = double.Parse(point[0]);
-        //                var y = double.Parse(point[1]);
-        //                pointList.Add((x, y));
-        //            }
-
-        //            var skiaStroke = new SkiaStroke(InkId.NewId())
-        //            {
-        //                Color = SKColors.Red,
-        //                InkThickness = 20,
-        //                InkCanvas = this,
-        //            };
-        //            skiaStroke.AddPoints(pointList.Select(t => new StylusPoint(t.x, t.y)));
-        //            skiaStroke.SetAsStatic();
-        //            AddStaticStroke(skiaStroke);
-        //        }
-        //#endif
-    }
-
-    /// <summary>
-    /// 获取笔迹渲染相关的设置和状态上下文。
-    /// </summary>
-    internal AvaloniaSkiaInkCanvasContext Context { get; } = new();
-
-    /// <summary>
-    /// 获取可以由业务指定的笔迹设置。
-    /// </summary>
-    public AvaloniaSkiaInkCanvasSettings Settings => Context.Settings;
-
-    /// <summary>
-    /// 共享的简单笔迹渲染器
-    /// </summary>
-    internal SkiaSimpleInkRender SimpleInkRender => _skiaSimpleInkRender ??= new SkiaSimpleInkRender();
-    private SkiaSimpleInkRender? _skiaSimpleInkRender;
-
-    internal void AddChild(Control childControl)
-    {
-        LogicalChildren.Add(childControl);
-        VisualChildren.Add(childControl);
-    }
-
-    internal void RemoveChild(Control childControl)
-    {
-        LogicalChildren.Remove(childControl);
-        VisualChildren.Remove(childControl);
-    }
-
-    /// <summary>
-    /// 橡皮擦模式
-    /// </summary>
-    public AvaloniaSkiaInkCanvasEraserMode EraserMode => _eraserMode ??= new AvaloniaSkiaInkCanvasEraserMode(this);
-
-    private AvaloniaSkiaInkCanvasEraserMode? _eraserMode;
-
-    public void WritingStart()
-    {
-        if (_contextDictionary.Count > 0)
-        {
-            Log.Warn($"[AvaSkiaInkCanvas][WritingStart] 开始写的时候发现上次书写存在点没有结束 {string.Join(';', _contextDictionary.Keys)}");
-            // 兼容性处理，如果上次书写没有结束，那就清空好了
-            _contextDictionary.Clear();
-        }
-
-        if (Context.ShouldUseBitmapCache)
-        {
-            // 开始书写时，禁止使用位图缓存
-            // 防止业务端忘记关闭位图缓存，导致动态笔迹无法正确显示
-            // 由于 UseBitmapCache 里面包含一次 lock 锁，为了性能考虑，这里先判断状态再调用
-            UseBitmapCache(false);
-        }
-    }
-
-    public void WritingDown(in InkingModeInputArgs args)
-    {
-        EnsureInputConflicts();
-
-        var dynamicStrokeContext = new DynamicStrokeContext(args, this);
-        _contextDictionary[args.Id] = dynamicStrokeContext;
-        dynamicStrokeContext.Stroke.AddPoint(args.StylusPoint);
-
-        InvalidateVisual();
-    }
-
-    public void WritingMove(in InkingModeInputArgs args)
-    {
-        EnsureInputConflicts();
-
-        if (_contextDictionary.TryGetValue(args.Id, out var context))
-        {
-            context.Stroke.AddPoints(EnumerateStylusPoints(args));
-            InvalidateVisual();
-        }
-    }
-
-    public void WritingUp(in InkingModeInputArgs args)
-    {
-        EnsureInputConflicts();
-
-        if (_contextDictionary.Remove(args.Id, out var context))
-        {
-            context.Stroke.AddPoints(EnumerateStylusPoints(args));
-            //_staticStrokeDictionary[context.Stroke.Id] = context.Stroke;
-            context.Stroke.SetAsStatic();
-            _staticStrokeList.Add(context.Stroke);
-
-            StrokeCollected?.Invoke(this, new AvaloniaSkiaInkCanvasStrokeCollectedEventArgs(args.Id, context.Stroke));
-        }
-        InvalidateVisual();
-    }
-
-    private static IEnumerable<InkStylusPoint> EnumerateStylusPoints(InkingModeInputArgs args)
-    {
-        if (args.StylusPointList is { Count: > 0 } stylusPointList)
-        {
-            foreach (var stylusPoint in stylusPointList)
-            {
-                yield return stylusPoint;
-            }
-        }
-        else
-        {
-            yield return args.StylusPoint;
-        }
-    }
-
-    public event EventHandler<AvaloniaSkiaInkCanvasStrokeCollectedEventArgs>? StrokeCollected;
-
-    public void WritingCompleted()
-    {
-        Debug.Assert(_contextDictionary.Count == 0, "书写完成时，不应该有未抬起的点");
-        _contextDictionary.Clear();
-    }
-
-    /// <summary>
-    /// 现在正在写的过程中的字典
-    /// </summary>
-    private readonly Dictionary<int, DynamicStrokeContext> _contextDictionary = [];
-
-#if DEBUG
-    private int _count;
-    private readonly List<Rect> _list = [];
-#endif
-
-    /// <summary>
-    /// 静态笔迹列表
-    /// </summary>
-    public IReadOnlyList<SkiaStroke> StaticStrokeList => _staticStrokeList;
-
-    /// <summary>
-    /// 用作静态笔迹层的笔迹列表
-    /// </summary>
-    private readonly List<SkiaStroke> _staticStrokeList = [];
-
-    public void AddStaticStroke(SkiaStroke skiaStroke)
-    {
-        skiaStroke.EnsureIsStaticStroke();
-        if (skiaStroke.InkCanvas != null)
-        {
-            // 禁止一个笔迹被添加到多个画布中
-            throw new InvalidOperationException("Stroke must not be added to multiple InkCanvas instances.");
-        }
-
-        _staticStrokeList.Add(skiaStroke);
-        skiaStroke.InkCanvas = this;
-        InvalidateVisual();
-    }
-
-    public void RemoveStaticStroke(SkiaStroke skiaStroke)
-    {
-        skiaStroke.EnsureIsStaticStroke();
-
-        if (!ReferenceEquals(skiaStroke.InkCanvas, this))
-        {
-            throw new InvalidOperationException("Stroke must be removed from this InkCanvas before removing.");
-        }
-
-        _staticStrokeList.Remove(skiaStroke);
-        skiaStroke.InkCanvas = null;
-
-        // 删除笔迹时，关闭位图缓存。这是因为可能存在以下情况：
-        // 1. 第一次绘制时，笔迹 A 和 B 都在，此时有前置的渲染正在进入等待
-        // 2. 用户删除了笔迹 A，设置缓存失效
-        // 3. 此时渲染线程执行第一次绘制，获取的信息是笔迹 A 和 B 都在，生成了缓存
-        // 4. 第二次绘制时，使用了缓存，笔迹 A 仍然显示
-        // 此逻辑无法规避，只能直接在删除笔迹时关闭位图缓存
-        UseBitmapCache(false);
-
-        InvalidateVisual();
-    }
-
-    internal void AddStaticStrokeWithRenderSynchronizer(SkiaStrokeRenderSynchronizer renderSynchronizer)
-    {
-        Context.UseBitmapCache(false);
-        _renderSynchronizerList.Add(renderSynchronizer);
-        _staticStrokeList.AddRange(renderSynchronizer.StrokeList);
-        foreach (var skiaStroke in renderSynchronizer.StrokeList)
-        {
-            skiaStroke.InkCanvas = this;
-        }
-        InvalidateVisual();
-
-#if DEBUG
-        foreach (var skiaStroke in _staticStrokeList)
-        {
-            Debug.Assert(skiaStroke != null);
-        }
-#endif
-
-        //#if DEBUG
-        //        foreach (var skiaStroke in renderSynchronizer.StrokeList)
-        //        {
-        //            DumpStrokeData(skiaStroke);
-        //        }
-        //#endif
-    }
-
-    /// <summary>
-    /// 调试用，输出笔迹数据到文件，文件放在桌面
-    /// </summary>
-    /// <param name="skiaStroke"></param>
-    private void DumpStrokeData(SkiaStroke skiaStroke)
-    {
-        var folder = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), nameof(AvaloniaSkiaInkCanvas));
-        Directory.CreateDirectory(folder);
-        var fileName = Path.Join(folder, $"{DateTime.Now:yyMMdd_HH-mm-ss} {skiaStroke.Id.Value}.txt");
-        using var streamWriter = new StreamWriter(fileName, append: true);
-        streamWriter.WriteLine($"Id: {skiaStroke.Id}");
-        streamWriter.WriteLine($"Color: {skiaStroke.Color}");
-        streamWriter.WriteLine($"InkThickness: {skiaStroke.InkThickness}");
-        streamWriter.WriteLine($"Path: {skiaStroke.Path.ToSvgPathData()}");
-        streamWriter.WriteLine($"PointCount: {skiaStroke.PointList.Count}");
-        streamWriter.WriteLine("PointList: ");
-        foreach (var point in skiaStroke.PointList)
-        {
-            streamWriter.WriteLine($"{point.X},{point.Y}");
-        }
-    }
-
-    /// <summary>
-    /// 渲染用的同步列表
-    /// </summary>
-    private readonly List<SkiaStrokeRenderSynchronizer> _renderSynchronizerList = [];
-
-    internal void ResetStaticStrokeListByEraserResult(IEnumerable<SkiaStroke> skiaStrokeList)
-    {
-        _staticStrokeList.Clear();
-        _staticStrokeList.AddRange(skiaStrokeList);
-        foreach (var skiaStroke in _staticStrokeList)
-        {
-#if DEBUG
-            skiaStroke.EnsureIsStaticStroke();
-#endif
-            skiaStroke.InkCanvas = this;
-        }
-        InvalidateVisual();
-    }
-
-    public override void Render(DrawingContext context)
-    {
-#if DEBUG
-        foreach (var skiaStroke in _staticStrokeList)
-        {
-            Debug.Assert(skiaStroke != null);
-        }
-#endif
-
-        if (_eraserMode?.IsErasing is true)
-        {
-            _eraserMode.Render(context);
-            return;
-        }
-
-        foreach (var skiaStroke in _staticStrokeList)
-        {
-            if (skiaStroke.InkCanvas is null)
-            {
-                skiaStroke.InkCanvas = this;
-            }
-        }
-
-#if DEBUG
-        _count++;
-        var n = Math.Sin(Math.Pow(Math.E * _count, Math.PI));
-        var x = Math.Abs(n) * Bounds.Width;
-        _count++;
-        n = Math.Sin(Math.Pow(Math.E * _count, Math.PI));
-        var y = Math.Abs(n) * Bounds.Height;
-
-        _list.Add(new Rect(x, y, 10, 10));
-#endif
-
-        UpdateCacheCore();
-        var inkCanvasCustomDrawOperation = new InkCanvasCustomDrawOperation(this, _cache);
-        context.Custom(inkCanvasCustomDrawOperation);
-
-        if (ElementComposition.GetElementVisual(this) is { } selfVisual)
-        {
-            Compositor compositor = selfVisual.Compositor;
-            CompositionBatch batch = compositor.RequestCompositionBatchCommitAsync();
-            batch.Rendered.ContinueWith(_ =>
-            {
-#if DEBUG // 实际测试不会进入此分支，也就是 Avalonia 的 Render 已经跑完了，但就不知道为什么还没有真的 commit 渲染画面到 DWM 那边，导致 Avalonia 还是落后一个帧。于是 WPF 这边就愉快先消失了，再等一个帧到 Avalonia 显示笔迹出来，表现就是闪烁一下
-                if (!inkCanvasCustomDrawOperation.IsFinishRender)
-                {
-                    // 不再抛出，最小化时，会进入此分支，此时还是预期的
-                    //throw new Exception($"笔迹开始通知退出时，还没有完成一次渲染！！！ 仅调试下抛出");
-                }
-#endif
-
-                var list = inkCanvasCustomDrawOperation.CurrentRenderSynchronizerList;
-                foreach (var skiaStrokeRenderSynchronizer in list)
-                {
-                    skiaStrokeRenderSynchronizer.OnRender();
-                }
-            });
-        }
-    }
-
-    /// <summary>
-    /// 更新笔迹位图缓存所需的一些上下文信息。
-    /// </summary>
-    /// <param name="visibleBounds">用户可见区域的边界。根坐标系。</param>
-    /// <param name="transformToRoot">笔迹变换到根（通常是画板，要求画板相对于顶级窗口没有额外变换）的变换矩阵。</param>
-    public void UpdateInkTransform(BoundingBox2D visibleBounds, SimilarityTransformation2D transformToRoot)
-    {
-        _inkTransformContext = (visibleBounds, transformToRoot);
-    }
-
-    /// <summary>
-    /// 更新位图缓存的状态。如果没有开启位图缓存，则会关闭位图缓存。
-    /// </summary>
-    private void UpdateCacheCore()
-    {
-        var scale = GetRenderScaling();
-        if (_cache.UseCacheOnNextRender is false && Context.ShouldUseBitmapCache)
-        {
-            if (_inkTransformContext is { } inkContext)
-            {
-                _cache.UpdateCacheContext(scale, inkContext.VisibleBounds, inkContext.TransformToRoot);
-            }
-            else
-            {
-                Log.Warn("[Ink][AvaSkiaInkCanvas][UpdateCacheCore] 未设置 InkTransformContext，无法更新缓存。请由笔迹元素调用 UpdateInkTransform 方法更新之。");
-            }
-            _cache.UseCacheOnNextRender = true;
-        }
-        else if (_cache.UseCacheOnNextRender && !Context.ShouldUseBitmapCache)
-        {
-            _cache.UseCacheOnNextRender = false;
-        }
-    }
-
-    class InkCanvasCustomDrawOperation : ICustomDrawOperation
-    {
-        private readonly InkBitmapCache _cache;
-
-        public InkCanvasCustomDrawOperation(AvaloniaSkiaInkCanvas inkCanvas, InkBitmapCache cache)
-        {
-            _cache = cache;
-            var contextDictionary = inkCanvas._contextDictionary;
-            _list = [];
-            _pathList = [];
-
-            foreach (var skiaStroke in inkCanvas._staticStrokeList)
-            {
-                var skiaStrokeDrawContext = skiaStroke.CreateDrawContext();
-                _pathList.Add(skiaStrokeDrawContext);
-            }
-
-            foreach (var strokeContext in contextDictionary.Values)
-            {
-                var stroke = strokeContext.Stroke;
-
-                var skiaStrokeDrawContext = stroke.CreateDrawContext();
-                _pathList.Add(skiaStrokeDrawContext);
-            }
-
-            foreach (var skiaStrokeDrawContext in _pathList)
-            {
-                _list.Add(skiaStrokeDrawContext.DrawBounds);
-            }
-
-            _currentRenderSynchronizerList = [];
-            foreach (var renderSynchronizer in inkCanvas._renderSynchronizerList)
-            {
-                bool canAdd = renderSynchronizer.StrokeList.All(skiaStroke => inkCanvas._staticStrokeList.Contains(skiaStroke));
-
-                if (canAdd)
-                {
-                    _currentRenderSynchronizerList.Add(renderSynchronizer);
-                }
-            }
-
-            foreach (var skiaStrokeRenderSynchronizer in _currentRenderSynchronizerList)
-            {
-                inkCanvas._renderSynchronizerList.Remove(skiaStrokeRenderSynchronizer);
-            }
-
-#if DEBUG
-            if (_list.Count == 0)
-            {
-                _list = inkCanvas._list;
-            }
-#endif
-            if (_list.Count == 0)
-            {
-                // 如果没有笔迹，那就不需要绘制
-                // 设置 Bounds 为 0 将在 Render 中不绘制
-                Bounds = new Rect(0, 0, 0, 0);
-                // 为了防止闪烁，在外层当前渲染次数结束后再通知渲染完成，因此这里不通知渲染完成
-                //// 由于在 Render 中不绘制，所以需要先通知渲染完成
-                //foreach (var skiaStrokeRenderSynchronizer in _currentRenderSynchronizerList)
-                //{
-                //    skiaStrokeRenderSynchronizer.OnRender();
-                //}
-                return;
-            }
-
-            var list = _list;
-
-            Rect bounds = list[0];
-            for (var i = 1; i < list.Count; i++)
-            {
-                bounds = bounds.Union(list[i]);
-            }
-            Bounds = bounds;
-
-            // 理论上 inkCanvas._renderSynchronizerList 是零个
-            Log.Debug($"[Ink][AvaSkiaInkCanvas] InkCanvasCustomDrawOperation 正常执行={inkCanvas._renderSynchronizerList.Count == 0}");
-        }
-
-        public IReadOnlyList<SkiaStrokeRenderSynchronizer> CurrentRenderSynchronizerList => _currentRenderSynchronizerList;
-        private readonly List<SkiaStrokeRenderSynchronizer> _currentRenderSynchronizerList;
-        private List<Rect> _list;
-        private List<SkiaStrokeDrawContext> _pathList;
-
-        public void Dispose()
-        {
-            foreach (var skiaStrokeDrawContext in _pathList)
-            {
-                skiaStrokeDrawContext.Dispose();
-            }
-        }
-
-        public bool Equals(ICustomDrawOperation? other)
-        {
-            return false;
-        }
-
-        public bool HitTest(Point p)
-        {
-            return false;
-        }
-
-        public void Render(ImmediateDrawingContext context)
-        {
-            var skiaSharpApiLeaseFeature = context.TryGetFeature<ISkiaSharpApiLeaseFeature>();
-            if (skiaSharpApiLeaseFeature == null)
-            {
-                return;
-            }
-
-            using var skiaSharpApiLease = skiaSharpApiLeaseFeature.Lease();
-            var canvas = skiaSharpApiLease.SkCanvas;
-            DrawCore(canvas);
-            IsFinishRender = true;
-        }
-
-        /// <summary>
-        /// 是否已经完成渲染
-        /// </summary>
-        public bool IsFinishRender { get; private set; }
-
-        private void DrawCore(SKCanvas canvas)
-        {
-            using var skPaint = new SKPaint();
-
-            skPaint.Color = SKColors.Red;
-            skPaint.Style = SKPaintStyle.Fill;
-            skPaint.IsAntialias = true;
-            skPaint.StrokeWidth = 10;
-
-            if (_cache.UseCacheOnNextRender)
-            {
-                // 当缓存可用时，使用此缓存。
-                _cache.DrawBitmap([.. _pathList], canvas, skPaint);
-            }
-            else if (_pathList.Count > 0)
-            {
-                // 当笔迹路径可用时，使用此路径。
-
-                // 绘制笔迹。
-                foreach (var skiaStrokeDrawContext in _pathList)
-                {
-                    canvas.DrawStroke(in skiaStrokeDrawContext, skPaint);
-                }
-
-                //// 清除动态层的笔迹渲染，然后清除动态层。
-                //foreach (var skiaStrokeRenderSynchronizer in _currentRenderSynchronizerList)
-                //{
-                //    Log.Debug($"[Ink][AvaSkiaInkCanvas] 渲染回调 OnRender");
-
-                //    skiaStrokeRenderSynchronizer.OnRender();
-                //}
-                //// 防止重复渲染
-                //_currentRenderSynchronizerList.Clear();
-            }
-            else
-            {
-                // 当笔迹路径不可用时，使用此调试。
-#if DEBUG
-                // 仅供调试。
-                for (var i = 0; i < _list.Count; i++)
-                {
-                    var bounds = _list[i];
-                    var x = (float) bounds.X;
-                    var y = (float) bounds.Y;
-
-                    skPaint.Color = new SKColor((uint) (Math.Sin(Math.Pow(Math.E * i, Math.PI)) * int.MaxValue));
-
-                    canvas.DrawRect(x, y, 10, 10, skPaint);
-                }
-#endif
-            }
-        }
-
-        public Rect Bounds { get; }
-    }
-
-    /// <summary>
-    /// 指定是否立即使用位图缓存替代真实的笔迹，或是使用真实的笔迹渲染。
-    /// </summary>
-    /// <param name="useBitmapCache">
-    /// 指定为 <see langword="true"/>，则立即使用位图缓存替代真实的笔迹；<br/>
-    /// 指定为 <see langword="false"/>，则位图缓存将不会工作，而使用真实的笔迹渲染。
-    /// </param>
-    /// <remarks>
-    /// 注意，此方法并不会修改用户设置的位图缓存开关，而是设置在某种程序状态下应该打开还是关闭位图缓存。<br/>
-    /// 关于它们之间的区别，请参见 <see cref="AvaloniaSkiaInkCanvasContext.UseBitmapCache(bool)"/> 的注释。
-    /// </remarks>
-    public void UseBitmapCache(bool useBitmapCache)
-    {
-        Context.UseBitmapCache(useBitmapCache);
-        UpdateBitmapCache();
-    }
-
-    /// <summary>
-    /// 使笔迹的位图缓存失效，并立即重新生成缓存。
-    /// </summary>
-    public void UpdateBitmapCache()
-    {
-        InvalidateBitmapCache();
-        InvalidateVisual();
-    }
-
-    /// <summary>
-    /// 使笔迹的位图缓存失效。下次绘制时，如果位图缓存启用，则会重新生成缓存。
-    /// </summary>
-    public void InvalidateBitmapCache()
-    {
-        var scale = GetRenderScaling();
-        if (_inkTransformContext is { } inkContext)
-        {
-            _cache.UpdateCacheContext(scale, inkContext.VisibleBounds, inkContext.TransformToRoot);
-        }
-        else
-        {
-            Log.Warn("[Ink][AvaSkiaInkCanvas][InvalidateBitmapCache] 未设置 InkTransformContext，无法更新缓存。请由笔迹元素调用 UpdateInkTransform 方法更新之。");
-        }
-    }
-
-    private double GetRenderScaling()
-    {
-        return TopLevel.GetTopLevel(this)?.RenderScaling ?? 1;
-    }
-
-    private bool IsWriting => _contextDictionary.Count > 0;
-
-    internal void EnsureInputConflicts()
-    {
-        if (IsWriting && EraserMode.IsErasing)
-        {
-            throw new InvalidOperationException("Writing and erasing cannot be performed at the same time.");
-        }
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Core/SkiaStroke.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Core/SkiaStroke.cs
deleted file mode 100644
index aa8a51d..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Core/SkiaStroke.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia;
-using Avalonia.Skia;
-using DotNetCampus.Inking.Contexts;
-using DotNetCampus.Inking.Primitive;
-using DotNetCampus.Inking.StrokeRenderers;
-using DotNetCampus.Inking.Utils;
-using DotNetCampus.Numerics.Geometry;
-
-using SkiaSharp;
-
-namespace DotNetCampus.Inking;
-
-public class SkiaStroke : IDisposable
-{
-    public SkiaStroke(InkId id) : this(id, new SKPath(), ownSkiaPath: true)
-    {
-    }
-
-    private SkiaStroke(InkId id, SKPath path, bool ownSkiaPath)
-    {
-        _ownSkiaPath = ownSkiaPath;
-        Id = id;
-        Path = path;
-    }
-
-    /// <summary>
-    /// 笔迹渲染器
-    /// </summary>
-    public ISkiaInkStrokeRenderer? InkStrokeRenderer { get; init; }
-
-    public AvaloniaSkiaInkCanvas? InkCanvas { get; set; }
-
-    public InkId Id { get; }
-
-    public SKPath Path { get; private set; }
-
-    public SKMatrix Transform { get; private set; } = SKMatrix.Identity;
-
-    /// <summary>
-    /// 是否拥有 <see cref="Path"/> 的所有权，即需要在释放的使用同步将其释放
-    /// </summary>
-    private readonly bool _ownSkiaPath;
-
-    /// <summary>
-    /// 笔迹颜色
-    /// </summary>
-    public SKColor Color { get; init; } = AvaloniaSkiaInkCanvasSettings.DefaultInkColor;
-
-    /// <summary>
-    /// 笔迹粗细
-    /// </summary>
-    public float InkThickness { get; init; } = AvaloniaSkiaInkCanvasSettings.DefaultInkThickness;
-
-    internal IReadOnlyList<InkStylusPoint> PointList => _pointList;
-
-    /// <summary>
-    /// 是否忽略压感
-    /// </summary>
-    public bool IgnorePressure { get; init; }
-
-    private readonly List<InkStylusPoint> _pointList = [];
-
-    public void AddPoint(InkStylusPoint point) => AddPoints([point]);
-
-    public void AddPoints(in IEnumerable<InkStylusPoint> points)
-    {
-        if (_isStaticStroke)
-        {
-            throw new InvalidOperationException($"禁止修改静态笔迹的点");
-        }
-
-        InkStylusPoint? lastPoint = _pointList.Count > 0 ? PointList[^1] : default;
-        foreach (InkStylusPoint currentPoint in points)
-        {
-            InkStylusPoint point = currentPoint;
-
-            if (IgnorePressure)
-            {
-                point = point with
-                {
-                    Pressure = InkStylusPoint.DefaultPressure,
-                };
-            }
-
-            if (lastPoint == point)
-            {
-                // 如果两个点相同，则丢点
-                continue;
-            }
-
-            lastPoint = point;
-
-            _pointList.Add(point);
-        }
-
-        var pointList = _pointList;
-        if (InkCanvas?.Settings.ShouldReCreatePoint is true && pointList.Count > 10)
-        {
-            pointList = ApplyMeanFilter(pointList);
-        }
-
-        RenderInk(pointList);
-    }
-
-    [AllowNull]
-    internal SkiaSimpleInkRender SimpleInkRender
-    {
-        get
-        {
-            return _skiaSimpleInkRender ??= new SkiaSimpleInkRender();
-        }
-        init
-        {
-            _skiaSimpleInkRender = value;
-        }
-    }
-
-    private SkiaSimpleInkRender? _skiaSimpleInkRender;
-
-    private void RenderInk(List<InkStylusPoint> pointList)
-    {
-        if (InkStrokeRenderer is not null)
-        {
-            // 如果有传入渲染器，则使用传入的渲染器
-            Path.Dispose();
-            Path = InkStrokeRenderer.RenderInkToPath(pointList, InkThickness);
-        }
-        else
-        {
-            if (pointList.Count >= 2)
-            {
-                var outlinePointList = SimpleInkRender.GetOutlineSKPointList(pointList, InkThickness);
-
-                Path.Reset();
-                Path.AddPoly(outlinePointList);
-            }
-            else if (pointList.Count == 1)
-            {
-                Path.Reset();
-                var stylusPoint = pointList[0];
-                float x = (float) stylusPoint.X;
-                float y = (float) stylusPoint.Y;
-                // 如果是一个点，那就画一个圆。圆的半径就是 笔迹粗细 * 压力 / 2
-                // 为什么要除以 2，因为传入的是半径
-                var radius = InkThickness * stylusPoint.Pressure / 2;
-                Path.AddCircle(x, y, radius);
-            }
-            else
-            {
-                // 一个点都没有，那就什么都不画
-            }
-        }
-    }
-
-    public void Dispose()
-    {
-        if (_ownSkiaPath)
-        {
-            Path.Dispose();
-        }
-    }
-
-    public static List<InkStylusPoint> ApplyMeanFilter(List<InkStylusPoint> pointList, int step = 10)
-    {
-        var xList = ApplyMeanFilter(pointList.Select(t => t.Point.X).ToList(), step);
-        var yList = ApplyMeanFilter(pointList.Select(t => t.Point.Y).ToList(), step);
-
-        var newPointList = new List<InkStylusPoint>();
-        for (int i = 0; i < xList.Count && i < yList.Count; i++)
-        {
-            newPointList.Add(new InkStylusPoint(xList[i], yList[i]));
-        }
-
-        return newPointList;
-    }
-
-    /// <summary>
-    /// 滤波算法，细节请看 [WPF 记一个特别简单的点集滤波平滑方法 - lindexi - 博客园](https://www.cnblogs.com/lindexi/p/18387840 )
-    /// </summary>
-    /// <param name="list"></param>
-    /// <param name="step"></param>
-    /// <returns></returns>
-    public static List<double> ApplyMeanFilter(List<double> list, int step)
-    {
-        // 前面一半加不了
-        var newList = new List<double>(list.Take(step / 2));
-        for (int i = step / 2; i < list.Count - step + step / 2; i++)
-        {
-            // 当前点，取前后各一半，即 step / 2 个点，求平均值作为当前点的值
-            newList.Add(list.Skip(i - step / 2).Take(step).Sum() / step);
-        }
-        // 后面一半加不了
-        newList.AddRange(list.Skip(list.Count - (step - step / 2)));
-        return newList;
-    }
-
-    internal SkiaStrokeDrawContext CreateDrawContext()
-    {
-        SKPath skPath;
-        bool shouldDisposePath;
-        if (_isStaticStroke)
-        {
-            // 静态笔迹，不需要复制，因为不会再更改，不存在线程安全问题
-            skPath = Path;
-            // 静态笔迹不需要释放，释放了会导致绘制闪退
-            shouldDisposePath = false;
-        }
-        else
-        {
-            // 动态笔迹，需要复制，因为可能会在多个线程中绘制使用和释放
-            // 如在 UI 线程加点，修改 Path 内容。与此同时在渲染线程绘制，导致多线程同时访问
-            // 为了避免这种情况，复制 Path 解决线程安全问题
-            skPath = Path.Clone();
-            shouldDisposePath = true;
-        }
-
-        return new SkiaStrokeDrawContext(Color, skPath, GetDrawBounds(), Transform, shouldDisposePath);
-    }
-
-    internal void SetAsStatic()
-    {
-        _drawBounds = GetDrawBounds();
-        _isStaticStroke = true;
-        // 不再需要渲染了，释放渲染器
-        _skiaSimpleInkRender = null;
-    }
-
-    public static SkiaStroke CreateStaticStroke(InkId id, SKPath path, StylusPointListSpan pointList, SKColor color,
-        float inkThickness, bool ownSkiaPath, ISkiaInkStrokeRenderer? inkStrokeRenderer)
-    {
-        var skiaStroke = new SkiaStroke(id, path, ownSkiaPath)
-        {
-            Color = color,
-            InkThickness = inkThickness,
-            InkStrokeRenderer = inkStrokeRenderer,
-        };
-
-        skiaStroke._pointList.EnsureCapacity(pointList.Length);
-        skiaStroke._pointList.AddRange(pointList.GetEnumerable());
-        skiaStroke.SetAsStatic();
-
-        return skiaStroke;
-    }
-
-    private bool _isStaticStroke;
-    private Rect _drawBounds;
-
-    public Rect GetDrawBounds()
-    {
-        if (_isStaticStroke)
-        {
-            return _drawBounds;
-        }
-
-        return SkiaSharpExtensions.ToAvaloniaRect(Path.Bounds).ExpandLength(InkThickness);
-    }
-
-    public void SetTransform(SKMatrix matrix)
-    {
-        Transform = matrix;
-        InkCanvas?.InvalidateVisual();
-    }
-
-    public void ApplyTransform(SimilarityTransformation2D transform)
-    {
-        for (var i = 0; i < _pointList.Count; i++)
-        {
-            var point = _pointList[i];
-            _pointList[i] = new InkStylusPoint(transform.Transform(point.Point), point.Pressure);
-        }
-
-        Path = new SKPath();
-
-        if (_pointList.Count > 2)
-        {
-            var outlinePointList = SimpleInkRender.GetOutlineSKPointList(_pointList, InkThickness);
-
-            Path.Reset();
-            Path.AddPoly(outlinePointList);
-        }
-
-        Transform = SKMatrix.Identity;
-        _drawBounds = SkiaSharpExtensions.ToAvaloniaRect(Path.Bounds).ExpandLength(InkThickness);
-
-        InkCanvas?.InvalidateVisual();
-    }
-
-    public void EnsureIsStaticStroke()
-    {
-        if (!_isStaticStroke)
-        {
-            throw new InvalidOperationException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/DotNetCampus.AvaloniaInkCanvas.csproj b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/DotNetCampus.AvaloniaInkCanvas.csproj
deleted file mode 100644
index 0755881..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/DotNetCampus.AvaloniaInkCanvas.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <RootNamespace>DotNetCampus.Inking</RootNamespace>
-    <IsAotCompatible>true</IsAotCompatible>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="Avalonia.Skia" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DotNetCampus.InkCanvas.InkCore\DotNetCampus.InkCanvas.InkCore.csproj" />
-    <ProjectReference Include="..\DotNetCampus.InkCanvas.SkiaInk\DotNetCampus.InkCanvas.SkiaInk.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/DotNetCampus.AvaloniaInkCanvas.csproj.DotSettings b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/DotNetCampus.AvaloniaInkCanvas.csproj.DotSettings
deleted file mode 100644
index 231aea2..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/DotNetCampus.AvaloniaInkCanvas.csproj.DotSettings
+++ /dev/null
@@ -1,4 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=api/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=core/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=erasing_005Cviews/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/AvaloniaSkiaInkCanvasEraserMode.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/AvaloniaSkiaInkCanvasEraserMode.cs
deleted file mode 100644
index eb0ae90..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/AvaloniaSkiaInkCanvasEraserMode.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-using System.Diagnostics;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Skia;
-using DotNetCampus.Inking.Contexts;
-using DotNetCampus.Inking.Interactives;
-using DotNetCampus.Inking.Utils;
-using SkiaSharp;
-using Point = Avalonia.Point;
-using Rect = Avalonia.Rect;
-using Size = Avalonia.Size;
-
-namespace DotNetCampus.Inking.Erasing;
-
-public class AvaloniaSkiaInkCanvasEraserMode
-{
-    public AvaloniaSkiaInkCanvasEraserMode(AvaloniaSkiaInkCanvas inkCanvas)
-    {
-        InkCanvas = inkCanvas;
-    }
-
-    private void InkCanvas_PointerWheelChanged(object? sender, PointerWheelEventArgs e)
-    {
-        _debugEraserSizeScale += e.Delta.Y;
-    }
-
-    private double _debugEraserSizeScale = 0;
-
-    public AvaloniaSkiaInkCanvas InkCanvas { get; }
-    private AvaloniaSkiaInkCanvasSettings Settings => InkCanvas.Settings;
-
-    public bool IsErasing { get; private set; }
-    private int MainEraserInputId { set; get; }
-
-    private PointPathEraserManager PointPathEraserManager { get; } = new PointPathEraserManager();
-
-    private IEraserView EraserView
-    {
-        get
-        {
-            if (_eraserView is null)
-            {
-                var eraserViewCreator = Settings.EraserViewCreator;
-                _eraserView = eraserViewCreator?.CreateEraserView()
-                    ?? new EraserView();
-            }
-
-            return _eraserView;
-        }
-    }
-
-    private IEraserView? _eraserView;
-
-    private void StartEraser()
-    {
-#if DEBUG
-        var topLevel = TopLevel.GetTopLevel(InkCanvas)!;
-        topLevel.PointerWheelChanged -= InkCanvas_PointerWheelChanged;
-        topLevel.PointerWheelChanged += InkCanvas_PointerWheelChanged;
-#endif
-
-        var staticStrokeList = InkCanvas.StaticStrokeList;
-        PointPathEraserManager.StartEraserPointPath(staticStrokeList);
-
-        // 如果没有自定义渲染器，则使用简单渲染器
-        if (InkCanvas.Settings.InkStrokeRenderer is null)
-        {
-            PointPathEraserManager.SimpleInkRender = InkCanvas.SimpleInkRender;
-        }
-
-        if (EraserView is Control eraserView)
-        {
-            InkCanvas.AddChild(eraserView);
-        }
-
-        _inputProcessStopwatch.Restart();
-        _lastEraserSize = Settings.EraserSize;
-    }
-
-    private readonly Stopwatch _inputProcessStopwatch = new();
-
-    public void EraserDown(in InkingModeInputArgs args)
-    {
-        InkCanvas.EnsureInputConflicts();
-        if (!IsErasing)
-        {
-            MainEraserInputId = args.Id;
-
-            IsErasing = true;
-
-            StartEraser();
-
-            EraserView.SetEraserSize(Settings.EraserSize);
-            EraserView.Move(args.Position.ToAvaloniaPoint());
-            InkCanvas.InvalidateVisual();
-        }
-        else
-        {
-            // 忽略其他的输入点
-        }
-    }
-
-    private Size _lastEraserSize;
-
-    public void EraserMove(in InkingModeInputArgs args)
-    {
-        InkCanvas.EnsureInputConflicts();
-        if (IsErasing && args.Id == MainEraserInputId)
-        {
-            // 擦除
-            var eraserWidth = _lastEraserSize.Width;
-            var eraserHeight = _lastEraserSize.Height;
-
-            if (Settings.EnableStylusSizeAsEraserSize)
-            {
-                var touchWidth = args.StylusPoint.Width ?? eraserWidth;
-                var touchHeight = args.StylusPoint.Height ?? eraserHeight;
-
-                if (Settings.CanEraserAlwaysFollowsTouchSize || _inputProcessStopwatch.Elapsed < Settings.EraserCanResizeDuringTimeSpan)
-                {
-                    eraserWidth = touchWidth;
-                    eraserHeight = touchHeight;
-                }
-            }
-
-#if DEBUG
-            if (_debugEraserSizeScale > 0)
-            {
-                _debugEraserSizeScale = Math.Min(100, _debugEraserSizeScale);
-
-                eraserWidth *= (1 + _debugEraserSizeScale / 10);
-                eraserHeight *= (1 + _debugEraserSizeScale / 10);
-            }
-            else if (_debugEraserSizeScale < -10)
-            {
-                _debugEraserSizeScale = Math.Max(-100, _debugEraserSizeScale);
-
-                eraserWidth *= (1 + _debugEraserSizeScale / 100);
-                eraserHeight *= (1 + _debugEraserSizeScale / 100);
-            }
-#endif
-
-            if (Settings.LockMinEraserSize)
-            {
-                // 锁定最小橡皮擦
-                // 有人嫌弃小咯，那就改大点咯
-                eraserWidth = Math.Max(eraserWidth, Settings.MinEraserSize.Width);
-                eraserHeight = Math.Max(eraserHeight, Settings.MinEraserSize.Height);
-            }
-
-            // 限制最大橡皮擦，防止那些 SB 设备报告的宽度过大
-            eraserWidth = Math.Min(eraserWidth, Settings.MaxEraserSize.Width);
-            eraserHeight = Math.Min(eraserHeight, Settings.MaxEraserSize.Height);
-
-            var rect = new Rect(args.Position.X - eraserWidth / 2, args.Position.Y - eraserHeight / 2, eraserWidth, eraserHeight);
-            PointPathEraserManager.Move(rect.ToRect2D());
-
-            var eraserSize = new Size(eraserWidth, eraserHeight);
-            _lastEraserSize = eraserSize;
-            EraserView.SetEraserSize(eraserSize);
-            EraserView.Move(args.Position.ToAvaloniaPoint());
-            InkCanvas.InvalidateVisual();
-        }
-    }
-
-    public void EraserUp(in InkingModeInputArgs args)
-    {
-        InkCanvas.EnsureInputConflicts();
-        if (IsErasing && args.Id == MainEraserInputId)
-        {
-            IsErasing = false;
-            var pointPathEraserResult = PointPathEraserManager.Finish();
-
-            var skiaStrokeList = pointPathEraserResult.ErasingSkiaStrokeList
-                .SelectMany(t => t.IsErased
-                    ? t.NewStrokeList // 被擦掉的，使用新的笔迹列表替代
-                    : [t.OriginStroke]); // 没有被擦掉的，使用原笔迹
-
-            InkCanvas.ResetStaticStrokeListByEraserResult(skiaStrokeList);
-
-            ClearEraser();
-
-            ErasingCompleted?.Invoke(this, new ErasingCompletedEventArgs(pointPathEraserResult.ErasingSkiaStrokeList));
-        }
-    }
-
-    private void ClearEraser()
-    {
-        if (EraserView is Control eraserView)
-        {
-            InkCanvas.RemoveChild(eraserView);
-        }
-    }
-
-    public event EventHandler<ErasingCompletedEventArgs>? ErasingCompleted;
-
-    public void Render(DrawingContext context)
-    {
-        context.Custom(new EraserModeCustomDrawOperation(this));
-    }
-
-    class EraserModeCustomDrawOperation : ICustomDrawOperation
-    {
-        public EraserModeCustomDrawOperation(AvaloniaSkiaInkCanvasEraserMode eraserMode)
-        {
-            var pointPathEraserManager = eraserMode.PointPathEraserManager;
-            IReadOnlyList<SkiaStrokeDrawContext> drawContextList = pointPathEraserManager.GetDrawContextList();
-            DrawContextList = drawContextList;
-
-            if (drawContextList.Count == 0)
-            {
-                Bounds = new Rect(0, 0, 0, 0);
-            }
-            else
-            {
-                Rect bounds = drawContextList[0].DrawBounds;
-
-                for (var i = 1; i < drawContextList.Count; i++)
-                {
-                    bounds = bounds.Union(drawContextList[i].DrawBounds);
-                }
-
-                Bounds = bounds;
-            }
-        }
-
-        private IReadOnlyList<SkiaStrokeDrawContext> DrawContextList { get; }
-
-        public void Dispose()
-        {
-            foreach (var skiaStrokeDrawContext in DrawContextList)
-            {
-                skiaStrokeDrawContext.Dispose();
-            }
-        }
-
-        public bool Equals(ICustomDrawOperation? other)
-        {
-            return false;
-        }
-
-        public bool HitTest(Point p)
-        {
-            return false;
-        }
-
-        public void Render(ImmediateDrawingContext context)
-        {
-            var skiaSharpApiLeaseFeature = context.TryGetFeature<ISkiaSharpApiLeaseFeature>();
-            if (skiaSharpApiLeaseFeature == null)
-            {
-                return;
-            }
-
-            using var skiaSharpApiLease = skiaSharpApiLeaseFeature.Lease();
-            var canvas = skiaSharpApiLease.SkCanvas;
-
-            using var skPaint = new SKPaint();
-            skPaint.Color = SKColors.Red;
-            skPaint.Style = SKPaintStyle.Fill;
-
-            skPaint.IsAntialias = true;
-
-            skPaint.StrokeWidth = 10;
-
-            foreach (var drawContext in DrawContextList)
-            {
-                // 绘制
-                skPaint.Color = drawContext.Color;
-                canvas.DrawPath(drawContext.Path, skPaint);
-            }
-        }
-
-        public Rect Bounds { get; }
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/ErasedSkiaStroke.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/ErasedSkiaStroke.cs
deleted file mode 100644
index f87ee37..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/ErasedSkiaStroke.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
-namespace DotNetCampus.Inking.Erasing;
-
-/// <summary>
-/// 橡皮擦掉之后的笔迹
-/// </summary>
-public readonly record struct ErasedSkiaStroke
-{
-    public ErasedSkiaStroke(SkiaStroke originStroke, IReadOnlyList<SkiaStroke>? newStrokeList, bool isErased)
-    {
-        OriginStroke = originStroke;
-        NewStrokeList = newStrokeList;
-        IsErased = isErased;
-
-        Debug.Assert(isErased == (newStrokeList != null), "被擦掉的情况下，必定存在列表，即使是空列表");
-    }
-
-    /// <summary>
-    /// 原始的笔迹
-    /// </summary>
-    public SkiaStroke OriginStroke { get; }
-
-    /// <summary>
-    /// 被擦掉之后的新笔迹列表，可能为空列表。空列表和 null 有区别，空列表表示被擦掉了，但是没有新的笔迹，而 null 表示没被擦掉
-    /// </summary>
-    public IReadOnlyList<SkiaStroke>? NewStrokeList { get; }
-
-    /// <summary>
-    /// 是否被擦掉了，即 <see cref="OriginStroke"/> 被擦掉成多条 <see cref="NewStrokeList"/> 新的笔迹
-    /// </summary>
-    [MemberNotNullWhen(true, nameof(NewStrokeList))]
-    public bool IsErased { get; }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/PointPathEraserManager.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/PointPathEraserManager.cs
deleted file mode 100644
index 0f731a7..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/PointPathEraserManager.cs
+++ /dev/null
@@ -1,398 +0,0 @@
-using System.Diagnostics;
-
-using Avalonia.Skia;
-
-using DotNetCampus.Inking.Contexts;
-using DotNetCampus.Inking.Primitive;
-using DotNetCampus.Numerics;
-using DotNetCampus.Numerics.Geometry;
-
-using SkiaSharp;
-
-using Point2D = DotNetCampus.Numerics.Geometry.Point2D;
-
-namespace DotNetCampus.Inking.Erasing;
-
-/// <summary>
-/// 点擦路径擦除
-/// </summary>
-class PointPathEraserManager
-{
-    private bool _isErasing;
-
-    public void StartEraserPointPath(IReadOnlyList<SkiaStroke> staticStrokeList)
-    {
-        Debug.Assert(_isErasing == false, $"开始橡皮擦时，开始橡皮擦的 {nameof(_isErasing)} 字段状态一定为 false 值");
-        Debug.Assert(WorkList.Count == 0, "橡皮擦计算开始的时候，必然此时没有任何笔迹正在被橡皮擦工作中");
-        // 兜底代码，确保 WorkList 为空，防止重复加入导致进入诡异的逻辑
-        WorkList.Clear();
-
-        _isErasing = true;
-
-        WorkList.EnsureCapacity(staticStrokeList.Count);
-        var workList = WorkList;
-        foreach (var skiaStrokeSynchronizer in staticStrokeList)
-        {
-            workList.Add(new InkInfoForEraserPointPath(skiaStrokeSynchronizer));
-        }
-    }
-
-    private List<InkInfoForEraserPointPath> WorkList { get; } = [];
-    public SkiaSimpleInkRender? SimpleInkRender { get; set; }
-
-    private readonly List<SubInkInfoForEraserPointPath> _cacheList = [];
-
-    public void Move(Rect2D rect) => Move(new RotatedRect(new Point2D(rect.X, rect.Y), new Size2D(rect.Width, rect.Height), AngularMeasure.Zero));
-
-    public void Move(RotatedRect rotatedEraserRect)
-    {
-        var eraserBoundingBox = rotatedEraserRect.GetBoundingBox();
-        var transformation = AffineTransformation2D.Identity.RotateAt(-rotatedEraserRect.Rotate, rotatedEraserRect.Location).Translate(-rotatedEraserRect.Location.ToVector());
-        var eraserBoundingBoxRect2D = new Rect2D(eraserBoundingBox.MinX, eraserBoundingBox.MinY, eraserBoundingBox.Width, eraserBoundingBox.Height);
-
-        foreach (InkInfoForEraserPointPath inkInfoForEraserPointPath in WorkList)
-        {
-            _cacheList.Clear();
-
-            // 擦点的核心逻辑
-            foreach (SubInkInfoForEraserPointPath pointPath in inkInfoForEraserPointPath.SubInkInfoList)
-            {
-                var bounds = pointPath.CacheBounds;
-                if (!bounds.IntersectsWith(eraserBoundingBoxRect2D))
-                {
-                    _cacheList.Add(pointPath);
-                    continue;
-                }
-
-                var span = pointPath.PointListSpan;
-                var start = -1;
-                var length = 0;
-
-                for (int i = 0; i < span.Length; i++)
-                {
-                    var index = span.Start + i;
-                    var point = inkInfoForEraserPointPath.PointList[index];
-
-                    //var point = inkInfoForEraserPointPath.StrokeSynchronizer.StylusPoints[index].Point;
-                    //_pointCount++;
-
-                    if (
-                        // 1. 短路过滤：快速判断目标点是否在旋转矩形的外接边框内（这可以过滤掉板书中的绝大部分点）。
-                        eraserBoundingBox.Contains(point)
-                        // 2. 精确判断：判断目标点是否在旋转矩形内。
-                        //    2.1. 将目标点转换到旋转矩形的坐标系中；
-                        && transformation.Transform(point) is { X: >= 0, Y: >= 0 } transformedPoint
-                        //    2.2. 判断变换后的点是否在矩形内。
-                        && transformedPoint.X <= rotatedEraserRect.Size.Width
-                        && transformedPoint.Y <= rotatedEraserRect.Size.Height)
-                    {
-                        if (start != -1)
-                        {
-                            // 截断
-                            _cacheList.Add(pointPath.Sub(start, length));
-                        }
-
-                        start = -1;
-                        length = 0;
-                    }
-                    else
-                    {
-                        if (start == -1)
-                        {
-                            start = index;
-                            length = 1;
-                        }
-                        else
-                        {
-                            length++;
-                        }
-                    }
-                }
-
-                // 这里的 start 是相对于 pointPath.PointPath 的，而不是相对于当前的 pointPath.PointListSpan 的。因此 start 为 0 不代表就是当前的 pointPath 的起点，而应该是 start == pointPath.PointListSpan.Start 才是代表起点和 pointPath 相同
-                if (start == pointPath.PointListSpan.Start && length == pointPath.PointListSpan.Length)
-                {
-                    // 短路代码，表示这条笔迹一个点都没被擦掉
-                    _cacheList.Add(pointPath);
-                }
-                else
-                {
-                    if (start != -1)
-                    {
-                        // 截断
-                        _cacheList.Add(pointPath.Sub(start, length));
-                    }
-
-                    // 截断最后需要将原来释放掉
-                    pointPath.Dispose();
-                }
-            }
-
-            inkInfoForEraserPointPath.SubInkInfoList.Clear();
-            inkInfoForEraserPointPath.SubInkInfoList.AddRange(_cacheList);
-
-#if DEBUG
-            foreach (var subInkInfoForEraserPointPath in _cacheList)
-            {
-                if (subInkInfoForEraserPointPath.IsDisposed)
-                {
-                    Debugger.Break();
-                }
-            }
-#endif
-
-            _cacheList.Clear();
-        }
-    }
-
-    public PointPathEraserResult Finish()
-    {
-        _isErasing = false;
-        var count = WorkList.Sum(t => t.SubInkInfoList.Count);
-        var erasingSkiaStrokeList = new List<ErasedSkiaStroke>(count);
-
-        foreach (var inkInfoForEraserPointPath in WorkList)
-        {
-            var originSkiaStroke = inkInfoForEraserPointPath.OriginSkiaStroke;
-
-            IReadOnlyList<SkiaStroke>? newStrokeList;
-            if (inkInfoForEraserPointPath.SubInkInfoList.Count == 0)
-            {
-                // 笔迹完全被擦掉了
-                newStrokeList = Array.Empty<SkiaStroke>();
-            }
-            else if (inkInfoForEraserPointPath.IsErased)
-            {
-                var strokeList = new List<SkiaStroke>(inkInfoForEraserPointPath.SubInkInfoList.Count);
-                newStrokeList = strokeList;
-
-                foreach (var subInkInfoForEraserPointPath in inkInfoForEraserPointPath.SubInkInfoList)
-                {
-                    var subSpan = subInkInfoForEraserPointPath.PointListSpan;
-                    var pointList = new StylusPointListSpan(originSkiaStroke.PointList, subSpan.Start, subSpan.Length);
-
-                    var skPath = subInkInfoForEraserPointPath.CachePath ?? ToPath(subInkInfoForEraserPointPath);
-                    // 已经从 CachePath 取出，不能再有原来的引用，生怕被释放
-                    subInkInfoForEraserPointPath.CachePath = null;
-
-                    var skiaStroke = SkiaStroke.CreateStaticStroke(InkId.NewId(), skPath, pointList, originSkiaStroke.Color,
-                        originSkiaStroke.InkThickness, ownSkiaPath: true, originSkiaStroke.InkStrokeRenderer);
-                    strokeList.Add(skiaStroke);
-                }
-            }
-            else
-            {
-                // 没被擦的笔迹依然可以使用原来的笔迹，设计上配置 newStrokeList 为空，减少对象的创建
-                // 满屏幕的笔迹，然后只擦掉一个笔迹，如果没有被擦掉的笔迹也创建 List 那将会是一个很大的开销
-                newStrokeList = null;
-            }
-
-            erasingSkiaStrokeList.Add(new ErasedSkiaStroke(originSkiaStroke, newStrokeList, inkInfoForEraserPointPath.IsErased));
-        }
-
-        WorkList.Clear();
-        var result = new PointPathEraserResult(erasingSkiaStrokeList);
-        return result;
-    }
-
-    /// <summary>
-    /// 获取渲染内容
-    /// </summary>
-    /// <returns></returns>
-    /// 为什么获取渲染内容需要在准备渲染时才获取，而不是在擦的过程中计算？ 原因是机器设备性能太差，擦的过程的进入次数会比渲染次数更多，且在插的过程中计算出来的结果没有被实际使用到，于是不如就在准备渲染的时候计算，如此可以稍微提升一些性能
-    public IReadOnlyList<SkiaStrokeDrawContext> GetDrawContextList()
-    {
-        var count = WorkList.Sum(t => t.SubInkInfoList.Count);
-        var result = new List<SkiaStrokeDrawContext>(count);
-
-        foreach (var inkInfoForEraserPointPath in WorkList)
-        {
-            var originSkiaStroke = inkInfoForEraserPointPath.OriginSkiaStroke;
-            if (inkInfoForEraserPointPath.IsErased)
-            {
-                // 被擦掉的笔迹，就需要逐个笔迹计算
-                foreach (var subInkInfoForEraserPointPath in inkInfoForEraserPointPath.SubInkInfoList)
-                {
-                    if (subInkInfoForEraserPointPath.IsDisposed)
-                    {
-                        throw new ObjectDisposedException($"当前所使用的 SubInkInfoForEraserPointPath 已经被释放了，橡皮擦状态不正常");
-                    }
-
-                    subInkInfoForEraserPointPath.CachePath ??= ToPath(subInkInfoForEraserPointPath);
-                    // 为什么需要复制一个？原因是接下来的渲染是交给 Avalonia 的渲染线程上，释放时机不固定。原本的在 UI 线程上的 CachePath 的释放时机是这条笔迹被擦到的时候释放，也不能和渲染线程统一，只好进行拷贝一次
-                    var skPath = subInkInfoForEraserPointPath.CachePath.Clone();
-
-                    result.Add(new SkiaStrokeDrawContext(originSkiaStroke.Color, skPath, skPath.Bounds.ToAvaloniaRect(), SKMatrix.Identity, ShouldDisposePath: true));
-                }
-            }
-            else
-            {
-                // 没被擦的笔迹依然可以使用静态笔迹提升性能
-#if DEBUG
-                originSkiaStroke.EnsureIsStaticStroke();
-#endif
-                result.Add(originSkiaStroke.CreateDrawContext());
-            }
-        }
-
-        return result;
-    }
-
-    private SKPath ToPath(SubInkInfoForEraserPointPath subInkInfoForEraserPointPath)
-    {
-        SkiaStroke originSkiaStroke = subInkInfoForEraserPointPath.PointPath.OriginSkiaStroke;
-
-        var subSpan = subInkInfoForEraserPointPath.PointListSpan;
-        // 对于 WPF 注入的渲染器，只要大于一个点就可以开始渲染了
-        if (subSpan.Length > 0)
-        {
-            var pointList = new StylusPointListSpan(originSkiaStroke.PointList, subSpan.Start, subSpan.Length);
-
-            if (originSkiaStroke.InkStrokeRenderer is { } inkStrokeRenderer)
-            {
-                return inkStrokeRenderer.RenderInkToPath(pointList.ToReadOnlyList(), originSkiaStroke.InkThickness);
-            }
-
-            // 如果没有自定义的渲染器，就使用默认的渲染器来进行渲染。默认简单渲染器要求大于两个点才能进行渲染
-            if (subSpan.Length > 2)
-            {
-                SimpleInkRender ??= new SkiaSimpleInkRender();
-                var outlinePointList = SimpleInkRender.GetOutlineSKPointList(pointList.ToReadOnlyList(), originSkiaStroke.InkThickness);
-
-                var skPath = new SKPath();
-                skPath.AddPoly(outlinePointList);
-                return skPath;
-            }
-        }
-
-        return new SKPath();
-    }
-
-    /// <summary>
-    /// 橡皮擦点擦过程中用到的笔迹信息
-    /// </summary>
-    /// 用于中间计算使用
-    class InkInfoForEraserPointPath
-    {
-        public InkInfoForEraserPointPath(SkiaStroke originSkiaStroke)
-        {
-            OriginSkiaStroke = originSkiaStroke;
-
-            SubInkInfoList = new List<SubInkInfoForEraserPointPath>();
-
-            var subInk = new SubInkInfoForEraserPointPath(new PointListSpan(0, originSkiaStroke.PointList.Count), this);
-            if (originSkiaStroke.Path is { } skPath)
-            {
-                subInk.CacheBounds = skPath.Bounds.ToRect2D();
-            }
-
-            SubInkInfoList.Add(subInk);
-
-            PointList = new Point2D[OriginSkiaStroke.PointList.Count];
-            for (var i = 0; i < OriginSkiaStroke.PointList.Count; i++)
-            {
-                PointList[i] = OriginSkiaStroke.PointList[i].Point;
-            }
-        }
-
-        public SkiaStroke OriginSkiaStroke { get; }
-
-        /// <summary>
-        /// 所有实际带的点
-        /// </summary>
-        /// 比 <see cref="InkStylusPoint"/> 结构体小，如此可以提升遍历性能
-        public Point2D[] PointList { get; }
-
-        /// <summary>
-        /// 拆分出来的笔迹
-        /// </summary>
-        /// 默认会有一条笔迹，就是原始的
-        public List<SubInkInfoForEraserPointPath> SubInkInfoList { get; }
-
-        /// <summary>
-        /// 是否被擦到了
-        /// </summary>
-        public bool IsErased
-        {
-            get
-            {
-                if (SubInkInfoList.Count == 1)
-                {
-                    var subInk = SubInkInfoList[0];
-                    if (subInk.PointListSpan.Start == 0 && subInk.PointListSpan.Length == PointList.Length)
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-        }
-    }
-
-    /// <summary>
-    /// 被橡皮擦拆分的子笔迹信息
-    /// </summary>
-    class SubInkInfoForEraserPointPath : IDisposable
-    {
-        public SubInkInfoForEraserPointPath(PointListSpan pointListSpan, InkInfoForEraserPointPath pointPath)
-        {
-            PointListSpan = pointListSpan;
-            PointPath = pointPath;
-        }
-
-        public SKPath? CachePath { get; set; }
-
-        public InkInfoForEraserPointPath PointPath { get; }
-
-        public Rect2D CacheBounds
-        {
-            get
-            {
-                if (_cacheBounds == null)
-                {
-                    var span = PointPath.PointList.AsSpan(PointListSpan.Start, PointListSpan.Length);
-                    Rect2D bounds = new Rect2D();
-
-                    if (span.Length > 0)
-                    {
-                        bounds = new Rect2D(span[0].X, span[0].Y, 0, 0);
-                    }
-
-                    for (int i = 1; i < span.Length; i++)
-                    {
-                        bounds = bounds.Union(span[i]);
-                    }
-
-                    _cacheBounds = bounds;
-                }
-
-                return _cacheBounds.Value;
-            }
-            set => _cacheBounds = value;
-        }
-
-        private Rect2D? _cacheBounds;
-
-        public PointListSpan PointListSpan { get; }
-
-        public SubInkInfoForEraserPointPath Sub(int start, int length)
-        {
-            return new SubInkInfoForEraserPointPath(new PointListSpan(start, length), PointPath)
-            {
-                _cacheBounds = null
-            };
-        }
-
-        public bool IsDisposed { get; set; }
-
-        public void Dispose()
-        {
-            IsDisposed = true;
-            CachePath?.Dispose();
-            CachePath = null;
-        }
-    }
-
-    readonly record struct PointListSpan(int Start, int Length);
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/PointPathEraserResult.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/PointPathEraserResult.cs
deleted file mode 100644
index bc259b9..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/PointPathEraserResult.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace DotNetCampus.Inking.Erasing;
-
-record PointPathEraserResult(IReadOnlyList<ErasedSkiaStroke> ErasingSkiaStrokeList);
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/DelegateEraserViewCreator.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/DelegateEraserViewCreator.cs
deleted file mode 100644
index 0d05f04..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/DelegateEraserViewCreator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace DotNetCampus.Inking.Erasing;
-
-/// <summary>
-/// 使用委托的方式创建 <see cref="IEraserView"/> 实例的创建器
-/// </summary>
-/// <param name="Creator"></param>
-public record DelegateEraserViewCreator(Func<IEraserView> Creator) : IEraserViewCreator
-{
-    public IEraserView CreateEraserView()
-    {
-        return Creator();
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/EraserView.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/EraserView.cs
deleted file mode 100644
index a38e943..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/EraserView.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-
-namespace DotNetCampus.Inking.Erasing;
-
-class EraserView : Control, IEraserView
-{
-    public EraserView()
-    {
-        var rectangleGeometry = new RectangleGeometry(new Rect(0, 0, 48, 72), 3, 3);
-        Path1 = rectangleGeometry;//Geometry.Parse("M0,5.0093855C0,2.24277828,2.2303666,0,5.00443555,0L24.9955644,0C27.7594379,0,30,2.23861485,30,4.99982044L30,17.9121669C30,20.6734914,30,25.1514578,30,27.9102984L30,40.0016889C30,42.7621799,27.7696334,45,24.9955644,45L5.00443555,45C2.24056212,45,0,42.768443,0,39.9906145L0,5.0093855z");
-        //skPaint.Color = new SKColor(0, 0, 0, 0x33);
-        Path1FillBrush = new SolidColorBrush(new Color(0x33, 0, 0, 0));
-
-        var bounds = Path1.Bounds; //.Union(Path2.Bounds);
-        Width = bounds.Width;
-        Height = bounds.Height;
-
-        HorizontalAlignment = HorizontalAlignment.Left;
-        VerticalAlignment = VerticalAlignment.Top;
-        IsHitTestVisible = false;
-
-        var translateTransform = new TranslateTransform();
-        _translateTransform = translateTransform;
-        var scaleTransform = new ScaleTransform();
-        _scaleTransform = scaleTransform;
-        var transformGroup = new TransformGroup();
-        transformGroup.Children.Add(_scaleTransform);
-        transformGroup.Children.Add(_translateTransform);
-        RenderTransform = transformGroup;
-
-        _currentEraserSize = new Size(Width, Height);
-    }
-
-    private readonly TranslateTransform _translateTransform;
-
-    private readonly ScaleTransform _scaleTransform;
-
-    private Geometry Path1 { get; }
-    private IBrush Path1FillBrush { get; }
-
-    //private Geometry Path2 { get; }
-    //private IBrush Path2FillBrush { get; }
-
-    //private IBrush Path3FillBrush { get; }
-
-    private Size _currentEraserSize;
-
-    public void Move(Point position)
-    {
-        _translateTransform.X = position.X - _currentEraserSize.Width / 2;
-        _translateTransform.Y = position.Y - _currentEraserSize.Height / 2;
-    }
-
-    public void SetEraserSize(Size size)
-    {
-        _scaleTransform.ScaleX = size.Width / Width;
-        _scaleTransform.ScaleY = size.Height / Height;
-
-        _currentEraserSize = size;
-    }
-
-    public override void Render(DrawingContext context)
-    {
-        context.DrawGeometry(Path1FillBrush, null, Path1);
-        //skPaint.Color = new SKColor(0xF2, 0xEE, 0xEB, 0xFF);
-        //skCanvas.DrawRoundRect(1, 1, 28, 43, 4, 4, skPaint);
-        //context.DrawRectangle(Path3FillBrush, null, new RoundedRect(new Rect(1, 1, 28, 43), 4));
-        //context.DrawGeometry(Path2FillBrush, null, Path2);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/IEraserView.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/IEraserView.cs
deleted file mode 100644
index e5c6109..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/IEraserView.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia;
-
-namespace DotNetCampus.Inking.Erasing;
-
-/// <summary>
-/// 橡皮擦的视图接口
-/// </summary>
-public interface IEraserView
-{
-    void Move(Point position);
-    void SetEraserSize(Size size);
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/IEraserViewCreator.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/IEraserViewCreator.cs
deleted file mode 100644
index 46476ae..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Erasing/Views/IEraserViewCreator.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace DotNetCampus.Inking.Erasing;
-
-public interface IEraserViewCreator
-{
-    IEraserView CreateEraserView();
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Primitive/StylusPointListSpan.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Primitive/StylusPointListSpan.cs
deleted file mode 100644
index 0e29f95..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Primitive/StylusPointListSpan.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace DotNetCampus.Inking.Primitive;
-
-public readonly record struct StylusPointListSpan(IReadOnlyList<InkStylusPoint> OriginList, int Start, int Length)
-{
-    public IEnumerable<InkStylusPoint> GetEnumerable()
-    {
-        return OriginList.Skip(Start).Take(Length);
-    }
-
-    public IReadOnlyList<InkStylusPoint> ToReadOnlyList()
-    {
-        var result = new InkStylusPoint[Length];
-        for (int i = 0, listIndex = Start; i < Length; i++, listIndex++)
-        {
-            result[i] = OriginList[listIndex];
-        }
-
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/ISkiaInkStrokeRenderer.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/ISkiaInkStrokeRenderer.cs
deleted file mode 100644
index dbff7af..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/ISkiaInkStrokeRenderer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using DotNetCampus.Inking.Primitive;
-
-using SkiaSharp;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DotNetCampus.Inking.StrokeRenderers;
-
-/// <summary>
-/// 提供给 Skia 系的笔迹渲染器的接口
-/// </summary>
-public interface ISkiaInkStrokeRenderer
-{
-    /// <summary>
-    /// 从给点的点集创建笔迹路径
-    /// </summary>
-    /// <param name="pointList"></param>
-    /// <param name="inkThickness"></param>
-    /// <returns></returns>
-    SKPath RenderInkToPath(IReadOnlyList<InkStylusPoint> pointList, double inkThickness);
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/WpfForSkiaInkStrokeRenderers/SkiaStreamGeometryContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/WpfForSkiaInkStrokeRenderers/SkiaStreamGeometryContext.cs
deleted file mode 100644
index 1460a41..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/WpfForSkiaInkStrokeRenderers/SkiaStreamGeometryContext.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using DotNetCampus.Numerics.Geometry;
-
-using SkiaSharp;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using WpfInk;
-
-namespace DotNetCampus.Inking.StrokeRenderers.WpfForSkiaInkStrokeRenderers;
-
-public class SkiaStreamGeometryContext : IStreamGeometryContext
-{
-    public SkiaStreamGeometryContext(SKPath path)
-    {
-        Path = path;
-        path.FillType = SKPathFillType.Winding;
-    }
-
-    public SKPath Path { get; }
-
-    public void BeginFigure(Point2D startPoint, bool isFilled, bool isClosed)
-    {
-        Path.MoveTo(startPoint.ToPoint());
-    }
-
-    public void PolyBezierTo(IList<Point2D> points, bool isStroked, bool isSmoothJoin)
-    {
-        // 传入的 points 必定是 3 的倍数
-
-        for (var i = 0; i < points.Count; i += 3)
-        {
-            var a = points[i];
-            var b = points[i + 1];
-            var c = points[i + 2];
-
-            Path.CubicTo(a.ToPoint(), b.ToPoint(), c.ToPoint());
-        }
-    }
-
-    public void PolyLineTo(IList<Point2D> points, bool isStroked, bool isSmoothJoin)
-    {
-        foreach (var point in points)
-        {
-            Path.LineTo(point.ToPoint());
-        }
-    }
-
-    public void ArcTo(Point2D point, Size2D size, double rotationAngle, bool isLargeArc, bool sweepDirection, bool isStroked,
-        bool isSmoothJoin)
-    {
-        Path.ArcTo((float) size.Width, (float) size.Height, (float) rotationAngle, isLargeArc ? SKPathArcSize.Large : SKPathArcSize.Small, sweepDirection ? SKPathDirection.Clockwise : SKPathDirection.CounterClockwise, (float) point.X, (float) point.Y);
-    }
-}
-
-file static class Converter
-{
-    public static SKPoint ToPoint(this Point2D point)
-    {
-        return new SKPoint((float) point.X, (float) point.Y);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/WpfForSkiaInkStrokeRenderers/WpfForSkiaInkStrokeRenderer.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/WpfForSkiaInkStrokeRenderers/WpfForSkiaInkStrokeRenderer.cs
deleted file mode 100644
index 8bef687..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/StrokeRenderers/WpfForSkiaInkStrokeRenderers/WpfForSkiaInkStrokeRenderer.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using DotNetCampus.Inking.Primitive;
-using SkiaSharp;
-using WpfInk;
-
-namespace DotNetCampus.Inking.StrokeRenderers.WpfForSkiaInkStrokeRenderers;
-
-/// <summary>
-/// 用 WPF 的笔迹算法提供给 Skia 这边的笔迹支持
-/// </summary>
-public class WpfForSkiaInkStrokeRenderer : ISkiaInkStrokeRenderer
-{
-    public SKPath RenderInkToPath(IReadOnlyList<InkStylusPoint> pointList, double inkThickness)
-    {
-        if (pointList.Count == 0)
-        {
-            return new SKPath();
-        }
-
-        var path = new SKPath();
-        var skiaStreamGeometryContext = new SkiaStreamGeometryContext(path);
-
-        InkStrokeRenderer.Render(skiaStreamGeometryContext, new StrokeRendererInfo()
-        {
-            Width = inkThickness / 2,
-            Height = inkThickness / 2,
-            StylusPointCollection = pointList
-        });
-        return path;
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/AvaloniaRectExtension.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/AvaloniaRectExtension.cs
deleted file mode 100644
index c20e897..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/AvaloniaRectExtension.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using DotNetCampus.Numerics.Geometry;
-using SkiaSharp;
-
-namespace DotNetCampus.Inking.Utils;
-
-static class AvaloniaRectExtension
-{
-    //public static Rect2D ToRect2D(this SKRect rect)
-    //{
-    //    return new Rect2D(rect.Left, rect.Top, rect.Width, rect.Height);
-    //}
-
-    public static Rect2D ToRect2D(this Avalonia.Rect rect)
-    {
-        return new Rect2D(rect.Left, rect.Top, rect.Width, rect.Height);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/PointExtension.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/PointExtension.cs
deleted file mode 100644
index 1e8cf12..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/PointExtension.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using DotNetCampus.Numerics.Geometry;
-
-namespace DotNetCampus.Inking.Utils;
-
-static class PointExtension
-{
-    public static Avalonia.Point ToAvaloniaPoint(this global::DotNetCampus.Numerics.Geometry.Point2D point)
-    {
-        return new Avalonia.Point(point.X, point.Y);
-    }
-
-    public static Point2D ToPoint2D(this Avalonia.Point point)
-    {
-        return new Point2D(point.X, point.Y);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/RectExtension.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/RectExtension.cs
deleted file mode 100644
index ea5e5e9..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/RectExtension.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia;
-
-namespace DotNetCampus.Inking.Utils;
-
-static class RectExtension
-{
-    public static Rect ExpandLength(this Rect rect, double value)
-    {
-        return new Rect(rect.X - value / 2, rect.Y - value / 2, rect.Width + value, rect.Height + value);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/SkiaRectExtension.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/SkiaRectExtension.cs
deleted file mode 100644
index 4c905bd..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/SkiaRectExtension.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using DotNetCampus.Numerics;
-using DotNetCampus.Numerics.Geometry;
-
-using SkiaSharp;
-
-namespace DotNetCampus.Inking.Utils;
-
-static class SkiaRectExtension
-{
-    public static SKMatrix ToSkMatrix(this AffineTransformation2D matrix)
-    {
-        return new SKMatrix
-        {
-            ScaleX = (float) matrix.M11,
-            SkewX = (float) matrix.M12,
-            SkewY = (float) matrix.M21,
-            ScaleY = (float) matrix.M22,
-            TransX = (float) matrix.OffsetX,
-            TransY = (float) matrix.OffsetY,
-            Persp0 = 0,
-            Persp1 = 0,
-            Persp2 = 1,
-        };
-    }
-
-    public static SKMatrix ToSkMatrix(this SimilarityTransformation2D transform)
-    {
-        return new SKMatrix
-        {
-            ScaleX = (float) transform.Scaling,
-            SkewX = 0,
-            SkewY = 0,
-            ScaleY = (float) transform.Scaling,
-            TransX = (float) transform.Translation.X,
-            TransY = (float) transform.Translation.Y,
-            Persp0 = 0,
-            Persp1 = 0,
-            Persp2 = 1,
-        };
-    }
-
-    public static AffineTransformation2D ToNumericMatrix(this SKMatrix matrix)
-    {
-        return new AffineTransformation2D(matrix.ScaleX, matrix.SkewX, matrix.SkewY, matrix.ScaleY, matrix.TransX, matrix.TransY);
-    }
-
-    public static SimilarityTransformation2D ToSimilarityTransformation(this SKMatrix matrix)
-    {
-        return matrix.ToNumericMatrix().ToSimilarityTransformation2D();
-    }
-
-    /// <summary>
-    /// 将 <see cref="AffineTransformation2D" /> 转换为 <see cref="SimilarityTransformation2D" />，其中剪切变换将被忽略，非等比缩放将使用最大缩放比进行等比缩放。
-    /// </summary>
-    /// <param name="affineTransformation">仿射变换。</param>
-    /// <returns>相似变换。</returns>
-    public static SimilarityTransformation2D ToSimilarityTransformation2D(this AffineTransformation2D affineTransformation)
-    {
-        var decomposition = affineTransformation.Decompose();
-        var scale = Math.Max(decomposition.Scaling.ScaleX.Abs(), decomposition.Scaling.ScaleY.Abs());
-        return new SimilarityTransformation2D(scale, decomposition.Scaling.ScaleY < 0, decomposition.Rotation, decomposition.Translation);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/SkiaStrokeRenderSynchronizer.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/SkiaStrokeRenderSynchronizer.cs
deleted file mode 100644
index f22ab1d..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.AvaloniaInkCanvas/Utils/SkiaStrokeRenderSynchronizer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DotNetCampus.Inking.Utils;
-
-/// <summary>
-/// 渲染同步器
-/// </summary>
-record SkiaStrokeRenderSynchronizer(IReadOnlyList<SkiaStroke> StrokeList, Action OnRender)
-{
-}
-
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/AssemblyInfo.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/AssemblyInfo.cs
deleted file mode 100644
index 1b7cbf9..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("DotNetCampus.InkCanvas.SkiaInk")]
-[assembly: InternalsVisibleTo("DotNetCampus.UnoInkCanvas")]
-[assembly: InternalsVisibleTo("DotNetCampus.AvaloniaInkCanvas")]
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/DotNetCampus.InkCanvas.InkCore.csproj b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/DotNetCampus.InkCanvas.InkCore.csproj
deleted file mode 100644
index bc5d49d..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/DotNetCampus.InkCanvas.InkCore.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <RootNamespace>DotNetCampus.Inking</RootNamespace>
-    <IsAotCompatible>true</IsAotCompatible>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DotNetCampus.Numerics.Geometry" />
-    <PackageReference Include="DotNetCampus.Logger" />
-  </ItemGroup>
-
-</Project>
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/DotNetCampus.InkCanvas.InkCore.csproj.DotSettings b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/DotNetCampus.InkCanvas.InkCore.csproj.DotSettings
deleted file mode 100644
index 6f053dd..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/DotNetCampus.InkCanvas.InkCore.csproj.DotSettings
+++ /dev/null
@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=inking/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=inking_005Ccontext_005F/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Algorithms/DropPointAlgorithm.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Algorithms/DropPointAlgorithm.cs
deleted file mode 100644
index eccb0b8..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Algorithms/DropPointAlgorithm.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using DotNetCampus.Inking.Primitive;
-
-namespace DotNetCampus.Inking.Algorithms;
-
-internal static class DropPointAlgorithm
-{
-    /// <summary>
-    /// 按照德熙的玄幻算法，决定传入的点是否能丢掉
-    /// </summary>
-    /// <param name="pointList"></param>
-    /// <param name="currentStylusPoint"></param>
-    /// <param name="dropPointCount"></param>
-    /// <returns></returns>
-    private static bool CanDropLastPoint(IReadOnlyList<InkStylusPoint> pointList, InkStylusPoint currentStylusPoint,
-        int dropPointCount)
-    {
-        if (pointList.Count < 3)
-        {
-            return false;
-        }
-
-        // 已经丢了10个点了，就不继续丢点了
-        if (dropPointCount >= 10)
-        {
-            return false;
-        }
-
-        // 假定要丢掉倒数第一个点，所以上一个点是倒数第二个点
-        var lastPoint = pointList[^2].Point;
-        var currentPoint = currentStylusPoint.Point;
-
-        var lastPointVector = new Vector2((float) lastPoint.X, (float) lastPoint.Y);
-        var currentPointVector = new Vector2((float) currentPoint.X, (float) currentPoint.Y);
-
-        var lineVector = currentPointVector - lastPointVector;
-        var lineLength = lineVector.Length();
-
-        // 如果移动距离比较长，则不丢点
-        if (lineLength > 10)
-        {
-            return false;
-        }
-
-        var last2Point = pointList[^3].Point;
-        var line2Vector = lastPointVector - new Vector2((float) last2Point.X, (float) last2Point.Y);
-        var line2Length = line2Vector.Length();
-        var vector2 = currentPointVector - lastPointVector;
-        var distance2 = MathF.Abs(line2Vector.X * vector2.Y - line2Vector.Y * vector2.X) / line2Length;
-        if (distance2 > 2)
-        {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Context_/InkId.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Context_/InkId.cs
deleted file mode 100644
index 15c8b04..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Context_/InkId.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace DotNetCampus.Inking;
-
-public readonly partial record struct InkId(int Value)
-{
-    public static InkId NewId() => new InkId(_nextId++);
-
-    private static int _nextId = 0;
-
-    public override string ToString()
-        => $"InkId={Value}";
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/AverageCounter.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/AverageCounter.cs
deleted file mode 100644
index c786b4f..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/AverageCounter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DotNetCampus.Inking.Diagnostics;
-
-class AverageCounter
-{
-    public AverageCounter(string name, int averageMaxCount = 100) : this(averageMaxCount, averageTime => StaticDebugLogger.WriteLine($"{name} 耗时： {averageTime}"))
-    {
-    }
-
-    public AverageCounter(int averageMaxCount, AverageCounterRecordHandler handler)
-    {
-        _averageMaxCount = averageMaxCount;
-        _handler = handler;
-
-#if DEBUG
-        Enable = true;
-#endif
-    }
-
-    /// <summary>
-    /// 是否可用，用于方便一口气关闭
-    /// </summary>
-    public bool Enable { get; set; }
-
-    public void Start()
-    {
-        _stopwatch.Restart();
-    }
-
-    public void Stop()
-    {
-        _stopwatch.Stop();
-        _totalTime += _stopwatch.Elapsed.TotalMilliseconds;
-        _count++;
-
-        if (_count >= _averageMaxCount)
-        {
-            _handler(_totalTime / _count);
-            _totalTime = 0;
-            _count = 0;
-        }
-    }
-
-    private readonly Stopwatch _stopwatch = new Stopwatch();
-    private double _totalTime;
-    private int _count;
-    private readonly int _averageMaxCount;
-    private readonly AverageCounterRecordHandler _handler;
-}
-
-delegate void AverageCounterRecordHandler(double averageTime);
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/StaticDebugLogger.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/StaticDebugLogger.cs
deleted file mode 100644
index 4ee1e2d..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/StaticDebugLogger.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Diagnostics;
-using DotNetCampus.Logging;
-
-namespace DotNetCampus.Inking.Diagnostics;
-
-static class StaticDebugLogger
-{
-    [Conditional("False")]
-    public static void WriteLine(string message)
-    {
-        //if (!message.Contains("X11DeviceInputManager"))
-        //{
-        //    return;
-        //}
-
-        Log.Debug($"[InkCore] {message}");
-
-        //Console.WriteLine(message);
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/StepCounter.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/StepCounter.cs
deleted file mode 100644
index 2702897..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Diagnostics/StepCounter.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System.Diagnostics;
-using System.Text;
-
-namespace DotNetCampus.Inking.Diagnostics;
-
-/// <summary>
-/// 线性步骤记录器
-/// </summary>
-class StepCounter
-{
-    /// <summary>
-    /// 开始
-    /// </summary>
-    /// 开始和记录分离，开始不一定是某个步骤。这样业务方修改开始对应的步骤时，可以能够更好的被约束，明确一个开始的时机
-    public void Start()
-    {
-        Stopwatch.Restart();
-        IsStart = true;
-    }
-
-    public void Restart()
-    {
-        IsStart = true;
-        StepDictionary.Clear();
-        Stopwatch.Restart();
-    }
-
-    public Stopwatch Stopwatch => _stopwatch ??= new Stopwatch();
-    private Stopwatch? _stopwatch;
-
-    /// <summary>
-    /// 记录某个步骤。默认就是一个步骤将会延续到下个步骤，两个步骤之间的耗时就是步骤耗时
-    /// 实在不行，那你就加上 “Xx开始” 和 “Xx结束”好了
-    /// </summary>
-    /// <param name="step"></param>
-    public void Record(string step)
-    {
-        if (!IsStart)
-        {
-            return;
-        }
-
-        Stopwatch.Stop();
-        StepDictionary[step] = Stopwatch.ElapsedTicks;
-        Stopwatch.Restart();
-    }
-
-    public void OutputToConsole()
-    {
-        if (!IsStart)
-        {
-            return;
-        }
-        Console.WriteLine(BuildStepResult());
-    }
-
-    /// <summary>
-    /// 进行耗时对比，用于对比两个模块或者两个版本的各个步骤的耗时差
-    /// </summary>
-    /// <param name="other"></param>
-    public void CompareToConsole(StepCounter other)
-    {
-        if (!IsStart)
-        {
-            return;
-        }
-        Console.WriteLine(Compare(other));
-    }
-
-    public string Compare(StepCounter other)
-    {
-        if (!IsStart)
-        {
-            return string.Empty;
-        }
-
-        var stringBuilder = new StringBuilder();
-        foreach (var (step, tick) in StepDictionary)
-        {
-            if (other.StepDictionary.TryGetValue(step, out var otherTick))
-            {
-                var sign = tick > otherTick ? "+" : "";
-                stringBuilder.AppendLine($"{step} {TickToMillisecond(tick):0.000}ms {TickToMillisecond(otherTick):0.000}ms {sign}{TickToMillisecond(tick - otherTick):0.000}ms");
-            }
-            else
-            {
-                stringBuilder.AppendLine($"{step} {tick * 1000d / Stopwatch.Frequency}ms");
-            }
-        }
-        return stringBuilder.ToString();
-    }
-
-    public string BuildStepResult()
-    {
-        if (!IsStart)
-        {
-            return string.Empty;
-        }
-
-        var stringBuilder = new StringBuilder();
-        foreach (var (step, tick) in StepDictionary)
-        {
-            stringBuilder.AppendLine($"{step} {TickToMillisecond(tick)}ms");
-        }
-        return stringBuilder.ToString();
-    }
-
-    public Dictionary<string /*Step*/, long /*耗时*/> StepDictionary => _stepDictionary ??= new Dictionary<string, long>();
-    private Dictionary<string, long>? _stepDictionary;
-
-    /// <summary>
-    /// 是否开始，如果没有开始则啥都不做，用于性能优化，方便一次性注释决定是否测试性能
-    /// </summary>
-    public bool IsStart { get; private set; }
-
-    private const double SecondToMillisecond = 1000d;
-    private static double TickToMillisecond(long tick) => tick * SecondToMillisecond / Stopwatch.Frequency;
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/IInkingInputProcessor.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/IInkingInputProcessor.cs
deleted file mode 100644
index ad4962b..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/IInkingInputProcessor.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace DotNetCampus.Inking.Interactives;
-
-/// <summary>
-/// 输入处理者
-/// </summary>
-interface IInkingInputProcessor
-{
-    /// <summary>
-    /// 是否有效，是否接受输入
-    /// </summary>
-    bool Enable { get; }
-
-    InkingInputProcessorSettings InputProcessorSettings => InkingInputProcessorSettings.Default;
-
-    void InputStart();
-
-    void Down(InkingModeInputArgs args);
-
-    void Move(InkingModeInputArgs args);
-
-    void Hover(InkingModeInputArgs args);
-
-    void Up(InkingModeInputArgs args);
-
-    void Leave();
-
-    void InputComplete();
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/IInkingModeInputDispatcherSensitive.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/IInkingModeInputDispatcherSensitive.cs
deleted file mode 100644
index ff1aa2e..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/IInkingModeInputDispatcherSensitive.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace DotNetCampus.Inking.Interactives;
-
-/// <summary>
-/// 表示对输入调度器敏感，将被注入
-/// </summary>
-interface IInkingModeInputDispatcherSensitive
-{
-    /// <summary>
-    /// 输入调度器 此属性将由框架层注入值
-    /// </summary>
-    InkingModeInputDispatcher ModeInputDispatcher { set; get; }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingInputProcessorSettings.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingInputProcessorSettings.cs
deleted file mode 100644
index 1277ace..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingInputProcessorSettings.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace DotNetCampus.Inking.Interactives;
-
-record InkingInputProcessorSettings
-{
-    // 不好实现，存在漏洞是首次收到 Move 的情况，此时不仅需要补 Down 还需要补 Start 的情况
-    ///// <summary>
-    ///// 对于丢失了 Down 的触摸，是否启用。如启用，则会自动补 Down 事件。默认 false 即丢点
-    ///// </summary>
-    //public bool EnableLostDownTouch { init; get; } = false;
-
-    public bool EnableMultiTouch { init; get; } = true;
-
-    public static readonly InkingInputProcessorSettings Default = new InkingInputProcessorSettings();
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingModeInputArgs.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingModeInputArgs.cs
deleted file mode 100644
index a79a2c0..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingModeInputArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using DotNetCampus.Inking.Primitive;
-using DotNetCampus.Numerics.Geometry;
-
-namespace DotNetCampus.Inking.Interactives;
-
-public readonly record struct InkingModeInputArgs(int Id, InkStylusPoint StylusPoint, ulong Timestamp)
-{
-    public Point2D Position => StylusPoint.Point;
-
-    /// <summary>
-    /// 是否来自鼠标的输入
-    /// </summary>
-    public bool IsMouse { init; get; }
-
-    /// <summary>
-    /// 被合并的其他历史的触摸点。可能为空
-    /// </summary>
-    public IReadOnlyList<InkStylusPoint>? StylusPointList { init; get; }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingModeInputDispatcher.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingModeInputDispatcher.cs
deleted file mode 100644
index 742f9fd..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Interactives/InkingModeInputDispatcher.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using System.Diagnostics;
-using DotNetCampus.Inking.Diagnostics;
-
-namespace DotNetCampus.Inking.Interactives;
-
-/// <summary>
-/// 输入调度器
-/// </summary>
-class InkingModeInputDispatcher
-{
-    private HashSet<int> CurrentInputIdHashSet { get; } = new HashSet<int>();
-
-    /// <summary>
-    /// 首个输入点
-    /// </summary>
-    public int MainInputId { private set; get; }
-
-    /// <summary>
-    /// 是否输入开始了
-    /// </summary>
-    public bool IsInputStart { private set; get; }
-
-    /// <summary>
-    /// 距离输入过去多久，仅在 <see cref="IsInputStart"/> 为 true 时，才有意义
-    /// </summary>
-    public TimeSpan InputDuring => _inputDuringStopwatch.Elapsed;
-
-    private readonly Stopwatch _inputDuringStopwatch = new Stopwatch();
-
-    public void Down(in InkingModeInputArgs args)
-    {
-        CurrentInputIdHashSet.Add(args.Id);
-
-        if (CurrentInputIdHashSet.Count == 1)
-        {
-            MainInputId = args.Id;
-            ProcessInputStart();
-        }
-
-        ProcessDown(in args);
-    }
-
-    private void ProcessInputStart()
-    {
-        IsInputStart = true;
-        _inputDuringStopwatch.Restart();
-
-        foreach (var inputProcessor in InputProcessors)
-        {
-            if (inputProcessor.Enable)
-            {
-                inputProcessor.InputStart();
-            }
-        }
-    }
-
-    private void ProcessDown(in InkingModeInputArgs args)
-    {
-        foreach (var inputProcessor in InputProcessors)
-        {
-            if (inputProcessor.Enable)
-            {
-                inputProcessor.Down(args);
-            }
-        }
-    }
-
-    public void Move(in InkingModeInputArgs args)
-    {
-        if (CurrentInputIdHashSet.Contains(args.Id))
-        {
-            foreach (var inputProcessor in InputProcessors)
-            {
-                if (inputProcessor.Enable)
-                {
-                    if (inputProcessor.InputProcessorSettings.EnableMultiTouch || MainInputId == args.Id)
-                    {
-                        inputProcessor.Move(args);
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (args.IsMouse)
-            {
-                foreach (var inputProcessor in InputProcessors)
-                {
-                    if (inputProcessor.Enable)
-                    {
-                        inputProcessor.Hover(args);
-                    }
-                }
-            }
-            else
-            {
-                // 非鼠标没有 Hover 效果
-                // 如果是在 IsInputStart=false 时，代表触摸离开之后，收到离开之后的消息
-                // 对应的问题记录：手势橡皮擦进入工具条时，先触发 Leave 里面，符合预期的进行结束手势橡皮擦。然而后续居然又继续收到 Move 事件，导致判断橡皮擦逻辑工作，再次错误进入了手势橡皮擦模式
-                StaticDebugLogger.WriteLine($"[{nameof(InkingModeInputDispatcher)}] Lost Move IsInputStart={IsInputStart} Id={args.Id}");
-            }
-        }
-    }
-
-    public void Up(InkingModeInputArgs args)
-    {
-        if (CurrentInputIdHashSet.Remove(args.Id))
-        {
-            if (args.Id == MainInputId)
-            {
-                StaticDebugLogger.WriteLine($"[{nameof(InkingModeInputDispatcher)}] MainIdUp MainId={MainInputId}");
-            }
-
-            foreach (var inputProcessor in InputProcessors)
-            {
-                if (inputProcessor.Enable)
-                {
-                    if (inputProcessor.InputProcessorSettings.EnableMultiTouch || MainInputId == args.Id)
-                    {
-                        inputProcessor.Up(args);
-                    }
-                }
-            }
-
-            if (CurrentInputIdHashSet.Count == 0)
-            {
-                ProcessInputComplete();
-            }
-        }
-        else
-        {
-            // 啥都不能做
-        }
-    }
-
-    private void ProcessInputComplete()
-    {
-        foreach (var inputProcessor in InputProcessors)
-        {
-            if (inputProcessor.Enable)
-            {
-                inputProcessor.InputComplete();
-            }
-        }
-        IsInputStart = false;
-        _inputDuringStopwatch.Stop();
-    }
-
-    /// <summary>
-    /// 输入被其他拿走了，比如鼠标移动到窗口外抬起
-    /// </summary>
-    public void Leave()
-    {
-        StaticDebugLogger.WriteLine($"{nameof(InkingModeInputDispatcher)} Leave");
-
-        foreach (var inputProcessor in InputProcessors)
-        {
-            if (inputProcessor.Enable)
-            {
-                inputProcessor.Leave();
-            }
-        }
-
-        CurrentInputIdHashSet.Clear();
-        IsInputStart = false;
-        _inputDuringStopwatch.Stop();
-    }
-
-    /// <summary>
-    /// 加上输入处理者，有输入时自然执行
-    /// </summary>
-    /// <param name="inkingInputProcessor"></param>
-    public void AddInputProcessor(IInkingInputProcessor inkingInputProcessor)
-    {
-        InputProcessors.Add(inkingInputProcessor);
-        if (inkingInputProcessor is IInkingModeInputDispatcherSensitive modeInputDispatcherSensitive)
-        {
-            modeInputDispatcherSensitive.ModeInputDispatcher = this;
-        }
-    }
-
-    private List<IInkingInputProcessor> InputProcessors { get; } = new List<IInkingInputProcessor>();
-
-    //public bool Enable => true;
-
-    /// <summary>
-    /// 某个触摸 Id 是否存在。不存在则代表被抬起
-    /// </summary>
-    /// <param name="deviceId"></param>
-    /// <returns></returns>
-    public bool ContainsDeviceId(int deviceId) => CurrentInputIdHashSet.Contains(deviceId);
-
-    /// <summary>
-    /// 当前有多少手指按下
-    /// </summary>
-    public int CurrentDeviceCount => CurrentInputIdHashSet.Count;
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Primitive/InkStylusPoint.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Primitive/InkStylusPoint.cs
deleted file mode 100644
index b1f7e4b..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Primitive/InkStylusPoint.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using DotNetCampus.Numerics.Geometry;
-
-namespace DotNetCampus.Inking.Primitive;
-
-public readonly record struct InkStylusPoint
-{
-    public InkStylusPoint(Point2D point, float pressure = DefaultPressure)
-    {
-        Point = point;
-        Pressure = pressure;
-    }
-
-    public InkStylusPoint(double x, double y, float pressure = DefaultPressure) : this(new Point2D(x, y), pressure)
-    {
-    }
-
-    public double X => Point.X;
-    public double Y => Point.Y;
-
-    public Point2D Point { init; get; }
-    public float Pressure { init; get; }
-
-    //public bool IsPressureEnable { init; get; }
-
-    public double? Width { init; get; }
-    public double? Height { init; get; }
-
-    public const float DefaultPressure = 0.5f;
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Primitive/RotatedRect.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Primitive/RotatedRect.cs
deleted file mode 100644
index bf2d7ac..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Primitive/RotatedRect.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-using DotNetCampus.Numerics;
-using DotNetCampus.Numerics.Geometry;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DotNetCampus.Inking.Primitive;
-
-/// <summary>
-/// 带有旋转的矩形。
-/// </summary>
-public readonly record struct RotatedRect : ISimilarityTransformable2D<RotatedRect>
-{
-    /// <summary>
-    /// 创建一个带有旋转的矩形。
-    /// </summary>
-    /// <param name="location">矩形所在的位置。UI 上表示为未旋转前矩形的左上角。</param>
-    /// <param name="size">矩形的大小。</param>
-    /// <param name="rotate">矩形的旋转角度。旋转的中心点为 <paramref name="location" />。</param>
-    public RotatedRect(Point2D location, Size2D size, AngularMeasure rotate)
-    {
-        Location = location;
-        Size = size;
-        Rotate = rotate;
-    }
-
-    /// <summary>
-    /// 矩形所在的位置。UI 上表示为未旋转前矩形的左上角。
-    /// </summary>
-    public Point2D Location { get; }
-
-    /// <summary>
-    /// 矩形的大小。
-    /// </summary>
-    public Size2D Size { get; }
-
-    /// <summary>
-    /// 矩形的旋转角度。旋转的中心点为 <see cref="Location" />。
-    /// </summary>
-    public AngularMeasure Rotate { get; }
-
-    /// <inheritdoc />
-    public RotatedRect Transform(SimilarityTransformation2D transformation)
-    {
-        var newLocation = transformation.Transform(Location);
-        var newRotate = Rotate + transformation.Rotation;
-        if (transformation.IsYScaleNegative)
-        {
-            newLocation -= transformation.Scaling * Size.Height * newRotate.UnitVector.NormalVector;
-        }
-
-        var newSize = new Size2D(Size.Width * transformation.Scaling, Size.Height * transformation.Scaling);
-        return new RotatedRect(newLocation, newSize, newRotate.Normalized);
-    }
-
-    /// <inheritdoc />
-    public RotatedRect ScaleTransform(double scale)
-    {
-        return Transform(SimilarityTransformation2D.Identity.Scale(scale));
-    }
-
-    /// <inheritdoc />
-    public RotatedRect RotateTransform(AngularMeasure rotation)
-    {
-        return Transform(SimilarityTransformation2D.Identity.Rotate(rotation));
-    }
-
-    /// <inheritdoc />
-    public RotatedRect TranslateTransform(Vector2D translation)
-    {
-        return Transform(SimilarityTransformation2D.Identity.Translate(translation));
-    }
-
-    /// <summary>
-    /// 判断指定的点是否在矩形内。这里考虑了矩形的旋转。
-    /// </summary>
-    /// <param name="point">要判断的点。</param>
-    /// <returns></returns>
-    public bool Contains(Point2D point)
-    {
-        var transformation = AffineTransformation2D.Identity.RotateAt(-Rotate, Location);
-        var transformedPoint = transformation.Transform(point);
-        return transformedPoint.X >= Location.X && transformedPoint.X <= Location.X + Size.Width &&
-               transformedPoint.Y >= Location.Y && transformedPoint.Y <= Location.Y + Size.Height;
-    }
-
-    /// <summary>
-    /// 过滤掉不在矩形内的点。这里考虑了矩形的旋转。
-    /// </summary>
-    /// <param name="points"></param>
-    /// <returns></returns>
-    public IEnumerable<Point2D> FilterContained(IEnumerable<Point2D> points)
-    {
-        var transformation = AffineTransformation2D.Identity.RotateAt(-Rotate, Location).Translate(-Location.ToVector());
-        foreach (var point in points)
-        {
-            var transformedPoint = transformation.Transform(point);
-            if (transformedPoint.X >= 0 && transformedPoint.X <= Size.Width && transformedPoint.Y >= 0 && transformedPoint.Y <= Size.Height)
-            {
-                yield return point;
-            }
-        }
-    }
-
-    /// <summary>
-    /// 获取矩形的包围盒。这里考虑了矩形的旋转。
-    /// </summary>
-    /// <returns></returns>
-    public BoundingBox2D GetBoundingBox()
-    {
-        var transformation = AffineTransformation2D.Identity.RotateAt(Rotate, Location);
-        var points = new[]
-        {
-            Location,
-            Location + new Vector2D(Size.Width, 0),
-            Location + new Vector2D(Size.Width, Size.Height),
-            Location + new Vector2D(0, Size.Height),
-        };
-
-        for (var index = 0; index < points.Length; index++)
-        {
-            points[index] = transformation.Transform(points[index]);
-        }
-
-        return BoundingBox2D.Create(points);
-    }
-
-    public RotatedRect FlipAtBottom()
-    {
-        var widthUnitVector = Rotate.UnitVector;
-        var heightUnitVector = Rotate.UnitVector.NormalVector;
-        var newLocation = Location + Size.Width * widthUnitVector + 2 * Size.Height * heightUnitVector;
-        return new RotatedRect(newLocation, Size, (Rotate + AngularMeasure.Pi).Normalized);
-    }
-
-    /// <summary>
-    /// 是否与另一个带旋转的矩形相交。
-    /// </summary>
-    /// <param name="other">另一个带旋转的矩形。</param>
-    /// <returns>是否相交。</returns>
-    public bool Intersects(RotatedRect other)
-    {
-        var widthUnitVector1 = Rotate.UnitVector;
-        var heightUnitVector1 = Rotate.UnitVector.NormalVector;
-        var widthUnitVector2 = other.Rotate.UnitVector;
-        var heightUnitVector2 = other.Rotate.UnitVector.NormalVector;
-        var axisUnitVectors = new[]
-        {
-            widthUnitVector1,
-            heightUnitVector1,
-            widthUnitVector2,
-            heightUnitVector2,
-        };
-
-        var vectors1 = new[]
-        {
-            Location.ToVector(),
-            Location.ToVector() + Size.Width * widthUnitVector1,
-            Location.ToVector() + Size.Width * widthUnitVector1 + Size.Height * heightUnitVector1,
-            Location.ToVector() + Size.Height * heightUnitVector1,
-        };
-        var vectors2 = new[]
-        {
-            other.Location.ToVector(),
-            other.Location.ToVector() + other.Size.Width * widthUnitVector2,
-            other.Location.ToVector() + other.Size.Width * widthUnitVector2 + other.Size.Height * heightUnitVector2,
-            other.Location.ToVector() + other.Size.Height * heightUnitVector2,
-        };
-
-        foreach (var axisUnitVector in axisUnitVectors)
-        {
-            var min1 = double.MaxValue;
-            var max1 = double.MinValue;
-            var min2 = double.MaxValue;
-            var max2 = double.MinValue;
-            foreach (var vector in vectors1)
-            {
-                var projection = axisUnitVector.Dot(vector);
-                min1 = Math.Min(min1, projection);
-                max1 = Math.Max(max1, projection);
-            }
-
-            foreach (var vector in vectors2)
-            {
-                var projection = axisUnitVector.Dot(vector);
-                min2 = Math.Min(min2, projection);
-                max2 = Math.Max(max2, projection);
-            }
-
-            if (max1 < min2 || max2 < min1)
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// 是否与指定的点集相交。
-    /// </summary>
-    /// <param name="points">指定的点集。</param>
-    /// <param name="isPolyline">点集是否视为折线。</param>
-    /// <returns>是否相交。</returns>
-    public bool Intersects(IEnumerable<Point2D> points, bool isPolyline)
-    {
-        var transformation = AffineTransformation2D.Identity.RotateAt(-Rotate, Location).Translate(-Location.ToVector());
-
-        if (isPolyline)
-        {
-            Point2D? lastPoint = null;
-            foreach (var point in points)
-            {
-                var currentPoint = transformation.Transform(point);
-
-                if (lastPoint is not { } lastPointValue)
-                {
-                    if (currentPoint.X >= 0 && currentPoint.X <= Size.Width && currentPoint.Y >= 0 && currentPoint.Y <= Size.Height)
-                    {
-                        return true;
-                    }
-
-                    lastPoint = point;
-                    continue;
-                }
-
-                var vector = currentPoint - lastPointValue;
-                if (vector.LengthSquared.IsAlmostZero())
-                {
-                    continue;
-                }
-
-                if (!vector.X.IsAlmostEqual(0))
-                {
-                    var k = vector.Y / vector.X;
-                    var y = currentPoint.Y - currentPoint.X * k;
-                    if (y >= 0 && y <= Size.Height)
-                    {
-                        return true;
-                    }
-
-                    y = currentPoint.Y - (currentPoint.X - Size.Width) * k;
-                    if (y >= 0 && y <= Size.Height)
-                    {
-                        return true;
-                    }
-                }
-
-                if (!vector.Y.IsAlmostEqual(0))
-                {
-                    // 斜率的倒数
-                    var rk = vector.X / vector.Y;
-                    var x = currentPoint.X - currentPoint.Y * rk;
-                    if (x >= 0 && x <= Size.Width)
-                    {
-                        return true;
-                    }
-
-                    x = currentPoint.X - (currentPoint.Y - Size.Height) * rk;
-                    if (x >= 0 && x <= Size.Width)
-                    {
-                        return true;
-                    }
-                }
-
-                lastPoint = point;
-            }
-        }
-        else
-        {
-            foreach (var point in points)
-            {
-                var transformedPoint = transformation.Transform(point);
-                if (transformedPoint.X >= 0 && transformedPoint.X <= Size.Width && transformedPoint.Y >= 0 && transformedPoint.Y <= Size.Height)
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// 在矩形的四个边上分别向外扩张形成新的矩形。
-    /// </summary>
-    /// <param name="widthAmount">宽度上的扩张量。</param>
-    /// <param name="heightAmount">高度上的扩张量。</param>
-    /// <returns>扩张后的矩形。</returns>
-    public RotatedRect Inflate(double widthAmount, double heightAmount)
-    {
-        var widthUnitVector = Rotate.UnitVector;
-        var heightUnitVector = Rotate.UnitVector.NormalVector;
-        var newLocation = Location - widthAmount * widthUnitVector - heightAmount * heightUnitVector;
-        var newSize = new Size2D(Size.Width + 2 * widthAmount, Size.Height + 2 * heightAmount);
-        return new RotatedRect(newLocation, newSize, Rotate);
-    }
-
-    /// <summary>
-    /// 在矩形的四个边上分别向外扩张形成新的矩形。
-    /// </summary>
-    /// <param name="amount">扩张量。</param>
-    /// <returns>扩张后的矩形。</returns>
-    public RotatedRect Inflate(double amount)
-    {
-        return Inflate(amount, amount);
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Utils/InkingFixedQueue.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Utils/InkingFixedQueue.cs
deleted file mode 100644
index 249fd9f..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/Inking/Utils/InkingFixedQueue.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System.Collections;
-using System.ComponentModel;
-
-namespace DotNetCampus.Inking.Utils;
-
-/// <summary>
-/// 带最大数量的队列，超过最大数量将会自动将队头元素出队丢弃
-/// </summary>
-/// <typeparam name="T"></typeparam>
-class InkingFixedQueue<T> : ICollection, IEnumerable<T>
-{
-    private readonly Queue<T> _innerQueue = new Queue<T>();
-
-    /// <summary>
-    /// 创建带最大数量的队列
-    /// </summary>
-    /// <param name="maxCount"></param>
-    public InkingFixedQueue(int maxCount)
-    {
-        MaxCount = maxCount;
-    }
-
-    /// <summary>
-    /// 队列可以使用的最大元素数量
-    /// </summary>
-    public int MaxCount { get; private set; }
-
-    #region Queue相关的成员
-    /// <summary>
-    /// Gets the enumerator.
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerator<T> GetEnumerator()
-    {
-        return _innerQueue.GetEnumerator();
-    }
-
-    /// <summary>
-    /// 返回一个循环访问集合的枚举器。
-    /// </summary>
-    /// <returns>
-    /// 可用于循环访问集合的 <see cref="T:System.Collections.IEnumerator" /> 对象。
-    /// </returns>
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-        return _innerQueue.GetEnumerator();
-    }
-
-    /// <summary>
-    /// 从特定的 <see cref="T:System.Array" /> 索引处开始，将 <see cref="T:System.Collections.ICollection" /> 的元素复制到一个 <see cref="T:System.Array" /> 中。
-    /// </summary>
-    /// <param name="array">作为从 <see cref="T:System.Collections.ICollection" /> 复制的元素的目标位置的一维 <see cref="T:System.Array" />。<see cref="T:System.Array" /> 必须具有从零开始的索引。</param>
-    /// <param name="index"><paramref name="array" /> 中从零开始的索引，将在此处开始复制。</param>
-    public void CopyTo(Array array, int index)
-    {
-        ((ICollection) _innerQueue).CopyTo(array, index);
-    }
-
-    /// <summary>
-    /// Copies to.
-    /// </summary>
-    /// <param name="array">The array.</param>
-    /// <param name="index">The index.</param>
-    public void CopyTo(T[] array, int index)
-    {
-        _innerQueue.CopyTo(array, index);
-    }
-
-    /// <summary>
-    /// 获取 <see cref="T:System.Collections.ICollection" /> 中包含的元素数。
-    /// </summary>
-    /// <returns>
-    ///   <see cref="T:System.Collections.ICollection" /> 中包含的元素数。</returns>
-    public int Count { get { return _innerQueue.Count; } }
-    /// <summary>
-    /// 获取一个可用于同步对 <see cref="T:System.Collections.ICollection" /> 的访问的对象。
-    /// </summary>
-    /// <returns>可用于同步对 <see cref="T:System.Collections.ICollection" /> 的访问的对象。</returns>
-    public object SyncRoot { get { return ((ICollection) _innerQueue).SyncRoot; } }
-
-    /// <summary>
-    /// 获取一个值，该值指示是否同步对 <see cref="T:System.Collections.ICollection" /> 的访问（线程安全）。
-    /// </summary>
-    /// <returns>如果对 <see cref="T:System.Collections.ICollection" /> 的访问是同步的（线程安全），则为 true；否则为 false。</returns>
-    public bool IsSynchronized => false;// 因为包装不是线程安全的，如 Enqueue 等方法，所以整个类是线程不安全的
-    #endregion
-
-    /// <summary>
-    /// 将对象添加到队列结尾处
-    /// </summary>
-    /// <param name="item"></param>
-    public void Enqueue(T item)
-    {
-        if (_innerQueue.Count > MaxCount)
-        {
-            throw new InvalidOperationException("集合中的元素已超过最大限定值。");
-        }
-        if (_innerQueue.Count == MaxCount)
-        {
-            _innerQueue.Dequeue();
-        }
-        _innerQueue.Enqueue(item);
-    }
-
-    /// <summary>
-    /// 移除并返回队列开始处元素
-    /// </summary>
-    /// <param name="item">一个没有被使用的元素，请随意传入，这是设计问题，但为了兼容性，暂时保存</param>
-    /// <returns></returns>
-    [Obsolete("请使用不带参数的 Dequeue 方法代替，这个方法传入的参数没有被使用")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public T Dequeue(T item)
-    {
-        return _innerQueue.Dequeue();
-    }
-
-    /// <summary>
-    /// 移除并返回队列开始处元素
-    /// </summary>
-    public T Dequeue() => _innerQueue.Dequeue();
-
-    /// <summary>
-    /// 返回队列开始处的对象但不将这个对象移除
-    /// </summary>
-    /// <returns></returns>
-    public T Peek()
-    {
-        return _innerQueue.Peek();
-    }
-
-    /// <summary>
-    /// 确定某元素是否在队列存在
-    /// </summary>
-    /// <param name="item"></param>
-    /// <returns></returns>
-    public bool Contains(T item)
-    {
-        return _innerQueue.Contains(item);
-    }
-
-    /// <summary>
-    /// 清空队列
-    /// </summary>
-    public void Clear()
-    {
-        _innerQueue.Clear();
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/ReferenceCode/Mathematics/SpatialGeometry/Rect2D.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/ReferenceCode/Mathematics/SpatialGeometry/Rect2D.cs
deleted file mode 100644
index 6d4f27e..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/ReferenceCode/Mathematics/SpatialGeometry/Rect2D.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System.Drawing;
-using DotNetCampus.Numerics.Geometry;
-using Rect = DotNetCampus.Numerics.Geometry.Rect2D;
-
-namespace DotNetCampus.Numerics.Geometry;
-
-#if HAS_UNO
-public
-#endif
-readonly record struct Rect2D(Point2D Location, Size2D Size)
-{
-    public Rect2D(double x, double y, double width, double height) : this(new Point2D(x, y), new Size2D(width, height))
-    {
-    }
-
-    public double X => Location.X;
-    public double Y => Location.Y;
-
-    public double Width => Size.Width;
-    public double Height => Size.Height;
-
-    public double Left => X;
-    public double Top => Y;
-    public double Right => X + Width;
-    public double Bottom => Y + Height;
-
-    public bool IsEmpty => (Width <= 0) || (Height <= 0);
-
-    public static Rect2D Zero => default;
-
-    public static Rect2D FromLTRB(double left, double top, double right, double bottom)
-    {
-        return new Rect2D(left, top, right - left, bottom - top);
-    }
-
-    public bool Contains(Rect2D rect)
-    {
-        return X <= rect.X && Right >= rect.Right && Y <= rect.Y && Bottom >= rect.Bottom;
-    }
-
-    public bool Contains(Point2D pt)
-    {
-        return Contains(pt.X, pt.Y);
-    }
-
-    public bool Contains(double x, double y)
-    {
-        return (x >= Left) && (x < Right) && (y >= Top) && (y < Bottom);
-    }
-
-    public bool IntersectsWith(Rect2D r)
-    {
-        return !((Left >= r.Right) || (Right <= r.Left) || (Top >= r.Bottom) || (Bottom <= r.Top));
-    }
-
-    public Rect2D Union(Rect2D r)
-    {
-        return Union(this, r);
-    }
-
-    public Rect Union(Point2D pt)
-    {
-        var left = Math.Min(Left, pt.X);
-        var top = Math.Min(Top, pt.Y);
-        var right = Math.Max(Right, pt.X);
-        var bottom = Math.Max(Bottom, pt.Y);
-        return FromLTRB(left, top, right, bottom);
-    }
-
-    public static Rect2D Union(Rect2D r1, Rect2D r2)
-    {
-        return FromLTRB(Math.Min(r1.Left, r2.Left), Math.Min(r1.Top, r2.Top), Math.Max(r1.Right, r2.Right), Math.Max(r1.Bottom, r2.Bottom));
-    }
-
-    public Rect2D Intersect(Rect2D r)
-    {
-        return Intersect(this, r);
-    }
-
-    public static Rect2D Intersect(Rect2D r1, Rect2D r2)
-    {
-        double x = Math.Max(r1.X, r2.X);
-        double y = Math.Max(r1.Y, r2.Y);
-        double width = Math.Min(r1.Right, r2.Right) - x;
-        double height = Math.Min(r1.Bottom, r2.Bottom) - y;
-
-        if (width < 0 || height < 0)
-        {
-            return Zero;
-        }
-        return new Rect2D(x, y, width, height);
-    }
-
-    public Rect2D Inflate(Size2D sz)
-    {
-        return Inflate(sz.Width, sz.Height);
-    }
-
-    public Rect2D Inflate(double width, double height)
-    {
-        return new Rect2D(X - width, Y - height, Width + width, Height + height);
-    }
-
-    public Rect2D Offset(double dx, double dy)
-    {
-        return this with
-        {
-            Location = new Point2D(X + dx, Y + dy)
-        };
-    }
-
-    public Rect2D Offset(Point2D dr)
-    {
-        return Offset(dr.X, dr.Y);
-    }
-
-    public Rect2D Round()
-    {
-        return new Rect2D(Math.Round(X), Math.Round(Y), Math.Round(Width), Math.Round(Height));
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/SimpleInkRender.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/SimpleInkRender.cs
deleted file mode 100644
index 16c1b74..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/SimpleInkRender.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System.Numerics;
-using DotNetCampus.Inking.Primitive;
-using Point = DotNetCampus.Numerics.Geometry.Point2D;
-
-namespace DotNetCampus.Inking
-{
-    /// <summary>
-    /// 特别简单的笔迹渲染器。
-    /// </summary>
-    internal static class SimpleInkRender
-    {
-        private static readonly Matrix3x2 RotationPiDiv8 = Matrix3x2.CreateRotation(MathF.PI / 8);
-        private static readonly Matrix3x2 RotationPiDiv4 = Matrix3x2.CreateRotation(MathF.PI / 4);
-        private static readonly Matrix3x2 Rotation3PiDiv8 = Matrix3x2.CreateRotation(3 * MathF.PI / 8);
-
-        public static Point[] GetOutlinePointList(IReadOnlyList<InkStylusPoint> pointList, double inkSize)
-        {
-            if (pointList.Count < 2)
-            {
-                throw new ArgumentException("小于两个点的无法应用算法");
-            }
-
-            var outlinePointList1 = new List<Point>(pointList.Count * 2);
-            var outlinePointList2 = new List<Point>(pointList.Count * 2);
-
-            for (var i = 0; i < pointList.Count; i++)
-            {
-                // 笔迹粗细的一半，一边用一半，合起来就是笔迹粗细了
-                var halfThickness = (float) inkSize / 2;
-
-                // 压感这里是直接乘法而已
-                halfThickness *= pointList[i].Pressure;
-                // 不能让笔迹粗细太小
-                halfThickness = MathF.Max(0.01f, halfThickness);
-
-                if (i == 0 || pointList[i].Point == pointList[i - 1].Point)
-                {
-                    if (i == pointList.Count - 1 || pointList[i].Point == pointList[i + 1].Point)
-                    {
-                        continue;
-                    }
-
-                    var direction = Vector2.Multiply(halfThickness, Vector2.Normalize(new Vector2((float) pointList[i + 1].Point.X - (float) pointList[i].Point.X, (float) pointList[i + 1].Point.Y - (float) pointList[i].Point.Y)));
-
-                    var point1 = new Point(pointList[i].Point.X - direction.Y, pointList[i].Point.Y + direction.X);
-                    var point2 = new Point(pointList[i].Point.X + direction.Y, pointList[i].Point.Y - direction.X);
-
-                    if (i == 0)
-                    {
-                        var direction0 = -direction;
-                        var direction1 = Vector2.Transform(direction0, RotationPiDiv8);
-                        var direction2 = Vector2.Transform(direction0, RotationPiDiv4);
-                        var direction3 = Vector2.Transform(direction0, Rotation3PiDiv8);
-                        var directionN1 = new Vector2(direction3.Y, -direction3.X);
-                        var directionN2 = new Vector2(direction2.Y, -direction2.X);
-                        var directionN3 = new Vector2(direction1.Y, -direction1.X);
-
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + direction0.X, pointList[i].Point.Y + direction0.Y));
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + directionN1.X, pointList[i].Point.Y + directionN1.Y));
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + directionN2.X, pointList[i].Point.Y + directionN2.Y));
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + directionN3.X, pointList[i].Point.Y + directionN3.Y));
-
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + direction0.X, pointList[i].Point.Y + direction0.Y));
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + direction1.X, pointList[i].Point.Y + direction1.Y));
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + direction2.X, pointList[i].Point.Y + direction2.Y));
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + direction3.X, pointList[i].Point.Y + direction3.Y));
-                    }
-
-                    outlinePointList1.Add(point1);
-                    outlinePointList2.Add(point2);
-                }
-                else if (i == pointList.Count - 1 || pointList[i].Point == pointList[i + 1].Point)
-                {
-                    var direction = Vector2.Multiply(halfThickness, Vector2.Normalize(new Vector2((float) pointList[i].Point.X - (float) pointList[i - 1].Point.X, (float) pointList[i].Point.Y - (float) pointList[i - 1].Point.Y)));
-
-                    var point1 = new Point(pointList[i].Point.X - direction.Y, pointList[i].Point.Y + direction.X);
-                    var point2 = new Point(pointList[i].Point.X + direction.Y, pointList[i].Point.Y - direction.X);
-
-                    outlinePointList1.Add(point1);
-                    outlinePointList2.Add(point2);
-
-                    if (i == pointList.Count - 1)
-                    {
-                        var rotationPiDiv8 = Matrix3x2.CreateRotation(MathF.PI / 8);
-                        var rotationPiDiv4 = Matrix3x2.CreateRotation(MathF.PI / 4);
-                        var rotation3PiDiv8 = Matrix3x2.CreateRotation(3 * MathF.PI / 8);
-
-                        var direction0 = direction;
-                        var direction1 = Vector2.Transform(direction0, rotationPiDiv8);
-                        var direction2 = Vector2.Transform(direction0, rotationPiDiv4);
-                        var direction3 = Vector2.Transform(direction0, rotation3PiDiv8);
-                        var directionN1 = new Vector2(direction3.Y, -direction3.X);
-                        var directionN2 = new Vector2(direction2.Y, -direction2.X);
-                        var directionN3 = new Vector2(direction1.Y, -direction1.X);
-
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + direction3.X, pointList[i].Point.Y + direction3.Y));
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + direction2.X, pointList[i].Point.Y + direction2.Y));
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + direction1.X, pointList[i].Point.Y + direction1.Y));
-                        outlinePointList1.Add(new Point(pointList[i].Point.X + direction0.X, pointList[i].Point.Y + direction0.Y));
-
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + directionN3.X, pointList[i].Point.Y + directionN3.Y));
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + directionN2.X, pointList[i].Point.Y + directionN2.Y));
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + directionN1.X, pointList[i].Point.Y + directionN1.Y));
-                        outlinePointList2.Add(new Point(pointList[i].Point.X + direction0.X, pointList[i].Point.Y + direction0.Y));
-                    }
-                }
-                else
-                {
-                    var direction1 = Vector2.Multiply(halfThickness, Vector2.Normalize(new Vector2((float) pointList[i].Point.X - (float) pointList[i - 1].Point.X, (float) pointList[i].Point.Y - (float) pointList[i - 1].Point.Y)));
-                    var direction2 = Vector2.Multiply(halfThickness, Vector2.Normalize(new Vector2((float) pointList[i + 1].Point.X - (float) pointList[i].Point.X, (float) pointList[i + 1].Point.Y - (float) pointList[i].Point.Y)));
-
-                    var vector11 = new Vector2(-direction1.Y, direction1.X);
-                    var vector12 = new Vector2(direction1.Y, -direction1.X);
-                    var vector21 = new Vector2(-direction2.Y, direction2.X);
-                    var vector22 = new Vector2(direction2.Y, -direction2.X);
-
-                    switch (-direction1.X * direction2.Y + direction1.Y * direction2.X)
-                    {
-                        case < 0:
-                            {
-                                var vector1 = Vector2.Normalize(vector11 + vector21) * halfThickness;
-                                var vector2 = Vector2.Normalize(vector12 + vector22) * halfThickness;
-
-                                outlinePointList1.Add(new Point(pointList[i].Point.X + vector1.X, pointList[i].Point.Y + vector1.Y));
-                                outlinePointList2.Add(new Point(pointList[i].Point.X + vector12.X, pointList[i].Point.Y + vector12.Y));
-                                outlinePointList2.Add(new Point(pointList[i].Point.X + vector2.X, pointList[i].Point.Y + vector2.Y));
-                                outlinePointList2.Add(new Point(pointList[i].Point.X + vector22.X, pointList[i].Point.Y + vector22.Y));
-                                break;
-                            }
-                        case > 0:
-                            {
-                                var vector1 = Vector2.Normalize(vector11 + vector21) * halfThickness;
-                                var vector2 = Vector2.Normalize(vector12 + vector22) * halfThickness;
-
-                                outlinePointList1.Add(new Point(pointList[i].Point.X + vector11.X, pointList[i].Point.Y + vector11.Y));
-                                outlinePointList1.Add(new Point(pointList[i].Point.X + vector1.X, pointList[i].Point.Y + vector1.Y));
-                                outlinePointList1.Add(new Point(pointList[i].Point.X + vector21.X, pointList[i].Point.Y + vector21.Y));
-                                outlinePointList2.Add(new Point(pointList[i].Point.X + vector2.X, pointList[i].Point.Y + vector2.Y));
-                                break;
-                            }
-                        default:
-                            outlinePointList1.Add(new Point(pointList[i].Point.X + vector11.X, pointList[i].Point.Y + vector11.Y));
-                            outlinePointList1.Add(new Point(pointList[i].Point.X + vector21.X, pointList[i].Point.Y + vector21.Y));
-                            outlinePointList2.Add(new Point(pointList[i].Point.X + vector12.X, pointList[i].Point.Y + vector12.Y));
-                            outlinePointList2.Add(new Point(pointList[i].Point.X + vector22.X, pointList[i].Point.Y + vector22.Y));
-                            break;
-                    }
-                }
-            }
-
-            var outlinePoints = new Point[outlinePointList1.Count + outlinePointList2.Count + 1];
-            outlinePointList2.Reverse();
-            outlinePointList1.CopyTo(outlinePoints, 0);
-            outlinePointList2.CopyTo(outlinePoints, outlinePointList1.Count);
-            outlinePoints[^1] = outlinePoints[0];
-            return outlinePoints;
-        }
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/Converter.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/Converter.cs
deleted file mode 100644
index 551e458..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/Converter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using DotNetCampus.Inking.Primitive;
-using DotNetCampus.Numerics.Geometry;
-using WpfInk.PresentationCore.System.Windows;
-using WpfInk.PresentationCore.System.Windows.Input.Stylus;
-
-namespace WpfInk;
-
-static class Converter
-{
-    public static Point2D ToPoint(this Point point) => new Point2D(point.X, point.Y);
-    public static Size2D ToSize(this Size size) => new Size2D(size.Width, size.Height);
-
-    public static StylusPoint ToStylusPoint(this InkStylusPoint stylusPoint)
-    {
-        return new StylusPoint(stylusPoint.X, stylusPoint.Y, stylusPoint.Pressure);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/IInternalStreamGeometryContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/IInternalStreamGeometryContext.cs
deleted file mode 100644
index 8734fc8..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/IInternalStreamGeometryContext.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using WpfInk.PresentationCore.System.Windows;
-
-namespace WpfInk;
-
-internal interface IInternalStreamGeometryContext
-{
-    void BeginFigure(Point startPoint, bool isFilled, bool isClosed);
-    void PolyBezierTo(IList<Point> points, bool isStroked, bool isSmoothJoin);
-    void PolyLineTo(IList<Point> points, bool isStroked, bool isSmoothJoin);
-    void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, bool sweepDirection, bool isStroked, bool isSmoothJoin);
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/IStreamGeometryContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/IStreamGeometryContext.cs
deleted file mode 100644
index ae9fa0b..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/IStreamGeometryContext.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using DotNetCampus.Numerics.Geometry;
-
-namespace WpfInk;
-
-public interface IStreamGeometryContext
-{
-    void BeginFigure(Point2D startPoint, bool isFilled, bool isClosed);
-    void PolyBezierTo(IList<Point2D> points, bool isStroked, bool isSmoothJoin);
-    void PolyLineTo(IList<Point2D> points, bool isStroked, bool isSmoothJoin);
-    void ArcTo(Point2D point, Size2D size, double rotationAngle, bool isLargeArc, bool sweepDirection, bool isStroked, bool isSmoothJoin);
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/InkStrokeRenderer.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/InkStrokeRenderer.cs
deleted file mode 100644
index 861455c..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/InkStrokeRenderer.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using DotNetCampus.Inking.Primitive;
-using MS.Internal.Ink;
-using WpfInk.PresentationCore.System.Windows.Ink;
-using WpfInk.PresentationCore.System.Windows.Input.Stylus;
-
-namespace WpfInk;
-
-public static class InkStrokeRenderer
-{
-    public static void Render(IStreamGeometryContext streamGeometryContext, in StrokeRendererInfo info)
-    {
-        var drawingAttributes = new DrawingAttributes()
-        {
-            Width = info.Width,
-            Height = info.Height,
-        };
-
-        var stylusPointCollection = new StylusPointCollection(info.StylusPointCollection.Count);
-
-        foreach (InkStylusPoint inkStylusPoint2D in info.StylusPointCollection)
-        {
-            stylusPointCollection.Add(inkStylusPoint2D.ToStylusPoint());
-        }
-
-        var stroke = new Stroke(stylusPointCollection, drawingAttributes);
-        StrokeNodeIterator strokeNodeIterator = StrokeNodeIterator.GetIterator(stroke, drawingAttributes);
-        var internalStreamGeometryContext = new InternalStreamGeometryContext(streamGeometryContext);
-        StrokeRenderer.CalcGeometryAndBounds(strokeNodeIterator, drawingAttributes, calculateBounds: false, internalStreamGeometryContext, out _);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/InternalStreamGeometryContext.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/InternalStreamGeometryContext.cs
deleted file mode 100644
index 390051a..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/InternalStreamGeometryContext.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using DotNetCampus.Numerics.Geometry;
-using WpfInk.PresentationCore.System.Windows;
-
-namespace WpfInk;
-
-internal class InternalStreamGeometryContext : IInternalStreamGeometryContext
-{
-    public InternalStreamGeometryContext(IStreamGeometryContext context)
-    {
-        _context = context;
-    }
-
-    private readonly IStreamGeometryContext _context;
-    private readonly List<Point2D> _cacheList = new List<Point2D>();
-
-    public void BeginFigure(Point startPoint, bool isFilled, bool isClosed)
-    {
-        _context.BeginFigure(startPoint.ToPoint(), isFilled, isClosed);
-    }
-
-    public void PolyBezierTo(IList<Point> points, bool isStroked, bool isSmoothJoin)
-    {
-        _cacheList.Clear();
-        _cacheList.AddRange(points.Select(t => t.ToPoint()));
-        _context.PolyBezierTo(_cacheList, isStroked, isSmoothJoin);
-    }
-
-    public void PolyLineTo(IList<Point> points, bool isStroked, bool isSmoothJoin)
-    {
-        _cacheList.Clear();
-        _cacheList.AddRange(points.Select(t => t.ToPoint()));
-        _context.PolyLineTo(_cacheList, isStroked, isSmoothJoin);
-    }
-
-    public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, bool sweepDirection, bool isStroked,
-        bool isSmoothJoin)
-    {
-        _context.ArcTo(point.ToPoint(), size.ToSize(), rotationAngle, isLargeArc, sweepDirection, isStroked, isSmoothJoin);
-    }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/StrokeRendererInfo.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/StrokeRendererInfo.cs
deleted file mode 100644
index 9bd2998..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/API/StrokeRendererInfo.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using DotNetCampus.Inking.Primitive;
-
-namespace WpfInk;
-
-public readonly record struct StrokeRendererInfo
-{
-    public required IReadOnlyList<InkStylusPoint> StylusPointCollection { get; init; }
-
-    public required double Width { get; init; }
-    public required double Height { get; init; }
-
-    public bool FitToCurve { get; init; }
-}
\ No newline at end of file
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Bezier.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Bezier.cs
deleted file mode 100644
index b735a30..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Bezier.cs
+++ /dev/null
@@ -1,587 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Input;
-using System.Collections.Generic;
-
-using MS.Internal.Ink.InkSerializedFormat;
-using WpfInk.PresentationCore.System.Windows;
-using WpfInk.PresentationCore.System.Windows.Input.Stylus;
-
-namespace MS.Internal.Ink
-{
-    /// <summary>
-    /// Bezier curve generation class
-    /// </summary>
-    internal class Bezier
-    {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public Bezier() { }
-
-        /// <summary>
-        /// Construct bezier control points from points
-        /// </summary>
-        /// <param name="stylusPoints">Original StylusPointCollection</param>
-        /// <param name="fitError">Fitting error</param>
-        /// <returns>Whether the algorithm succeeded</returns>
-        internal bool ConstructBezierState(StylusPointCollection stylusPoints, double fitError)
-        {
-            // If the point count is zero, the curve cannot be constructed
-            if ((null == stylusPoints) || (stylusPoints.Count == 0))
-                return false;
-
-            // Compile list of distinct points and their nodes
-            CuspData dat = new CuspData();
-            dat.Analyze(stylusPoints,
-                        fitError /*typically zero*/);
-
-            return ConstructFromData(dat, fitError);
-        }
-
-        /// <summary>
-        /// Flatten bezier with a given resolution
-        /// </summary>
-        /// <param name="tolerance">tolerance</param>
-        internal List<Point> Flatten(double tolerance)
-        {
-            List<Point> points = new List<Point>();
-
-            // First point
-            Vector vector = GetBezierPoint(0);
-            points.Add(new Point(vector.X, vector.Y));
-
-            int last = this.BezierPointCount - 4;
-
-            if (0 <= last)
-            {
-                // Tolerance needs to be non-zero positive
-                if (tolerance < DoubleUtil.DBL_EPSILON)
-                    tolerance = DoubleUtil.DBL_EPSILON;
-
-                // Flatten individual segments
-                for (int i = 0; i <= last; i += 3)
-                    FlattenSegment(i, tolerance, points);
-            }
-
-            //convert from himetric to Avalon
-            for (int x = 0; x < points.Count; x++)
-            {
-                Point p = points[x];
-                p.X *= StrokeCollectionSerializer.HimetricToAvalonMultiplier;
-                p.Y *= StrokeCollectionSerializer.HimetricToAvalonMultiplier;
-                points[x] = p;
-            }
-
-            return points;
-        }
-
-
-        /// <summary>
-        /// Extend the current bezier segment if possible
-        /// </summary>
-        /// <param name="error">Fitting error sqaure</param>
-        /// <param name="data">Data points</param>
-        /// <param name="from">Starting index</param>
-        /// <param name="next_cusp">NExt cusp index</param>
-        /// <param name="to">Index of the last index, updated here</param>
-        /// <param name="cusp">Whether there is a cusp at the end</param>
-        /// <param name="done">Whether end of the stroke is reached</param>
-        /// <returns>Whether the the segment was extended</returns>
-        private bool ExtendingRange(double error, CuspData data, int from, int next_cusp, ref int to, ref bool cusp, ref bool done)
-        {
-            to++;
-            cusp = true;    // Presumed guilty
-            done = to >= data.Count - 1;
-            if (done)
-            {
-                to = data.Count - 1;
-                cusp = true;
-                return false;
-            }
-
-            cusp = to >= next_cusp;
-            if (cusp)
-            {
-                to = next_cusp;
-                return false;
-            }
-
-            Debug.Assert(to - from >= 4);
-            int d = (to - from) / 4;
-            int[] i = { from, from + d, (to + from) / 2, to - d, to };
-
-            // Test for "cubicness"
-            return CoCubic(data, i, error);
-        }
-
-
-        /// <summary>
-        /// Add a bezier segment to the bezier buffer
-        /// </summary>
-        /// <param name="data">In: Data points</param>
-        /// <param name="from">In: Index of the first point</param>
-        /// <param name="tanStart">In: Unit tangent vector at the start</param>
-        /// <param name="to">In: Index of the last point, updated here</param>
-        /// <param name="tanEnd">In: Unit tangent vector at the end</param>
-        /// <returns>True if the segment was added</returns>
-        private bool AddBezierSegment(CuspData data, int from, ref Vector tanStart, int to, ref Vector tanEnd)
-        {
-            switch (to - from)
-            {
-                case 1:
-                    AddLine(data, from, to);
-                    return true;
-
-                case 2:
-                    AddParabola(data, from);
-                    return true;
-            }
-
-            // We have at least 4 points, compute a least squares cubic
-            return AddLeastSquares(data, from, ref tanStart, to, ref tanEnd);
-        }
-
-
-        /// <summary>
-        /// Construct bezier curve from data points
-        /// </summary>
-        /// <param name="data">In: Data points</param>
-        /// <param name="fitError">In: tolerated error</param>
-        /// <returns>Whether bezier construction is possible</returns>
-        private bool ConstructFromData(CuspData data, double fitError)
-        {
-            // Check for empty stroke 
-            if (data.Count < 2)
-            {
-                return false;
-            }
-
-            // Add the first point
-            AddBezierPoint(data.XY(0));
-
-            // Special cases - 2 or 3 points
-            if (data.Count == 3)
-            {
-                AddParabola(data, 0);
-                return true;
-            }
-            else if (data.Count == 2)
-            {
-                AddLine(data, 0, 1);
-                return true;
-            }
-
-            // For default case error passed in will be 0.
-            // 3% is the default value
-            if (DoubleUtil.DBL_EPSILON > fitError)
-                fitError = 0.03f * (data.Distance() * StrokeCollectionSerializer.HimetricToAvalonMultiplier);
-
-            data.SetTanLinks(0.5f * fitError);
-
-            // otherwise use the value specified in the drawing attribute
-            // get (error)^2
-            fitError *= (fitError);
-
-            bool done = false;
-            int to = 0;
-            int next_cusp = 0;
-            int prev_cusp = 0;
-            bool is_a_cusp = true;
-            Vector tanEnd = new Vector(0, 0);
-            Vector tanStart = new Vector(0, 0);
-
-            for (int from = 0; !done; from = to)
-            {
-                if (is_a_cusp)
-                {
-                    prev_cusp = next_cusp;
-                    next_cusp = data.GetNextCusp(from);
-                    if (!data.Tangent(ref tanStart, from, prev_cusp, next_cusp, false, true))
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    tanStart.X = -tanEnd.X;
-                    tanStart.Y = -tanEnd.Y;
-                }
-
-                to = from + 3;
-
-                // No meat in this loop, just extending the index range
-                while (ExtendingRange(fitError, data, from, next_cusp, ref to, ref is_a_cusp, ref done)) ;
-
-                // Find the tangent 
-                if (!data.Tangent(ref tanEnd, to, prev_cusp, next_cusp, true, is_a_cusp))
-                {
-                    return false;
-                }
-
-                // Add bezier segment
-                if (!AddBezierSegment(data, from, ref tanStart, to, ref tanEnd))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-
-        /// <summary>
-        /// Add parabola to the bezier
-        /// </summary>
-        /// <param name="data">In: Data points</param>
-        /// <param name="from">In: The index of the parabola's first point</param>
-        private void AddParabola(CuspData data, int from)
-        {
-            /* Denote s = 1-t.  We construct the parabola with Bezier points A,B,C that 
-                goes thru the point P at parameter value t, that is
-                    P = s^2A + 2stB + t^2C
-
-                We know A and C, and we solve for B:
-                    B = (P - s^2A - t^2C) / 2st. 
-
-                Elevating the degree to cubic replaces B with 2 points, the first at 
-                    2B/3 + A/3, and the second at 2B/3 + C/3.
-
-                That is, one point at
-                    (P/(st) - Ct/s + A(-s/t + 1)) / 3
-                and the other point at
-                    (P/(st) + C(-t/s + 1) - As/t) / 3
-            */
-            // By the way the nodes were constructed:
-            //ASSERT(data.Node(from+2) - data.Node(from) > 
-            //        data.Node(from+1) - data.Node(from));
-            double t = (data.Node(from + 1) - data.Node(from)) / (data.Node(from + 2) - data.Node(from));
-            double s = 1 - t;
-
-            if (t < .001 || s < .001)
-            {
-                // A straight line will be a better approximation
-                AddLine(data, from, from + 2);
-                return;
-            }
-
-            double tt = 1 / t;
-            double ss = 1 / s;
-            const double third = 1.0d / 3.0d;
-            Vector P = (tt * ss) * data.XY(from + 1);
-            Vector B = third * (P + (1 - s * tt) * data.XY(from) - (t * ss) * data.XY(from + 1));
-
-            AddBezierPoint(B);
-            B = third * (P - (s * tt) * data.XY(from) + (1 - t * ss) * data.XY(from + 2));
-            AddBezierPoint(B);
-            AddSegmentPoint(data, from + 2);
-        }
-
-
-        /// <summary>
-        /// Add Line to the bezier
-        /// </summary>
-        /// <param name="data">In: Data points</param>
-        /// <param name="from">In: The index of the line's first point</param>
-        /// <param name="to">In: The index of the line's last point</param>
-        private void AddLine(CuspData data, int from, int to)
-        {
-            const double third = 1.0d / 3.0d;
-
-            AddBezierPoint((2 * data.XY(from) + data.XY(to)) * third);
-            AddBezierPoint((data.XY(from) + 2 * data.XY(to)) * third);
-            AddSegmentPoint(data, to);
-        }
-
-
-        /// <summary>
-        /// Add least square fit curve to the bezier
-        /// </summary>
-        /// <param name="data">In: Data points</param>
-        /// <param name="from">In: Index of the first point</param>
-        /// <param name="V">In: Unit tangent vector at the start</param>
-        /// <param name="to">In: Index of the last point, updated here</param>
-        /// <param name="W">In: Unit tangent vector at the end</param>
-        /// <returns>Return true segment added</returns>
-        private bool AddLeastSquares(CuspData data, int from, ref Vector V, int to, ref Vector W)
-        {
-            /* To do: When there is a cusp at either one of the ends, we'll get a
-            better approximation if we use a construction without  a prescribed 
-            tangent there */
-            /*  
-            The Bezier points of this segment are A, A+sV, B+uW, and B, where A,B are the
-            endpoints, and V,W are the end tangents.  For the node tj, denote f0j=(1-tj)^3,
-            f1j=3(1-tj)^2tj, f2j=3(1-tj)tj^2, f3j=tj^3.  Let Pj be the jth point.
-            We are lookig for s,u that minimize 
-                    Sum(A*f0j + (A+sV)*f1j + (B+uW)*f2j + B*f3j - Pj)^2.
-
-            Equate the partial derivatives of this w.r.t. s and u to 0:
-                    Sum(A*f0j + (A+sV)*f1j + (B+uW)*f2j + B*f3j - Pj)*(V*f1j)=0
-                    Sum(A*f0j + (A+sV)*f1j + (B+uW)*f2j + B*f3j - Pj)*(W*f2j)=0
-            hence
-
-                s*Sum(V*V*f1j*f1j) + u*Sum(W*V*f1j*f2j)= -Sum(A*(f0j+f1j) + B*(f2j+f3j) - Pj)*V*f1j
-                s*Sum(V*W*f1j*f2j) + u*Sum(W*W*f2j*f2j)= -Sum(A*(f0j+f1j) + B*(f2j+f3j) - Pj)*W*f2j
-
-            so the equations are    
-                s*a11 + u*a12 = b1
-                s*a12 * u*a22 = b2
-
-            with 
-                a11 = W*W*Sum(f1j^2), a22 = V*V*Sum(f2j^2), a12 = W*V*Sum(f1j*f2j)
-                b1 = -V*A*Sum(f0j + f1j)*f1j - V*B*Sum(f2j + f3j)*f1j + Sum(f1j*Pj*V)
-                b2 = -W*A*Sum(f0j + f1j)*f2j - W*B*Sum(f2j + f3j)*f2j + Sum(f2j*Pj*W)
-
-            V and W ae unit vectors, so V*V = W*W = 1.
-            For computational efficiency, we will break b1 and b2 into 3 sums each, and add
-            them up at the end
-
-            The solution is 
-                s = (b1*a22 - b2*a12) / det
-                u = (b2*a11 - b1*a12) / det
-            where det = a11*a22 - a22^2
-            */
-            // Compute the coefficients
-            double a11 = 0, a12 = 0, a22 = 0, b1 = 0, b2 = 0;
-            double b11 = 0, b12 = 0, b21 = 0, b22 = 0;
-
-            for (int j = checked(from + 1); j < to; j++)
-            {
-                // By the way the nodes were constructed - 
-                Debug.Assert(data.Node(to) - data.Node(from) > data.Node(j) - data.Node(from));
-                double tj = (data.Node(j) - data.Node(from)) / (data.Node(to) - data.Node(from));
-                double tj2 = tj * tj;
-                double rj = 1 - tj;
-                double rj2 = rj * rj;
-
-                double f0j = rj2 * rj;
-                double f1j = 3 * rj2 * tj;
-                double f2j = 3 * rj * tj2;
-                double f3j = tj2 * tj;
-
-                a11 += f1j * f1j;
-                a22 += f2j * f2j;
-                a12 += f1j * f2j;
-
-                b11 -= (f0j + f1j) * f1j;
-                b12 -= (f2j + f3j) * f1j;
-                b1 += f1j * (data.XY(j) * V);
-
-                b21 -= (f0j + f1j) * f2j;
-                b22 -= (f2j + f3j) * f2j;
-                b2 += f2j * (data.XY(j) * W);
-            }
-
-            a12 *= (V * W);
-            b1 += ((V * data.XY(from)) * b11 + (V * data.XY(to)) * b12);
-            b2 += ((W * data.XY(from)) * b21 + (W * data.XY(to)) * b22);
-
-            // Solve the equations
-            double s = b1 * a22 - b2 * a12;
-            double u = b2 * a11 - b1 * a12;
-            double det = a11 * a22 - a12 * a12;
-            bool accept = (Math.Abs(det) > Math.Abs(s) * DoubleUtil.DBL_EPSILON &&
-                            Math.Abs(det) > Math.Abs(u) * DoubleUtil.DBL_EPSILON);
-
-            if (accept)
-            {
-                s /= det;
-                u /= det;
-
-                // We'll only accept large enough positive solutions
-                accept = s > 1.0e-6 && u > 1.0e-6;
-            }
-
-            if (!accept)
-                s = u = (data.Node(to) - data.Node(from)) / 3;
-
-            AddBezierPoint(data.XY(from) + s * V);
-            AddBezierPoint(data.XY(to) + u * W);
-            AddSegmentPoint(data, to);
-            return true;
-        }
-
-
-        /// <summary>
-        /// Checks whether five points are co-cubic within tolerance
-        /// </summary>
-        /// <param name="data">In: Data points</param>
-        /// <param name="i">In: Array of 5 indices</param>
-        /// <param name="fitError">In: tolerated error - squared</param>
-        /// <returns>Return true if extended</returns>
-        private static bool CoCubic(CuspData data, int[] i, double fitError)
-        {
-            /* Our error estimate is (t[4]-t[0])^4 times the 4th divided difference
-            * of the points with resect to the nodes. The divided difference is
-            * equal to Sum(c(i)*p[i]), where c(i)=Product(t[i]-t[j]: j != i)
-            * (See Conte & deBoor's Elementary Numerical Analysis, Excercise 2.2-1).
-            * We multiply each factor in the product by t[4]-t[0].
-            */
-            double d04 = data.Node(i[4]) - data.Node(i[0]);
-            double d01 = d04 / (data.Node(i[1]) - data.Node(i[0]));
-            double d02 = d04 / (data.Node(i[2]) - data.Node(i[0]));
-            double d03 = d04 / (data.Node(i[3]) - data.Node(i[0]));
-            double d12 = d04 / (data.Node(i[2]) - data.Node(i[1]));
-            double d13 = d04 / (data.Node(i[3]) - data.Node(i[1]));
-            double d14 = d04 / (data.Node(i[4]) - data.Node(i[1]));
-            double d23 = d04 / (data.Node(i[3]) - data.Node(i[2]));
-            double d24 = d04 / (data.Node(i[4]) - data.Node(i[2]));
-            double d34 = d04 / (data.Node(i[4]) - data.Node(i[3]));
-            Vector P = d01 * d02 * d03 * data.XY(i[0]) -
-                        d01 * d12 * d13 * d14 * data.XY(i[1]) +
-                        d02 * d12 * d23 * d24 * data.XY(i[2]) -
-                        d03 * d13 * d23 * d34 * data.XY(i[3]) +
-                        d14 * d24 * d34 * data.XY(i[4]);
-
-            return ((P * P) < fitError);
-        }
-
-
-        /// <summary>
-        /// Add Bezier point to the output buffer
-        /// </summary>
-        /// <param name="point">In: The point to add</param>
-        private void AddBezierPoint(Vector point)
-        {
-            _bezierControlPoints.Add((Point) point);
-        }
-
-
-        /// <summary>
-        /// Add segment point
-        /// </summary>
-        /// <param name="data">In: Interpolation data</param>
-        /// <param name="index">In: The index of the point to add</param>
-        private void AddSegmentPoint(CuspData data, int index)
-        {
-            _bezierControlPoints.Add((Point) data.XY(index));
-        }
-
-
-        /// <summary>
-        /// Evaluate on a Bezier segment a point at a given parameter 
-        /// </summary>
-        /// <param name="iFirst">Index of Bezier segment's first point</param>
-        /// <param name="t">Parameter value t</param>
-        /// <returns>Return the point at parameter t on the curve</returns>
-        private Vector DeCasteljau(int iFirst, double t)
-        {
-            // Using the de Casteljau algorithm.  See "Curves & Surfaces for Computer
-            // Aided Design" for the theory
-            double s = 1.0f - t;
-
-            // Level 1
-            Vector Q0 = s * GetBezierPoint(iFirst) + t * GetBezierPoint(iFirst + 1);
-            Vector Q1 = s * GetBezierPoint(iFirst + 1) + t * GetBezierPoint(iFirst + 2);
-            Vector Q2 = s * GetBezierPoint(iFirst + 2) + t * GetBezierPoint(iFirst + 3);
-
-            // Level 2
-            Q0 = s * Q0 + t * Q1;
-            Q1 = s * Q1 + t * Q2;
-
-            // Level 3
-            return s * Q0 + t * Q1;
-        }
-
-        /// <summary>
-        ///  Flatten a Bezier segment within given resolution
-        /// </summary>
-        /// <param name="iFirst">Index of Bezier segment's first point</param>
-        /// <param name="tolerance">tolerance</param>
-        /// <param name="points"></param>
-        /// <returns></returns>
-        private void FlattenSegment(int iFirst, double tolerance, List<Point> points)
-        {
-            // We use forward differencing.  It is much faster than subdivision
-            int i, k;
-            int nPoints = 1;
-            Vector[] Q = new Vector[4];
-
-            // The number of points is determined by the "curvedness" of this segment,
-            // which is a heuristic: it's the maximum of the 2 medians of the triangles 
-            // formed by consecutive Bezier points.  Why median? because it is cheaper
-            // to compute than height.
-            double rCurv = 0;
-
-            for (i = checked(iFirst + 1); i <= checked(iFirst + 2); i++)
-            {
-                // Get the longer median
-                Q[0] = (GetBezierPoint(i - 1) + GetBezierPoint(i + 1)) * 0.5f - GetBezierPoint(i);
-
-                double r = Q[0].Length;
-
-                if (r > rCurv)
-                    rCurv = r;
-            }
-
-            // Now we look at the ratio between the medain and the error tolerance.
-            // the points are collinear then one point - the endpoint - will do. 
-            // Otherwise, since curvature is roughly inverse proportional
-            // to the square of nPoints, we set nPoints to be the square root of this 
-            // ratio, but not less than 3.
-            if (rCurv <= 0.5 * tolerance)  // Flat segment
-            {
-                Vector vector = GetBezierPoint(iFirst + 3);
-                points.Add(new Point(vector.X, vector.Y));
-                return;
-            }
-
-            // Otherwise we'll have at least 3 points
-            // Tolerance is assumed to be positive
-            nPoints = (int) (Math.Sqrt(rCurv / tolerance)) + 3;
-            if (nPoints > 1000)
-                nPoints = 1000; // Arbitrary limitation, but...
-
-            // Get the first 4 points on the segment in the buffer
-            double d = 1.0f / (double) nPoints;
-
-            Q[0] = GetBezierPoint(iFirst);
-            for (i = 1; i <= 3; i++)
-            {
-                Q[i] = DeCasteljau(iFirst, i * d);
-                points.Add(new Point(Q[i].X, Q[i].Y));
-            }
-
-            // Replace points in the buffer with differences of various levels
-            for (i = 1; i <= 3; i++)
-                for (k = 0; k <= (3 - i); k++)
-                    Q[k] = Q[k + 1] - Q[k];
-
-            // Now generate the rest of the points by forward differencing
-            for (i = 4; i <= nPoints; i++)
-            {
-                for (k = 1; k <= 3; k++)
-                    Q[k] += Q[k - 1];
-
-                points.Add(new Point(Q[3].X, Q[3].Y));
-            }
-        }
-        /// <summary>
-        /// Returns a single bezier control point at index
-        /// </summary>
-        /// <param name="index">Index</param>
-        /// <returns></returns>
-        private Vector GetBezierPoint(int index)
-        {
-            return (Vector) _bezierControlPoints[index];
-        }
-
-
-        /// <summary>
-        /// Count of bezier control points
-        /// </summary>
-        private int BezierPointCount
-        {
-            get { return _bezierControlPoints.Count; }
-        }
-
-        // Bezier points
-        private List<Point> _bezierControlPoints = new List<Point>();
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ContourSegment.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ContourSegment.cs
deleted file mode 100644
index d50df24..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ContourSegment.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Windows;
-using WpfInk.PresentationCore.System.Windows;
-
-namespace MS.Internal.Ink
-{
-    /// <summary>
-    /// A helper structure representing an edge of a contour, where 
-    /// the edge is either a straight segment or an arc of a circle.
-    /// ContourSegment are alwais directed clockwise (i.e with the contour
-    /// inner area being on the right side.
-    /// Used in hit-testing a contour vs another contour.
-    /// </summary> 
-    internal readonly struct ContourSegment
-    {
-        /// <summary>
-        /// Constructor for linear segments
-        /// </summary>
-        /// <param name="begin">segment's begin point</param>
-        /// <param name="end">segment's end point</param>
-        internal ContourSegment(Point begin, Point end)
-        {
-            _begin = begin;
-            _vector = DoubleUtil.AreClose(begin, end) ? new Vector(0, 0) : (end - begin);
-            _radius = new Vector(0, 0);
-        }
-
-        /// <summary>
-        /// Constructor for arcs
-        /// </summary>
-        /// <param name="begin">arc's begin point</param>
-        /// <param name="end">arc's end point</param>
-        /// <param name="center">arc's center</param>
-        internal ContourSegment(Point begin, Point end, Point center)
-        {
-            _begin = begin;
-            _vector = end - begin;
-            _radius = center - begin;
-        }
-
-        /// <summary> Tells whether the segment is arc or straight </summary>
-        internal bool IsArc { get { return (_radius.X != 0) || (_radius.Y != 0); } }
-
-        /// <summary> Returns the begin point of the segment </summary>
-        internal Point Begin { get { return _begin; } }
-
-        /// <summary> Returns the end point of the segment </summary>
-        internal Point End { get { return _begin + _vector; } }
-
-        /// <summary> Returns the vector from Begin to End </summary>
-        internal Vector Vector { get { return _vector; } }
-
-        /// <summary> Returns the vector from Begin to the center of the circle 
-        /// (zero vector for linear segments </summary>
-        internal Vector Radius { get { return _radius; } }
-
-        #region Fields
-
-        private readonly Point _begin;
-        private readonly Vector _vector;
-        private readonly Vector _radius;
-
-        #endregion
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/CuspData.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/CuspData.cs
deleted file mode 100644
index 2235d51..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/CuspData.cs
+++ /dev/null
@@ -1,548 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Input;
-using System.Collections.Generic;
-using MS.Internal.Ink.InkSerializedFormat;
-using WpfInk.PresentationCore.System.Windows;
-using WpfInk.PresentationCore.System.Windows.Input.Stylus;
-
-namespace MS.Internal.Ink
-{
-    internal class CuspData
-    {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        internal CuspData()
-        {
-        }
-
-        /// <summary>
-        /// Constructs internal data structure from points for doing operations like
-        /// cusp detection or tangent computation
-        /// </summary>
-        /// <param name="stylusPoints">Points to be analyzed</param>
-        /// <param name="rSpan">Distance between two consecutive distinct points</param>
-        internal void Analyze(StylusPointCollection stylusPoints, double rSpan)
-        {
-            // If the count is less than 1, return
-            if ((null == stylusPoints) || (stylusPoints.Count == 0))
-                return;
-
-            _points = new List<CDataPoint>(stylusPoints.Count);
-            _nodes = new List<double>(stylusPoints.Count);
-
-            // Construct the lists of data points and nodes
-            _nodes.Add(0);
-            CDataPoint cdp0 = new CDataPoint();
-            cdp0.Index = 0;
-            //convert from Avalon to Himetric
-            Point point = (Point) stylusPoints[0];
-            point.X *= StrokeCollectionSerializer.AvalonToHimetricMultiplier;
-            point.Y *= StrokeCollectionSerializer.AvalonToHimetricMultiplier;
-            cdp0.Point = point;
-            _points.Add(cdp0);
-
-            //drop duplicates
-            int index = 0;
-            for (int i = 1; i < stylusPoints.Count; i++)
-            {
-                if (!DoubleUtil.AreClose(stylusPoints[i].X, stylusPoints[i - 1].X) ||
-                    !DoubleUtil.AreClose(stylusPoints[i].Y, stylusPoints[i - 1].Y))
-                {
-                    //this is a unique point, add it
-                    index++;
-
-                    CDataPoint cdp = new CDataPoint();
-                    cdp.Index = index;
-
-                    //convert from Avalon to Himetric
-                    Point point2 = (Point) stylusPoints[i];
-                    point2.X *= StrokeCollectionSerializer.AvalonToHimetricMultiplier;
-                    point2.Y *= StrokeCollectionSerializer.AvalonToHimetricMultiplier;
-                    cdp.Point = point2;
-
-                    _points.Insert(index, cdp);
-                    _nodes.Insert(index, _nodes[index - 1] + (XY(index) - XY(index - 1)).Length);
-                }
-            }
-
-            SetLinks(rSpan);
-        }
-
-        /// <summary>
-        /// Set links amongst the points for tangent computation
-        /// </summary>
-        /// <param name="rError">Shortest distance between two distinct points</param>
-        internal void SetTanLinks(double rError)
-        {
-            int count = Count;
-
-            if (rError < 1.0)
-                rError = 1.0f;
-
-            for (int i = 0; i < count; ++i)
-            {
-                // Find a StylusPoint at distance-_span forward
-                for (int j = i + 1; j < count; j++)
-                {
-                    if (_nodes[j] - _nodes[i] >= rError)
-                    {
-                        CDataPoint cdp = _points[i];
-                        cdp.TanNext = j;
-                        _points[i] = cdp;
-
-                        CDataPoint cdp2 = _points[j];
-                        cdp2.TanPrev = i;
-                        _points[j] = cdp2;
-                        break;
-                    }
-                }
-
-                if (0 > _points[i].TanPrev)
-                {
-                    for (int j = i - 1; 0 <= j; --j)
-                    {
-                        if (_nodes[i] - _nodes[j] >= rError)
-                        {
-                            CDataPoint cdp = _points[i];
-                            cdp.TanPrev = j;
-                            _points[i] = cdp;
-                            break;
-                        }
-                    }
-                }
-
-                if (0 > _points[i].TanNext)
-                {
-                    CDataPoint cdp = _points[i];
-                    cdp.TanNext = count - 1;
-                    _points[i] = cdp;
-                }
-
-                if (0 > _points[i].TanPrev)
-                {
-                    CDataPoint cdp = _points[i];
-                    cdp.TanPrev = 0;
-                    _points[i] = cdp;
-                }
-            }
-        }
-
-
-
-
-        /// <summary>
-        /// Return the Index of the next cusp or the 
-        /// Index of the last StylusPoint if no cusp was found
-        /// </summary>
-        /// <param name="iCurrent">Current StylusPoint Index</param>
-        /// <returns>Index into CuspData object for the next cusp </returns>
-        internal int GetNextCusp(int iCurrent)
-        {
-            int last = Count - 1;
-
-            if (iCurrent < 0)
-                return 0;
-
-            if (iCurrent >= last)
-                return last;
-
-            // Perform a binary search
-            int s = 0, e = _cusps.Count;
-            int m = (s + e) / 2;
-
-            while (s < m)
-            {
-                if (_cusps[m] <= iCurrent)
-                    s = m;
-                else
-                    e = m;
-
-                m = (s + e) / 2;
-            }
-
-            return _cusps[m + 1];
-        }
-
-        /// <summary>
-        /// Point at Index i into the cusp data structure
-        /// </summary>
-        /// <param name="i">Index</param>
-        /// <returns>StylusPoint</returns>
-        /// <remarks>The Index is within the bounds</remarks>
-        internal Vector XY(int i)
-        {
-            return new Vector(_points[i].Point.X, _points[i].Point.Y);
-        }
-
-
-        /// <summary>
-        /// Number of points in the internal data structure
-        /// </summary>
-        internal int Count
-        {
-            get { return _points.Count; }
-        }
-
-
-        /// <summary>
-        /// Returns the chord length of the i-th StylusPoint from start of the stroke
-        /// </summary>
-        /// <param name="i">StylusPoint Index</param>
-        /// <returns>distance</returns>
-        /// <remarks>The Index is within the bounds</remarks>
-        internal double Node(int i)
-        {
-            return _nodes[i];
-        }
-
-
-        /// <summary>
-        /// Returns the Index into original points given an Index into cusp data
-        /// </summary>
-        /// <param name="nodeIndex">Cusp data Index</param>
-        /// <returns>Original StylusPoint Index</returns>
-        internal int GetPointIndex(int nodeIndex)
-        {
-            return _points[nodeIndex].Index;
-        }
-
-
-        /// <summary>
-        /// Distance
-        /// </summary>
-        /// <returns>distance</returns>
-        internal double Distance()
-        {
-            return _dist;
-        }
-
-
-        /// <summary>
-        /// Finds the approximante tangent at a given StylusPoint
-        /// </summary>
-        /// <param name="ptT">Tangent vector</param>
-        /// <param name="nAt">Index at which the tangent is calculated</param>
-        /// <param name="nPrevCusp">Index of the previous cusp</param>
-        /// <param name="nNextCusp">Index of the next cusp</param>
-        /// <param name="bReverse">Forward or reverse tangent</param>
-        /// <param name="bIsCusp">Whether the current idex is a cusp StylusPoint</param>
-        /// <returns>Return whether the tangent computation succeeded</returns>
-        internal bool Tangent(ref Vector ptT, int nAt, int nPrevCusp, int nNextCusp, bool bReverse, bool bIsCusp)
-        {
-            // Tangent is computed as the unit vector along 
-            // PT = (P1 - P0) + (P2 - P0) + (P3 - P0)
-            // => PT = P1 + P2 + P3 - 3 * P0
-            int i_1, i_2, i_3;
-
-            if (bIsCusp)
-            {
-                if (bReverse)
-                {
-                    i_1 = _points[nAt].TanPrev;
-                    if (i_1 < nPrevCusp || (0 > i_1))
-                    {
-                        i_2 = nPrevCusp;
-                        i_1 = (i_2 + nAt) / 2;
-                    }
-                    else
-                    {
-                        i_2 = _points[i_1].TanPrev;
-                        if (i_2 < nPrevCusp)
-                            i_2 = nPrevCusp;
-                    }
-                }
-                else
-                {
-                    i_1 = _points[nAt].TanNext;
-                    if (i_1 > nNextCusp || (0 > i_1))
-                    {
-                        i_2 = nNextCusp;
-                        i_1 = (i_2 + nAt) / 2;
-                    }
-                    else
-                    {
-                        i_2 = _points[i_1].TanNext;
-                        if (i_2 > nNextCusp)
-                            i_2 = nNextCusp;
-                    }
-                }
-                ptT = XY(i_1) + 0.5 * XY(i_2) - 1.5 * XY(nAt);
-            }
-            else
-            {
-                Debug.Assert(bReverse);
-                i_1 = nAt;
-                i_2 = _points[nAt].TanPrev;
-                if (i_2 < nPrevCusp)
-                {
-                    i_3 = nPrevCusp;
-                    i_2 = (i_3 + i_1) / 2;
-                }
-                else
-                {
-                    i_3 = _points[i_2].TanPrev;
-                    if (i_3 < nPrevCusp)
-                        i_3 = nPrevCusp;
-                }
-
-                nAt = _points[nAt].TanNext;
-                if (nAt > nNextCusp)
-                    nAt = nNextCusp;
-
-                ptT = XY(i_1) + XY(i_2) + 0.5 * XY(i_3) - 2.5 * XY(nAt);
-            }
-
-            if (DoubleUtil.IsZero(ptT.LengthSquared))
-            {
-                return false;
-            }
-
-            ptT.Normalize();
-            return true;
-        }
-
-        /// <summary>
-        /// This "curvature" is not the theoretical curvature.  it is a number between
-        /// 0 and 2 that is defined as 1 - cos(angle between segments) at this StylusPoint.
-        /// </summary>
-        /// <param name="iPrev">Previous data StylusPoint Index</param>
-        /// <param name="iCurrent">Current data StylusPoint Index </param>
-        /// <param name="iNext">Next data StylusPoint Index</param>
-        /// <returns>"Curvature"</returns>
-        private double GetCurvature(int iPrev, int iCurrent, int iNext)
-        {
-            Vector V = XY(iCurrent) - XY(iPrev);
-            Vector W = XY(iNext) - XY(iCurrent);
-            double r = V.Length * W.Length;
-
-            if (DoubleUtil.IsZero(r))
-                return 0;
-
-            return 1 - (V * W) / r;
-        }
-
-
-        /// <summary>
-        /// Find all cusps for the stroke
-        /// </summary>
-        private void FindAllCusps()
-        {
-            // Clear the existing cusp indices
-            _cusps.Clear();
-
-            // There is nothing to find out from
-            if (1 > this.Count)
-                return;
-
-            // First StylusPoint is always a cusp
-            _cusps.Add(0);
-
-            int iPrev = 0, iNext = 0, iCuspPrev = 0;
-
-            // Find the next StylusPoint for Index 0
-            // The following check will cover coincident points, stroke with 
-            // less than 3 points
-            if (!FindNextAndPrev(0, iCuspPrev, ref iPrev, ref iNext))
-            {
-                // Point count is zero, thus, there can't be any cusps
-                if (0 == this.Count)
-                    _cusps.Clear();
-                else if (1 < this.Count) // Last StylusPoint is always a cusp
-                    _cusps.Add(iNext);
-
-                return;
-            }
-
-            // Start the algorithm with the next StylusPoint
-            int iPoint = iNext;
-            double rCurv = 0;
-
-            // Check all the points on the chord of the stroke
-            while (FindNextAndPrev(iPoint, iCuspPrev, ref iPrev, ref iNext))
-            {
-                // Find the curvature at iPoint
-                rCurv = GetCurvature(iPrev, iPoint, iNext);
-
-                /*
-                    We'll look at every StylusPoint where rPrevCurv is a local maximum, and the 
-                    curvature is more than the noise threashold.  If we're near the beginning
-                    of the stroke then we'll ignore it and carry on.  If we're near the end 
-                    then we'll skip to the end.  Otherwise, we'll flag it as a cusp if it 
-                    deviates is significantly from the curvature at nearby points, forward
-                    and backward
-                */
-                if (0.80 < rCurv)
-                {
-                    double rMaxCurv = rCurv;
-                    int iMaxCurv = iPoint;
-                    int m = 0, k = 0;
-
-                    if (!FindNextAndPrev(iNext, iCuspPrev, ref k, ref m))
-                    {
-                        // End of the stroke has been reached
-                        break;
-                    }
-
-                    for (int i = iPrev + 1; (i <= m) && FindNextAndPrev(i, iCuspPrev, ref iPrev, ref iNext); ++i)
-                    {
-                        rCurv = GetCurvature(iPrev, i, iNext);
-                        if (rCurv > rMaxCurv)
-                        {
-                            rMaxCurv = rCurv;
-                            iMaxCurv = i;
-                        }
-                    }
-
-                    // Save the Index with max curvature
-                    _cusps.Add(iMaxCurv);
-
-                    // Continue the search with next StylusPoint
-                    iPoint = m + 1;
-                    iCuspPrev = iMaxCurv;
-                }
-                else if (0.035 > rCurv)
-                {
-                    // If the angle is less than 15 degree, skip the segment
-                    iPoint = iNext;
-                }
-                else
-                    ++iPoint;
-            }
-
-            // If everything went right, add the last StylusPoint to the list of cusps
-            _cusps.Add(this.Count - 1);
-        }
-
-
-        /// <summary>
-        /// Finds the next and previous data StylusPoint Index for the given data Index
-        /// </summary>
-        /// <param name="iPoint">Index at which the computation is performed</param>
-        /// <param name="iPrevCusp">Previous cusp</param>
-        /// <param name="iPrev">Previous data Index</param>
-        /// <param name="iNext">Next data Index</param>
-        /// <returns>Returns true if the end has NOT been reached.</returns>
-        private bool FindNextAndPrev(int iPoint, int iPrevCusp, ref int iPrev, ref int iNext)
-        {
-            bool bHasMore = true;
-
-            if (iPoint >= Count)
-            {
-                bHasMore = false;
-                iPoint = Count - 1;
-            }
-
-            // Find a StylusPoint at distance-_span forward
-            for (iNext = checked(iPoint + 1); iNext < Count; ++iNext)
-                if (_nodes[iNext] - _nodes[iPoint] >= _span)
-                    break;
-
-            if (iNext >= Count)
-            {
-                bHasMore = false;
-                iNext = Count - 1;
-            }
-
-            for (iPrev = checked(iPoint - 1); iPrevCusp <= iPrev; --iPrev)
-                if (_nodes[iPoint] - _nodes[iPrev] >= _span)
-                    break;
-
-            if (iPrev < 0)
-                iPrev = 0;
-
-            return bHasMore;
-        }
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="a"></param>
-        /// <param name="rMin"></param>
-        /// <param name="rMax"></param>
-        private static void UpdateMinMax(double a, ref double rMin, ref double rMax)
-        {
-            rMin = Math.Min(rMin, a);
-            rMax = Math.Max(a, rMax);
-        }
-        /// <summary>
-        /// Sets up the internal data structure to construct chain of points
-        /// </summary>
-        /// <param name="rSpan">Shortest distance between two distinct points</param>
-        private void SetLinks(double rSpan)
-        {
-            // NOP, if there is only one StylusPoint
-            int count = Count;
-
-            if (2 > count)
-                return;
-
-            // Set up the links to next and previous probe
-            double rL = XY(0).X;
-            double rT = XY(0).Y;
-            double rR = rL;
-            double rB = rT;
-
-            for (int i = 0; i < count; ++i)
-            {
-                UpdateMinMax(XY(i).X, ref rL, ref rR);
-                UpdateMinMax(XY(i).Y, ref rT, ref rB);
-            }
-
-            rR -= rL;
-            rB -= rT;
-            _dist = Math.Abs(rR) + Math.Abs(rB);
-            if (false == DoubleUtil.IsZero(rSpan))
-                _span = rSpan;
-            else if (0 < _dist)
-            {
-                /***
-                _nodes[count - 1] at this StylusPoint contains the length of the stroke.
-                _dist is the half peripheri of the bounding box of the stroke.
-                The idea here is that the Length/_dist is somewhat analogous to the 
-                "fractal dimension" of the stroke (or in other words, how much the stroke
-                winds.)
-                Length/count is the average distance between two consequitive points
-                on the stroke. Thus, this average distance is multiplied by the winding
-                factor.
-                If the stroke were a PURE straight line across the diagone of a square, 
-                Lenght/Dist will be approximately 1.41. And if there were one pixel per
-                co-ordinate, the span would have been 1.41, which works fairly well in
-                cusp detection
-                ***/
-                _span = 0.75f * (_nodes[count - 1] * _nodes[count - 1]) / (count * _dist);
-            }
-
-            if (_span < 1.0)
-                _span = 1.0f;
-
-            FindAllCusps();
-        }
-
-
-        private List<CDataPoint> _points;
-        private List<double> _nodes;
-        private double _dist = 0;
-        private List<int> _cusps = new List<int>();
-
-        // Parameters governing the cusp detection algorithm
-        // Distance between probes for curvature checking
-        private double _span = 3; // Default span
-
-        struct CDataPoint
-        {
-            public Point Point;       // Point (coordinates are double)
-            public int Index;       // Index into the original array
-            public int TanPrev;    // Previous StylusPoint Index for tangent computation
-            public int TanNext;    // Next StylusPoint Index for tangent computation
-        };
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/DrawingFlags.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/DrawingFlags.cs
deleted file mode 100644
index 1745416..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/DrawingFlags.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-
-namespace WpfInk.PresentationCore.System.Windows.Ink
-{
-    /// <summary>Flag values which can help the renderer decide how to
-    /// draw the ink strokes</summary>
-    [Flags]
-    internal enum DrawingFlags
-    {
-        /// <summary>The stroke should be drawn as a polyline</summary>
-        Polyline = 0x00000000,
-        /// <summary>The stroke should be fit to a curve, such as a bezier.</summary>
-        FitToCurve = 0x00000001,
-        /// <summary>The stroke should be rendered by subtracting its rendering values
-        /// from those on the screen</summary>
-        SubtractiveTransparency = 0x00000002,
-        /// <summary>Ignore any stylus pressure information when rendering</summary>
-        IgnorePressure = 0x00000004,
-        /// <summary>The stroke should be rendered with anti-aliased edges</summary>
-        AntiAliased = 0x00000010,
-        /// <summary>Ignore any stylus rotation information when rendering</summary>
-        IgnoreRotation = 0x00000020,
-        /// <summary>Ignore any stylus angle information when rendering</summary>
-        IgnoreAngle = 0x00000040,
-    };
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/EllipticalNodeOperations.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/EllipticalNodeOperations.cs
deleted file mode 100644
index 3cc918b..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/EllipticalNodeOperations.cs
+++ /dev/null
@@ -1,836 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Input;
-using System.Diagnostics;
-using WpfInk.PresentationCore.System.Windows;
-using WpfInk.PresentationCore.System.Windows.Ink;
-using WpfInk.WindowsBase.System.Windows.Media;
-
-namespace MS.Internal.Ink
-{
-    /// <summary>
-    /// StrokeNodeOperations implementation for elliptical nodes
-    /// </summary>
-    internal class EllipticalNodeOperations : StrokeNodeOperations
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="nodeShape"></param>
-        internal EllipticalNodeOperations(StylusShape nodeShape)
-            : base(nodeShape)
-        {
-            System.Diagnostics.Debug.Assert((nodeShape != null) && nodeShape.IsEllipse);
-
-            _radii = new Size(nodeShape.Width * 0.5, nodeShape.Height * 0.5);
-
-            // All operations with ellipses become simple(r) if transfrom ellipses into circles.
-            // Use the max of the radii for the radius of the circle
-            _radius = Math.Max(_radii.Width, _radii.Height);
-
-            // Compute ellipse-to-circle and circle-to-elliipse transforms. The former is used
-            // in hit-testing operations while the latter is used when computing vertices of
-            // a quadrangle connecting two ellipses
-            _transform = nodeShape.Transform;
-            _nodeShapeToCircle = _transform;
-
-            Debug.Assert(_nodeShapeToCircle.HasInverse, "About to invert a non-invertible transform");
-            _nodeShapeToCircle.Invert();
-            if (DoubleUtil.AreClose(_radii.Width, _radii.Height))
-            {
-                _circleToNodeShape = _transform;
-            }
-            else
-            {
-                // Reverse the rotation
-                if (false == DoubleUtil.IsZero(nodeShape.Rotation))
-                {
-                    _nodeShapeToCircle.Rotate(-nodeShape.Rotation);
-                    Debug.Assert(_nodeShapeToCircle.HasInverse, "Just rotated an invertible transform and produced a non-invertible one");
-                }
-
-                // Scale to enlarge
-                double sx, sy;
-                if (_radii.Width > _radii.Height)
-                {
-                    sx = 1;
-                    sy = _radii.Width / _radii.Height;
-                }
-                else
-                {
-                    sx = _radii.Height / _radii.Width;
-                    sy = 1;
-                }
-                _nodeShapeToCircle.Scale(sx, sy);
-                Debug.Assert(_nodeShapeToCircle.HasInverse, "Just scaled an invertible transform and produced a non-invertible one");
-
-                _circleToNodeShape = _nodeShapeToCircle;
-                _circleToNodeShape.Invert();
-            }
-        }
-
-        /// <summary>
-        /// This is probably not the best (design-wise) but the cheapest way to tell
-        /// EllipticalNodeOperations from all other implementations of node operations.
-        /// </summary>
-        internal override bool IsNodeShapeEllipse { get { return true; } }
-
-        /// <summary>
-        /// Finds connecting points for a pair of stroke nodes
-        /// </summary>
-        /// <param name="beginNode">a node to connect</param>
-        /// <param name="endNode">another node, next to beginNode</param>
-        /// <returns>connecting quadrangle</returns>
-        internal override Quad GetConnectingQuad(in StrokeNodeData beginNode, in StrokeNodeData endNode)
-        {
-            if (beginNode.IsEmpty || endNode.IsEmpty || DoubleUtil.AreClose(beginNode.Position, endNode.Position))
-            {
-                return Quad.Empty;
-            }
-
-            // Get the vector between the node positions
-            Vector spine = endNode.Position - beginNode.Position;
-            if (_nodeShapeToCircle.IsIdentity == false)
-            {
-                spine = _nodeShapeToCircle.Transform(spine);
-            }
-
-            double beginRadius = _radius * beginNode.PressureFactor;
-            double endRadius = _radius * endNode.PressureFactor;
-
-            // Get the vector and the distance between the node positions
-            double distanceSquared = spine.LengthSquared;
-            double delta = endRadius - beginRadius;
-            double deltaSquared = DoubleUtil.IsZero(delta) ? 0 : (delta * delta);
-
-            if (DoubleUtil.LessThanOrClose(distanceSquared, deltaSquared))
-            {
-                // One circle is contained within the other
-                return Quad.Empty;
-            }
-
-            // Thus, at this point, distance > 0, which avoids the DivideByZero error
-            // Also, here, distanceSquared > deltaSquared
-            // Thus, 0 <= rSin < 1
-            // Get the components of the radius vectors
-            double distance = Math.Sqrt(distanceSquared);
-
-            spine /= distance;
-
-            Vector rad = spine;
-
-            // Turn left
-            double temp = rad.Y;
-            rad.Y = -rad.X;
-            rad.X = temp;
-
-            Vector vectorToLeftTangent, vectorToRightTangent;
-            double rSinSquared = deltaSquared / distanceSquared;
-
-            if (DoubleUtil.IsZero(rSinSquared))
-            {
-                vectorToLeftTangent = rad;
-                vectorToRightTangent = -rad;
-            }
-            else
-            {
-                rad *= Math.Sqrt(1 - rSinSquared);
-                spine *= Math.Sqrt(rSinSquared);
-                if (beginNode.PressureFactor < endNode.PressureFactor)
-                {
-                    spine = -spine;
-                }
-
-                vectorToLeftTangent = spine + rad;
-                vectorToRightTangent = spine - rad;
-            }
-
-            // Get the common tangent points
-
-            if (_circleToNodeShape.IsIdentity == false)
-            {
-                vectorToLeftTangent = _circleToNodeShape.Transform(vectorToLeftTangent);
-                vectorToRightTangent = _circleToNodeShape.Transform(vectorToRightTangent);
-            }
-
-            return new Quad(beginNode.Position + (vectorToLeftTangent * beginRadius),
-                            endNode.Position + (vectorToLeftTangent * endRadius),
-                            endNode.Position + (vectorToRightTangent * endRadius),
-                            beginNode.Position + (vectorToRightTangent * beginRadius));
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="node"></param>
-        /// <param name="quad"></param>
-        /// <returns></returns>
-        internal override IEnumerable<ContourSegment> GetContourSegments(StrokeNodeData node, Quad quad)
-        {
-            System.Diagnostics.Debug.Assert(node.IsEmpty == false);
-
-            if (quad.IsEmpty)
-            {
-                Point point = node.Position;
-                point.X += _radius;
-                yield return new ContourSegment(point, point, node.Position);
-            }
-            else if (_nodeShapeToCircle.IsIdentity)
-            {
-                yield return new ContourSegment(quad.A, quad.B);
-                yield return new ContourSegment(quad.B, quad.C, node.Position);
-                yield return new ContourSegment(quad.C, quad.D);
-                yield return new ContourSegment(quad.D, quad.A);
-            }
-        }
-
-        /// <summary>
-        /// ISSUE-2004/06/15- temporary workaround to avoid hit-testing ellipses with ellipses
-        /// </summary>
-        /// <param name="beginNode"></param>
-        /// <param name="endNode"></param>
-        /// <returns></returns>
-        internal override IEnumerable<ContourSegment> GetNonBezierContourSegments(StrokeNodeData beginNode, StrokeNodeData endNode)
-        {
-            Quad quad = beginNode.IsEmpty ? Quad.Empty : base.GetConnectingQuad(beginNode, endNode);
-            return base.GetContourSegments(endNode, quad);
-        }
-
-
-        /// <summary>
-        /// Hit-tests a stroke segment defined by two nodes against a linear segment.
-        /// </summary>
-        /// <param name="beginNode">Begin node of the stroke segment to hit-test. Can be empty (none)</param>
-        /// <param name="endNode">End node of the stroke segment</param>
-        /// <param name="quad">Pre-computed quadrangle connecting the two nodes.
-        /// Can be empty if the begion node is empty or when one node is entirely inside the other</param>
-        /// <param name="hitBeginPoint">an end point of the hitting linear segment</param>
-        /// <param name="hitEndPoint">an end point of the hitting linear segment</param>
-        /// <returns>true if the hitting segment intersect the contour comprised of the two stroke nodes</returns>
-        internal override bool HitTest(
-           in StrokeNodeData beginNode, in StrokeNodeData endNode, Quad quad, Point hitBeginPoint, Point hitEndPoint)
-        {
-            StrokeNodeData bigNode, smallNode;
-            if (beginNode.IsEmpty || (quad.IsEmpty && (endNode.PressureFactor > beginNode.PressureFactor)))
-            {
-                // Need to test one node only
-                bigNode = endNode;
-                smallNode = StrokeNodeData.Empty;
-            }
-            else
-            {
-                // In this case the size doesn't matter.
-                bigNode = beginNode;
-                smallNode = endNode;
-            }
-
-            // Compute the positions of the involved points relative to bigNode.
-            Vector hitBegin = hitBeginPoint - bigNode.Position;
-            Vector hitEnd = hitEndPoint - bigNode.Position;
-
-            // If the node shape is an ellipse, transform the scene to turn the shape to a circle
-            if (_nodeShapeToCircle.IsIdentity == false)
-            {
-                hitBegin = _nodeShapeToCircle.Transform(hitBegin);
-                hitEnd = _nodeShapeToCircle.Transform(hitEnd);
-            }
-
-            bool isHit = false;
-
-            // Hit-test the big node
-            double bigRadius = _radius * bigNode.PressureFactor;
-            Vector nearest = GetNearest(hitBegin, hitEnd);
-            if (nearest.LengthSquared <= (bigRadius * bigRadius))
-            {
-                isHit = true;
-            }
-            else if (quad.IsEmpty == false)
-            {
-                // Hit-test the other node
-                Vector spineVector = smallNode.Position - bigNode.Position;
-                if (_nodeShapeToCircle.IsIdentity == false)
-                {
-                    spineVector = _nodeShapeToCircle.Transform(spineVector);
-                }
-                double smallRadius = _radius * smallNode.PressureFactor;
-                nearest = GetNearest(hitBegin - spineVector, hitEnd - spineVector);
-                if ((nearest.LengthSquared <= (smallRadius * smallRadius)) || HitTestQuadSegment(quad, hitBeginPoint, hitEndPoint))
-                {
-                    isHit = true;
-                }
-            }
-
-            return isHit;
-        }
-
-        /// <summary>
-        /// Hit-tests a stroke segment defined by two nodes against another stroke segment.
-        /// </summary>
-        /// <param name="beginNode">Begin node of the stroke segment to hit-test. Can be empty (none)</param>
-        /// <param name="endNode">End node of the stroke segment</param>
-        /// <param name="quad">Pre-computed quadrangle connecting the two nodes.
-        /// Can be empty if the begion node is empty or when one node is entirely inside the other</param>
-        /// <param name="hitContour">a collection of basic segments outlining the hitting contour</param>
-        /// <returns>true if the contours intersect or overlap</returns>
-        internal override bool HitTest(
-            in StrokeNodeData beginNode, in StrokeNodeData endNode, Quad quad, IEnumerable<ContourSegment> hitContour)
-        {
-            StrokeNodeData bigNode, smallNode;
-            double bigRadiusSquared, smallRadiusSquared = 0;
-            Vector spineVector;
-            if (beginNode.IsEmpty || (quad.IsEmpty && (endNode.PressureFactor > beginNode.PressureFactor)))
-            {
-                // Need to test one node only
-                bigNode = endNode;
-                smallNode = StrokeNodeData.Empty;
-                spineVector = new Vector();
-            }
-            else
-            {
-                // In this case the size doesn't matter.
-                bigNode = beginNode;
-                smallNode = endNode;
-
-                smallRadiusSquared = _radius * smallNode.PressureFactor;
-                smallRadiusSquared *= smallRadiusSquared;
-
-                // Find position of smallNode relative to the bigNode.
-                spineVector = smallNode.Position - bigNode.Position;
-                // If the node shape is an ellipse, transform the scene to turn the shape to a circle
-                if (_nodeShapeToCircle.IsIdentity == false)
-                {
-                    spineVector = _nodeShapeToCircle.Transform(spineVector);
-                }
-            }
-
-            bigRadiusSquared = _radius * bigNode.PressureFactor;
-            bigRadiusSquared *= bigRadiusSquared;
-
-            bool isHit = false;
-
-            // When hit-testing a contour against another contour, like in this case,
-            // the default implementation checks whether any edge (segment) of the hitting
-            // contour intersects with the contour of the ink segment. But this doesn't cover
-            // the case when the ink segment is entirely inside of the hitting segment.
-            // The bool variable isInside is used here to track that case. It answers the question
-            // 'Is ink contour inside if the hitting contour?'. It's initialized to 'true"
-            // and then verified for each edge of the hitting contour until there's a hit or
-            // until it's false.
-            bool isInside = true;
-
-            foreach (ContourSegment hitSegment in hitContour)
-            {
-                if (hitSegment.IsArc)
-                {
-                    // ISSUE-2004/06/15-vsmirnov - ellipse vs arc hit-testing is not implemented
-                    // and currently disabled in ErasingStroke
-                }
-                else
-                {
-                    // Find position of the hitting segment relative to bigNode transformed to circle.
-                    Vector hitBegin = hitSegment.Begin - bigNode.Position;
-                    Vector hitEnd = hitBegin + hitSegment.Vector;
-                    if (_nodeShapeToCircle.IsIdentity == false)
-                    {
-                        hitBegin = _nodeShapeToCircle.Transform(hitBegin);
-                        hitEnd = _nodeShapeToCircle.Transform(hitEnd);
-                    }
-
-                    // Hit-test the big node
-                    Vector nearest = GetNearest(hitBegin, hitEnd);
-                    if (nearest.LengthSquared <= bigRadiusSquared)
-                    {
-                        isHit = true;
-                        break;
-                    }
-
-                    // Hit-test the other node
-                    if (quad.IsEmpty == false)
-                    {
-                        nearest = GetNearest(hitBegin - spineVector, hitEnd - spineVector);
-                        if ((nearest.LengthSquared <= smallRadiusSquared) ||
-                            HitTestQuadSegment(quad, hitSegment.Begin, hitSegment.End))
-                        {
-                            isHit = true;
-                            break;
-                        }
-                    }
-
-                    // While there's still a chance to find the both nodes inside the hitting contour,
-                    // continue checking on position of the endNode relative to the edges of the hitting contour.
-                    if (isInside &&
-                        (WhereIsVectorAboutVector(endNode.Position - hitSegment.Begin, hitSegment.Vector) != HitResult.Right))
-                    {
-                        isInside = false;
-                    }
-                }
-            }
-
-            return (isHit || isInside);
-        }
-
-        /// <summary>
-        /// Cut-test ink segment defined by two nodes and a connecting quad against a linear segment
-        /// </summary>
-        /// <param name="beginNode">Begin node of the ink segment</param>
-        /// <param name="endNode">End node of the ink segment</param>
-        /// <param name="quad">Pre-computed quadrangle connecting the two ink nodes</param>
-        /// <param name="hitBeginPoint">egin point of the hitting segment</param>
-        /// <param name="hitEndPoint">End point of the hitting segment</param>
-        /// <returns>Exact location to cut at represented by StrokeFIndices</returns>
-        internal override StrokeFIndices CutTest(
-            in StrokeNodeData beginNode, in StrokeNodeData endNode, Quad quad, Point hitBeginPoint, Point hitEndPoint)
-        {
-            // Compute the positions of the involved points relative to the endNode.
-            Vector spineVector = beginNode.IsEmpty ? new Vector(0, 0) : (beginNode.Position - endNode.Position);
-            Vector hitBegin = hitBeginPoint - endNode.Position;
-            Vector hitEnd = hitEndPoint - endNode.Position;
-
-            // If the node shape is an ellipse, transform the scene to turn the shape to a circle
-            if (_nodeShapeToCircle.IsIdentity == false)
-            {
-                spineVector = _nodeShapeToCircle.Transform(spineVector);
-                hitBegin = _nodeShapeToCircle.Transform(hitBegin);
-                hitEnd = _nodeShapeToCircle.Transform(hitEnd);
-            }
-
-            StrokeFIndices result = StrokeFIndices.Empty;
-
-            // Hit-test the end node
-            double beginRadius = 0, endRadius = _radius * endNode.PressureFactor;
-            Vector nearest = GetNearest(hitBegin, hitEnd);
-            if (nearest.LengthSquared <= (endRadius * endRadius))
-            {
-                result.EndFIndex = StrokeFIndices.AfterLast;
-                result.BeginFIndex = beginNode.IsEmpty ? StrokeFIndices.BeforeFirst : 1;
-            }
-            if (beginNode.IsEmpty == false)
-            {
-                // Hit-test the first node
-                beginRadius = _radius * beginNode.PressureFactor;
-                nearest = GetNearest(hitBegin - spineVector, hitEnd - spineVector);
-                if (nearest.LengthSquared <= (beginRadius * beginRadius))
-                {
-                    result.BeginFIndex = StrokeFIndices.BeforeFirst;
-                    if (!DoubleUtil.AreClose(result.EndFIndex, StrokeFIndices.AfterLast))
-                    {
-                        result.EndFIndex = 0;
-                    }
-                }
-            }
-
-            // If both nodes are hit or nothing is hit at all, return.
-            if (result.IsFull || quad.IsEmpty
-                || (result.IsEmpty && (HitTestQuadSegment(quad, hitBeginPoint, hitEndPoint) == false)))
-            {
-                return result;
-            }
-
-            // Find out whether the {begin, end} segment intersects with the contour
-            // of the stroke segment {_lastNode, _thisNode}, and find the lower index
-            // of the fragment to cut out.
-            if (!DoubleUtil.AreClose(result.BeginFIndex, StrokeFIndices.BeforeFirst))
-            {
-                result.BeginFIndex = ClipTest(-spineVector, beginRadius, endRadius, hitBegin - spineVector, hitEnd - spineVector);
-            }
-
-            if (!DoubleUtil.AreClose(result.EndFIndex, StrokeFIndices.AfterLast))
-            {
-                result.EndFIndex = 1 - ClipTest(spineVector, endRadius, beginRadius, hitBegin, hitEnd);
-            }
-
-            if (IsInvalidCutTestResult(result))
-            {
-                return StrokeFIndices.Empty;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// CutTest an inking StrokeNode segment (two nodes and a connecting quadrangle) against a hitting contour
-        /// (represented by an enumerator of Contoursegments).
-        /// </summary>
-        /// <param name="beginNode">The begin StrokeNodeData</param>
-        /// <param name="endNode">The end StrokeNodeData</param>
-        /// <param name="quad">Connecing quadrangle between the begin and end inking node</param>
-        /// <param name="hitContour">The hitting ContourSegments</param>
-        /// <returns>StrokeFIndices representing the location for cutting</returns>
-        internal override StrokeFIndices CutTest(
-            in StrokeNodeData beginNode, in StrokeNodeData endNode, Quad quad, IEnumerable<ContourSegment> hitContour)
-        {
-            // Compute the positions of the beginNode relative to the endNode.
-            Vector spineVector = beginNode.IsEmpty ? new Vector(0, 0) : (beginNode.Position - endNode.Position);
-            // If the node shape is an ellipse, transform the scene to turn the shape to a circle
-            if (_nodeShapeToCircle.IsIdentity == false)
-            {
-                spineVector = _nodeShapeToCircle.Transform(spineVector);
-            }
-
-            double beginRadius = 0, endRadius;
-            double beginRadiusSquared = 0, endRadiusSquared;
-
-            endRadius = _radius * endNode.PressureFactor;
-            endRadiusSquared = endRadius * endRadius;
-            if (beginNode.IsEmpty == false)
-            {
-                beginRadius = _radius * beginNode.PressureFactor;
-                beginRadiusSquared = beginRadius * beginRadius;
-            }
-
-            bool isInside = true;
-            StrokeFIndices result = StrokeFIndices.Empty;
-
-            foreach (ContourSegment hitSegment in hitContour)
-            {
-                if (hitSegment.IsArc)
-                {
-                    // ISSUE-2004/06/15-vsmirnov - ellipse vs arc hit-testing is not implemented
-                    // and currently disabled in ErasingStroke
-                }
-                else
-                {
-                    Vector hitBegin = hitSegment.Begin - endNode.Position;
-                    Vector hitEnd = hitBegin + hitSegment.Vector;
-
-                    // If the node shape is an ellipse, transform the scene to turn
-                    // the shape into circle.
-                    if (_nodeShapeToCircle.IsIdentity == false)
-                    {
-                        hitBegin = _nodeShapeToCircle.Transform(hitBegin);
-                        hitEnd = _nodeShapeToCircle.Transform(hitEnd);
-                    }
-
-                    bool isHit = false;
-
-                    // Hit-test the end node
-                    Vector nearest = GetNearest(hitBegin, hitEnd);
-                    if (nearest.LengthSquared < endRadiusSquared)
-                    {
-                        isHit = true;
-                        if (!DoubleUtil.AreClose(result.EndFIndex, StrokeFIndices.AfterLast))
-                        {
-                            result.EndFIndex = StrokeFIndices.AfterLast;
-                            if (beginNode.IsEmpty)
-                            {
-                                result.BeginFIndex = StrokeFIndices.BeforeFirst;
-                                break;
-                            }
-                            if (DoubleUtil.AreClose(result.BeginFIndex, StrokeFIndices.BeforeFirst))
-                            {
-                                break;
-                            }
-                        }
-                    }
-
-                    if ((beginNode.IsEmpty == false) && (!isHit || !DoubleUtil.AreClose(result.BeginFIndex, StrokeFIndices.BeforeFirst)))
-                    {
-                        // Hit-test the first node
-                        nearest = GetNearest(hitBegin - spineVector, hitEnd - spineVector);
-                        if (nearest.LengthSquared < beginRadiusSquared)
-                        {
-                            isHit = true;
-                            if (!DoubleUtil.AreClose(result.BeginFIndex, StrokeFIndices.BeforeFirst))
-                            {
-                                result.BeginFIndex = StrokeFIndices.BeforeFirst;
-                                if (DoubleUtil.AreClose(result.EndFIndex, StrokeFIndices.AfterLast))
-                                {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    // If both nodes are hit or nothing is hit at all, return.
-                    if (beginNode.IsEmpty || (!isHit && (quad.IsEmpty ||
-                        (HitTestQuadSegment(quad, hitSegment.Begin, hitSegment.End) == false))))
-                    {
-                        if (isInside && (WhereIsVectorAboutVector(
-                            endNode.Position - hitSegment.Begin, hitSegment.Vector) != HitResult.Right))
-                        {
-                            isInside = false;
-                        }
-                        continue;
-                    }
-
-                    isInside = false;
-
-                    // Calculate the exact locations to cut.
-                    CalculateCutLocations(spineVector, hitBegin, hitEnd, endRadius, beginRadius, ref result);
-
-                    if (result.IsFull)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            //
-            if (!result.IsFull)
-            {
-                if (isInside == true)
-                {
-                    System.Diagnostics.Debug.Assert(result.IsEmpty);
-                    result = StrokeFIndices.Full;
-                }
-                else if ((DoubleUtil.AreClose(result.EndFIndex, StrokeFIndices.BeforeFirst)) && (!DoubleUtil.AreClose(result.BeginFIndex, StrokeFIndices.AfterLast)))
-                {
-                    result.EndFIndex = StrokeFIndices.AfterLast;
-                }
-                else if ((DoubleUtil.AreClose(result.BeginFIndex, StrokeFIndices.AfterLast)) && (!DoubleUtil.AreClose(result.EndFIndex, StrokeFIndices.BeforeFirst)))
-                {
-                    result.BeginFIndex = StrokeFIndices.BeforeFirst;
-                }
-            }
-
-            if (IsInvalidCutTestResult(result))
-            {
-                return StrokeFIndices.Empty;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Clip-Testing a circluar inking segment against a linear segment.
-        /// See http://tabletpc/longhorn/Specs/Rendering%20and%20Hit-Testing%20Ink%20in%20Avalon%20M11.doc section
-        /// 5.4.4.14	Clip-Testing a Circular Inking Segment against a Linear Segment for details of the algorithm
-        /// </summary>
-        /// <param name="spineVector">Represent the spine of the inking segment pointing from the beginNode to endNode</param>
-        /// <param name="beginRadius">Radius of the beginNode</param>
-        /// <param name="endRadius">Radius of the endNode</param>
-        /// <param name="hitBegin">Hitting segment start point</param>
-        /// <param name="hitEnd">Hitting segment end point</param>
-        /// <returns>A double which represents the location for cutting</returns>
-        private static double ClipTest(Vector spineVector, double beginRadius, double endRadius, Vector hitBegin, Vector hitEnd)
-        {
-            // First handle the special case when the spineVector is (0,0). In other words, this is the case
-            // when the stylus stays at the the location but pressure changes.
-            if (DoubleUtil.IsZero(spineVector.X) && DoubleUtil.IsZero(spineVector.Y))
-            {
-                System.Diagnostics.Debug.Assert(DoubleUtil.AreClose(beginRadius, endRadius) == false);
-
-                Vector nearest = GetNearest(hitBegin, hitEnd);
-                double radius;
-                if (nearest.X == 0)
-                {
-                    radius = Math.Abs(nearest.Y);
-                }
-                else if (nearest.Y == 0)
-                {
-                    radius = Math.Abs(nearest.X);
-                }
-                else
-                {
-                    radius = nearest.Length;
-                }
-                return AdjustFIndex((radius - beginRadius) / (endRadius - beginRadius));
-            }
-
-            // This change to ClipTest with a point if the two hitting segment are close enough.
-            if (DoubleUtil.AreClose(hitBegin, hitEnd))
-            {
-                return ClipTest(spineVector, beginRadius, endRadius, hitBegin);
-            }
-
-            double findex;
-            Vector hitVector = hitEnd - hitBegin;
-
-            if (DoubleUtil.IsZero(Vector.Determinant(spineVector, hitVector)))
-            {
-                // hitVector and spineVector are parallel
-                findex = ClipTest(spineVector, beginRadius, endRadius, GetNearest(hitBegin, hitEnd));
-                System.Diagnostics.Debug.Assert(!double.IsNaN(findex));
-            }
-            else
-            {
-                // On the line defined by the segment find point P1Xp, the nearest to the beginNode.Position
-                double x = GetProjectionFIndex(hitBegin, hitEnd);
-                Vector P1Xp = hitBegin + (hitVector * x);
-                if (P1Xp.LengthSquared < (beginRadius * beginRadius))
-                {
-                    System.Diagnostics.Debug.Assert(DoubleUtil.IsBetweenZeroAndOne(x) == false);
-                    findex = ClipTest(spineVector, beginRadius, endRadius, (0 > x) ? hitBegin : hitEnd);
-                    System.Diagnostics.Debug.Assert(!double.IsNaN(findex));
-                }
-                else
-                {
-                    // Find the projection point P of endNode.Position to the line (beginNode.Position, B).
-                    Vector P1P2p = spineVector + GetProjection(-spineVector, P1Xp - spineVector);
-
-                    //System.Diagnostics.Debug.Assert(false == DoubleUtil.IsZero(P1P2p.LengthSquared));
-                    //System.Diagnostics.Debug.Assert(false == DoubleUtil.IsZero(endRadius - beginRadius + P1P2p.Length));
-                    // There checks are here since if either fail no real solution can be caculated and we may
-                    // as well bail out now and save the caculations that are below.
-                    if (DoubleUtil.IsZero(P1P2p.LengthSquared) || DoubleUtil.IsZero(endRadius - beginRadius + P1P2p.Length))
-                        return 1d;
-
-                    // Calculate the findex of the point to split the ink segment at.
-                    findex = (P1Xp.Length - beginRadius) / (endRadius - beginRadius + P1P2p.Length);
-                    System.Diagnostics.Debug.Assert(!double.IsNaN(findex));
-
-                    // Find the projection of the split point to the line of this segment.
-                    Vector S = spineVector * findex;
-
-                    double r = GetProjectionFIndex(hitBegin - S, hitEnd - S);
-
-                    // If the nearest point misses the segment, then find the findex
-                    // of the node nearest to the segment.
-                    if (false == DoubleUtil.IsBetweenZeroAndOne(r))
-                    {
-                        findex = ClipTest(spineVector, beginRadius, endRadius, (0 > r) ? hitBegin : hitEnd);
-                        System.Diagnostics.Debug.Assert(!double.IsNaN(findex));
-                    }
-                }
-            }
-            return AdjustFIndex(findex);
-        }
-
-        /// <summary>
-        /// Clip-Testing a circular inking segment again a hitting point.
-        ///
-        /// What need to find out a doulbe value s, which is between 0 and 1, such that
-        ///     DistanceOf(hit - s*spine) = beginRadius + s * (endRadius - beginRadius)
-        /// That is
-        ///     (hit.X-s*spine.X)^2 + (hit.Y-s*spine.Y)^2 = [beginRadius + s*(endRadius-beginRadius)]^2
-        /// Rearrange
-        ///     A*s^2 + B*s + C = 0
-        /// where the value of A, B and C are described in the source code.
-        /// Solving for s:
-        ///             s = (-B + sqrt(B^2-4A*C))/(2A)  or s = (-B - sqrt(B^2-4A*C))/(2A)
-        /// The smaller value between 0 and 1 is the one we want and discard the other one.
-        /// </summary>
-        /// <param name="spine">Represent the spine of the inking segment pointing from the beginNode to endNode</param>
-        /// <param name="beginRadius">Radius of the beginNode</param>
-        /// <param name="endRadius">Radius of the endNode</param>
-        /// <param name="hit">The hitting point</param>
-        /// <returns>A double which represents the location for cutting</returns>
-        private static double ClipTest(Vector spine, double beginRadius, double endRadius, Vector hit)
-        {
-            double radDiff = endRadius - beginRadius;
-            double A = spine.X * spine.X + spine.Y * spine.Y - radDiff * radDiff;
-            double B = -2.0f * (hit.X * spine.X + hit.Y * spine.Y + beginRadius * radDiff);
-            double C = hit.X * hit.X + hit.Y * hit.Y - beginRadius * beginRadius;
-
-            // There checks are here since if either fail no real solution can be caculated and we may
-            // as well bail out now and save the caculations that are below.
-            if (DoubleUtil.IsZero(A) || !DoubleUtil.GreaterThanOrClose(B * B, 4.0f * A * C))
-                return 1d;
-
-            double tmp = Math.Sqrt(B * B - 4.0f * A * C);
-            double s1 = (-B + tmp) / (2.0f * A);
-            double s2 = (-B - tmp) / (2.0f * A);
-            double findex;
-
-            if (DoubleUtil.IsBetweenZeroAndOne(s1) && DoubleUtil.IsBetweenZeroAndOne(s1))
-            {
-                findex = Math.Min(s1, s2);
-            }
-            else if (DoubleUtil.IsBetweenZeroAndOne(s1))
-            {
-                findex = s1;
-            }
-            else if (DoubleUtil.IsBetweenZeroAndOne(s2))
-            {
-                findex = s2;
-            }
-            else
-            {
-                // There is still possiblity that value like 1.0000000000000402 is not considered
-                // as "IsOne" by DoubleUtil class. We should be at either one of the following two cases:
-                // 1. s1/s2 around 0 but not close enough (say -0.0000000000001)
-                // 2. s1/s2 around 1 but not close enought (say 1.0000000000000402)
-
-                if (s1 > 1d && s2 > 1d)
-                {
-                    findex = 1d;
-                }
-                else if (s1 < 0d && s2 < 0d)
-                {
-                    findex = 0d;
-                }
-                else
-                {
-                    findex = Math.Abs(Math.Min(s1, s2) - 0d) < Math.Abs(Math.Max(s1, s2) - 1d) ? 0d : 1d;
-                }
-            }
-            return AdjustFIndex(findex);
-        }
-
-        /// <summary>
-        /// Helper function to find out the relative location of a segment {segBegin, segEnd} against
-        /// a strokeNode (spine).
-        /// </summary>
-        /// <param name="spine">the spineVector of the StrokeNode</param>
-        /// <param name="segBegin">Start position of the line segment</param>
-        /// <param name="segEnd">End position of the line segment</param>
-        /// <returns>HitResult</returns>
-        private static HitResult WhereIsNodeAboutSegment(Vector spine, Vector segBegin, Vector segEnd)
-        {
-            HitResult whereabout = HitResult.Right;
-            Vector segVector = segEnd - segBegin;
-
-            if ((WhereIsVectorAboutVector(-segBegin, segVector) == HitResult.Left)
-                && !DoubleUtil.IsZero(Vector.Determinant(spine, segVector)))
-            {
-                whereabout = HitResult.Left;
-            }
-            return whereabout;
-        }
-
-        /// <summary>
-        /// Helper method to calculate the exact location to cut
-        /// </summary>
-        /// <param name="spineVector">Vector the relative location of the two inking nodes</param>
-        /// <param name="hitBegin">the begin point of the hitting segment</param>
-        /// <param name="hitEnd">the end point of the hitting segment</param>
-        /// <param name="endRadius">endNode radius</param>
-        /// <param name="beginRadius">beginNode radius</param>
-        /// <param name="result">StrokeFIndices representing the location for cutting</param>
-        private void CalculateCutLocations(
-            Vector spineVector, Vector hitBegin, Vector hitEnd, double endRadius, double beginRadius, ref StrokeFIndices result)
-        {
-            // Find out whether the {hitBegin, hitEnd} segment intersects with the contour
-            // of the stroke segment, and find the lower index of the fragment to cut out.
-            if (!DoubleUtil.AreClose(result.EndFIndex, StrokeFIndices.AfterLast))
-            {
-                if (WhereIsNodeAboutSegment(spineVector, hitBegin, hitEnd) == HitResult.Left)
-                {
-                    double findex = 1 - ClipTest(spineVector, endRadius, beginRadius, hitBegin, hitEnd);
-                    if (findex > result.EndFIndex)
-                    {
-                        result.EndFIndex = findex;
-                    }
-                }
-            }
-
-            // Find out whether the {hitBegin, hitEnd} segment intersects with the contour
-            // of the stroke segment, and find the higher index of the fragment to cut out.
-            if (!DoubleUtil.AreClose(result.BeginFIndex, StrokeFIndices.BeforeFirst))
-            {
-                hitBegin -= spineVector;
-                hitEnd -= spineVector;
-                if (WhereIsNodeAboutSegment(-spineVector, hitBegin, hitEnd) == HitResult.Left)
-                {
-                    double findex = ClipTest(-spineVector, beginRadius, endRadius, hitBegin, hitEnd);
-                    if (findex < result.BeginFIndex)
-                    {
-                        result.BeginFIndex = findex;
-                    }
-                }
-            }
-        }
-
-        private double _radius = 0;
-        private Size _radii;
-        private Matrix _transform;
-        private Matrix _nodeShapeToCircle;
-        private Matrix _circleToNodeShape;
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ErasingStroke.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ErasingStroke.cs
deleted file mode 100644
index e009503..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ErasingStroke.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-//#define POINTS_FILTER_TRACE
-
-using System;
-using System.Windows;
-using System.Collections.Generic;
-using WpfInk.PresentationCore.System.Windows;
-using WpfInk.PresentationCore.System.Windows.Ink;
-
-
-namespace MS.Internal.Ink
-{
-    #region ErasingStroke
-
-    /// <summary>
-    /// This class represents a contour of an erasing stroke, and provides
-    /// internal API for static and incremental stroke_contour vs stroke_contour
-    /// hit-testing.
-    /// </summary>
-    internal class ErasingStroke
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Constructor for incremental erasing
-        /// </summary>
-        /// <param name="erasingShape">The shape of the eraser's tip</param>
-        internal ErasingStroke(StylusShape erasingShape)
-        {
-            System.Diagnostics.Debug.Assert(erasingShape != null);
-            _nodeIterator = new StrokeNodeIterator(erasingShape);
-        }
-
-        /// <summary>
-        /// Constructor for static (atomic) erasing
-        /// </summary>
-        /// <param name="erasingShape">The shape of the eraser's tip</param>
-        /// <param name="path">the spine of the erasing stroke</param>
-        internal ErasingStroke(StylusShape erasingShape, IEnumerable<Point> path)
-            : this(erasingShape)
-        {
-            MoveTo(path);
-        }
-
-        #endregion
-
-        #region API
-
-        /// <summary>
-        /// Generates stroke nodes along a given path.
-        /// Drops any previously genererated nodes.
-        /// </summary>
-        /// <param name="path"></param>
-        internal void MoveTo(IEnumerable<Point> path)
-        {
-            System.Diagnostics.Debug.Assert((path != null) && (IEnumerablePointHelper.GetCount(path) != 0));
-            Point[] points = IEnumerablePointHelper.GetPointArray(path);
-
-            if (_erasingStrokeNodes == null)
-            {
-                _erasingStrokeNodes = new List<StrokeNode>(points.Length);
-            }
-            else
-            {
-                _erasingStrokeNodes.Clear();
-            }
-
-
-            _bounds = Rect.Empty;
-            _nodeIterator = _nodeIterator.GetIteratorForNextSegment(points.Length > 1 ? FilterPoints(points) : points);
-            for (int i = 0; i < _nodeIterator.Count; i++)
-            {
-                StrokeNode strokeNode = _nodeIterator[i];
-                _bounds.Union(strokeNode.GetBoundsConnected());
-                _erasingStrokeNodes.Add(strokeNode);
-            }
-#if POINTS_FILTER_TRACE
-            _totalPointsAdded += path.Length;
-            System.Diagnostics.Debug.WriteLine(String.Format("Total Points added: {0} screened: {1} collinear screened: {2}", _totalPointsAdded, _totalPointsScreened, _collinearPointsScreened));
-#endif
-
-        }
-
-        /// <summary>
-        /// Returns the bounds of the eraser's last move.
-        /// </summary>
-        /// <value></value>
-        internal Rect Bounds { get { return _bounds; } }
-
-        /// <summary>
-        /// Hit-testing for stroke erase scenario.
-        /// </summary>
-        /// <param name="iterator">the stroke nodes to iterate</param>
-        /// <returns>true if the strokes intersect, false otherwise</returns>
-        internal bool HitTest(StrokeNodeIterator iterator)
-        {
-            System.Diagnostics.Debug.Assert(iterator != null);
-
-            if ((_erasingStrokeNodes == null) || (_erasingStrokeNodes.Count == 0))
-            {
-                return false;
-            }
-
-            Rect inkSegmentBounds = Rect.Empty;
-            for (int i = 0; i < iterator.Count; i++)
-            {
-                StrokeNode inkStrokeNode = iterator[i];
-                Rect inkNodeBounds = inkStrokeNode.GetBounds();
-                inkSegmentBounds.Union(inkNodeBounds);
-
-                if (inkSegmentBounds.IntersectsWith(_bounds))
-                {
-                    // can be optimized (using pre-computed bounds
-                    // of parts of the erasing stroke)
-                    foreach (StrokeNode erasingStrokeNode in _erasingStrokeNodes)
-                    {
-                        if (inkSegmentBounds.IntersectsWith(erasingStrokeNode.GetBoundsConnected())
-                            && erasingStrokeNode.HitTest(inkStrokeNode))
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Hit-testing for point erase.
-        /// </summary>
-        /// <param name="iterator"></param>
-        /// <param name="intersections"></param>
-        /// <returns></returns>
-        internal bool EraseTest(StrokeNodeIterator iterator, List<StrokeIntersection> intersections)
-        {
-            System.Diagnostics.Debug.Assert(iterator != null);
-            System.Diagnostics.Debug.Assert(intersections != null);
-            intersections.Clear();
-
-            List<StrokeFIndices> eraseAt = new List<StrokeFIndices>();
-
-            if ((_erasingStrokeNodes == null) || (_erasingStrokeNodes.Count == 0))
-            {
-                return false;
-            }
-
-            Rect inkSegmentBounds = Rect.Empty;
-            for (int x = 0; x < iterator.Count; x++)
-            {
-                StrokeNode inkStrokeNode = iterator[x];
-                Rect inkNodeBounds = inkStrokeNode.GetBounds();
-                inkSegmentBounds.Union(inkNodeBounds);
-
-                if (inkSegmentBounds.IntersectsWith(_bounds))
-                {
-                    // can be optimized (using pre-computed bounds
-                    // of parts of the erasing stroke)
-                    int index = eraseAt.Count;
-                    foreach (StrokeNode erasingStrokeNode in _erasingStrokeNodes)
-                    {
-                        if (false == inkSegmentBounds.IntersectsWith(erasingStrokeNode.GetBoundsConnected()))
-                        {
-                            continue;
-                        }
-
-                        StrokeFIndices fragment = inkStrokeNode.CutTest(erasingStrokeNode);
-                        if (fragment.IsEmpty)
-                        {
-                            continue;
-                        }
-
-                        // Merge it with the other results for this ink segment
-                        bool inserted = false;
-                        for (int i = index; i < eraseAt.Count; i++)
-                        {
-                            StrokeFIndices lastFragment = eraseAt[i];
-                            if (fragment.BeginFIndex < lastFragment.EndFIndex)
-                            {
-                                // If the fragments overlap, merge them
-                                if (fragment.EndFIndex > lastFragment.BeginFIndex)
-                                {
-                                    fragment = new StrokeFIndices(
-                                        Math.Min(lastFragment.BeginFIndex, fragment.BeginFIndex),
-                                        Math.Max(lastFragment.EndFIndex, fragment.EndFIndex));
-
-                                    // If the fragment doesn't go beyond lastFragment, break
-                                    if ((fragment.EndFIndex <= lastFragment.EndFIndex) || ((i + 1) == eraseAt.Count))
-                                    {
-                                        inserted = true;
-                                        eraseAt[i] = fragment;
-                                        break;
-                                    }
-                                    else
-                                    {
-                                        eraseAt.RemoveAt(i);
-                                        i--;
-                                    }
-                                }
-                                // insert otherwise
-                                else
-                                {
-                                    eraseAt.Insert(i, fragment);
-                                    inserted = true;
-                                    break;
-                                }
-                            }
-                        }
-
-                        // If not merged nor inserted, add it to the end of the list
-                        if (false == inserted)
-                        {
-                            eraseAt.Add(fragment);
-                        }
-                        // Break out if the entire ink segment is hit - {BeforeFirst, AfterLast}
-                        if (eraseAt[eraseAt.Count - 1].IsFull)
-                        {
-                            break;
-                        }
-                    }
-                    // Merge inter-segment overlapping fragments
-                    if ((index > 0) && (index < eraseAt.Count))
-                    {
-                        StrokeFIndices lastFragment = eraseAt[index - 1];
-                        if (DoubleUtil.AreClose(lastFragment.EndFIndex, StrokeFIndices.AfterLast))
-                        {
-                            if (DoubleUtil.AreClose(eraseAt[index].BeginFIndex, StrokeFIndices.BeforeFirst))
-                            {
-                                lastFragment.EndFIndex = eraseAt[index].EndFIndex;
-                                eraseAt[index - 1] = lastFragment;
-                                eraseAt.RemoveAt(index);
-                            }
-                            else
-                            {
-                                lastFragment.EndFIndex = inkStrokeNode.Index;
-                                eraseAt[index - 1] = lastFragment;
-                            }
-                        }
-                    }
-                }
-                // Start next ink segment
-                inkSegmentBounds = inkNodeBounds;
-            }
-            if (eraseAt.Count != 0)
-            {
-                foreach (StrokeFIndices segment in eraseAt)
-                {
-                    intersections.Add(new StrokeIntersection(segment.BeginFIndex, StrokeFIndices.AfterLast,
-                                            StrokeFIndices.BeforeFirst, segment.EndFIndex));
-                }
-            }
-            return (eraseAt.Count != 0);
-        }
-
-        #endregion
-
-        #region private API
-        private Point[] FilterPoints(Point[] path)
-        {
-            System.Diagnostics.Debug.Assert(path.Length > 1);
-            Point back2, back1;
-            int i;
-            List<Point> newPath = new List<Point>();
-            if (_nodeIterator.Count == 0)
-            {
-                newPath.Add(path[0]);
-                newPath.Add(path[1]);
-                back2 = path[0];
-                back1 = path[1];
-                i = 2;
-            }
-            else
-            {
-                newPath.Add(path[0]);
-                back2 = _nodeIterator[_nodeIterator.Count - 1].Position;
-                back1 = path[0];
-                i = 1;
-            }
-
-            while (i < path.Length)
-            {
-                if (DoubleUtil.AreClose(back1, path[i]))
-                {
-                    // Filter out duplicate points
-                    i++;
-                    continue;
-                }
-
-                Vector begin = back2 - back1;
-                Vector end = path[i] - back1;
-                //On a line defined by begin & end,  finds the findex of the point nearest to the origin (0,0).
-                double findex = StrokeNodeOperations.GetProjectionFIndex(begin, end);
-
-                if (DoubleUtil.IsBetweenZeroAndOne(findex))
-                {
-                    Vector v = (begin + (end - begin) * findex);
-                    if (v.LengthSquared < CollinearTolerance)
-                    {
-                        // The point back1 can be considered as on the line from back2 to the toTest StrokeNode.
-                        // Modify the previous point.
-                        newPath[newPath.Count - 1] = path[i];
-                        back1 = path[i];
-                        i++;
-#if POINTS_FILTER_TRACE
-                        _collinearPointsScreened ++;
-#endif
-                        continue;
-                    }
-                }
-
-                // Add the surviving point into the list.
-                newPath.Add(path[i]);
-                back2 = back1;
-                back1 = path[i];
-                i++;
-            }
-#if POINTS_FILTER_TRACE
-            _totalPointsScreened += path.Length - newPath.Count;
-#endif
-            return newPath.ToArray();
-        }
-
-        #endregion
-
-        #region Fields
-
-        private StrokeNodeIterator _nodeIterator;
-        private List<StrokeNode> _erasingStrokeNodes = null;
-        private Rect _bounds = Rect.Empty;
-
-#if POINTS_FILTER_TRACE
-        private int                     _totalPointsAdded = 0;
-        private int                     _totalPointsScreened = 0;
-        private int                     _collinearPointsScreened = 0;
-#endif
-
-        // The collinear tolerance used in points filtering algorithm. The valie
-        // should be further tuned considering trade-off of performance and accuracy.
-        // In general, the larger the value, more points are filtered but less accurate.
-        // For a value of 0.5, typically 70% - 80% percent of the points are filtered out.
-        private static readonly double CollinearTolerance = 0.1f;
-
-        #endregion
-    }
-
-    #endregion
-}
-
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ExtendedProperty.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ExtendedProperty.cs
deleted file mode 100644
index ef85c93..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ExtendedProperty.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using SRID = MS.Internal.PresentationCore.SRID;
-
-namespace WpfInk.PresentationCore.System.Windows.Ink
-{
-    /// <summary>
-    /// Drawing Attribute Key/Value pair for specifying each attribute
-    /// </summary>
-    internal sealed class ExtendedProperty
-    {
-        /// <summary>
-        /// Create a new drawing attribute with the specified key and value
-        /// </summary>
-        /// <param name="id">Identifier of attribute</param>
-        /// <param name="value">Attribute value - not that the Type for value is tied to the id</param>
-        /// <exception cref="ArgumentException">Value type must be compatible with attribute Id</exception>
-        internal ExtendedProperty(Guid id, object value)
-        {
-            if (id == Guid.Empty)
-            {
-                throw new ArgumentException(SR.Get(SRID.InvalidGuid));
-            }
-            _id = id;
-            Value = value;
-        }
-
-        /// <summary>Returns a value that can be used to store and lookup
-        /// ExtendedProperty objects in a hash table</summary>
-        public override int GetHashCode()
-        {
-            return Id.GetHashCode() ^ Value.GetHashCode();
-        }
-
-        /// <summary>Determine if two ExtendedProperty objects are equal</summary>
-        public override bool Equals(object obj)
-        {
-            if (obj == null || obj.GetType() != GetType())
-            {
-                return false;
-            }
-
-            ExtendedProperty that = (ExtendedProperty) obj;
-
-            if (that.Id == this.Id)
-            {
-                Type type1 = this.Value.GetType();
-                Type type2 = that.Value.GetType();
-
-                if (type1.IsArray && type2.IsArray)
-                {
-                    Type elementType1 = type1.GetElementType();
-                    Type elementType2 = type2.GetElementType();
-                    if (elementType1 == elementType2 &&
-                        elementType1.IsValueType &&
-                        type1.GetArrayRank() == 1 &&
-                        elementType2.IsValueType &&
-                        type2.GetArrayRank() == 1)
-                    {
-                        Array array1 = (Array) this.Value;
-                        Array array2 = (Array) that.Value;
-                        if (array1.Length == array2.Length)
-                        {
-                            for (int i = 0; i < array1.Length; i++)
-                            {
-                                if (!array1.GetValue(i).Equals(array2.GetValue(i)))
-                                {
-                                    return false;
-                                }
-                            }
-                            return true;
-                        }
-                    }
-                }
-                else
-                {
-                    return that.Value.Equals(this.Value);
-                }
-            }
-            return false;
-        }
-
-        /// <summary>Overload of the equality operator for comparing
-        /// two ExtendedProperty objects</summary>
-        public static bool operator ==(ExtendedProperty first, ExtendedProperty second)
-        {
-            if ((object) first == null && (object) second == null)
-            {
-                return true;
-            }
-            else if ((object) first == null || (object) second == null)
-            {
-                return false;
-            }
-            else
-            {
-                return first.Equals(second);
-            }
-        }
-
-        /// <summary>Compare two custom attributes for Id and value inequality</summary>
-        /// <remarks>Value comparison is performed based on Value.Equals</remarks>
-        public static bool operator !=(ExtendedProperty first, ExtendedProperty second)
-        {
-            return !(first == second);
-        }
-
-        /// <summary>
-        /// Returns a debugger-friendly version of the ExtendedProperty
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            string val;
-            if (Value == null)
-            {
-                val = "<undefined value>";
-            }
-            else if (Value is string)
-            {
-                val = "\"" + Value.ToString() + "\"";
-            }
-            else
-            {
-                val = Value.ToString();
-            }
-            return Id + "," + val;
-        }
-
-        /// <summary>
-        /// Retrieve the Identifier, or key, for Drawing Attribute key/value pair
-        /// </summary>
-        internal Guid Id
-        {
-            get
-            {
-                return _id;
-            }
-        }
-        /// <summary>
-        /// Set or retrieve the value for ExtendedProperty key/value pair
-        /// </summary>
-        /// <exception cref="ArgumentException">Value type must be compatible with attribute Id</exception>
-        /// <remarks>Value can be null.</remarks>
-        internal object Value
-        {
-            get
-            {
-                return _value;
-            }
-            set
-            {
-                if (value == null)
-                {
-                    throw new ArgumentNullException("value");
-                }
-
-                _value = value;
-            }
-        }
-
-        ///// <summary>
-        ///// Creates a copy of the Guid and Value
-        ///// </summary>
-        ///// <returns></returns>
-        //internal ExtendedProperty Clone()
-        //{
-        //    //
-        //    // the only properties we accept are value types or arrays of
-        //    // value types with the exception of string.
-        //    //
-        //    Guid guid = _id; //Guid is a ValueType that copies on assignment
-        //    Type type = _value.GetType();
-
-        //    //
-        //    // check for the very common, copy on assignment
-        //    // types (ValueType or string)
-        //    //
-        //    if (type.IsValueType || type == typeof(string))
-        //    {
-        //        //
-        //        // either ValueType or string is passed by value
-        //        //
-        //        return new ExtendedProperty(guid, _value);
-        //    }
-        //    else if (type.IsArray)
-        //    {
-        //        Type elementType = type.GetElementType();
-        //        if (elementType.IsValueType && type.GetArrayRank() == 1)
-        //        {
-        //            //
-        //            // copy the array memebers, which we know are copy
-        //            // on assignment value types
-        //            //
-        //            Array newArray = Array.CreateInstance(elementType, ((Array) _value).Length);
-        //            Array.Copy((Array) _value, newArray, ((Array) _value).Length);
-        //            return new ExtendedProperty(guid, newArray);
-        //        }
-        //    }
-        //    //
-        //    // we didn't find a type we expect, throw
-        //    //
-        //    throw new InvalidOperationException(SR.Get(SRID.InvalidDataTypeForExtendedProperty));
-        //}
-
-
-        private Guid _id;                // id of attribute
-        private object _value;             // data in attribute
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ExtendedPropertyCollection.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ExtendedPropertyCollection.cs
deleted file mode 100644
index fbec81c..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/ExtendedPropertyCollection.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-using SRID = MS.Internal.PresentationCore.SRID;
-
-namespace WpfInk.PresentationCore.System.Windows.Ink
-{
-    /// <summary>
-    /// A collection of name/value pairs, called ExtendedProperties, can be stored
-    /// in a collection to enable aggregate operations and assignment to Ink object
-    /// model objects, such StrokeCollection and Stroke.
-    /// </summary>
-    internal sealed class ExtendedPropertyCollection //does not implement ICollection, we don't need it
-    {
-        /// <summary>
-        /// Create a new empty ExtendedPropertyCollection
-        /// </summary>
-        internal ExtendedPropertyCollection()
-        {
-        }
-
-        /// <summary>Overload of the Equals method which determines if two ExtendedPropertyCollection
-        /// objects contain equivalent key/value pairs</summary>
-        public override bool Equals(object o)
-        {
-            if (o == null || o.GetType() != GetType())
-            {
-                return false;
-            }
-
-            //
-            // compare counts
-            //
-            ExtendedPropertyCollection that = (ExtendedPropertyCollection) o;
-            if (that.Count != this.Count)
-            {
-                return false;
-            }
-
-            //
-            // counts are equal, compare individual items
-            // 
-            //
-            for (int x = 0; x < that.Count; x++)
-            {
-                bool cont = false;
-                for (int i = 0; i < _extendedProperties.Count; i++)
-                {
-                    if (_extendedProperties[i].Equals(that[x]))
-                    {
-                        cont = true;
-                        break;
-                    }
-                }
-                if (!cont)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>Overload of the equality operator which determines
-        /// if two ExtendedPropertyCollections are equal</summary>
-        public static bool operator ==(ExtendedPropertyCollection first, ExtendedPropertyCollection second)
-        {
-            // compare the GC ptrs for the obvious reference equality
-            if (((object) first == null && (object) second == null) ||
-                ((object) first == (object) second))
-            {
-                return true;
-            }
-            // otherwise, if one of the ptrs are null, but not the other then return false
-            else if ((object) first == null || (object) second == null)
-            {
-                return false;
-            }
-            // finally use the full `blown value-style comparison against the collection contents
-            else
-            {
-                return first.Equals(second);
-            }
-        }
-
-        /// <summary>Overload of the not equals operator to determine if two
-        /// ExtendedPropertyCollections have different key/value pairs</summary>
-        public static bool operator !=(ExtendedPropertyCollection first, ExtendedPropertyCollection second)
-        {
-            return !(first == second);
-        }
-
-        /// <summary>
-        /// GetHashCode
-        /// </summary>
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-
-        /// <summary>
-        /// Check to see if the attribute is defined in the collection. 
-        /// </summary>
-        /// <param name="attributeId">Attribute identifier</param>
-        /// <returns>True if attribute is set in the mask, false otherwise</returns>
-        internal bool Contains(Guid attributeId)
-        {
-            for (int x = 0; x < _extendedProperties.Count; x++)
-            {
-                if (_extendedProperties[x].Id == attributeId)
-                {
-                    //
-                    // a typical pattern is to first check if 
-                    // ep.Contains(guid)
-                    // before accessing:
-                    // object o = ep[guid];
-                    //
-                    // I'm caching the index that contains returns so that we
-                    // can look there first for the guid in the indexer
-                    //
-                    _optimisticIndex = x;
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        ///// <summary>
-        ///// Copies the ExtendedPropertyCollection
-        ///// </summary>
-        ///// <returns>Copy of the ExtendedPropertyCollection</returns>
-        ///// <remarks>Any reference types held in the collection will only be deep copied (e.g. Arrays).
-        ///// </remarks>
-        //internal ExtendedPropertyCollection Clone()
-        //{
-        //    ExtendedPropertyCollection copied = new ExtendedPropertyCollection();
-        //    for (int x = 0; x < _extendedProperties.Count; x++)
-        //    {
-        //        copied.Add(_extendedProperties[x].Clone());
-        //    }
-        //    return copied;
-        //}
-
-        /// <summary>
-        /// Add
-        /// </summary>
-        /// <param name="id">Id</param>
-        /// <param name="value">value</param>
-        internal void Add(Guid id, object value)
-        {
-            if (this.Contains(id))
-            {
-                throw new ArgumentException(SR.Get(SRID.EPExists), "id");
-            }
-
-            ExtendedProperty extendedProperty = new ExtendedProperty(id, value);
-
-            //this will raise change events
-            this.Add(extendedProperty);
-        }
-
-
-        /// <summary>
-        /// Remove
-        /// </summary>
-        /// <param name="id">id</param>
-        internal void Remove(Guid id)
-        {
-            if (!Contains(id))
-            {
-                throw new ArgumentException(SR.Get(SRID.EPGuidNotFound), "id");
-            }
-
-            ExtendedProperty propertyToRemove = GetExtendedPropertyById(id);
-            Debug.Assert(propertyToRemove != null);
-
-            _extendedProperties.Remove(propertyToRemove);
-
-            //
-            // this value is bogus now
-            //
-            _optimisticIndex = -1;
-
-            // fire notification event
-            if (this.Changed != null)
-            {
-                ExtendedPropertiesChangedEventArgs eventArgs
-                    = new ExtendedPropertiesChangedEventArgs(propertyToRemove, null);
-                this.Changed(this, eventArgs);
-            }
-        }
-
-        /// <value>
-        ///     Retrieve the Guid array of ExtendedProperty Ids  in the collection.
-        ///     <paramref>Guid[]</paramref> is of type <see cref="int"/>.
-        ///     <seealso cref="System.Collections.ICollection.Count"/>
-        /// </value>
-        internal Guid[] GetGuidArray()
-        {
-            if (_extendedProperties.Count > 0)
-            {
-                Guid[] guids = new Guid[_extendedProperties.Count];
-                for (int i = 0; i < _extendedProperties.Count; i++)
-                {
-                    guids[i] = this[i].Id;
-                }
-                return guids;
-            }
-            else
-            {
-                return Array.Empty<Guid>();
-            }
-        }
-
-        /// <summary>
-        /// Generic accessor for the ExtendedPropertyCollection. 
-        /// </summary>
-        /// <param name="attributeId">Attribue Id to find</param>
-        /// <returns>Value for attribute specified by Id</returns>
-        /// <exception cref="ArgumentException">Specified identifier was not found</exception>
-        /// <remarks>
-        /// Note that you can access extended properties via this indexer.
-        /// </remarks>
-        internal object this[Guid attributeId]
-        {
-            get
-            {
-                ExtendedProperty ep = GetExtendedPropertyById(attributeId);
-                if (ep == null)
-                {
-                    throw new ArgumentException(SR.Get(SRID.EPNotFound), "attributeId");
-                }
-                return ep.Value;
-            }
-            set
-            {
-                if (value == null)
-                {
-                    throw new ArgumentNullException("value");
-                }
-                for (int i = 0; i < _extendedProperties.Count; i++)
-                {
-                    ExtendedProperty currentProperty = _extendedProperties[i];
-
-                    if (currentProperty.Id == attributeId)
-                    {
-                        object oldValue = currentProperty.Value;
-                        //this will raise events
-                        currentProperty.Value = value;
-
-                        //raise change if anyone is listening
-                        if (this.Changed != null)
-                        {
-                            ExtendedPropertiesChangedEventArgs eventArgs
-                                = new ExtendedPropertiesChangedEventArgs(
-                                    new ExtendedProperty(currentProperty.Id, oldValue), //old prop
-                                    currentProperty);                                   //new prop
-
-                            this.Changed(this, eventArgs);
-                        }
-                        return;
-                    }
-                }
-
-                //
-                //  we didn't find the Id in the collection, we need to add it.
-                //  this will raise change notifications
-                //
-                ExtendedProperty attributeToAdd = new ExtendedProperty(attributeId, value);
-                this.Add(attributeToAdd);
-            }
-        }
-
-        /// <summary>
-        /// Generic accessor for the ExtendedPropertyCollection. 
-        /// </summary>
-        /// <param name="index">index into masking collection to retrieve</param>
-        /// <returns>ExtendedProperty specified at index</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Index was not found</exception>
-        /// <remarks>
-        /// Note that you can access extended properties via this indexer.
-        /// </remarks>
-        internal ExtendedProperty this[int index]
-        {
-            get
-            {
-                return _extendedProperties[index];
-            }
-        }
-
-        /// <value>
-        ///     Retrieve the number of ExtendedProperty objects in the collection.
-        ///     <paramref>Count</paramref> is of type <see cref="int"/>.
-        ///     <seealso cref="System.Collections.ICollection.Count"/>
-        /// </value>
-        internal int Count
-        {
-            get
-            {
-                return _extendedProperties.Count;
-            }
-        }
-
-        /// <summary>
-        /// Event fired whenever a ExtendedProperty is modified in the collection
-        /// </summary>
-        internal event ExtendedPropertiesChangedEventHandler Changed;
-
-
-        /// <summary>
-        /// private Add, we need to consider making this public in order to implement the generic ICollection
-        /// </summary>
-        private void Add(ExtendedProperty extendedProperty)
-        {
-            Debug.Assert(!this.Contains(extendedProperty.Id), "ExtendedProperty already belongs to the collection");
-
-            _extendedProperties.Add(extendedProperty);
-
-            // fire notification event
-            if (this.Changed != null)
-            {
-                ExtendedPropertiesChangedEventArgs eventArgs
-                    = new ExtendedPropertiesChangedEventArgs(null, extendedProperty);
-                this.Changed(this, eventArgs);
-            }
-        }
-
-        /// <summary>
-        /// Private helper for getting an EP out of our internal collection
-        /// </summary>
-        /// <param name="id">id</param>
-        private ExtendedProperty GetExtendedPropertyById(Guid id)
-        {
-            //
-            // a typical pattern is to first check if 
-            // ep.Contains(guid)
-            // before accessing:
-            // object o = ep[guid];
-            //
-            // The last call to .Contains sets this index
-            //
-            if (_optimisticIndex != -1 &&
-                _optimisticIndex < _extendedProperties.Count &&
-                _extendedProperties[_optimisticIndex].Id == id)
-            {
-                return _extendedProperties[_optimisticIndex];
-            }
-
-            //we didn't find the ep optimistically, perform linear lookup
-            for (int i = 0; i < _extendedProperties.Count; i++)
-            {
-                if (_extendedProperties[i].Id == id)
-                {
-                    return _extendedProperties[i];
-                }
-            }
-
-            return null;
-        }
-
-        // the set of ExtendedProperties stored in this collection
-        private List<ExtendedProperty> _extendedProperties = new List<ExtendedProperty>();
-
-
-        //used to optimize across Contains / Index calls
-        private int _optimisticIndex = -1;
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/InkSerializedFormat/ISFTagAndGuidCache.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/InkSerializedFormat/ISFTagAndGuidCache.cs
deleted file mode 100644
index 71b25b8..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/InkSerializedFormat/ISFTagAndGuidCache.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections;
-using System.IO;
-
-namespace MS.Internal.Ink.InkSerializedFormat
-{
-    /// <summary>
-    ///    <para>[To be supplied.]</para>
-    /// </summary>
-    internal static class KnownIdCache
-    {
-        // This id table includes the original Guids that were hardcoded
-        //      into ISF for the TabletPC v1 release
-        public static Guid[] OriginalISFIdTable = {
-            new Guid(0x598a6a8f, 0x52c0, 0x4ba0, 0x93, 0xaf, 0xaf, 0x35, 0x74, 0x11, 0xa5, 0x61),
-            new Guid(0xb53f9f75, 0x04e0, 0x4498, 0xa7, 0xee, 0xc3, 0x0d, 0xbb, 0x5a, 0x90, 0x11),
-            new Guid(0x735adb30, 0x0ebb, 0x4788, 0xa0, 0xe4, 0x0f, 0x31, 0x64, 0x90, 0x05, 0x5d),
-            new Guid(0x6e0e07bf, 0xafe7, 0x4cf7, 0x87, 0xd1, 0xaf, 0x64, 0x46, 0x20, 0x84, 0x18),
-            new Guid(0x436510c5, 0xfed3, 0x45d1, 0x8b, 0x76, 0x71, 0xd3, 0xea, 0x7a, 0x82, 0x9d),
-            new Guid(0x78a81b56, 0x0935, 0x4493, 0xba, 0xae, 0x00, 0x54, 0x1a, 0x8a, 0x16, 0xc4),
-            new Guid(0x7307502d, 0xf9f4, 0x4e18, 0xb3, 0xf2, 0x2c, 0xe1, 0xb1, 0xa3, 0x61, 0x0c),
-            new Guid(0x6da4488b, 0x5244, 0x41ec, 0x90, 0x5b, 0x32, 0xd8, 0x9a, 0xb8, 0x08, 0x09),
-            new Guid(0x8b7fefc4, 0x96aa, 0x4bfe, 0xac, 0x26, 0x8a, 0x5f, 0x0b, 0xe0, 0x7b, 0xf5),
-            new Guid(0xa8d07b3a, 0x8bf0, 0x40b0, 0x95, 0xa9, 0xb8, 0x0a, 0x6b, 0xb7, 0x87, 0xbf),
-            new Guid(0x0e932389, 0x1d77, 0x43af, 0xac, 0x00, 0x5b, 0x95, 0x0d, 0x6d, 0x4b, 0x2d),
-            new Guid(0x029123b4, 0x8828, 0x410b, 0xb2, 0x50, 0xa0, 0x53, 0x65, 0x95, 0xe5, 0xdc),
-            new Guid(0x82dec5c7, 0xf6ba, 0x4906, 0x89, 0x4f, 0x66, 0xd6, 0x8d, 0xfc, 0x45, 0x6c),
-            new Guid(0x0d324960, 0x13b2, 0x41e4, 0xac, 0xe6, 0x7a, 0xe9, 0xd4, 0x3d, 0x2d, 0x3b),
-            new Guid(0x7f7e57b7, 0xbe37, 0x4be1, 0xa3, 0x56, 0x7a, 0x84, 0x16, 0x0e, 0x18, 0x93),
-            new Guid(0x5d5d5e56, 0x6ba9, 0x4c5b, 0x9f, 0xb0, 0x85, 0x1c, 0x91, 0x71, 0x4e, 0x56),
-            new Guid(0x6a849980, 0x7c3a, 0x45b7, 0xaa, 0x82, 0x90, 0xa2, 0x62, 0x95, 0x0e, 0x89),
-            new Guid(0x33c1df83, 0xecdb, 0x44f0, 0xb9, 0x23, 0xdb, 0xd1, 0xa5, 0xb2, 0x13, 0x6e),
-            new Guid(0x5329cda5, 0xfa5b, 0x4ed2, 0xbb, 0x32, 0x83, 0x46, 0x01, 0x72, 0x44, 0x28),
-            new Guid(0x002df9af, 0xdd8c, 0x4949, 0xba, 0x46, 0xd6, 0x5e, 0x10, 0x7d, 0x1a, 0x8a),
-            new Guid(0x9d32b7ca, 0x1213, 0x4f54, 0xb7, 0xe4, 0xc9, 0x05, 0x0e, 0xe1, 0x7a, 0x38),
-            new Guid(0xe71caab9, 0x8059, 0x4c0d, 0xa2, 0xdb, 0x7c, 0x79, 0x54, 0x47, 0x8d, 0x82),
-            new Guid(0x5c0b730a, 0xf394, 0x4961, 0xa9, 0x33, 0x37, 0xc4, 0x34, 0xf4, 0xb7, 0xeb),
-            new Guid(0x2812210f, 0x871e, 0x4d91, 0x86, 0x07, 0x49, 0x32, 0x7d, 0xdf, 0x0a, 0x9f),
-            new Guid(0x8359a0fa, 0x2f44, 0x4de6, 0x92, 0x81, 0xce, 0x5a, 0x89, 0x9c, 0xf5, 0x8f),
-            new Guid(0x4c4642dd, 0x479e, 0x4c66, 0xb4, 0x40, 0x1f, 0xcd, 0x83, 0x95, 0x8f, 0x00),
-            new Guid(0xce2d9a8a, 0xe58e, 0x40ba, 0x93, 0xfa, 0x18, 0x9b, 0xb3, 0x90, 0x00, 0xae),
-            new Guid(0xc3c7480f, 0x5839, 0x46ef, 0xa5, 0x66, 0xd8, 0x48, 0x1c, 0x7a, 0xfe, 0xc1),
-            new Guid(0xea2278af, 0xc59d, 0x4ef4, 0x98, 0x5b, 0xd4, 0xbe, 0x12, 0xdf, 0x22, 0x34),
-            new Guid(0xb8630dc9, 0xcc5c, 0x4c33, 0x8d, 0xad, 0xb4, 0x7f, 0x62, 0x2b, 0x8c, 0x79),
-            new Guid(0x15e2f8e6, 0x6381, 0x4e8b, 0xa9, 0x65, 0x01, 0x1f, 0x7d, 0x7f, 0xca, 0x38),
-            new Guid(0x7066fbe4, 0x473e, 0x4675, 0x9c, 0x25, 0x00, 0x26, 0x82, 0x9b, 0x40, 0x1f),
-            new Guid(0xbbc85b9a, 0xade6, 0x4093, 0xb3, 0xbb, 0x64, 0x1f, 0xa1, 0xd3, 0x7a, 0x1a),
-            new Guid(0x39143d3, 0x78cb, 0x449c, 0xa8, 0xe7, 0x67, 0xd1, 0x88, 0x64, 0xc3, 0x32),
-            new Guid(0x67743782, 0xee5, 0x419a, 0xa1, 0x2b, 0x27, 0x3a, 0x9e, 0xc0, 0x8f, 0x3d),
-            new Guid(0xf0720328, 0x663b, 0x418f, 0x85, 0xa6, 0x95, 0x31, 0xae, 0x3e, 0xcd, 0xfa),
-            new Guid(0xa1718cdd, 0xdac, 0x4095, 0xa1, 0x81, 0x7b, 0x59, 0xcb, 0x10, 0x6b, 0xfb),
-            new Guid(0x810a74d2, 0x6ee2, 0x4e39, 0x82, 0x5e, 0x6d, 0xef, 0x82, 0x6a, 0xff, 0xc5),
-        };
-
-        // Size of data used by identified by specified Guid/Id
-
-        public enum OriginalISFIdIndex : uint
-        {
-            X = 0,
-            Y = 1,
-            Z = 2,
-            PacketStatus = 3,
-            TimerTick = 4,
-            SerialNumber = 5,
-            NormalPressure = 6,
-            TangentPressure = 7,
-            ButtonPressure = 8,
-            XTiltOrientation = 9,
-            YTiltOrientation = 10,
-            AzimuthOrientation = 11,
-            AltitudeOrientation = 12,
-            TwistOrientation = 13,
-            PitchRotation = 14,
-            RollRotation = 15,
-            YawRotation = 16,
-            PenStyle = 17,
-            ColorRef = 18,
-            StylusWidth = 19,
-            StylusHeight = 20,
-            PenTip = 21,
-            DrawingFlags = 22,
-            CursorId = 23,
-            WordAlternates = 24,
-            CharAlternates = 25,
-            InkMetrics = 26,
-            GuideStructure = 27,
-            Timestamp = 28,
-            Language = 29,
-            Transparency = 30,
-            CurveFittingError = 31,
-            RecoLattice = 32,
-            CursorDown = 33,
-            SecondaryTipSwitch = 34,
-            BarrelDown = 35,
-            TabletPick = 36,
-            RasterOperation = 37,
-            MAXIMUM = 37,
-        }
-
-        // This id table includes the Guids that used the internal persistence APIs
-        //      - meaning they didn't have the data type information encoded in ISF
-        public static Guid[] TabletInternalIdTable = {
-                // Highlighter
-            new Guid(0x9b6267b8, 0x3968, 0x4048, 0xab, 0x74, 0xf4, 0x90, 0x40, 0x6a, 0x2d, 0xfa),
-                // Ink properties
-            new Guid(0x7fc30e91, 0xd68d, 0x4f07, 0x8b, 0x62, 0x6, 0xf6, 0xd2, 0x73, 0x1b, 0xed),
-                // Ink Style Bold
-            new Guid(0xe02fb5c1, 0x9693, 0x4312, 0xa4, 0x34, 0x0, 0xde, 0x7f, 0x3a, 0xd4, 0x93),
-                // Ink Style Italics
-            new Guid(0x5253b51, 0x49c6, 0x4a04, 0x89, 0x93, 0x64, 0xdd, 0x9a, 0xbd, 0x84, 0x2a),
-                // Stroke Timestamp
-            new Guid(0x4ea66c4, 0xf33a, 0x461b, 0xb8, 0xfe, 0x68, 0x7, 0xd, 0x9c, 0x75, 0x75),
-                // Stroke Time Id
-            new Guid(0x50b6bc8, 0x3b7d, 0x4816, 0x8c, 0x61, 0xbc, 0x7e, 0x90, 0x5b, 0x21, 0x32),
-                // Stroke Lattice
-            new Guid(0x82871c85, 0xe247, 0x4d8c, 0x8d, 0x71, 0x22, 0xe5, 0xd6, 0xf2, 0x57, 0x76),
-                // Ink Custom Strokes
-            new Guid(0x33cdbbb3, 0x588f, 0x4e94, 0xb1, 0xfe, 0x5d, 0x79, 0xff, 0xe7, 0x6e, 0x76),
-        };
-        // lookup indices for table of GUIDs used with non-Automation APIs
-        internal enum TabletInternalIdIndex
-        {
-            Highlighter = 0,
-            InkProperties = 1,
-            InkStyleBold = 2,
-            InkStyleItalics = 3,
-            StrokeTimestamp = 4,
-            StrokeTimeId = 5,
-            InkStrokeLattice = 6,
-            InkCustomStrokes = 7,
-            MAXIMUM = 7
-        }
-
-        // The maximum value that can be encoded into a single byte is 127.
-        // To improve the chances of storing all of the guids in the ISF guid table
-        //      with single-byte lookups, the guids are broken into two ranges
-        // 0-50 known tags
-        // 50-100 known guids (reserved)
-        // 101-127 custom guids (user-defined guids)
-        // 128-... more custom guids, but requiring multiples bytes for guid table lookup
-
-        // These values aren't currently used, so comment them out
-        // static internal uint KnownGuidIndexLimit = MaximumPossibleKnownGuidIndex;
-        static internal uint MaximumPossibleKnownGuidIndex = 100;
-        static internal uint CustomGuidBaseIndex = MaximumPossibleKnownGuidIndex;
-
-        // This id table includes the Guids that have been added to ISF as ExtendedProperties
-        //      Note that they are visible to 3rd party applications
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/InkSerializedFormat/InkSerializer.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/InkSerializedFormat/InkSerializer.cs
deleted file mode 100644
index 17f48b5..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/InkSerializedFormat/InkSerializer.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace MS.Internal.Ink.InkSerializedFormat
-{
-    internal class StrokeCollectionSerializer
-    {
-        internal static readonly double AvalonToHimetricMultiplier = 2540.0d / 96.0d;
-        internal static readonly double HimetricToAvalonMultiplier = 96.0d / 2540.0d;
-    }
-}
-
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Lasso.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Lasso.cs
deleted file mode 100644
index 14ccde6..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Lasso.cs
+++ /dev/null
@@ -1,908 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Windows;
-using System.Collections.Generic;
-using System.Globalization;
-using WpfInk.PresentationCore.System.Windows;
-using WpfInk.PresentationCore.System.Windows.Ink;
-
-namespace MS.Internal.Ink
-{
-    #region Lasso
-
-    /// <summary>
-    /// Represents a lasso for selecting/cutting ink strokes with.
-    /// Lasso is a sequence of points defining a complex region (polygon)
-    /// </summary>
-    internal class Lasso
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Default c-tor. Used in incremental hit-testing.
-        /// </summary>
-        internal Lasso()
-        {
-            _points = new List<Point>();
-        }
-
-        #endregion
-
-        #region API
-
-        /// <summary>
-        /// Returns the bounds of the lasso
-        /// </summary>
-        internal Rect Bounds
-        {
-            get { return _bounds; }
-            set { _bounds = value; }
-        }
-
-        /// <summary>
-        /// Tells whether the lasso captures any area
-        /// </summary>
-        internal bool IsEmpty
-        {
-            get
-            {
-                System.Diagnostics.Debug.Assert(_points != null);
-                // The value is based on the assumption that the lasso is normalized
-                // i.e. it has no duplicate points or collinear sibling segments.
-                return (_points.Count < 3);
-            }
-        }
-
-        /// <summary>
-        /// Returns the count of points in the lasso
-        /// </summary>
-        internal int PointCount
-        {
-            get
-            {
-                System.Diagnostics.Debug.Assert(_points != null);
-                return _points.Count;
-            }
-        }
-
-        /// <summary>
-        /// Index-based read-only accessor to lasso points
-        /// </summary>
-        /// <param name="index">index of the point to return</param>
-        /// <returns>a point in the lasso</returns>
-        internal Point this[int index]
-        {
-            get
-            {
-                System.Diagnostics.Debug.Assert(_points != null);
-                System.Diagnostics.Debug.Assert((0 <= index) && (index < _points.Count));
-
-                return _points[index];
-            }
-        }
-
-        /// <summary>
-        /// Extends the lasso by appending more points
-        /// </summary>
-        /// <param name="points">new points</param>
-        internal void AddPoints(IEnumerable<Point> points)
-        {
-            System.Diagnostics.Debug.Assert(null != points);
-
-            foreach (Point point in points)
-            {
-                AddPoint(point);
-            }
-        }
-
-        /// <summary>
-        /// Appends a point to the lasso
-        /// </summary>
-        /// <param name="point">new lasso point</param>
-        internal void AddPoint(Point point)
-        {
-            System.Diagnostics.Debug.Assert(_points != null);
-            if (!Filter(point))
-            {
-                // The point is not filtered, add it to the lasso
-                AddPointImpl(point);
-            }
-        }
-
-        /// <summary>
-        /// This method implement the core algorithm to check whether a point is within a polygon
-        /// that are formed by the lasso points.
-        /// </summary>
-        /// <param name="point"></param>
-        /// <returns>true if the point is contained within the lasso; false otherwise </returns>
-        internal bool Contains(Point point)
-        {
-            System.Diagnostics.Debug.Assert(_points != null);
-
-            if (false == _bounds.Contains(point))
-            {
-                return false;
-            }
-
-            bool isHigher = false;
-            int last = _points.Count;
-            while (--last >= 0)
-            {
-                if (!DoubleUtil.AreClose(_points[last].Y, point.Y))
-                {
-                    isHigher = (point.Y < _points[last].Y);
-                    break;
-                }
-            }
-
-            bool isInside = false;
-            Point prevLassoPoint = _points[_points.Count - 1];
-            for (int i = 0; i < _points.Count; i++)
-            {
-                Point lassoPoint = _points[i];
-                if (DoubleUtil.AreClose(lassoPoint.Y, point.Y))
-                {
-                    if (DoubleUtil.AreClose(lassoPoint.X, point.X))
-                    {
-                        isInside = true;
-                        break;
-                    }
-                    if ((0 != i) && DoubleUtil.AreClose(prevLassoPoint.Y, point.Y) &&
-                        DoubleUtil.GreaterThanOrClose(point.X, Math.Min(prevLassoPoint.X, lassoPoint.X)) &&
-                        DoubleUtil.LessThanOrClose(point.X, Math.Max(prevLassoPoint.X, lassoPoint.X)))
-                    {
-                        isInside = true;
-                        break;
-                    }
-                }
-                else if (isHigher != (point.Y < lassoPoint.Y))
-                {
-                    isHigher = !isHigher;
-                    if (DoubleUtil.GreaterThanOrClose(point.X, Math.Max(prevLassoPoint.X, lassoPoint.X)))
-                    {
-                        // there certainly is an intersection on the left
-                        isInside = !isInside;
-                    }
-                    else if (DoubleUtil.GreaterThanOrClose(point.X, Math.Min(prevLassoPoint.X, lassoPoint.X)))
-                    {
-                        // The X of the point lies within the x ranges for the segment.
-                        // Calculate the x value of the point where the segment intersects with the line.
-                        Vector lassoSegment = lassoPoint - prevLassoPoint;
-                        System.Diagnostics.Debug.Assert(lassoSegment.Y != 0);
-                        double x = prevLassoPoint.X + (lassoSegment.X / lassoSegment.Y) * (point.Y - prevLassoPoint.Y);
-                        if (DoubleUtil.GreaterThanOrClose(point.X, x))
-                        {
-                            isInside = !isInside;
-                        }
-                    }
-                }
-                prevLassoPoint = lassoPoint;
-            }
-            return isInside;
-        }
-
-        internal StrokeIntersection[] HitTest(StrokeNodeIterator iterator)
-        {
-            System.Diagnostics.Debug.Assert(_points != null);
-            System.Diagnostics.Debug.Assert(iterator != null);
-
-            if (_points.Count < 3)
-            {
-                //
-                // it takes at least 3 points to create a lasso
-                //
-                return Array.Empty<StrokeIntersection>();
-            }
-
-            //
-            // We're about to perform hit testing with a lasso.
-            // To do so we need to iterate through each StrokeNode.
-            // As we do, we calculate the bounding rect between it
-            // and the previous StrokeNode and store this in 'currentStrokeSegmentBounds'
-            //
-            // Next, we check to see if that StrokeNode pair's bounding box intersects
-            // with the bounding box of the Lasso points.  If not, we continue iterating through
-            // StrokeNode pairs.
-            //
-            // If it does, we do a more granular hit test by pairing points in the Lasso, getting
-            // their bounding box and seeing if that bounding box intersects our current StrokeNode
-            // pair
-            //
-
-            Point lastNodePosition = new Point();
-            Point lassoLastPoint = _points[_points.Count - 1];
-            Rect currentStrokeSegmentBounds = Rect.Empty;
-
-            // Initilize the current crossing to be an empty one
-            LassoCrossing currentCrossing = LassoCrossing.EmptyCrossing;
-
-            // Creat a list to hold all the crossings
-            List<LassoCrossing> crossingList = new List<LassoCrossing>();
-            for (int i = 0; i < iterator.Count; i++)
-            {
-                StrokeNode strokeNode = iterator[i];
-                Rect nodeBounds = strokeNode.GetBounds();
-                currentStrokeSegmentBounds.Union(nodeBounds);
-
-                // Skip the node if it's outside of the lasso's bounds
-                if (currentStrokeSegmentBounds.IntersectsWith(_bounds) == true)
-                {
-                    // currentStrokeSegmentBounds, made up of the bounding box of
-                    // this StrokeNode unioned with the last StrokeNode,
-                    // intersects the lasso bounding box.
-                    //
-                    // Now we need to iterate through the lasso points and find out where they cross
-                    //
-                    Point lastPoint = lassoLastPoint;
-                    foreach (Point point in _points)
-                    {
-                        //
-                        // calculate a segment of the lasso from the last point
-                        // to the current point
-                        //
-                        Rect lassoSegmentBounds = new Rect(lastPoint, point);
-
-                        //
-                        // see if this lasso segment intersects with the current stroke segment
-                        //
-                        if (!currentStrokeSegmentBounds.IntersectsWith(lassoSegmentBounds))
-                        {
-                            lastPoint = point;
-                            continue;
-                        }
-
-                        //
-                        // the lasso segment DOES intersect with the current stroke segment
-                        // find out precisely where
-                        //
-                        StrokeFIndices strokeFIndices = strokeNode.CutTest(lastPoint, point);
-
-                        lastPoint = point;
-                        if (strokeFIndices.IsEmpty)
-                        {
-                            // current lasso segment does not hit the stroke segment, continue with the next lasso point
-                            continue;
-                        }
-
-                        // Create a potentially new crossing for the current hit testing result.
-                        LassoCrossing potentialNewCrossing = new LassoCrossing(strokeFIndices, strokeNode);
-
-                        // Try to merge with the current crossing. If the merge is succussful (return true), the new crossing is actually
-                        // continueing the current crossing, so do not start a new crossing. Otherwise, start a new one and add the existing
-                        // one to the list.
-                        if (!currentCrossing.Merge(potentialNewCrossing))
-                        {
-                            // start a new crossing and add the existing on to the list
-                            crossingList.Add(currentCrossing);
-                            currentCrossing = potentialNewCrossing;
-                        }
-                    }
-                }
-
-                // Continue with the next node
-                currentStrokeSegmentBounds = nodeBounds;
-                lastNodePosition = strokeNode.Position;
-            }
-
-
-            // Adding the last crossing to the list, if valid
-            if (!currentCrossing.IsEmpty)
-            {
-                crossingList.Add(currentCrossing);
-            }
-
-            // Handle the special case of no intersection at all
-            if (crossingList.Count == 0)
-            {
-                // the stroke was either completely inside the lasso
-                // or outside the lasso
-                if (this.Contains(lastNodePosition))
-                {
-                    StrokeIntersection[] strokeIntersections = new StrokeIntersection[1];
-                    strokeIntersections[0] = StrokeIntersection.Full;
-                    return strokeIntersections;
-                }
-                else
-                {
-                    return Array.Empty<StrokeIntersection>();
-                }
-            }
-
-            // It is still possible that the current crossing list is not sorted or overlapping.
-            // Sort the list and merge the overlapping ones.
-            SortAndMerge(ref crossingList);
-
-            // Produce the hit test results and store them in a list
-            List<StrokeIntersection> strokeIntersectionList = new List<StrokeIntersection>();
-            ProduceHitTestResults(crossingList, strokeIntersectionList);
-
-            return strokeIntersectionList.ToArray();
-        }
-
-        /// <summary>
-        /// Sort and merge the crossing list
-        /// </summary>
-        /// <param name="crossingList">The crossing list to sort/merge</param>
-        private static void SortAndMerge(ref List<LassoCrossing> crossingList)
-        {
-            // Sort the crossings based on the BeginFIndex values
-            crossingList.Sort();
-
-            List<LassoCrossing> mergedList = new List<LassoCrossing>();
-            LassoCrossing mcrossing = LassoCrossing.EmptyCrossing;
-            foreach (LassoCrossing crossing in crossingList)
-            {
-                System.Diagnostics.Debug.Assert(!crossing.IsEmpty && crossing.StartNode.IsValid && crossing.EndNode.IsValid);
-                if (!mcrossing.Merge(crossing))
-                {
-                    System.Diagnostics.Debug.Assert(!mcrossing.IsEmpty && mcrossing.StartNode.IsValid && mcrossing.EndNode.IsValid);
-                    mergedList.Add(mcrossing);
-                    mcrossing = crossing;
-                }
-            }
-            if (!mcrossing.IsEmpty)
-            {
-                System.Diagnostics.Debug.Assert(!mcrossing.IsEmpty && mcrossing.StartNode.IsValid && mcrossing.EndNode.IsValid);
-                mergedList.Add(mcrossing);
-            }
-            crossingList = mergedList;
-        }
-
-
-        /// <summary>
-        /// Helper function to find out whether a point is inside the lasso
-        /// </summary>
-        private bool SegmentWithinLasso(StrokeNode strokeNode, double fIndex)
-        {
-            bool currentSegmentWithinLasso;
-            if (DoubleUtil.AreClose(fIndex, StrokeFIndices.BeforeFirst))
-            {
-                // This should check against the very first stroke node
-                currentSegmentWithinLasso = this.Contains(strokeNode.GetPointAt(0f));
-            }
-            else if (DoubleUtil.AreClose(fIndex, StrokeFIndices.AfterLast))
-            {
-                // This should check against the last stroke node
-                currentSegmentWithinLasso = this.Contains(strokeNode.Position);
-            }
-            else
-            {
-                currentSegmentWithinLasso = this.Contains(strokeNode.GetPointAt(fIndex));
-            }
-
-            return currentSegmentWithinLasso;
-        }
-
-        /// <summary>
-        /// Helper function to find out the hit test result
-        /// </summary>
-        private void ProduceHitTestResults(
-                                List<LassoCrossing> crossingList, List<StrokeIntersection> strokeIntersections)
-        {
-            bool previousSegmentInsideLasso = false;
-            for (int x = 0; x <= crossingList.Count; x++)
-            {
-                bool currentSegmentWithinLasso = false;
-                bool canMerge = true;
-                StrokeIntersection si = new StrokeIntersection();
-                if (x == 0)
-                {
-                    si.HitBegin = StrokeFIndices.BeforeFirst;
-                    si.InBegin = StrokeFIndices.BeforeFirst;
-                }
-                else
-                {
-                    si.InBegin = crossingList[x - 1].FIndices.EndFIndex;
-                    si.HitBegin = crossingList[x - 1].FIndices.BeginFIndex;
-                    currentSegmentWithinLasso = SegmentWithinLasso(crossingList[x - 1].EndNode, si.InBegin);
-                }
-
-                if (x == crossingList.Count)
-                {
-                    // For a special case when the last intersection is something like (1.2, AL).
-                    // As a result the last InSegment should be empty.
-                    if (DoubleUtil.AreClose(si.InBegin, StrokeFIndices.AfterLast))
-                    {
-                        si.InEnd = StrokeFIndices.BeforeFirst;
-                    }
-                    else
-                    {
-                        si.InEnd = StrokeFIndices.AfterLast;
-                    }
-                    si.HitEnd = StrokeFIndices.AfterLast;
-                }
-                else
-                {
-                    si.InEnd = crossingList[x].FIndices.BeginFIndex;
-
-                    // For a speical case when the first intersection is something like (BF, 0.67).
-                    // As a result the first InSegment should be empty
-                    if (DoubleUtil.AreClose(si.InEnd, StrokeFIndices.BeforeFirst))
-                    {
-                        System.Diagnostics.Debug.Assert(DoubleUtil.AreClose(si.InBegin, StrokeFIndices.BeforeFirst));
-                        si.InBegin = StrokeFIndices.AfterLast;
-                    }
-
-                    si.HitEnd = crossingList[x].FIndices.EndFIndex;
-                    currentSegmentWithinLasso = SegmentWithinLasso(crossingList[x].StartNode, si.InEnd);
-
-                    // If both the start and end position of the current crossing is
-                    // outside the lasso, the crossing is a hit-only intersection, i.e., the in-segment is empty.
-                    if (!currentSegmentWithinLasso && !SegmentWithinLasso(crossingList[x].EndNode, si.HitEnd))
-                    {
-                        currentSegmentWithinLasso = true;
-                        si.HitBegin = crossingList[x].FIndices.BeginFIndex;
-                        si.InBegin = StrokeFIndices.AfterLast;
-                        si.InEnd = StrokeFIndices.BeforeFirst;
-                        canMerge = false;
-                    }
-                }
-
-                if (currentSegmentWithinLasso)
-                {
-                    if (x > 0 && previousSegmentInsideLasso && canMerge)
-                    {
-                        // we need to consolidate with the previous segment
-                        StrokeIntersection previousIntersection = strokeIntersections[strokeIntersections.Count - 1];
-
-                        // For example: previousIntersection = [BF, AL, BF, 0.0027], si = [BF, 0.0027, 0.049, 0.063]
-                        if (previousIntersection.InSegment.IsEmpty)
-                        {
-                            previousIntersection.InBegin = si.InBegin;
-                        }
-                        previousIntersection.InEnd = si.InEnd;
-                        previousIntersection.HitEnd = si.HitEnd;
-                        strokeIntersections[strokeIntersections.Count - 1] = previousIntersection;
-                    }
-                    else
-                    {
-                        strokeIntersections.Add(si);
-                    }
-
-                    if (DoubleUtil.AreClose(si.HitEnd, StrokeFIndices.AfterLast))
-                    {
-                        // The strokeIntersections already cover the end of the stroke. No need to continue.
-                        return;
-                    }
-                }
-                previousSegmentInsideLasso = currentSegmentWithinLasso;
-            }
-        }
-
-        /// <summary>
-        /// This flag is set to true when a lasso point has been modified or removed
-        /// from the list, which will invalidate incremental lasso hitteting
-        /// </summary>
-        internal bool IsIncrementalLassoDirty
-        {
-            get
-            {
-                return _incrementalLassoDirty;
-            }
-            set
-            {
-                _incrementalLassoDirty = value;
-            }
-        }
-
-        /// <summary>
-        /// Get a reference to the lasso points store
-        /// </summary>
-        protected List<Point> PointsList
-        {
-            get
-            {
-                return _points;
-            }
-        }
-
-        /// <summary>
-        /// Filter out duplicate points (and maybe in the futuer colinear points).
-        /// Return true if the point should be filtered
-        /// </summary>
-        protected virtual bool Filter(Point point)
-        {
-            // First point should not be filtered
-            if (0 == _points.Count)
-            {
-                return false;
-            }
-            // ISSUE-2004/06/14-vsmirnov - If the new segment is collinear with the last one,
-            // don't add the point but modify the last point instead.
-            Point lastPoint = _points[_points.Count - 1];
-            Vector vector = point - lastPoint;
-
-            // The point will be filtered out, i.e. not added to the list, if the distance to the previous point is
-            // within the tolerance
-            return (Math.Abs(vector.X) < MinDistance && Math.Abs(vector.Y) < MinDistance);
-        }
-
-        /// <summary>
-        /// Implemtnation of add point
-        /// </summary>
-        /// <param name="point"></param>
-        protected virtual void AddPointImpl(Point point)
-        {
-            _points.Add(point);
-            _bounds.Union(point);
-        }
-        #endregion
-
-        #region Fields
-
-        private List<Point> _points;
-        private Rect _bounds = Rect.Empty;
-        private bool _incrementalLassoDirty = false;
-        private static readonly double MinDistance = 1.0;
-
-        #endregion
-
-        /// <summary>
-        /// Simple helper struct used to track where the lasso crosses a stroke
-        /// we should consider making this a class if generics perf is bad for structs
-        /// </summary>
-        private struct LassoCrossing : IComparable
-        {
-            internal StrokeFIndices FIndices;
-            internal StrokeNode StartNode;
-            internal StrokeNode EndNode;
-
-            /// <summary>
-            /// Constructor
-            /// </summary>
-            /// <param name="newFIndices"></param>
-            /// <param name="strokeNode"></param>
-            public LassoCrossing(StrokeFIndices newFIndices, StrokeNode strokeNode)
-            {
-                System.Diagnostics.Debug.Assert(!newFIndices.IsEmpty);
-                System.Diagnostics.Debug.Assert(strokeNode.IsValid);
-                FIndices = newFIndices;
-                StartNode = EndNode = strokeNode;
-            }
-
-            /// <summary>
-            /// ToString
-            /// </summary>
-            public override string ToString()
-            {
-                return FIndices.ToString();
-            }
-
-            /// <summary>
-            /// Construct an empty LassoCrossing
-            /// </summary>
-            public static LassoCrossing EmptyCrossing
-            {
-                get
-                {
-                    LassoCrossing crossing = new LassoCrossing();
-                    crossing.FIndices = StrokeFIndices.Empty;
-                    return crossing;
-                }
-            }
-
-            /// <summary>
-            /// Return true if this crossing is an empty one; false otherwise
-            /// </summary>
-            public bool IsEmpty
-            {
-                get { return FIndices.IsEmpty; }
-            }
-
-            /// <summary>
-            /// Implement the interface used for comparison
-            /// </summary>
-            /// <param name="obj"></param>
-            /// <returns></returns>
-            public int CompareTo(object obj)
-            {
-                System.Diagnostics.Debug.Assert(obj is LassoCrossing);
-                LassoCrossing crossing = (LassoCrossing) obj;
-                if (crossing.IsEmpty && this.IsEmpty)
-                {
-                    return 0;
-                }
-                else if (crossing.IsEmpty)
-                {
-                    return 1;
-                }
-                else if (this.IsEmpty)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return FIndices.CompareTo(crossing.FIndices);
-                }
-            }
-
-            /// <summary>
-            /// Merge two crossings into one.
-            /// </summary>
-            /// <param name="crossing"></param>
-            /// <returns>Return true if these two crossings are actually overlapping and merged; false otherwise</returns>
-            public bool Merge(LassoCrossing crossing)
-            {
-                if (crossing.IsEmpty)
-                {
-                    return false;
-                }
-
-                if (FIndices.IsEmpty && !crossing.IsEmpty)
-                {
-                    FIndices = crossing.FIndices;
-                    StartNode = crossing.StartNode;
-                    EndNode = crossing.EndNode;
-                    return true;
-                }
-
-                if (DoubleUtil.GreaterThanOrClose(crossing.FIndices.EndFIndex, FIndices.BeginFIndex) &&
-                    DoubleUtil.GreaterThanOrClose(FIndices.EndFIndex, crossing.FIndices.BeginFIndex))
-                {
-                    if (DoubleUtil.LessThan(crossing.FIndices.BeginFIndex, FIndices.BeginFIndex))
-                    {
-                        FIndices.BeginFIndex = crossing.FIndices.BeginFIndex;
-                        StartNode = crossing.StartNode;
-                    }
-
-                    if (DoubleUtil.GreaterThan(crossing.FIndices.EndFIndex, FIndices.EndFIndex))
-                    {
-                        FIndices.EndFIndex = crossing.FIndices.EndFIndex;
-                        EndNode = crossing.EndNode;
-                    }
-                    return true;
-                }
-
-                return false;
-            }
-        }
-    }
-    #endregion
-
-
-    #region Single-Loop Lasso
-
-    /// <summary>
-    /// Implement a special lasso that considers only the first loop
-    /// </summary>
-    internal class SingleLoopLasso : Lasso
-    {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        internal SingleLoopLasso() : base() { }
-
-        /// <summary>
-        /// Return true if the point will be filtered out and should NOT be added to the list
-        /// </summary>
-        protected override bool Filter(Point point)
-        {
-            List<Point> points = PointsList;
-
-            // First point should not be filtered
-            if (0 == points.Count)
-            {
-                // Just add the new point to the lasso
-                return false;
-            }
-
-            // Don't add this point if the lasso already has a loop; or
-            // if it's filtered by base class's filter.
-            if (true == _hasLoop || true == base.Filter(point))
-            {
-                // Don't add this point to the lasso.
-                return true;
-            }
-
-            double intersection = 0f;
-
-            // Now check whether the line lastPoint->point intersect with the
-            // existing lasso.
-
-            if (true == GetIntersectionWithExistingLasso(point, ref intersection))
-            {
-                System.Diagnostics.Debug.Assert(intersection >= 0 && intersection <= points.Count - 2);
-
-                if (intersection == points.Count - 2)
-                {
-                    return true;
-                }
-
-                // Adding the new point will form a loop
-                int i = (int) intersection;
-
-                if (!DoubleUtil.AreClose(i, intersection))
-                {
-                    // Move points[i] to the intersection position
-                    Point intersectionPoint = new Point(0, 0);
-                    intersectionPoint.X = points[i].X + (intersection - i) * (points[i + 1].X - points[i].X);
-                    intersectionPoint.Y = points[i].Y + (intersection - i) * (points[i + 1].Y - points[i].Y);
-                    points[i] = intersectionPoint;
-                    IsIncrementalLassoDirty = true;
-                }
-
-                // Since the lasso has a self loop and the loop starts at points[i], points[0] to
-                // points[i-1] should be removed
-                if (i > 0)
-                {
-                    points.RemoveRange(0, i /*count*/);   // Remove points[0] to points[i-1]
-                    IsIncrementalLassoDirty = true;
-                }
-
-                if (true == IsIncrementalLassoDirty)
-                {
-                    // Update the bounds
-                    Rect bounds = Rect.Empty;
-                    for (int j = 0; j < points.Count; j++)
-                    {
-                        bounds.Union(points[j]);
-                    }
-                    Bounds = bounds;
-                }
-
-                // The lasso has a self_loop, any more points will be neglected.
-                _hasLoop = true;
-
-                // Don't add this point to the lasso.
-                return true;
-            }
-
-            // Just add the new point to the lasso
-            return false;
-        }
-
-        protected override void AddPointImpl(Point point)
-        {
-            _prevBounds = Bounds;
-            base.AddPointImpl(point);
-        }
-
-        /// <summary>
-        /// If the line _points[Count -1]->point insersect with the existing lasso, return true
-        /// and bIndex value is set to a doulbe value representing position of the intersection.
-        /// </summary>
-        private bool GetIntersectionWithExistingLasso(Point point, ref double bIndex)
-        {
-            List<Point> points = PointsList;
-            int count = points.Count;
-
-            Rect newRect = new Rect(points[count - 1], point);
-
-            if (false == _prevBounds.IntersectsWith(newRect))
-            {
-                // The point is not contained in the bound of the existing lasso, no intersection.
-                return false;
-            }
-
-            for (int i = 0; i < count - 2; i++)
-            {
-                Rect currRect = new Rect(points[i], points[i + 1]);
-                if (!currRect.IntersectsWith(newRect))
-                {
-                    continue;
-                }
-
-                double s = FindIntersection(points[count - 1] - points[i],            /*hitBegin*/
-                                                    point - points[i],              /*hitEnd*/
-                                                    new Vector(0, 0),               /*orgBegin*/
-                                                    points[i + 1] - points[i]         /*orgEnd*/);
-                if (s >= 0 && s <= 1)
-                {
-                    // Intersection found, adjust the fIndex
-                    bIndex = i + s;
-                    return true;
-                }
-            }
-
-            // No intersection
-            return false;
-        }
-
-
-        /// <summary>
-        /// Finds the intersection between the segment [hitBegin, hitEnd] and the segment [orgBegin, orgEnd].
-        /// </summary>
-        private static double FindIntersection(Vector hitBegin, Vector hitEnd, Vector orgBegin, Vector orgEnd)
-        {
-            System.Diagnostics.Debug.Assert(hitEnd != hitBegin && orgBegin != orgEnd);
-
-            //----------------------------------------------------------------------
-            // Source: http://isc.faqs.org/faqs/graphics/algorithms-faq/
-            // Subject 1.03: How do I find intersections of 2 2D line segments?
-            //
-            // Let A,B,C,D be 2-space position vectors.  Then the directed line
-            // segments AB & CD are given by:
-            //
-            // AB=A+r(B-A), r in [0,1]
-            // CD=C+s(D-C), s in [0,1]
-            //
-            // If AB & CD intersect, then
-            //
-            // A+r(B-A)=C+s(D-C), or  Ax+r(Bx-Ax)=Cx+s(Dx-Cx)
-            // Ay+r(By-Ay)=Cy+s(Dy-Cy)  for some r,s in [0,1]
-            //
-            // Solving the above for r and s yields
-            //
-            //      (Ay-Cy)(Dx-Cx)-(Ax-Cx)(Dy-Cy)
-            //  r = -----------------------------  (eqn 1)
-            //      (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx)
-            //
-            //      (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
-            //  s = -----------------------------  (eqn 2)
-            //      (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx)
-            //
-            // Let P be the position vector of the intersection point, then
-            //
-            //  P=A+r(B-A) or Px=Ax+r(Bx-Ax) and Py=Ay+r(By-Ay)
-            //
-            // By examining the values of r & s, you can also determine some
-            // other limiting conditions:
-            //  If 0 <= r <= 1 && 0 <= s <= 1, intersection exists
-            //  r < 0 or r > 1 or s < 0 or s > 1 line segments do not intersect
-            //  If the denominator in eqn 1 is zero, AB & CD are parallel
-            //  If the numerator in eqn 1 is also zero, AB & CD are collinear.
-            //  If they are collinear, then the segments may be projected to the x-
-            //  or y-axis, and overlap of the projected intervals checked.
-            //
-            // If the intersection point of the 2 lines are needed (lines in this
-            // context mean infinite lines) regardless whether the two line
-            // segments intersect, then
-            //  If r > 1, P is located on extension of AB
-            //  If r < 0, P is located on extension of BA
-            //  If s > 1, P is located on extension of CD
-            //  If s < 0, P is located on extension of DC
-            // Also note that the denominators of eqn 1 & 2 are identical.
-            //
-            // References:
-            // [O'Rourke (C)] pp. 249-51
-            // [Gems III] pp. 199-202 "Faster Line Segment Intersection,"
-            //----------------------------------------------------------------------
-
-            // Calculate the vectors.
-            Vector AB = orgEnd - orgBegin;          // B - A
-            Vector CA = orgBegin - hitBegin;        // A - C
-            Vector CD = hitEnd - hitBegin;          // D - C
-            double det = Vector.Determinant(AB, CD);
-
-            if (DoubleUtil.IsZero(det))
-            {
-                // The segments are parallel. no intersection
-                return NoIntersection;
-            }
-
-            double r = AdjustFIndex(Vector.Determinant(AB, CA) / det);
-
-            if (r >= 0 && r <= 1)
-            {
-                // The line defined AB does cross the segment CD.
-                double s = AdjustFIndex(Vector.Determinant(CD, CA) / det);
-                if (s >= 0 && s <= 1)
-                {
-                    // The crossing point is on the segment AB as well.
-                    // Intersection found.
-                    return s;
-                }
-            }
-
-            // No intersection found
-            return NoIntersection;
-        }
-
-        /// <summary>
-        /// Clears double's computation fuzz around 0 and 1
-        /// </summary>
-        internal static double AdjustFIndex(double findex)
-        {
-            return DoubleUtil.IsZero(findex) ? 0 : (DoubleUtil.IsOne(findex) ? 1 : findex);
-        }
-
-        private bool _hasLoop = false;
-        private Rect _prevBounds = Rect.Empty;
-        private static readonly double NoIntersection = StrokeFIndices.BeforeFirst;
-    }
-    #endregion
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Quad.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Quad.cs
deleted file mode 100644
index 4c34b65..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/Quad.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Collections.Generic;
-using WpfInk.PresentationCore.System.Windows;
-
-namespace MS.Internal.Ink
-{
-    /// <summary>
-    /// A helper structure used in StrokeNode and StrokeNodeOperation implementations
-    /// to store endpoints of the quad connecting two nodes of a stroke. 
-    /// The vertices of a quad are supposed to be clockwise with points A and D located
-    /// on the begin node and B and C on the end one.
-    /// </summary>
-    internal struct Quad
-    {
-        #region Statics
-
-        private static readonly Quad s_empty = new Quad(new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0));
-
-        #endregion
-
-        #region API
-
-        /// <summary> Returns the static object representing an empty (unitialized) quad </summary>
-        internal static Quad Empty { get { return s_empty; } }
-
-        /// <summary> Constructor </summary>
-        internal Quad(Point a, Point b, Point c, Point d)
-        {
-            _A = a; _B = b; _C = c; _D = d;
-        }
-
-        /// <summary> The A vertex of the quad </summary>
-        internal Point A { get { return _A; } set { _A = value; } }
-
-        /// <summary> The B vertex of the quad </summary>
-        internal Point B { get { return _B; } set { _B = value; } }
-
-        /// <summary> The C vertex of the quad </summary>
-        internal Point C { get { return _C; } set { _C = value; } }
-
-        /// <summary> The D vertex of the quad </summary>
-        internal Point D { get { return _D; } set { _D = value; } }
-
-        // Returns quad's vertex by index where A is of the index 0, B - is 1, etc
-        internal Point this[int index]
-        {
-            get
-            {
-                switch (index)
-                {
-                    case 0: return _A;
-                    case 1: return _B;
-                    case 2: return _C;
-                    case 3: return _D;
-                    default:
-                        throw new IndexOutOfRangeException("index");
-                }
-            }
-        }
-
-        /// <summary> Tells whether the quad is invalid (empty) </summary>
-        internal bool IsEmpty
-        {
-            get { return (_A == _B) && (_C == _D); }
-        }
-
-        internal void GetPoints(List<Point> pointBuffer)
-        {
-            pointBuffer.Add(_A);
-            pointBuffer.Add(_B);
-            pointBuffer.Add(_C);
-            pointBuffer.Add(_D);
-        }
-
-        /// <summary> Returns the bounds of the quad </summary>
-        internal Rect Bounds
-        {
-            get { return IsEmpty ? Rect.Empty : Rect.Union(new Rect(_A, _B), new Rect(_C, _D)); }
-        }
-
-        #endregion
-
-        #region Fields
-
-        private Point _A;
-        private Point _B;
-        private Point _C;
-        private Point _D;
-
-        #endregion
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeFIndices.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeFIndices.cs
deleted file mode 100644
index 3e30530..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeFIndices.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Globalization;
-
-namespace MS.Internal.Ink
-{
-    #region StrokeFIndices
-
-    /// <summary>
-    /// A helper struct that represents a fragment of a stroke spine.
-    /// </summary>
-    internal struct StrokeFIndices : IEquatable<StrokeFIndices>
-    {
-        #region Private statics
-        private static readonly StrokeFIndices s_empty = new StrokeFIndices(AfterLast, BeforeFirst);
-        private static readonly StrokeFIndices s_full = new StrokeFIndices(BeforeFirst, AfterLast);
-        #endregion
-
-        #region Internal API
-
-        /// <summary>
-        /// BeforeFirst
-        /// </summary>
-        /// <value></value>
-        internal static double BeforeFirst { get { return double.MinValue; } }
-
-        /// <summary>
-        /// AfterLast
-        /// </summary>
-        /// <value></value>
-        internal static double AfterLast { get { return double.MaxValue; } }
-
-        /// <summary>
-        /// StrokeFIndices
-        /// </summary>
-        /// <param name="beginFIndex">beginFIndex</param>
-        /// <param name="endFIndex">endFIndex</param>
-        internal StrokeFIndices(double beginFIndex, double endFIndex)
-        {
-            _beginFIndex = beginFIndex;
-            _endFIndex = endFIndex;
-        }
-
-        /// <summary>
-        /// BeginFIndex
-        /// </summary>
-        /// <value></value>
-        internal double BeginFIndex
-        {
-            get { return _beginFIndex; }
-            set { _beginFIndex = value; }
-        }
-
-        /// <summary>
-        /// EndFIndex
-        /// </summary>
-        /// <value></value>
-        internal double EndFIndex
-        {
-            get { return _endFIndex; }
-            set { _endFIndex = value; }
-        }
-
-        /// <summary>
-        /// ToString
-        /// </summary>
-        public override string ToString()
-        {
-            return "{" + GetStringRepresentation(_beginFIndex) + "," + GetStringRepresentation(_endFIndex) + "}";
-        }
-
-        /// <summary>
-        /// Equals
-        /// </summary>
-        /// <param name="strokeFIndices"></param>
-        /// <returns></returns>
-        public bool Equals(StrokeFIndices strokeFIndices)
-        {
-            return (strokeFIndices == this);
-        }
-
-        /// <summary>
-        /// Equals
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public override bool Equals(Object obj)
-        {
-            // Check for null and compare run-time types
-            if (obj == null || GetType() != obj.GetType())
-                return false;
-            return ((StrokeFIndices) obj == this);
-        }
-
-        /// <summary>
-        /// GetHashCode
-        /// </summary>
-        /// <returns></returns>
-        public override int GetHashCode()
-        {
-            return _beginFIndex.GetHashCode() ^ _endFIndex.GetHashCode();
-        }
-
-        /// <summary>
-        /// operator ==
-        /// </summary>
-        /// <param name="sfiLeft"></param>
-        /// <param name="sfiRight"></param>
-        /// <returns></returns>
-        public static bool operator ==(StrokeFIndices sfiLeft, StrokeFIndices sfiRight)
-        {
-            return (DoubleUtil.AreClose(sfiLeft._beginFIndex, sfiRight._beginFIndex)
-                    && DoubleUtil.AreClose(sfiLeft._endFIndex, sfiRight._endFIndex));
-        }
-
-        /// <summary>
-        /// operator !=
-        /// </summary>
-        /// <param name="sfiLeft"></param>
-        /// <param name="sfiRight"></param>
-        /// <returns></returns>
-        public static bool operator !=(StrokeFIndices sfiLeft, StrokeFIndices sfiRight)
-        {
-            return !(sfiLeft == sfiRight);
-        }
-
-        internal static string GetStringRepresentation(double fIndex)
-        {
-            if (DoubleUtil.AreClose(fIndex, StrokeFIndices.BeforeFirst))
-            {
-                return "BeforeFirst";
-            }
-            if (DoubleUtil.AreClose(fIndex, StrokeFIndices.AfterLast))
-            {
-                return "AfterLast";
-            }
-            return fIndex.ToString(CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal static StrokeFIndices Empty { get { return s_empty; } }
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal static StrokeFIndices Full { get { return s_full; } }
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal bool IsEmpty { get { return DoubleUtil.GreaterThanOrClose(_beginFIndex, _endFIndex); } }
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal bool IsFull { get { return ((DoubleUtil.AreClose(_beginFIndex, BeforeFirst)) && (DoubleUtil.AreClose(_endFIndex, AfterLast))); } }
-
-
-#if DEBUG
-        /// <summary>
-        ///
-        /// </summary>
-        private bool IsValid { get { return !double.IsNaN(_beginFIndex) && !double.IsNaN(_endFIndex) && _beginFIndex < _endFIndex; } }
-
-#endif
-
-        /// <summary>
-        /// Compare StrokeFIndices based on the BeinFIndex
-        /// </summary>
-        /// <param name="fIndices"></param>
-        /// <returns></returns>
-        internal int CompareTo(StrokeFIndices fIndices)
-        {
-#if DEBUG
-            System.Diagnostics.Debug.Assert(!double.IsNaN(_beginFIndex) && !double.IsNaN(_endFIndex) && DoubleUtil.LessThan(_beginFIndex, _endFIndex));
-#endif
-            if (DoubleUtil.AreClose(BeginFIndex, fIndices.BeginFIndex))
-            {
-                return 0;
-            }
-            else if (DoubleUtil.GreaterThan(BeginFIndex, fIndices.BeginFIndex))
-            {
-                return 1;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-
-        #endregion
-
-        #region  Fields
-
-        private double _beginFIndex;
-        private double _endFIndex;
-
-        #endregion
-    }
-
-    #endregion
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeIntersection.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeIntersection.cs
deleted file mode 100644
index 0648f1f..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeIntersection.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Collections.Generic;
-using MS.Internal.Ink;
-
-namespace WpfInk.PresentationCore.System.Windows.Ink
-{
-    /// <summary>
-    /// A helper struct that represents a fragment of a stroke spine.
-    /// </summary>
-    internal struct StrokeIntersection
-    {
-        #region Private statics
-        private static StrokeIntersection s_empty = new StrokeIntersection(AfterLast, AfterLast, BeforeFirst, BeforeFirst);
-        private static StrokeIntersection s_full = new StrokeIntersection(BeforeFirst, BeforeFirst, AfterLast, AfterLast);
-        #endregion
-
-        #region Public API
-
-        /// <summary>
-        /// BeforeFirst
-        /// </summary>
-        /// <value></value>
-        internal static double BeforeFirst { get { return StrokeFIndices.BeforeFirst; } }
-
-        /// <summary>
-        /// AfterLast
-        /// </summary>
-        /// <value></value>
-        internal static double AfterLast { get { return StrokeFIndices.AfterLast; } }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="hitBegin"></param>
-        /// <param name="inBegin"></param>
-        /// <param name="inEnd"></param>
-        /// <param name="hitEnd"></param>
-        internal StrokeIntersection(double hitBegin, double inBegin, double inEnd, double hitEnd)
-        {
-            //ISSUE-2004/12/06-XiaoTu: should we validate the input?
-            _hitSegment = new StrokeFIndices(hitBegin, hitEnd);
-            _inSegment = new StrokeFIndices(inBegin, inEnd);
-        }
-
-        /// <summary>
-        /// hitBeginFIndex
-        /// </summary>
-        /// <value></value>
-        internal double HitBegin
-        {
-            set { _hitSegment.BeginFIndex = value; }
-        }
-
-        /// <summary>
-        /// hitEndFIndex
-        /// </summary>
-        /// <value></value>
-        internal double HitEnd
-        {
-            get { return _hitSegment.EndFIndex; }
-            set { _hitSegment.EndFIndex = value; }
-        }
-
-
-        /// <summary>
-        /// InBegin
-        /// </summary>
-        /// <value></value>
-        internal double InBegin
-        {
-            get { return _inSegment.BeginFIndex; }
-            set { _inSegment.BeginFIndex = value; }
-        }
-
-        /// <summary>
-        /// InEnd
-        /// </summary>
-        /// <value></value>
-        internal double InEnd
-        {
-            get { return _inSegment.EndFIndex; }
-            set { _inSegment.EndFIndex = value; }
-        }
-
-        /// <summary>
-        /// ToString
-        /// </summary>
-        public override string ToString()
-        {
-            return "{" + StrokeFIndices.GetStringRepresentation(_hitSegment.BeginFIndex) + ","
-                        + StrokeFIndices.GetStringRepresentation(_inSegment.BeginFIndex) + ","
-                        + StrokeFIndices.GetStringRepresentation(_inSegment.EndFIndex) + ","
-                        + StrokeFIndices.GetStringRepresentation(_hitSegment.EndFIndex) + "}";
-        }
-
-
-        /// <summary>
-        /// Equals
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public override bool Equals(Object obj)
-        {
-            // Check for null and compare run-time types
-            if (obj == null || GetType() != obj.GetType())
-                return false;
-            return ((StrokeIntersection) obj == this);
-        }
-
-        /// <summary>
-        /// GetHashCode
-        /// </summary>
-        /// <returns></returns>
-        public override int GetHashCode()
-        {
-            return _hitSegment.GetHashCode() ^ _inSegment.GetHashCode();
-        }
-
-
-        /// <summary>
-        /// operator ==
-        /// </summary>
-        /// <param name="left"></param>
-        /// <param name="right"></param>
-        /// <returns></returns>
-        public static bool operator ==(StrokeIntersection left, StrokeIntersection right)
-        {
-            return (left._hitSegment == right._hitSegment && left._inSegment == right._inSegment);
-        }
-
-        /// <summary>
-        /// operator !=
-        /// </summary>
-        /// <param name="left"></param>
-        /// <param name="right"></param>
-        /// <returns></returns>
-        public static bool operator !=(StrokeIntersection left, StrokeIntersection right)
-        {
-            return !(left == right);
-        }
-
-        #endregion
-
-        #region Internal API
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal static StrokeIntersection Full { get { return s_full; } }
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal bool IsEmpty { get { return _hitSegment.IsEmpty; } }
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal StrokeFIndices HitSegment
-        {
-            get { return _hitSegment; }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        internal StrokeFIndices InSegment
-        {
-            get { return _inSegment; }
-        }
-
-        #endregion
-
-        #region Internal static methods
-
-        /// <summary>
-        /// Get the "in-segments" of the intersections.
-        /// </summary>
-        internal static StrokeFIndices[] GetInSegments(StrokeIntersection[] intersections)
-        {
-            global::System.Diagnostics.Debug.Assert(intersections != null);
-            global::System.Diagnostics.Debug.Assert(intersections.Length > 0);
-
-            List<StrokeFIndices> inFIndices = new List<StrokeFIndices>(intersections.Length);
-            for (int j = 0; j < intersections.Length; j++)
-            {
-                global::System.Diagnostics.Debug.Assert(!intersections[j].IsEmpty);
-                if (!intersections[j].InSegment.IsEmpty)
-                {
-                    if (inFIndices.Count > 0 &&
-                        inFIndices[inFIndices.Count - 1].EndFIndex >=
-                        intersections[j].InSegment.BeginFIndex)
-                    {
-                        //merge
-                        StrokeFIndices sfiPrevious = inFIndices[inFIndices.Count - 1];
-                        sfiPrevious.EndFIndex = intersections[j].InSegment.EndFIndex;
-                        inFIndices[inFIndices.Count - 1] = sfiPrevious;
-                    }
-                    else
-                    {
-                        inFIndices.Add(intersections[j].InSegment);
-                    }
-                }
-            }
-            return inFIndices.ToArray();
-        }
-
-        /// <summary>
-        /// Get the "hit-segments"
-        /// </summary>
-        internal static StrokeFIndices[] GetHitSegments(StrokeIntersection[] intersections)
-        {
-            global::System.Diagnostics.Debug.Assert(intersections != null);
-            global::System.Diagnostics.Debug.Assert(intersections.Length > 0);
-
-            List<StrokeFIndices> hitFIndices = new List<StrokeFIndices>(intersections.Length);
-            for (int j = 0; j < intersections.Length; j++)
-            {
-                global::System.Diagnostics.Debug.Assert(!intersections[j].IsEmpty);
-                if (!intersections[j].HitSegment.IsEmpty)
-                {
-                    if (hitFIndices.Count > 0 &&
-                        hitFIndices[hitFIndices.Count - 1].EndFIndex >=
-                        intersections[j].HitSegment.BeginFIndex)
-                    {
-                        //merge
-                        StrokeFIndices sfiPrevious = hitFIndices[hitFIndices.Count - 1];
-                        sfiPrevious.EndFIndex = intersections[j].HitSegment.EndFIndex;
-                        hitFIndices[hitFIndices.Count - 1] = sfiPrevious;
-                    }
-                    else
-                    {
-                        hitFIndices.Add(intersections[j].HitSegment);
-                    }
-                }
-            }
-            return hitFIndices.ToArray();
-        }
-
-        #endregion
-
-        #region  Fields
-
-        private StrokeFIndices _hitSegment;
-        private StrokeFIndices _inSegment;
-
-        #endregion
-    }
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNode.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNode.cs
deleted file mode 100644
index ae0a44a..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNode.cs
+++ /dev/null
@@ -1,1106 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-//#define DEBUG_RENDERING_FEEDBACK
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Input;
-using System.Diagnostics;
-using WpfInk.PresentationCore.System.Windows;
-
-namespace MS.Internal.Ink
-{
-    #region StrokeNode
-
-    /// <summary>
-    /// StrokeNode represents a single segment on a stroke spine.
-    /// It's used in enumerating through basic geometries making a stroke contour.
-    /// </summary>
-    internal struct StrokeNode
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="operations">StrokeNodeOperations object created for particular rendering</param>
-        /// <param name="index">Index of the node on the stroke spine</param>
-        /// <param name="nodeData">StrokeNodeData for this node</param>
-        /// <param name="lastNodeData">StrokeNodeData for the precedeng node</param>
-        /// <param name="isLastNode">Whether the current node is the last node</param>
-        internal StrokeNode(
-            StrokeNodeOperations operations,
-            int index,
-            in StrokeNodeData nodeData,
-            in StrokeNodeData lastNodeData,
-            bool isLastNode)
-        {
-            System.Diagnostics.Debug.Assert(operations != null);
-            System.Diagnostics.Debug.Assert((nodeData.IsEmpty == false) && (index >= 0));
-
-
-            _operations = operations;
-            _index = index;
-            _thisNode = nodeData;
-            _lastNode = lastNodeData;
-            _isQuadCached = lastNodeData.IsEmpty;
-            _connectingQuad = Quad.Empty;
-            _isLastNode = isLastNode;
-        }
-
-        #endregion
-
-        #region Public API
-
-        /// <summary>
-        /// Position of the node on the stroke spine.
-        /// </summary>
-        /// <value></value>
-        internal Point Position { get { return _thisNode.Position; } }
-
-        /// <summary>
-        /// Position of the previous StrokeNode
-        /// </summary>
-        /// <value></value>
-        internal Point PreviousPosition { get { return _lastNode.Position; } }
-
-        /// <summary>
-        /// PressureFactor of the node on the stroke spine.
-        /// </summary>
-        /// <value></value>
-        internal float PressureFactor { get { return _thisNode.PressureFactor; } }
-
-        /// <summary>
-        /// PressureFactor of the previous StrokeNode
-        /// </summary>
-        /// <value></value>
-        internal float PreviousPressureFactor { get { return _lastNode.PressureFactor; } }
-
-        /// <summary>
-        /// Tells whether the node shape (the stylus shape used in the rendering)
-        /// is elliptical or polygonal. If the shape is an ellipse, GetContourPoints
-        /// returns the control points for the quadratic Bezier that defines the ellipse.
-        /// </summary>
-        /// <value>true if the shape is ellipse, false otherwise</value>
-        internal bool IsEllipse { get { return IsValid && _operations.IsNodeShapeEllipse; } }
-
-        /// <summary>
-        /// Returns true if this is the last node in the enumerator
-        /// </summary>
-        internal bool IsLastNode { get { return _isLastNode; } }
-
-        /// <summary>
-        /// Returns the bounds of the node shape w/o connecting quadrangle
-        /// </summary>
-        /// <returns></returns>
-        internal Rect GetBounds()
-        {
-            return IsValid ? _operations.GetNodeBounds(_thisNode) : Rect.Empty;
-        }
-
-        /// <summary>
-        /// Returns the bounds of the node shape and connecting quadrangle
-        /// </summary>
-        /// <returns></returns>
-        internal Rect GetBoundsConnected()
-        {
-            return IsValid ? Rect.Union(_operations.GetNodeBounds(_thisNode), ConnectingQuad.Bounds) : Rect.Empty;
-        }
-
-        /// <summary>
-        /// Returns the points that make up the stroke node shape (minus the connecting quad)
-        /// </summary>
-        internal void GetContourPoints(List<Point> pointBuffer)
-        {
-            if (IsValid)
-            {
-                _operations.GetNodeContourPoints(_thisNode, pointBuffer);
-            }
-        }
-
-        /// <summary>
-        /// Returns the points that make up the stroke node shape (minus the connecting quad)
-        /// </summary>
-        internal void GetPreviousContourPoints(List<Point> pointBuffer)
-        {
-            if (IsValid)
-            {
-                _operations.GetNodeContourPoints(_lastNode, pointBuffer);
-            }
-        }
-
-        /// <summary>
-        /// Returns the connecting quad
-        /// </summary>
-        internal Quad GetConnectingQuad()
-        {
-            if (IsValid)
-            {
-                return ConnectingQuad;
-            }
-            return Quad.Empty;
-        }
-
-        ///// <summary>
-        ///// IsPointWithinRectOrEllipse
-        ///// </summary>
-        //internal bool IsPointWithinRectOrEllipse(Point point, double xRadiusOrHalfWidth, double yRadiusOrHalfHeight, Point center, bool isEllipse)
-        //{
-        //    if (isEllipse)
-        //    {
-        //        //determine what delta is required to move the rect to be 
-        //        //centered at 0,0
-        //        double xDelta = center.X + xRadiusOrHalfWidth;
-        //        double yDelta = center.Y + yRadiusOrHalfHeight;
-
-        //        //offset the point by that delta
-        //        point.X -= xDelta;
-        //        point.Y -= yDelta;
-
-        //        //formula for ellipse is x^2/a^2 + y^2/b^2 = 1
-        //        double a = xRadiusOrHalfWidth;
-        //        double b = yRadiusOrHalfHeight;
-        //        double res = (((point.X * point.X) / (a * a)) +
-        //                     ((point.Y * point.Y) / (b * b)));
-
-        //        if (res <= 1)
-        //        {
-        //            return true;
-        //        }
-        //        return false;
-        //    }
-        //    else
-        //    {
-        //        if (point.X >= (center.X - xRadiusOrHalfWidth) &&
-        //            point.X <= (center.X + xRadiusOrHalfWidth) &&
-        //            point.Y >= (center.Y - yRadiusOrHalfHeight) &&
-        //            point.Y <= (center.Y + yRadiusOrHalfHeight))
-        //        {
-        //            return true;
-        //        }
-        //        return false;
-        //    }
-        //}
-
-        /// <summary>
-        /// GetPointsAtStartOfSegment
-        /// </summary>
-        internal void GetPointsAtStartOfSegment(List<Point> abPoints,
-                                                List<Point> dcPoints
-#if DEBUG_RENDERING_FEEDBACK
-                                                , DrawingContext debugDC, double feedbackSize, bool showFeedback
-#endif
-                                                )
-        {
-            if (IsValid)
-            {
-                Quad quad = ConnectingQuad;
-                if (IsEllipse)
-                {
-                    Rect startNodeBounds = _operations.GetNodeBounds(_lastNode);
-
-                    //add instructions to arc from D to A
-                    abPoints.Add(quad.D);
-                    abPoints.Add(StrokeRenderer.ArcToMarker);
-                    abPoints.Add(new Point(startNodeBounds.Width, startNodeBounds.Height));
-                    abPoints.Add(quad.A);
-
-                    //simply start at D
-                    dcPoints.Add(quad.D);
-
-#if DEBUG_RENDERING_FEEDBACK
-                    if (showFeedback)
-                    {
-                        debugDC.DrawEllipse(null, new Pen(Brushes.Pink, feedbackSize / 2), _lastNode.Position, startNodeBounds.Width / 2, startNodeBounds.Height / 2);
-                        debugDC.DrawEllipse(Brushes.Red, null, quad.A, feedbackSize, feedbackSize);
-                        debugDC.DrawEllipse(Brushes.Blue, null, quad.D, feedbackSize, feedbackSize);
-                    }
-#endif
-                }
-                else
-                {
-                    //we're interested in the A, D points as well as the 
-                    //nodecountour points between them
-                    Rect endNodeRect = _operations.GetNodeBounds(_thisNode);
-
-#if DEBUG_RENDERING_FEEDBACK
-                    if (showFeedback)
-                    {
-                        debugDC.DrawRectangle(null, new Pen(Brushes.Pink, feedbackSize / 2), _operations.GetNodeBounds(_lastNode));
-                    }
-#endif
-                    Vector[] vertices = _operations.GetVertices();
-                    double pressureFactor = _lastNode.PressureFactor;
-                    int maxCount = vertices.Length * 2;
-                    int i = 0;
-                    bool dIsInEndNode = true;
-                    for (; i < maxCount; i++)
-                    {
-                        //look for the d point first
-                        Point point = _lastNode.Position + (vertices[i % vertices.Length] * pressureFactor);
-                        if (point == quad.D)
-                        {
-                            //ab always starts with the D position (only add if it's not in endNode's bounds)
-                            if (!endNodeRect.Contains(quad.D))
-                            {
-                                dIsInEndNode = false;
-                                abPoints.Add(quad.D);
-                                dcPoints.Add(quad.D);
-                            }
-#if DEBUG_RENDERING_FEEDBACK
-                            if (showFeedback)
-                            {
-                                debugDC.DrawEllipse(Brushes.Blue, null, quad.D, feedbackSize, feedbackSize);
-                            }
-#endif
-                            break;
-                        }
-                    }
-
-                    if (i == maxCount)
-                    {
-                        Debug.Assert(false, "StrokeNodeOperations.GetPointsAtStartOfSegment failed to find the D position");
-                        //we didn't find the d point, return
-                        return;
-                    }
-
-
-                    //now look for the A position
-                    //advance i
-                    i++;
-                    for (int j = 0; i < maxCount && j < vertices.Length; i++, j++)
-                    {
-                        //look for the A point now
-                        Point point = _lastNode.Position + (vertices[i % vertices.Length] * pressureFactor);
-                        //add everything in between to ab as long as it's not already in endNode's bounds
-                        if (!endNodeRect.Contains(point))
-                        {
-                            abPoints.Add(point);
-#if DEBUG_RENDERING_FEEDBACK
-                        if (showFeedback)
-                        {
-                            debugDC.DrawEllipse(Brushes.Wheat, null, point, feedbackSize, feedbackSize);
-                        }
-#endif
-                        }
-                        if (dIsInEndNode)
-                        {
-                            Debug.Assert(!endNodeRect.Contains(point));
-
-                            //add the first point after d, clockwise
-                            dIsInEndNode = false;
-                            dcPoints.Add(point);
-                        }
-                        if (point == quad.A)
-                        {
-#if DEBUG_RENDERING_FEEDBACK
-                            if (showFeedback)
-                            {
-                                debugDC.DrawEllipse(Brushes.Red, null, point, feedbackSize, feedbackSize);
-                            }
-#endif
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// GetPointsAtEndOfSegment
-        /// </summary>
-        internal void GetPointsAtEndOfSegment(List<Point> abPoints,
-                                                List<Point> dcPoints
-#if DEBUG_RENDERING_FEEDBACK
-                                                , DrawingContext debugDC, double feedbackSize, bool showFeedback
-#endif
-                                                )
-        {
-            if (IsValid)
-            {
-                Quad quad = ConnectingQuad;
-                if (IsEllipse)
-                {
-                    Rect bounds = GetBounds();
-                    //add instructions to arc from D to A
-                    abPoints.Add(quad.B);
-                    abPoints.Add(StrokeRenderer.ArcToMarker);
-                    abPoints.Add(new Point(bounds.Width, bounds.Height));
-                    abPoints.Add(quad.C);
-
-                    //don't add to the dc points
-#if DEBUG_RENDERING_FEEDBACK
-                    if (showFeedback)
-                    {
-                        debugDC.DrawEllipse(null, new Pen(Brushes.Pink, feedbackSize / 2), _thisNode.Position, bounds.Width / 2, bounds.Height / 2);
-                        debugDC.DrawEllipse(Brushes.Green, null, quad.B, feedbackSize, feedbackSize);
-                        debugDC.DrawEllipse(Brushes.Yellow, null, quad.C, feedbackSize, feedbackSize);
-                    }
-#endif
-                }
-                else
-                {
-#if DEBUG_RENDERING_FEEDBACK
-                    if (showFeedback)
-                    {
-                        debugDC.DrawRectangle(null, new Pen(Brushes.Pink, feedbackSize / 2), GetBounds());
-                    }
-#endif
-                    //we're interested in the B, C points as well as the 
-                    //nodecountour points between them
-                    double pressureFactor = _thisNode.PressureFactor;
-                    Vector[] vertices = _operations.GetVertices();
-                    int maxCount = vertices.Length * 2;
-                    int i = 0;
-                    for (; i < maxCount; i++)
-                    {
-                        //look for the d point first
-                        Point point = _thisNode.Position + (vertices[i % vertices.Length] * pressureFactor);
-                        if (point == quad.B)
-                        {
-                            abPoints.Add(quad.B);
-#if DEBUG_RENDERING_FEEDBACK
-                            if (showFeedback)
-                            {
-                                debugDC.DrawEllipse(Brushes.Green, null, point, feedbackSize, feedbackSize);
-                            }
-#endif
-                            break;
-                        }
-                    }
-
-                    if (i == maxCount)
-                    {
-                        Debug.Assert(false, "StrokeNodeOperations.GetPointsAtEndOfSegment failed to find the B position");
-                        //we didn't find the d point, return
-                        return;
-                    }
-
-                    //now look for the C position
-                    //advance i
-                    i++;
-                    for (int j = 0; i < maxCount && j < vertices.Length; i++, j++)
-                    {
-                        //look for the c point last
-                        Point point = _thisNode.Position + (vertices[i % vertices.Length] * pressureFactor);
-                        if (point == quad.C)
-                        {
-                            break;
-                        }
-                        //only add to ab if we didn't find C
-                        abPoints.Add(point);
-
-#if DEBUG_RENDERING_FEEDBACK
-                        if (showFeedback)
-                        {
-                            debugDC.DrawEllipse(Brushes.Wheat, null, quad.C, feedbackSize, feedbackSize);
-                        }
-#endif
-                    }
-                    //finally, add the D point
-                    dcPoints.Add(quad.C);
-
-#if DEBUG_RENDERING_FEEDBACK
-                    if (showFeedback)
-                    {
-                        debugDC.DrawEllipse(Brushes.Yellow, null, quad.C, feedbackSize, feedbackSize);
-                    }
-#endif
-                }
-            }
-        }
-
-        /// <summary>
-        /// GetPointsAtMiddleSegment
-        /// </summary>
-        internal void GetPointsAtMiddleSegment(StrokeNode previous,
-                                                double angleBetweenNodes,
-                                                List<Point> abPoints,
-                                                List<Point> dcPoints,
-                                                out bool missingIntersection
-#if DEBUG_RENDERING_FEEDBACK
-                                                , DrawingContext debugDC, double feedbackSize, bool showFeedback
-#endif
-                                                )
-        {
-            missingIntersection = false;
-            if (IsValid && previous.IsValid)
-            {
-                Quad quad1 = previous.ConnectingQuad;
-                if (!quad1.IsEmpty)
-                {
-                    Quad quad2 = ConnectingQuad;
-                    if (!quad2.IsEmpty)
-                    {
-                        if (IsEllipse)
-                        {
-                            Rect node1Bounds = _operations.GetNodeBounds(previous._lastNode);
-                            Rect node2Bounds = _operations.GetNodeBounds(_lastNode);
-                            Rect node3Bounds = _operations.GetNodeBounds(_thisNode);
-#if DEBUG_RENDERING_FEEDBACK
-                            if (showFeedback)
-                            {
-                                debugDC.DrawEllipse(null, new Pen(Brushes.Pink, feedbackSize / 2), _lastNode.Position, node2Bounds.Width / 2, node2Bounds.Height / 2);
-                            }
-#endif
-                            if (angleBetweenNodes == 0.0d || ((quad1.B == quad2.A) && (quad1.C == quad2.D)))
-                            {
-                                //quads connections are the same, just add them
-                                abPoints.Add(quad1.B);
-                                dcPoints.Add(quad1.C);
-#if DEBUG_RENDERING_FEEDBACK
-                                if (showFeedback)
-                                {
-                                    debugDC.DrawEllipse(Brushes.Green, null, quad1.B, feedbackSize, feedbackSize);
-                                    debugDC.DrawEllipse(Brushes.Yellow, null, quad1.C, feedbackSize, feedbackSize);
-                                }
-#endif
-                            }
-                            else if (angleBetweenNodes > 0.0)
-                            {
-                                //the stroke angled towards the AB side
-                                //this part is easy
-                                if (quad1.B == quad2.A)
-                                {
-                                    abPoints.Add(quad1.B);
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Green, null, quad1.B, feedbackSize, feedbackSize);
-                                    }
-#endif
-                                }
-                                else
-                                {
-                                    Point intersection = GetIntersection(quad1.A, quad1.B, quad2.A, quad2.B);
-                                    Rect union = Rect.Union(node1Bounds, node2Bounds);
-                                    union.Inflate(1.0, 1.0);
-                                    //make sure we're not off in space
-
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Green, null, quad1.B, feedbackSize * 1.5, feedbackSize * 1.5);
-                                        debugDC.DrawEllipse(Brushes.Red, null, quad2.A, feedbackSize, feedbackSize);
-                                    }
-#endif
-
-                                    if (union.Contains(intersection))
-                                    {
-                                        abPoints.Add(intersection);
-#if DEBUG_RENDERING_FEEDBACK
-                                        if (showFeedback)
-                                        {
-                                            debugDC.DrawEllipse(Brushes.Orange, null, intersection, feedbackSize, feedbackSize);
-                                        }
-#endif
-                                    }
-                                    else
-                                    {
-                                        //if we missed the intersection we'll need to close the stroke segment
-                                        //this work is done in StrokeRenderer
-                                        missingIntersection = true;
-                                        return; //we're done.
-                                    }
-                                }
-
-                                if (quad1.C == quad2.D)
-                                {
-                                    dcPoints.Add(quad1.C);
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Yellow, null, quad1.C, feedbackSize, feedbackSize);
-                                    }
-#endif
-                                }
-                                else
-                                {
-                                    //add instructions to arc from quad1.C to quad2.D in reverse order (since we walk this array backwards to render)
-                                    dcPoints.Add(quad1.C);
-                                    dcPoints.Add(new Point(node2Bounds.Width, node2Bounds.Height));
-                                    dcPoints.Add(StrokeRenderer.ArcToMarker);
-                                    dcPoints.Add(quad2.D);
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Yellow, null, quad1.C, feedbackSize, feedbackSize);
-                                        debugDC.DrawEllipse(Brushes.Blue, null, quad2.D, feedbackSize, feedbackSize);
-                                    }
-#endif
-                                }
-                            }
-                            else
-                            {
-                                //the stroke angled towards the CD side
-                                //this part is easy
-                                if (quad1.C == quad2.D)
-                                {
-                                    dcPoints.Add(quad1.C);
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Yellow, null, quad1.C, feedbackSize, feedbackSize);
-                                    }
-#endif
-                                }
-                                else
-                                {
-                                    Point intersection = GetIntersection(quad1.D, quad1.C, quad2.D, quad2.C);
-                                    Rect union = Rect.Union(node1Bounds, node2Bounds);
-                                    union.Inflate(1.0, 1.0);
-                                    //make sure we're not off in space
-
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Yellow, null, quad1.C, feedbackSize * 1.5, feedbackSize * 1.5);
-                                        debugDC.DrawEllipse(Brushes.Blue, null, quad2.D, feedbackSize, feedbackSize);
-                                    }
-#endif
-
-                                    if (union.Contains(intersection))
-                                    {
-                                        dcPoints.Add(intersection);
-#if DEBUG_RENDERING_FEEDBACK
-                                        if (showFeedback)
-                                        {
-                                            debugDC.DrawEllipse(Brushes.Orange, null, intersection, feedbackSize, feedbackSize);
-                                        }
-#endif
-                                    }
-                                    else
-                                    {
-                                        //if we missed the intersection we'll need to close the stroke segment
-                                        //this work is done in StrokeRenderer
-                                        missingIntersection = true;
-                                        return; //we're done.
-                                    }
-                                }
-
-                                if (quad1.B == quad2.A)
-                                {
-                                    abPoints.Add(quad1.B);
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Green, null, quad1.B, feedbackSize, feedbackSize);
-                                    }
-#endif
-
-                                }
-                                else
-                                {
-                                    //we need to arc between quad1.B and quad2.A along node2
-                                    abPoints.Add(quad1.B);
-                                    abPoints.Add(StrokeRenderer.ArcToMarker);
-                                    abPoints.Add(new Point(node2Bounds.Width, node2Bounds.Height));
-                                    abPoints.Add(quad2.A);
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Green, null, quad1.B, feedbackSize, feedbackSize);
-                                        debugDC.DrawEllipse(Brushes.Red, null, quad2.A, feedbackSize, feedbackSize);
-                                    }
-#endif
-                                }
-                            }
-                        }
-                        else
-                        {
-                            //rectangle
-                            int indexA = -1;
-                            int indexB = -1;
-                            int indexC = -1;
-                            int indexD = -1;
-
-                            Vector[] vertices = _operations.GetVertices();
-                            double pressureFactor = _lastNode.PressureFactor;
-                            for (int i = 0; i < vertices.Length; i++)
-                            {
-                                Point point = _lastNode.Position + (vertices[i % vertices.Length] * pressureFactor);
-                                if (point == quad2.A)
-                                {
-                                    indexA = i;
-                                }
-                                if (point == quad1.B)
-                                {
-                                    indexB = i;
-                                }
-                                if (point == quad1.C)
-                                {
-                                    indexC = i;
-                                }
-                                if (point == quad2.D)
-                                {
-                                    indexD = i;
-                                }
-                            }
-
-                            if (indexA == -1 || indexB == -1 || indexC == -1 || indexD == -1)
-                            {
-                                Debug.Assert(false, "Couldn't find all 4 indexes in StrokeNodeOperations.GetPointsAtMiddleSegment");
-                                return;
-                            }
-
-#if DEBUG_RENDERING_FEEDBACK
-                            if (showFeedback)
-                            {
-
-                                debugDC.DrawRectangle(null, new Pen(Brushes.Pink, feedbackSize / 2), _operations.GetNodeBounds(_lastNode));
-                                debugDC.DrawEllipse(Brushes.Red, null, quad2.A, feedbackSize, feedbackSize);
-                                debugDC.DrawEllipse(Brushes.Green, null, quad1.B, feedbackSize, feedbackSize);
-                                debugDC.DrawEllipse(Brushes.Yellow, null, quad1.C, feedbackSize, feedbackSize);
-                                debugDC.DrawEllipse(Brushes.Blue, null, quad2.D, feedbackSize, feedbackSize);
-                            }
-#endif
-
-                            Rect node3Rect = _operations.GetNodeBounds(_thisNode);
-                            //take care of a-b first
-                            if (indexA == indexB)
-                            {
-                                //quad connection is the same, just add it
-                                if (!node3Rect.Contains(quad1.B))
-                                {
-                                    abPoints.Add(quad1.B);
-                                }
-                            }
-                            else if ((indexA == 0 && indexB == 3) || ((indexA != 3 || indexB != 0) && (indexA > indexB)))
-                            {
-                                if (!node3Rect.Contains(quad1.B))
-                                {
-                                    abPoints.Add(quad1.B);
-                                }
-                                if (!node3Rect.Contains(quad2.A))
-                                {
-                                    abPoints.Add(quad2.A);
-                                }
-                            }
-                            else
-                            {
-                                Point intersection = GetIntersection(quad1.A, quad1.B, quad2.A, quad2.B);
-                                Rect node12 = Rect.Union(_operations.GetNodeBounds(previous._lastNode), _operations.GetNodeBounds(_lastNode));
-                                node12.Inflate(1.0, 1.0);
-                                //make sure we're not off in space
-                                if (node12.Contains(intersection))
-                                {
-                                    abPoints.Add(intersection);
-#if DEBUG_RENDERING_FEEDBACK
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Orange, null, intersection, feedbackSize, feedbackSize * 1.5);
-                                    }
-#endif
-                                }
-                                else
-                                {
-                                    //if we missed the intersection we'll need to close the stroke segment
-                                    //this work is done in StrokeRenderer.
-                                    missingIntersection = true;
-                                    return; //we're done.
-                                }
-                            }
-
-                            // now take care of c-d.  
-                            if (indexC == indexD)
-                            {
-                                //quad connection is the same, just add it
-                                if (!node3Rect.Contains(quad1.C))
-                                {
-                                    dcPoints.Add(quad1.C);
-                                }
-                            }
-                            else if ((indexC == 0 && indexD == 3) || ((indexC != 3 || indexD != 0) && (indexC > indexD)))
-                            {
-                                if (!node3Rect.Contains(quad1.C))
-                                {
-                                    dcPoints.Add(quad1.C);
-                                }
-                                if (!node3Rect.Contains(quad2.D))
-                                {
-                                    dcPoints.Add(quad2.D);
-                                }
-                            }
-                            else
-                            {
-                                Point intersection = GetIntersection(quad1.D, quad1.C, quad2.D, quad2.C);
-                                Rect node12 = Rect.Union(_operations.GetNodeBounds(previous._lastNode), _operations.GetNodeBounds(_lastNode));
-                                node12.Inflate(1.0, 1.0);
-                                //make sure we're not off in space
-                                if (node12.Contains(intersection))
-                                {
-                                    dcPoints.Add(intersection);
-#if DEBUG_RENDERING_FEEDBACK 
-                                    if (showFeedback)
-                                    {
-                                        debugDC.DrawEllipse(Brushes.Orange, null, intersection, feedbackSize, feedbackSize * 1.5);
-                                    }
-#endif
-                                }
-                                else
-                                {
-                                    //if we missed the intersection we'll need to close the stroke segment
-                                    //this work is done in StrokeRenderer.
-                                    missingIntersection = true;
-                                    return; //we're done.
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns the intersection between two lines.  This code assumes there is an intersection
-        /// and should only be called if that assumption is valid
-        /// </summary>
-        /// <returns></returns>
-        internal static Point GetIntersection(Point line1Start, Point line1End, Point line2Start, Point line2End)
-        {
-            double a1 = line1End.Y - line1Start.Y;
-            double b1 = line1Start.X - line1End.X;
-            double c1 = (line1End.X * line1Start.Y) - (line1Start.X * line1End.Y);
-            double a2 = line2End.Y - line2Start.Y;
-            double b2 = line2Start.X - line2End.X;
-            double c2 = (line2End.X * line2Start.Y) - (line2Start.X * line2End.Y);
-
-            double d = (a1 * b2) - (a2 * b1);
-            if (d != 0.0)
-            {
-                double x = ((b1 * c2) - (b2 * c1)) / d;
-                double y = ((a2 * c1) - (a1 * c2)) / d;
-
-                //capture the min and max points
-                double line1XMin, line1XMax, line1YMin, line1YMax, line2XMin, line2XMax, line2YMin, line2YMax;
-                if (line1Start.X < line1End.X)
-                {
-                    line1XMin = Math.Floor(line1Start.X);
-                    line1XMax = Math.Ceiling(line1End.X);
-                }
-                else
-                {
-                    line1XMin = Math.Floor(line1End.X);
-                    line1XMax = Math.Ceiling(line1Start.X);
-                }
-
-                if (line2Start.X < line2End.X)
-                {
-                    line2XMin = Math.Floor(line2Start.X);
-                    line2XMax = Math.Ceiling(line2End.X);
-                }
-                else
-                {
-                    line2XMin = Math.Floor(line2End.X);
-                    line2XMax = Math.Ceiling(line2Start.X);
-                }
-
-                if (line1Start.Y < line1End.Y)
-                {
-                    line1YMin = Math.Floor(line1Start.Y);
-                    line1YMax = Math.Ceiling(line1End.Y);
-                }
-                else
-                {
-                    line1YMin = Math.Floor(line1End.Y);
-                    line1YMax = Math.Ceiling(line1Start.Y);
-                }
-
-                if (line2Start.Y < line2End.Y)
-                {
-                    line2YMin = Math.Floor(line2Start.Y);
-                    line2YMax = Math.Ceiling(line2End.Y);
-                }
-                else
-                {
-                    line2YMin = Math.Floor(line2End.Y);
-                    line2YMax = Math.Ceiling(line2Start.Y);
-                }
-
-
-                // now see if we have an intersection between the lines
-                // and not just the projection of the lines
-                if ((line1XMin <= x && x <= line1XMax) &&
-                    (line1YMin <= y && y <= line1YMax) &&
-                    (line2XMin <= x && x <= line2XMax) &&
-                    (line2YMin <= y && y <= line2YMax))
-                {
-                    return new Point(x, y);
-                }
-            }
-
-            if ((long) line1End.X == (long) line2Start.X &&
-                (long) line1End.Y == (long) line2Start.Y)
-            {
-                return new Point(line1End.X, line1End.Y);
-            }
-
-            return new Point(Double.NaN, Double.NaN);
-        }
-
-        /// <summary>
-        /// This method tells whether the contour of a given stroke node
-        /// intersects with the contour of this node. The contours of both nodes
-        /// include their connecting quadrangles.
-        /// </summary>
-        /// <param name="hitNode"></param>
-        /// <returns></returns>
-        internal bool HitTest(StrokeNode hitNode)
-        {
-            if (!IsValid || !hitNode.IsValid)
-            {
-                return false;
-            }
-
-            IEnumerable<ContourSegment> hittingContour = hitNode.GetContourSegments();
-
-            return _operations.HitTest(_lastNode, _thisNode, ConnectingQuad, hittingContour);
-        }
-
-        /// <summary>
-        /// Finds out if a given node intersects with this one,
-        /// and returns findices of the intersection.
-        /// </summary>
-        /// <param name="hitNode"></param>
-        /// <returns></returns>
-        internal StrokeFIndices CutTest(StrokeNode hitNode)
-        {
-            if ((IsValid == false) || (hitNode.IsValid == false))
-            {
-                return StrokeFIndices.Empty;
-            }
-
-            IEnumerable<ContourSegment> hittingContour = hitNode.GetContourSegments();
-
-            // If the node contours intersect, the result is a pair of findices
-            // this segment should be cut at to let the hitNode's contour through it.
-            StrokeFIndices cutAt = _operations.CutTest(_lastNode, _thisNode, ConnectingQuad, hittingContour);
-
-            return (_index == 0) ? cutAt : BindFIndices(cutAt);
-        }
-
-        /// <summary>
-        /// Finds out if a given linear segment intersects with the contour of this node
-        /// (including connecting quadrangle), and returns findices of the intersection.
-        /// </summary>
-        /// <param name="begin"></param>
-        /// <param name="end"></param>
-        /// <returns></returns>
-        internal StrokeFIndices CutTest(Point begin, Point end)
-        {
-            if (IsValid == false)
-            {
-                return StrokeFIndices.Empty;
-            }
-
-            // If the node contours intersect, the result is a pair of findices
-            // this segment should be cut at to let the hitNode's contour through it.
-            StrokeFIndices cutAt = _operations.CutTest(_lastNode, _thisNode, ConnectingQuad, begin, end);
-
-            System.Diagnostics.Debug.Assert(!double.IsNaN(cutAt.BeginFIndex) && !double.IsNaN(cutAt.EndFIndex));
-
-            // Bind the found findices to the node and return the result
-            return BindFIndicesForLassoHitTest(cutAt);
-        }
-
-        #endregion
-
-        #region Private helpers
-
-        /// <summary>
-        /// Binds a local fragment to this node by setting the integer part of the
-        /// fragment findices equal to the index of the previous node
-        /// </summary>
-        /// <param name="fragment"></param>
-        /// <returns></returns>
-        private StrokeFIndices BindFIndices(StrokeFIndices fragment)
-        {
-            System.Diagnostics.Debug.Assert(IsValid && (_index >= 0));
-
-            if (fragment.IsEmpty == false)
-            {
-                // Adjust only findices which are on this segment of thew spine (i.e. between 0 and 1)
-                if (!DoubleUtil.AreClose(fragment.BeginFIndex, StrokeFIndices.BeforeFirst))
-                {
-                    System.Diagnostics.Debug.Assert(fragment.BeginFIndex >= 0 && fragment.BeginFIndex <= 1);
-                    fragment.BeginFIndex += _index - 1;
-                }
-                if (!DoubleUtil.AreClose(fragment.EndFIndex, StrokeFIndices.AfterLast))
-                {
-                    System.Diagnostics.Debug.Assert(fragment.EndFIndex >= 0 && fragment.EndFIndex <= 1);
-                    fragment.EndFIndex += _index - 1;
-                }
-            }
-            return fragment;
-        }
-
-        internal int Index
-        {
-            get { return _index; }
-        }
-
-        /// <summary>
-        /// Bind the StrokeFIndices for lasso hit test results.
-        /// </summary>
-        /// <param name="fragment"></param>
-        /// <returns></returns>
-        private StrokeFIndices BindFIndicesForLassoHitTest(StrokeFIndices fragment)
-        {
-            System.Diagnostics.Debug.Assert(IsValid);
-            if (!fragment.IsEmpty)
-            {
-                // Adjust BeginFIndex
-                if (DoubleUtil.AreClose(fragment.BeginFIndex, StrokeFIndices.BeforeFirst))
-                {
-                    // set it to be the index of the previous node, indicating intersection start from previous node
-                    fragment.BeginFIndex = (_index == 0 ? StrokeFIndices.BeforeFirst : _index - 1);
-                }
-                else
-                {
-                    // Adjust findices which are on this segment of the spine (i.e. between 0 and 1)
-                    System.Diagnostics.Debug.Assert(DoubleUtil.GreaterThanOrClose(fragment.BeginFIndex, 0f));
-
-                    System.Diagnostics.Debug.Assert(DoubleUtil.LessThanOrClose(fragment.BeginFIndex, 1f));
-
-                    // Adjust the value to consider index, say from 0.75 to 3.75 (for _index = 4)
-                    fragment.BeginFIndex += _index - 1;
-                }
-
-                //Adjust EndFIndex
-                if (DoubleUtil.AreClose(fragment.EndFIndex, StrokeFIndices.AfterLast))
-                {
-                    // set it to be the index of the current node, indicating the intersection cover the end of the node
-                    fragment.EndFIndex = (_isLastNode ? StrokeFIndices.AfterLast : _index);
-                }
-                else
-                {
-                    System.Diagnostics.Debug.Assert(DoubleUtil.GreaterThanOrClose(fragment.EndFIndex, 0f));
-
-                    System.Diagnostics.Debug.Assert(DoubleUtil.LessThanOrClose(fragment.EndFIndex, 1f));
-                    // Ajust the value to consider the index
-                    fragment.EndFIndex += _index - 1;
-                }
-            }
-            return fragment;
-        }
-
-        /// <summary>
-        /// Tells whether the StrokeNode instance is valid or not (created via the default ctor)
-        /// </summary>
-        internal bool IsValid { get { return _operations != null; } }
-
-        /// <summary>
-        /// The quadrangle that connects this and the previous node.
-        /// Can be empty if this node is the first one or if one of the nodes is
-        /// completely inside the other.
-        /// The type Quad is supposed to be internal even if we surface StrokeNode.
-        /// External users of StrokeNode should use GetConnectionPoints instead.
-        /// </summary>
-        private Quad ConnectingQuad
-        {
-            get
-            {
-                System.Diagnostics.Debug.Assert(IsValid);
-
-                if (_isQuadCached == false)
-                {
-                    _connectingQuad = _operations.GetConnectingQuad(_lastNode, _thisNode);
-                    _isQuadCached = true;
-                }
-                return _connectingQuad;
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumerator for edges of the contour comprised by the node
-        /// and connecting quadrangle (_lastNode is excluded)
-        /// Used for hit-testing a stroke against an other stroke (stroke and point erasing)
-        /// </summary>
-        private IEnumerable<ContourSegment> GetContourSegments()
-        {
-            System.Diagnostics.Debug.Assert(IsValid);
-
-            // Calls thru to the StrokeNodeOperations object
-            if (IsEllipse)
-            {
-                // ISSUE-2004/06/15- temporary workaround to avoid hit-testing with ellipses
-                return _operations.GetNonBezierContourSegments(_lastNode, _thisNode);
-            }
-            return _operations.GetContourSegments(_thisNode, ConnectingQuad);
-        }
-
-        /// <summary>
-        /// Returns the spine point that corresponds to the given findex.
-        /// </summary>
-        /// <param name="findex">A local findex between the previous index and this one (ex: between 2.0 and 3.0)</param>
-        /// <returns>Point on the spine</returns>
-        internal Point GetPointAt(double findex)
-        {
-            System.Diagnostics.Debug.Assert(IsValid);
-
-            if (_lastNode.IsEmpty)
-            {
-                System.Diagnostics.Debug.Assert(findex == 0);
-                return _thisNode.Position;
-            }
-
-            System.Diagnostics.Debug.Assert((findex >= _index - 1) && (findex <= _index));
-
-            if (DoubleUtil.AreClose(findex, (double) _index))
-            {
-                //
-                // we're being asked for this exact point
-                // if we don't return it here, our algorithm
-                // below doesn't work
-                //
-                return _thisNode.Position;
-            }
-
-            //
-            // get the spare change to the left of the decimal point
-            // eg turn 2.75 into .75
-            //
-            double floor = Math.Floor(findex);
-            findex = findex - floor;
-
-            double xDiff = (_thisNode.Position.X - _lastNode.Position.X) * findex;
-            double yDiff = (_thisNode.Position.Y - _lastNode.Position.Y) * findex;
-
-            //
-            // return the previous point plus the delta's
-            //
-            return new Point(_lastNode.Position.X + xDiff,
-                                _lastNode.Position.Y + yDiff);
-        }
-
-        #endregion
-
-        #region Fields
-
-        // Internal objects created for particular rendering
-        private StrokeNodeOperations _operations;
-
-        // Node's index on the stroke spine
-        private int _index;
-
-        // This and the previous node data that used by the StrokeNodeOperations object to build
-        // and/or hit-test the contour of the node/segment
-        private StrokeNodeData _thisNode;
-        private StrokeNodeData _lastNode;
-
-        // Calculating of the connecting quadrangle is not a cheap operations, therefore,
-        // first, it's computed only by request, and second, once computed it's cached in the StrokeNode
-        private bool _isQuadCached;
-        private Quad _connectingQuad;
-
-        // Is the current stroke node the last node?
-        private bool _isLastNode;
-
-        #endregion
-    }
-    #endregion
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNodeData.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNodeData.cs
deleted file mode 100644
index 7fdd508..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNodeData.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Input;
-using System.Diagnostics;
-using WpfInk.PresentationCore.System.Windows;
-
-namespace MS.Internal.Ink
-{
-    #region StrokeNodeData
-
-    /// <summary>
-    /// This structure represents a node on a stroke spine. 
-    /// </summary>
-    internal readonly struct StrokeNodeData
-    {
-        #region Statics
-
-        private static readonly StrokeNodeData s_empty = new StrokeNodeData();
-
-        #endregion
-
-        #region API (internal)
-
-        /// <summary> Returns static object representing an unitialized node </summary>
-        internal static StrokeNodeData Empty { get { return s_empty; } }
-
-        /// <summary>
-        /// Constructor for nodes of a pressure insensitive stroke
-        /// </summary>
-        /// <param name="position">position of the node</param>
-        internal StrokeNodeData(Point position)
-        {
-            _position = position;
-            _pressure = 1;
-        }
-
-        /// <summary>
-        /// Constructor for nodes with pressure data
-        /// </summary>
-        /// <param name="position">position of the node</param>
-        /// <param name="pressure">pressure scaling factor at the node</param>
-        internal StrokeNodeData(Point position, float pressure)
-        {
-            System.Diagnostics.Debug.Assert(DoubleUtil.GreaterThan((double) pressure, 0d));
-
-            _position = position;
-            _pressure = pressure;
-        }
-
-        /// <summary> Tells whether the structre was properly initialized </summary>
-        internal bool IsEmpty
-        {
-            get
-            {
-                Debug.Assert(DoubleUtil.AreClose(0, s_empty._pressure));
-                return DoubleUtil.AreClose(_pressure, s_empty._pressure);
-            }
-        }
-
-        /// <summary> Position of the node </summary>
-        internal Point Position
-        {
-            get { return _position; }
-        }
-
-        /// <summary> Pressure scaling factor at the node </summary>
-        internal float PressureFactor { get { return _pressure; } }
-
-        #endregion
-
-        #region Privates
-
-        private readonly Point _position;
-        private readonly float _pressure;
-
-        #endregion
-    }
-
-    #endregion
-}
diff --git a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNodeEnumerator.cs b/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNodeEnumerator.cs
deleted file mode 100644
index 9fcfb67..0000000
--- a/ThirdParty/DotNetCampus.InkCanvas/src/DotNetCampus.InkCanvas.InkCore/WpfInkRenderAlgorithms/PresentationCore/MS/Internal/Ink/StrokeNodeEnumerator.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using WpfInk.PresentationCore.System.Windows;
-using WpfInk.PresentationCore.System.Windows.Ink;
-using WpfInk.PresentationCore.System.Windows.Input.Stylus;
-
-namespace MS.Internal.Ink
-{
-    /// <summary>
-    /// This class serves as a unified tool for enumerating through stroke nodes
-    /// for all kinds of rendering and/or hit-testing that uses stroke contours.
-    /// It provides static API for static (atomic) rendering, and it needs to be
-    /// instantiated for dynamic (incremental) rendering. It generates stroke nodes
-    /// from Stroke objects with or w/o overriden drawing attributes, as well as from
-    /// a arrays of points (for a given StylusShape), and from raw stylus packets.
-    /// In either case, the output collection of nodes is represented by a disposable
-    /// iterator (i.e. good for a single enumeration only).
-    /// </summary>
-    internal class StrokeNodeIterator
-    {
-        /// <summary>
-        /// Helper wrapper
-        /// </summary>
-        public static StrokeNodeIterator GetIterator(Stroke stroke, DrawingAttributes drawingAttributes)
-        {
-            if (stroke == null)
-            {
-                throw new System.ArgumentNullException("stroke");
-            }
-            if (drawingAttributes == null)
-            {
-                throw new System.ArgumentNullException("drawingAttributes");
-            }
-
-            StylusPointCollection stylusPoints =
-                drawingAttributes.FitToCurve ? stroke.GetBezierStylusPoints() : stroke.StylusPoints;
-
-            return GetIterator(stylusPoints, drawingAttributes);
-        }
-        /// <summary>
-        /// Creates a default enumerator for a given stroke
-        /// If using the strokes drawing attributes, pass stroke.DrawingAttributes for the second
-        /// argument.  If using an overridden DA, use that instance.
-        /// </summary>
-        internal static StrokeNodeIterator GetIterator(StylusPointCollection stylusPoints, DrawingAttributes drawingAttributes)
-        {
-            if (stylusPoints == null)
-            {
-                throw new System.ArgumentNullException("stylusPoints");
-            }
-            if (drawingAttributes == null)
-            {
-                throw new System.ArgumentNullException("drawingAttributes");
-            }
-
-            StrokeNodeOperations operations =
-                StrokeNodeOperations.CreateInstance(drawingAttributes.StylusShape);
-
-            bool usePressure = !drawingAttributes.IgnorePressure;
-
-            return new StrokeNodeIterator(stylusPoints, operations, usePressure);
-        }
-
-
-        /// <summary>
-        /// GetNormalizedPressureFactor
-        /// </summary>
-        private static float GetNormalizedPressureFactor(float stylusPointPressureFactor)
-        {
-            //
-            // create a compatible pressure value that maps 0-1 to 0.25 - 1.75
-            //
-            return (1.5f * stylusPointPressureFactor) + 0.25f;
-        }
-
-        /// <summary>
-        /// Constructor for an incremental node enumerator that builds nodes
-        /// from array(s) of points and a given stylus shape.
-        /// </summary>
-        /// <param name="nodeShape">a shape that defines the stroke contour</param>
-        internal StrokeNodeIterator(StylusShape nodeShape)
<!DOCTYPE html>
<html lang="en-US" data-theme="gitea-auto">
<head>
	<meta name="viewport" content="width=device-width, initial-scale=1">
	<title>Internal Server Error -  MistAperio Gitea</title>
	<link rel="icon" href="/assets/img/favicon.svg" type="image/svg+xml">
	<link rel="alternate icon" href="/assets/img/favicon.png" type="image/png">
	<link rel="stylesheet" href="/assets/css/index.css?v=1.25.5">
<link rel="stylesheet" href="/assets/css/theme-gitea-auto.css?v=1.25.5">

</head>
<body>
	<div class="full height">
		<nav class="ui secondary menu">
			<div class="ui container tw-flex">
				<div class="item tw-flex-1">
					<a href="/" aria-label="Home">
						<img width="30" height="30" src="/assets/img/logo.svg" alt="Logo" aria-hidden="true">
					</a>
				</div>
				<div class="item">
					<button class="ui icon button disabled"><svg viewBox="0 0 16 16" class="svg octicon-three-bars" aria-hidden="true" width="16" height="16"><path d="M1 2.75A.75.75 0 0 1 1.75 2h12.5a.75.75 0 0 1 0 1.5H1.75A.75.75 0 0 1 1 2.75m0 5A.75.75 0 0 1 1.75 7h12.5a.75.75 0 0 1 0 1.5H1.75A.75.75 0 0 1 1 7.75M1.75 12h12.5a.75.75 0 0 1 0 1.5H1.75a.75.75 0 0 1 0-1.5"/></svg></button>
				</div>
			</div>
		</nav>
		<div class="divider tw-my-0"></div>
		<div role="main" class="page-content status-page-500">
			<div class="ui container" >
				<style> .ui.message.flash-message { text-align: left; } </style>
				
				<div class="status-page-error">
					<div class="status-page-error-title">500 Internal Server Error</div>
					
					<div class="tw-mt-8 tw-text-center">
						<p>Gitea Version: 1.25.5</p>
						
					</div>
				</div>
			</div>
		</div>
	</div>

	
	<script type="module">
		const embedded = document.querySelector('.page-content .page-content.status-page-500');
		if (embedded) {
			
			const embeddedParent = embedded.parentNode;
			let main = document.querySelector('.page-content');
			main = main ?? document.querySelector('body');
			main.prepend(document.createElement('hr'));
			main.prepend(embedded);
			embeddedParent.remove(); 
		}
	</script>
</body>
</html>