Skip to content

Commit ddc91a4

Browse files
committed
Merge branch 'main' into ocasta181/ENG-209
2 parents 11a32d9 + 8909ee7 commit ddc91a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1549
-856
lines changed

.changeset/honest-deers-add.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"claude-dev": minor
3+
---
4+
5+
Support for Loading Files from the `.clinerules/` Directory

.changeset/nice-comics-flash.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"claude-dev": minor
3+
---
4+
5+
Adding Tailwind to the extension

.changeset/quick-rings-eat.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/changeset-release.yml

Lines changed: 0 additions & 162 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [3.6.5]
4+
5+
- Add 'Delete all Task History' button to History view
6+
- Add toggle to disable model switching between Plan/Act modes in Settings (new users default to disabled)
7+
- Add temperature option to OpenAI Compatible
8+
- Add Kotlin support to tree-sitter parser (thanks @fumiya-kume!)
9+
10+
## [3.6.3]
11+
12+
- Improve QwQ support for Alibaba (thanks @meglinge!) and OpenRouter
13+
- Improve diff edit prompting to prevent immediately reverting to write_to_file when a model uses search patterns that don't match anything in the file
14+
- Fix bug where new checkpoints system would revert file changes when switching between tasks
15+
- Fix issue with incorrect token count for some OpenAI compatible providers
16+
317
## [3.6.0]
418

519
- Add Cline API as a provider option, allowing new users to sign up and get started with Cline for free

docs/PRIVACY.md

Lines changed: 1 addition & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1 @@
1-
# Cline Privacy Policy
2-
3-
Cline Bot Inc. ("Cline," "we," "our," and/or "us") values the privacy of individuals who use our VS Code extension and related services (collectively, our "Services"). This privacy policy explains how we collect, use, and disclose information from users of our Services.
4-
5-
## Key Points
6-
7-
- Cline operates entirely client-side as a VS Code extension
8-
- No code or data is collected, stored, or transmitted to Cline's servers
9-
- Your data is only sent to your chosen AI provider (e.g., Anthropic, OpenAI) when you explicitly request assistance
10-
- All processing happens locally on your machine
11-
- API keys are stored securely in VS Code's built-in settings storage
12-
13-
## Information We Process
14-
15-
### A. Information You Provide
16-
17-
- **API Keys**: When you choose to use certain AI model providers (OpenRouter, Anthropic, OpenAI, etc.), you provide API keys. These are stored securely and locally in your VS Code settings.
18-
- **Communications**: If you contact us directly (e.g., via Discord or email), we may receive information like your name, email address, and message contents.
19-
20-
### B. Information Processing
21-
22-
Cline functions solely as a client-side VS Code extension that facilitates communication between your editor and your chosen AI model provider:
23-
24-
1. **File Contents**:
25-
26-
- Only sent to your chosen AI provider when you explicitly request assistance
27-
- Never stored or transmitted to Cline's servers
28-
- Only the specific files/content you select are included
29-
30-
2. **Terminal Commands**:
31-
32-
- Processed entirely locally on your machine
33-
- Require explicit user confirmation before execution
34-
- No command history is transmitted to Cline
35-
36-
3. **Browser Integration**:
37-
- Screenshots and console logs are processed locally
38-
- Temporary data is cleared after task completion
39-
40-
## Data Security
41-
42-
1. **Local-Only Processing**:
43-
44-
- All operations happen on your local machine
45-
- No central servers or data collection by default
46-
- Anonymous telemetry and usage statistics are only collected if you explicitly opt in
47-
- No account creation required
48-
49-
2. **API Key Security**:
50-
51-
- Stored using VS Code's secure settings storage system
52-
- Never transmitted to Cline's servers
53-
- You can remove/modify keys at any time
54-
55-
3. **User Control**:
56-
- Explicit approval required for file changes
57-
- Terminal commands require confirmation
58-
- Browser actions need explicit permission
59-
- You control which AI provider to use
60-
61-
## Communication with AI Providers
62-
63-
When you request assistance:
64-
65-
1. Selected content is sent directly to your chosen AI provider
66-
2. No data passes through Cline's servers
67-
3. Provider's own privacy policy applies to this communication:
68-
- [Anthropic Privacy Policy](https://www.anthropic.com/privacy)
69-
- [OpenAI Privacy Policy](https://openai.com/privacy)
70-
- [OpenRouter Privacy Policy](https://openrouter.ai/privacy)
71-
72-
## Error Handling & Debugging
73-
74-
- Error logs are processed locally
75-
- No automatic error reporting to Cline
76-
- Optional anonymous telemetry and error reporting via PostHog if you opt in
77-
- You control what information to include when manually reporting issues
78-
79-
## Children's Privacy
80-
81-
We do not knowingly collect, maintain, or use personal information from children under 18 years of age, and no part of our Service(s) is directed to children. If you learn that a child has provided us with personal information in violation of this Privacy Policy, then you may alert us at [email protected].
82-
83-
## Changes to Privacy Policy
84-
85-
We will post any changes to this policy on our GitHub repository. Significant changes will be announced in our Discord community.
86-
87-
## Security Concerns & Auditing
88-
89-
- Cline is open source and available for security audit
90-
- Our client-side architecture ensures no central point of data collection
91-
- You can inspect exactly what data is being sent to AI providers
92-
- Enterprise users can implement additional access controls through VS Code
93-
94-
## Telemetry & Usage Statistics
95-
96-
If you choose to opt in to anonymous telemetry:
97-
98-
- Basic usage statistics and error reports are collected via PostHog
99-
- A stable, anonymous identifier (VS Code's `machineId`) is used to understand unique usage patterns
100-
- This identifier is not linked to any personal information
101-
- It helps us understand how features are used across sessions
102-
- It cannot be used to identify you personally
103-
- All data is anonymized and cannot be linked to individual users
104-
- No code content or sensitive information is ever included
105-
- You can opt out at any time through:
106-
- VS Code Settings > Cline > Enable Telemetry
107-
- VS Code Settings > Telemetry > Telemetry Level (setting this to anything other than "all" will disable Cline's telemetry)
108-
- Collected data helps us improve the extension's functionality and stability
109-
110-
## Contact Us
111-
112-
For privacy-related questions or concerns:
113-
114-
- Open an issue on our [GitHub repository](https://github.com/cline/cline)
115-
- Join our [Discord community](https://discord.gg/cline)
116-
1+
See [https://cline.bot/privacy](https://cline.bot/privacy) for our privacy policy.

docs/prompting/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,27 @@ Cline's system prompt, on the other hand, is not user-editable ([here's where yo
128128
- Focus on Desired Outcomes: Describe the results you want, not the specific steps.
129129
- Test and Iterate: Experiment to find what works best for your workflow.
130130

131+
132+
### Support for Loading Files from the `.clinerules/` Directory
133+
All files under the `.clinerules/` directory are recursively loaded, and their contents are merged into clineRulesFileInstructions.
134+
135+
#### Example 1:
136+
```
137+
.clinerules/
138+
├── .local-clinerules
139+
└── .project-clinerules
140+
```
141+
142+
#### Example 2:
143+
```
144+
.clinerules/
145+
├── .clinerules-nextjs
146+
├── .clinerules-serverside
147+
└── tests/
148+
├── .pytest-clinerules
149+
└── .jest-clinerules
150+
```
151+
131152
## Prompting Cline 💬
132153

133154
**Prompting is how you communicate your needs for a given task in the back-and-forth chat with Cline.** Cline understands natural language, so write conversationally.

esbuild.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const copyWasmFiles = {
5252
"java",
5353
"php",
5454
"swift",
55+
"kotlin",
5556
]
5657

5758
languages.forEach((lang) => {

package-lock.json

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)