diff --git a/docs/docs.json b/docs/docs.json
index 732a0d664b..80ef3c4e67 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -80,6 +80,7 @@
 					"features/plan-and-act",
 					"features/slash-commands/workflows",
 					"features/focus-chain",
+					"features/auto-compact",
 					"features/editing-messages",
 					{
 						"group": "@ Mentions",
@@ -148,9 +149,14 @@
 				"pages": [
 					"provider-config/anthropic",
 					"provider-config/claude-code",
-					"provider-config/aws-bedrock-with-apikey-authentication",
-					"provider-config/aws-bedrock-with-credentials-authentication",
-					"provider-config/aws-bedrock-with-profile-authentication",
+					{
+						"group": "AWS Bedrock",
+						"pages": [
+							"provider-config/aws-bedrock/api-key",
+							"provider-config/aws-bedrock/iam-credentials",
+							"provider-config/aws-bedrock/cli-profile"
+						]
+					},
 					"provider-config/gcp-vertex-ai",
 					"provider-config/litellm-and-cline-using-codestral",
 					"provider-config/vscode-language-model-api",
diff --git a/docs/features/auto-compact.mdx b/docs/features/auto-compact.mdx
new file mode 100644
index 0000000000..38100a3a8a
--- /dev/null
+++ b/docs/features/auto-compact.mdx
@@ -0,0 +1,55 @@
+---
+title: "Automatic Context Summarization"
+sidebarTitle: "Auto Compact"
+---
+
+When your conversation approaches the model's context window limit, Cline automatically summarizes it to free up space and keep working. 
+
+## How It Works
+
+Cline monitors token usage during your conversation. When you're getting close to the limit, he:
+
+1. Creates a comprehensive summary of everything that's happened
+2. Preserves all the technical details, code changes, and decisions
+3. Replaces the conversation history with the summary
+4. Continues exactly where he left off
+
+You'll see a summarization tool call when this happens, showing the total cost like any other api call in the chat view.
+
+## Why This Matters
+
+Previously, Cline would truncate older messages when hitting context limits. This meant losing important context from earlier in the conversation.
+
+Now with summarization:
+- All technical decisions and code patterns are preserved
+- File changes and project context remain intact
+- Cline remembers everything he's done
+- You can work on much larger projects without interruption
+
+<Tip>
+Context Summarization synergizes beautifully with [Focus Chain](/features/focus-chain). When Focus Chain is enabled, todo lists persist across summarizations. This means Cline can work on long-horizon tasks that span multiple context windows while staying on track with the todo list guiding him through each reset.
+</Tip>
+
+## Technical Details
+
+The summarization happens through your configured API provider using the same model you're already using. It leverages prompt caching to minimize costs.
+
+1. Cline uses a [summarization prompt](https://github.com/cline/cline/blob/main/src/core/prompts/contextManagement.ts) to request a summary of the conversation.
+
+2. Once the summary is generated, Cline replaces the conversation history with a [continuation prompt](https://github.com/cline/cline/blob/main/src/core/prompts/contextManagement.ts#L69) that asks Cline to keep working and provides the summary as context.
+
+Different models have different context window thresholds for when auto-summarization kicks in. You can see how thresholds are determined in [context-window-utils.ts](https://github.com/cline/cline/blob/main/src/core/context/context-management/context-window-utils.ts). 
+
+## Cost Considerations
+
+Summarization leverages your existing prompt cache from the conversation, so it costs about the same as any other tool call.
+
+Since most input tokens are already cached, you're primarily paying for the summary generation (output tokens), making it very cost-effective.
+
+## Restoring Context with Checkpoints
+
+You can use [checkpoints](/features/checkpoints) to restore your task state from before a summarization occurred. This means you never truly lose context - you can always roll back to previous versions of your conversation. 
+
+<Note>
+  Editing a message before a summarization tool call will work similarly to a checkpoint, allowing you to restore the conversation to that point.
+</Note>
\ No newline at end of file
diff --git a/docs/features/drag-and-drop.mdx b/docs/features/drag-and-drop.mdx
index 97803fb70c..d85bab6fad 100644
--- a/docs/features/drag-and-drop.mdx
+++ b/docs/features/drag-and-drop.mdx
@@ -11,4 +11,4 @@ Dragging and dropping workspace files into Cline will automatically create a [fi
 
 ### Supported File Types
 
-Cline supports dragging external images from your file system, as well as files from your workspace.
+Cline supports dragging external images, pdfs, csv, excel, and other text files from your file system, as well as files from your workspace.
diff --git a/docs/getting-started/understanding-context-management.mdx b/docs/getting-started/understanding-context-management.mdx
index 860a6fda4c..93ef09884d 100644
--- a/docs/getting-started/understanding-context-management.mdx
+++ b/docs/getting-started/understanding-context-management.mdx
@@ -55,7 +55,8 @@ Think of context like a whiteboard you and Cline share:
     -   Each model has a fixed size:
         -   Claude 3.5 Sonnet: 200,000 tokens
         -   DeepSeek: 64,000 tokens
-    -   When the whiteboard is full, you need to erase (clear context) to write more
+    -   When the whiteboard is full, Cline automatically summarizes the conversation to free up space
+        -   [Learn about Automatic Context Summarization](/features/automatic-context-summarization)
         -   [How Cline manages context under the hood](https://cline.bot/blog/understanding-the-new-context-window-progress-bar-in-cline)
 
 ⚠️ **Important**: Having a large context window (like Claude's 200k tokens) doesn't mean you should fill it completely. Just like a cluttered whiteboard, too much information can make it harder to focus on what's important.
@@ -85,7 +86,28 @@ Cline provides a visual way to monitor your context window usage through a progr
 -   Before starting complex tasks
 -   When Cline seems to lose context
 
-💡 **Tip**: Consider starting a fresh session when usage reaches 70-80% to maintain optimal performance.
+💡 **Tip**: With [Automatic Context Summarization](/features/automatic-context-summarization), Cline can now handle long conversations automatically. When combined with [Focus Chain](/features/focus-chain), you can work on complex projects that span multiple context windows without losing progress.
+
+## Automatic Context Management
+
+Cline now includes intelligent features to manage context automatically:
+
+### Automatic Context Summarization
+
+When your conversation approaches the context window limit, Cline automatically:
+- Creates a comprehensive summary of the conversation
+- Preserves all essential technical details and decisions
+- Seamlessly continues work without interruption
+- Maintains full task continuity
+
+This means you can work on larger projects without manually managing context. [Learn more about Automatic Context Summarization](/features/automatic-context-summarization).
+
+### Focus Chain Integration
+
+When combined with [Focus Chain](/features/focus-chain), Cline can:
+- Maintain todo lists across context resets
+- Track progress through multiple summarizations
+- Keep working on long-horizon tasks without losing direction
 
 ## Working with Context Files
 
diff --git a/docs/provider-config/aws-bedrock-with-apikey-authentication.mdx b/docs/provider-config/aws-bedrock/api-key.mdx
similarity index 91%
rename from docs/provider-config/aws-bedrock-with-apikey-authentication.mdx
rename to docs/provider-config/aws-bedrock/api-key.mdx
index f2aa68282a..a9dcbff5ee 100644
--- a/docs/provider-config/aws-bedrock-with-apikey-authentication.mdx
+++ b/docs/provider-config/aws-bedrock/api-key.mdx
@@ -1,6 +1,7 @@
 ---
-title: "AWS Bedrock"
-description: "Learn how to set up AWS Bedrock with Cline using credentials authentication. This guide covers AWS environment setup, regional access verification, and secure integration with the Cline VS Code extension."
+title: "API Key (Simple Setup)"
+sidebarTitle: "API Key"
+description: "Set up AWS Bedrock with Cline using Bedrock API Keys. Simplest setup for individual developers to access frontier models."
 ---
 
 ### Overview
@@ -121,14 +122,14 @@ You can create a custom IAM policy with these permissions and attach it to your
 
 ### Conclusion
 
-By following these steps, your enterprise team can securely integrate AWS Bedrock with the Cline VS Code extension to accelerate development:
+By following these steps, you can quickly integrate AWS Bedrock with the Cline VS Code extension to accelerate development:
 
-1. **Prepare Your AWS Environment:** Create or use a secure IAM role/user, attach the `AmazonBedrockLimitedAccess` policy, and ensure necessary permissions.
+1. **Prepare Your AWS Environment:** Create a Bedrock API Key with the necessary permissions.
 2. **Verify Region and Model Access:** Confirm that your selected region supports your required models.
-3. **Configure Cline in VS Code:** Install and set up Cline with your AWS credentials and choose an appropriate model.
+3. **Configure Cline in VS Code:** Install and set up Cline with your AWS API Key and choose an appropriate model.
 4. **Implement Security and Monitoring:** Use best practices for IAM, network security, monitoring, and cost management.
 
-For further details, consult the [AWS Bedrock Documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-bedrock.html) and coordinate with your internal cloud team. Happy coding!
+For further details, consult the [AWS Bedrock Documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-bedrock.html). Happy coding!
 
 ---
 
diff --git a/docs/provider-config/aws-bedrock-with-profile-authentication.mdx b/docs/provider-config/aws-bedrock/cli-profile.mdx
similarity index 91%
rename from docs/provider-config/aws-bedrock-with-profile-authentication.mdx
rename to docs/provider-config/aws-bedrock/cli-profile.mdx
index 3722f67417..313b926475 100644
--- a/docs/provider-config/aws-bedrock-with-profile-authentication.mdx
+++ b/docs/provider-config/aws-bedrock/cli-profile.mdx
@@ -1,6 +1,7 @@
 ---
-title: "AWS Bedrock w/ Profile Authentication"
-description: "Learn how to configure AWS Bedrock to use AWS Profiles for authentication with Cline, focusing on SSO/Federated roles for secure access."
+title: "CLI Profile (SSO)"
+sidebarTitle: "CLI Profile (SSO)"
+description: "Configure AWS Bedrock to use AWS CLI profiles for authentication with Cline. Best for SSO/federated roles and secure enterprise access."
 ---
 
 ### Overview
diff --git a/docs/provider-config/aws-bedrock-with-credentials-authentication.mdx b/docs/provider-config/aws-bedrock/iam-credentials.mdx
similarity index 97%
rename from docs/provider-config/aws-bedrock-with-credentials-authentication.mdx
rename to docs/provider-config/aws-bedrock/iam-credentials.mdx
index 84a5c59606..558ec4cfe6 100644
--- a/docs/provider-config/aws-bedrock-with-credentials-authentication.mdx
+++ b/docs/provider-config/aws-bedrock/iam-credentials.mdx
@@ -1,6 +1,7 @@
 ---
-title: "AWS Bedrock"
-description: "Learn how to set up AWS Bedrock with Cline using credentials authentication. This guide covers AWS environment setup, regional access verification, and secure integration with the Cline VS Code extension."
+title: "IAM Credentials"
+sidebarTitle: "IAM Credentials"
+description: "Set up AWS Bedrock with Cline using IAM Access Key and Secret Key credentials. Best for enterprise environments with established IAM policies."
 ---
 
 ### Overview