Merge branch 'main' into feat/cli-completion

fengmk2 · web-flow · commit 84ad6ae9f850 · 2026-03-19T13:46:10.000+08:00
diff --git a/packages/cli/snap-tests-global/command-config-no-agent-writes/CLAUDE.md b/packages/cli/snap-tests-global/command-config-no-agent-writes/CLAUDE.md
@@ -0,0 +1,3 @@
+# My Custom Claude Instructions
+
+Do not modify this file.
diff --git a/packages/cli/snap-tests-global/command-config-no-agent-writes/package.json b/packages/cli/snap-tests-global/command-config-no-agent-writes/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "command-config-no-agent-writes"
+}
diff --git a/packages/cli/snap-tests-global/command-config-no-agent-writes/snap.txt b/packages/cli/snap-tests-global/command-config-no-agent-writes/snap.txt
@@ -0,0 +1,9 @@
+> git init
+> vp config
+> cat CLAUDE.md # should be unchanged
+# My Custom Claude Instructions
+
+Do not modify this file.
+
+> test -f AGENTS.md && echo 'AGENTS.md exists' || echo 'AGENTS.md not created' # should not exist
+AGENTS.md not created
diff --git a/packages/cli/snap-tests-global/command-config-no-agent-writes/steps.json b/packages/cli/snap-tests-global/command-config-no-agent-writes/steps.json
@@ -0,0 +1,8 @@
+{
+  "commands": [
+    { "command": "git init", "ignoreOutput": true },
+    "vp config",
+    "cat CLAUDE.md # should be unchanged",
+    "test -f AGENTS.md && echo 'AGENTS.md exists' || echo 'AGENTS.md not created' # should not exist"
+  ]
+}
diff --git a/packages/cli/snap-tests-global/command-config-prepare-auto-hooks/package.json b/packages/cli/snap-tests-global/command-config-prepare-auto-hooks/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "command-config-prepare-auto-hooks"
+}
diff --git a/packages/cli/snap-tests-global/command-config-prepare-auto-hooks/snap.txt b/packages/cli/snap-tests-global/command-config-prepare-auto-hooks/snap.txt
@@ -0,0 +1,31 @@
+> git init
+> vp config # should install hooks automatically without prompting
+> git config --local core.hooksPath # should be .vite-hooks/_
+.vite-hooks/_
+
+> cat .vite-hooks/pre-commit # should have vp staged
+vp staged
+
+> cat vite.config.ts # should have staged config
+import { defineConfig } from 'vite-plus';
+
+export default defineConfig({
+  staged: {
+    "*": "vp check --fix"
+  },
+  
+});
+
+> vp config # run again to ensure idempotent
+> cat .vite-hooks/pre-commit # should remain unchanged
+vp staged
+
+> cat vite.config.ts # should remain unchanged
+import { defineConfig } from 'vite-plus';
+
+export default defineConfig({
+  staged: {
+    "*": "vp check --fix"
+  },
+  
+});
diff --git a/packages/cli/snap-tests-global/command-config-prepare-auto-hooks/steps.json b/packages/cli/snap-tests-global/command-config-prepare-auto-hooks/steps.json
@@ -0,0 +1,15 @@
+{
+  "env": {
+    "npm_lifecycle_event": "prepare"
+  },
+  "commands": [
+    { "command": "git init", "ignoreOutput": true },
+    "vp config # should install hooks automatically without prompting",
+    "git config --local core.hooksPath # should be .vite-hooks/_",
+    "cat .vite-hooks/pre-commit # should have vp staged",
+    "cat vite.config.ts # should have staged config",
+    "vp config # run again to ensure idempotent",
+    "cat .vite-hooks/pre-commit # should remain unchanged",
+    "cat vite.config.ts # should remain unchanged"
+  ]
+}
diff --git a/packages/cli/snap-tests-global/command-config-update-agents/AGENTS.md b/packages/cli/snap-tests-global/command-config-update-agents/AGENTS.md
@@ -0,0 +1,11 @@
+# My Project
+
+Custom instructions here.
+
+<!--VITE PLUS START-->
+
+OUTDATED CONTENT THAT SHOULD BE REPLACED
+
+<!--VITE PLUS END-->
+
+More custom content below.
diff --git a/packages/cli/snap-tests-global/command-config-update-agents/package.json b/packages/cli/snap-tests-global/command-config-update-agents/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "command-config-update-agents"
+}
diff --git a/packages/cli/snap-tests-global/command-config-update-agents/snap.txt b/packages/cli/snap-tests-global/command-config-update-agents/snap.txt
@@ -0,0 +1,16 @@
+> git init
+> vp config # should auto-update agent instructions
+> head -5 AGENTS.md # verify user content preserved
+# My Project
+
+Custom instructions here.
+
+<!--VITE PLUS START-->
+
+> tail -3 AGENTS.md # verify user content preserved
+<!--VITE PLUS END-->
+
+More custom content below.
+
+> grep -q 'OUTDATED CONTENT' AGENTS.md && echo 'ERROR: outdated content still present' || echo 'outdated content replaced' # verify old content gone
+outdated content replaced
diff --git a/packages/cli/snap-tests-global/command-config-update-agents/steps.json b/packages/cli/snap-tests-global/command-config-update-agents/steps.json
@@ -0,0 +1,9 @@
+{
+  "commands": [
+    { "command": "git init", "ignoreOutput": true },
+    "vp config # should auto-update agent instructions",
+    "head -5 AGENTS.md # verify user content preserved",
+    "tail -3 AGENTS.md # verify user content preserved",
+    "grep -q 'OUTDATED CONTENT' AGENTS.md && echo 'ERROR: outdated content still present' || echo 'outdated content replaced' # verify old content gone"
+  ]
+}
diff --git a/packages/cli/snap-tests-global/migration-lint-staged-merge-fail/snap.txt b/packages/cli/snap-tests-global/migration-lint-staged-merge-fail/snap.txt
@@ -4,16 +4,19 @@ VITE+ - The Unified Toolchain for the Web
 
 ◇ Migrated . to Vite+<repeat>
 • Node <semver>  pnpm <semver>
-• Git hooks configured
 ! Warnings:
   - Failed to merge staged config into vite.config.ts
+  - Git hooks not configured — Failed to merge staged config into vite.config.ts
+
+Please add staged config to vite.config.ts manually, see https://viteplus.dev/guide/migrate#lint-staged
 → Manual follow-up:
   - Please add staged config to vite.config.ts manually, see https://viteplus.dev/guide/migrate#lint-staged
 
 > cat package.json # lint-staged config should be preserved when merge fails
 {
   "name": "migration-lint-staged-merge-fail",
   "devDependencies": {
+    "lint-staged": "^16.2.6",
     "vite": "npm:@voidzero-dev/vite-plus-core@latest",
     "vite-plus": "latest"
   },
@@ -37,4 +40,4 @@ const config = { plugins: [] };
 module.exports = config;
 
 > test -f .vite-hooks/pre-commit && echo 'pre-commit hook exists' || echo 'no pre-commit hook' # should NOT exist when merge fails
-no pre-commit hook
+pre-commit hook exists
diff --git a/packages/cli/snap-tests-global/migration-lintstagedrc-merge-fail/snap.txt b/packages/cli/snap-tests-global/migration-lintstagedrc-merge-fail/snap.txt
@@ -4,16 +4,19 @@ VITE+ - The Unified Toolchain for the Web
 
 ◇ Migrated . to Vite+<repeat>
 • Node <semver>  pnpm <semver>
-• Git hooks configured
 ! Warnings:
   - Failed to merge staged config into vite.config.ts
+  - Git hooks not configured — Failed to merge staged config into vite.config.ts
+
+Please add staged config to vite.config.ts manually, see https://viteplus.dev/guide/migrate#lint-staged
 → Manual follow-up:
   - Please add staged config to vite.config.ts manually, see https://viteplus.dev/guide/migrate#lint-staged
 
 > cat package.json # check package.json
 {
   "name": "migration-lintstagedrc-merge-fail",
   "devDependencies": {
+    "lint-staged": "^16.2.6",
     "vite": "npm:@voidzero-dev/vite-plus-core@latest",
     "vite-plus": "latest"
   },
@@ -39,4 +42,4 @@ const config = { plugins: [] };
 module.exports = config;
 
 > test -f .vite-hooks/pre-commit && echo 'pre-commit hook exists' || echo 'no pre-commit hook' # should NOT exist when merge fails
-no pre-commit hook
+pre-commit hook exists
diff --git a/packages/cli/snap-tests/command-run-with-vp-config/snap.txt b/packages/cli/snap-tests/command-run-with-vp-config/snap.txt
@@ -2,21 +2,6 @@
 $ vp config ⊘ cache disabled
 .git can't be found
 
-Created AGENTS.md with Vite+ instructions
-◇  Add this MCP server config to your agent ─╮
-                                              
-   {                                          
-     "vite-plus": {                           
-       "command": "npx",                      
-       "args": [                              
-         "vp",                                
-         "mcp"                                
-       ]                                      
-     }                                        
-   }                                          
-                                              
-╰────────────────────────────────────────────╯
-
 
 [2]> vp run bar # should throw error
 $ vp not-exist-command ⊘ cache disabled
diff --git a/packages/cli/src/config/__tests__/agent.spec.ts b/packages/cli/src/config/__tests__/agent.spec.ts
diff --git a/packages/cli/src/config/agent.ts b/packages/cli/src/config/agent.ts
diff --git a/packages/cli/src/config/bin.ts b/packages/cli/src/config/bin.ts
diff --git a/packages/cli/src/migration/migrator.ts b/packages/cli/src/migration/migrator.ts
diff --git a/packages/cli/src/utils/agent.ts b/packages/cli/src/utils/agent.ts
diff --git a/rfcs/config-and-staged-commands.md b/rfcs/config-and-staged-commands.md

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# My Custom Claude Instructions`
	`2`	`+`
	`3`	`+Do not modify this file.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "command-config-no-agent-writes"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "command-config-prepare-auto-hooks"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "command-config-update-agents"`
	`3`	`+}`