refactor: code cleanup, formatting updates, improved workspace handli…

…ng, checkpoints feature Add instructions Fix completion Refactor Rename reset to restore add haschanges flag Remove log Better error handling Better error handling Fix wording Fix Fix Fix Comment Add hash for only latest tool Prepare for release Fix Fix delete Format fix
ttthree · Jan 6, 2025 · 9de7253 · 9de7253
1 parent a7e9d47
commit 9de7253
Show file tree

Hide file tree

Showing 113 changed files with 7,141 additions and 1,684 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,7 +5,11 @@
 	"tasks": [
 		{
 			"label": "watch",
-			"dependsOn": ["npm: build:webview", "npm: watch:tsc", "npm: watch:esbuild"],
+			"dependsOn": [
+				"npm: build:webview",
+				"npm: watch:tsc",
+				"npm: watch:esbuild"
+			],
 			"presentation": {
 				"reveal": "never"
 			},

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [3.1.0]
+
+- Added checkpoints: Snapshots of workspace are automatically created whenever Cline uses a tool
+  - Compare changes: Hover over any tool use to see a diff between the snapshot and current workspace state
+  - Restore options: Choose to restore just the task state, just the workspace files, or both
+- New 'See new changes' button appears after task completion, providing an overview of all workspace changes
+- Task header now shows disk space usage with a delete button to help manage snapshot storage
+
 ## [3.0.12]
 
 - Fix DeepSeek API cost reporting (input price is 0 since it's all either a cache read or write, different than how Anthropic reports cache usage)

diff --git a/README.md b/README.md
@@ -114,6 +114,18 @@ Thanks to the [Model Context Protocol](https://github.com/modelcontextprotocol),
 
 **`@folder`:** Adds folder's files all at once to speed up your workflow even more
 
+<!-- Transparent pixel to create line break after floating image -->
+
+<img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
+
+<img align="right" width="350" src="https://github.com/user-attachments/assets/ac0efa14-5c1f-4c26-a42d-9d7c56f5fadd">
+
+### Checkpoints: Compare and Restore
+
+As Cline works through a task, the extension takes a snapshot of your workspace at each step. You can use the 'Compare' button to see a diff between the snapshot and your current workspace, and the 'Restore' button to roll back to that point.
+
+For example, when working with a local web server, you can use 'Restore Workspace Only' to quickly test different versions of your app, then use 'Restore Task and Workspace' when you find the version you want to continue building from. This lets you safely explore different approaches without losing progress.
+
 ## Contributing
 
 To contribute to the project, start with our [Contributing Guide](CONTRIBUTING.md) to learn the basics. You can also join our [Discord](https://discord.gg/cline) to chat with other contributors in the `#contributors` channel. If you're looking for full-time work, check out our open positions on our [careers page](https://cline.bot/join-us)!

diff --git a/esbuild.js b/esbuild.js
@@ -18,7 +18,9 @@ const esbuildProblemMatcherPlugin = {
 		build.onEnd((result) => {
 			result.errors.forEach(({ text, location }) => {
 				console.error(`✘ [ERROR] ${text}`)
-				console.error(`    ${location.file}:${location.line}:${location.column}:`)
+				console.error(
+					`    ${location.file}:${location.line}:${location.column}:`,
+				)
 			})
 			console.log("[watch] build finished")
 		})
@@ -30,14 +32,26 @@ const copyWasmFiles = {
 	setup(build) {
 		build.onEnd(() => {
 			// tree sitter
-			const sourceDir = path.join(__dirname, "node_modules", "web-tree-sitter")
+			const sourceDir = path.join(
+				__dirname,
+				"node_modules",
+				"web-tree-sitter",
+			)
 			const targetDir = path.join(__dirname, "dist")
 
 			// Copy tree-sitter.wasm
-			fs.copyFileSync(path.join(sourceDir, "tree-sitter.wasm"), path.join(targetDir, "tree-sitter.wasm"))
+			fs.copyFileSync(
+				path.join(sourceDir, "tree-sitter.wasm"),
+				path.join(targetDir, "tree-sitter.wasm"),
+			)
 
 			// Copy language-specific WASM files
-			const languageWasmDir = path.join(__dirname, "node_modules", "tree-sitter-wasms", "out")
+			const languageWasmDir = path.join(
+				__dirname,
+				"node_modules",
+				"tree-sitter-wasms",
+				"out",
+			)
 			const languages = [
 				"typescript",
 				"tsx",
@@ -56,7 +70,10 @@ const copyWasmFiles = {
 
 			languages.forEach((lang) => {
 				const filename = `tree-sitter-${lang}.wasm`
-				fs.copyFileSync(path.join(languageWasmDir, filename), path.join(targetDir, filename))
+				fs.copyFileSync(
+					path.join(languageWasmDir, filename),
+					path.join(targetDir, filename),
+				)
 			})
 		})
 	},

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "claude-dev",
 	"displayName": "Cline (prev. Claude Dev)",
 	"description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
-	"version": "3.0.12",
+	"version": "3.1.0",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",
@@ -171,6 +171,7 @@
 		"@google/generative-ai": "^0.18.0",
 		"@modelcontextprotocol/sdk": "^1.0.1",
 		"@types/clone-deep": "^4.0.4",
+		"@types/get-folder-size": "^3.0.4",
 		"@types/pdf-parse": "^1.1.4",
 		"@types/turndown": "^5.0.5",
 		"@vscode/codicons": "^0.0.36",
@@ -183,6 +184,7 @@
 		"diff": "^5.2.0",
 		"execa": "^9.5.2",
 		"fast-deep-equal": "^3.1.3",
+		"get-folder-size": "^5.0.0",
 		"globby": "^14.0.2",
 		"isbinaryfile": "^5.0.2",
 		"mammoth": "^1.8.0",
@@ -194,6 +196,7 @@
 		"puppeteer-chromium-resolver": "^23.0.0",
 		"puppeteer-core": "^23.4.0",
 		"serialize-error": "^11.0.3",
+		"simple-git": "^3.27.0",
 		"strip-ansi": "^7.1.0",
 		"tree-sitter-wasms": "^0.1.11",
 		"turndown": "^7.2.0",

diff --git a/src/api/index.ts b/src/api/index.ts
@@ -13,7 +13,10 @@ import { ApiStream } from "./transform/stream"
 import { DeepSeekHandler } from "./providers/deepseek"
 
 export interface ApiHandler {
-	createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream
+	createMessage(
+		systemPrompt: string,
+		messages: Anthropic.Messages.MessageParam[],
+	): ApiStream
 	getModel(): { id: string; info: ModelInfo }
 }
 

diff --git a/src/api/providers/anthropic.ts b/src/api/providers/anthropic.ts
@@ -22,7 +22,10 @@ export class AnthropicHandler implements ApiHandler {
 		})
 	}
 
-	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
+	async *createMessage(
+		systemPrompt: string,
+		messages: Anthropic.Messages.MessageParam[],
+	): ApiStream {
 		let stream: AnthropicStream<Anthropic.Beta.PromptCaching.Messages.RawPromptCachingBetaMessageStreamEvent>
 		const modelId = this.getModel().id
 		switch (modelId) {
@@ -35,19 +38,31 @@ export class AnthropicHandler implements ApiHandler {
 				The latest message will be the new user message, one before will be the assistant message from a previous request, and the user message before that will be a previously cached user message. So we need to mark the latest user message as ephemeral to cache it for the next request, and mark the second to last user message as ephemeral to let the server know the last message to retrieve from the cache for the current request..
 				*/
 				const userMsgIndices = messages.reduce(
-					(acc, msg, index) => (msg.role === "user" ? [...acc, index] : acc),
+					(acc, msg, index) =>
+						msg.role === "user" ? [...acc, index] : acc,
 					[] as number[],
 				)
-				const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1
-				const secondLastMsgUserIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1
+				const lastUserMsgIndex =
+					userMsgIndices[userMsgIndices.length - 1] ?? -1
+				const secondLastMsgUserIndex =
+					userMsgIndices[userMsgIndices.length - 2] ?? -1
 				stream = await this.client.beta.promptCaching.messages.create(
 					{
 						model: modelId,
 						max_tokens: this.getModel().info.maxTokens || 8192,
 						temperature: 0,
-						system: [{ text: systemPrompt, type: "text", cache_control: { type: "ephemeral" } }], // setting cache breakpoint for system prompt so new tasks can reuse it
+						system: [
+							{
+								text: systemPrompt,
+								type: "text",
+								cache_control: { type: "ephemeral" },
+							},
+						], // setting cache breakpoint for system prompt so new tasks can reuse it
 						messages: messages.map((message, index) => {
-							if (index === lastUserMsgIndex || index === secondLastMsgUserIndex) {
+							if (
+								index === lastUserMsgIndex ||
+								index === secondLastMsgUserIndex
+							) {
 								return {
 									...message,
 									content:
@@ -56,13 +71,24 @@ export class AnthropicHandler implements ApiHandler {
 													{
 														type: "text",
 														text: message.content,
-														cache_control: { type: "ephemeral" },
+														cache_control: {
+															type: "ephemeral",
+														},
 													},
 												]
-											: message.content.map((content, contentIndex) =>
-													contentIndex === message.content.length - 1
-														? { ...content, cache_control: { type: "ephemeral" } }
-														: content,
+											: message.content.map(
+													(content, contentIndex) =>
+														contentIndex ===
+														message.content.length -
+															1
+															? {
+																	...content,
+																	cache_control:
+																		{
+																			type: "ephemeral",
+																		},
+																}
+															: content,
 												),
 								}
 							}
@@ -83,7 +109,10 @@ export class AnthropicHandler implements ApiHandler {
 							case "claude-3-opus-20240229":
 							case "claude-3-haiku-20240307":
 								return {
-									headers: { "anthropic-beta": "prompt-caching-2024-07-31" },
+									headers: {
+										"anthropic-beta":
+											"prompt-caching-2024-07-31",
+									},
 								}
 							default:
 								return undefined
@@ -116,8 +145,10 @@ export class AnthropicHandler implements ApiHandler {
 						type: "usage",
 						inputTokens: usage.input_tokens || 0,
 						outputTokens: usage.output_tokens || 0,
-						cacheWriteTokens: usage.cache_creation_input_tokens || undefined,
-						cacheReadTokens: usage.cache_read_input_tokens || undefined,
+						cacheWriteTokens:
+							usage.cache_creation_input_tokens || undefined,
+						cacheReadTokens:
+							usage.cache_read_input_tokens || undefined,
 					}
 					break
 				case "message_delta":
@@ -171,6 +202,9 @@ export class AnthropicHandler implements ApiHandler {
 			const id = modelId as AnthropicModelId
 			return { id, info: anthropicModels[id] }
 		}
-		return { id: anthropicDefaultModelId, info: anthropicModels[anthropicDefaultModelId] }
+		return {
+			id: anthropicDefaultModelId,
+			info: anthropicModels[anthropicDefaultModelId],
+		}
 	}
 }