Merge remote-tracking branch 'origin/feat/windows-pwsh-default' into feat/windows-acl-sandbox

# Conflicts: # apps/cli/reference/README.i18n.yaml # knip.json # packages/sandbox/sandbox-local/package.json # pnpm-lock.yaml # scripts/check-workspace-constraints.ts
2026-08-08 17:50:39 +08:00
parent 07c7e2f0bd d1b080a68d
commit cc64c729db
841 changed files with 13282 additions and 5966 deletions
--- a/packages/bundle/base/cordis.patch.yml
+++ b/packages/bundle/base/cordis.patch.yml
@@ -218,6 +218,10 @@
    - id: skill-local
      name: '@deepseek-ai/dsh-skill-local'

+    - id: skill-badge
+      name: '@deepseek-ai/dsh-skill-badge'
+      disabled: true
+
    - id: tool-skill
      name: '@deepseek-ai/dsh-tool-skill'

--- a/packages/bundle/base/package.json
+++ b/packages/bundle/base/package.json
@@ -74,6 +74,7 @@
    "@deepseek-ai/dsh-session-title-first-message-llm": "workspace:^",
    "@deepseek-ai/dsh-settings-local": "workspace:^",
    "@deepseek-ai/dsh-skill": "workspace:^",
+    "@deepseek-ai/dsh-skill-badge": "workspace:^",
    "@deepseek-ai/dsh-skill-local": "workspace:^",
    "@deepseek-ai/dsh-spill-local": "workspace:^",
    "@deepseek-ai/dsh-spill-policy": "workspace:^",
--- a/packages/bundle/base/tests/fixtures/root.cordis.yml
+++ b/packages/bundle/base/tests/fixtures/root.cordis.yml
@@ -0,0 +1 @@
+[]