Merge branch 'main' into fix/mcp-hub-test-ordering

Author: HappyLiang12

.changeset/add-editor-auto-close-settings.md

@@ -0,0 +1,5 @@
+---
+"zoo-code": minor
+---
+
+Add settings to control whether editor tabs Zoo opens during diff edits are auto-closed after accept/reject: auto-close transiently-opened files, auto-close even after user interaction (a refinement of the first), and auto-close newly created files.

.changeset/fix-diff-scroll-position.md

@@ -0,0 +1,7 @@
+---
+"zoo-code": patch
+---
+
+Fix diff view scroll position and tab handling when applying edits. The diff now opens scrolled to the first changed line (including end-of-file removals, which are clamped to a valid line in the modified document) instead of forcing the viewport to the top. After accepting or rejecting a diff, files that were already open are restored to their pre-edit scroll position, and files that were not open before the edit have their transiently opened tab closed -- unless the user activated that tab during the diff, in which case it is kept open. Focus is no longer pulled back to the edited file when the user has navigated elsewhere. A file that was open in a preview tab is restored in a preview tab with the original scroll position, even if the target file replaced the preview tab and was automatically closed after the diff was accepted or rejected. A file that was pinned before the edit is re-pinned after the diff closes, so applying a diff no longer drops the tab's pinned state.
+
+When a user clicks or edits inside the diff pane, the target file's tab is kept open after saving -- even if it was not previously open. If the user only scrolls in the diff pane, the existing close behavior is preserved. When the target file is re-revealed after a diff, it scrolls to the position most recently viewed by the user: if the user last scrolled in the diff pane, the target file mirrors that scroll position; if the user last scrolled in the target file's own editor, that position is used instead; otherwise the pre-edit scroll position is restored.

.changeset/fix-multiline-quoted-command-parsing.md

@@ -14,4 +14,4 @@ Quote masking is comment-aware: a quote character inside a `#` comment is not pa
 
 **Pattern selector (UI)**: the command pattern breakdown shown after execution now uses the same heredoc- and quote-aware parser (`parseCommand`) before extracting patterns, so an unterminated or terminated heredoc no longer produces spurious tokens like `EOF`, body-line words, or `<<` fragments in the allow/deny selector.
 
-Note: this change only prevents *auto-approval* of fragments from a malformed command; it does not reject malformed commands before execution, which will be addressed in a separate PR to keep the scope focused here.
+Note: this change only prevents _auto-approval_ of fragments from a malformed command; it does not reject malformed commands before execution, which will be addressed in a separate PR to keep the scope focused here.

README.md

@@ -89,7 +89,7 @@ for this exact support, so if you are having problems or if you have question, j
 - [简体中文](locales/zh-CN/README.md)
 - [繁體中文](locales/zh-TW/README.md)
 - ...
-      </details>
+  </details>
 
 ---
 

package.json

@@ -60,7 +60,7 @@
 			"tar-fs": ">=3.1.1",
 			"esbuild": "0.28.1",
 			"rollup": "4.60.4",
-			"vite": "8.0.14",
+			"vite": "8.0.16",
 			"undici": ">=5.29.0",
 			"form-data": ">=4.0.4",
 			"bluebird": ">=3.7.2",

packages/types/src/global-settings.ts

@@ -180,6 +180,9 @@ export const globalSettingsSchema = z.object({
 	execaShellPath: z.string().optional(),
 
 	diagnosticsEnabled: z.boolean().optional(),
+	autoCloseZooOpenedFiles: z.boolean().optional(),
+	autoCloseZooOpenedFilesAfterUserEdited: z.boolean().optional(),
+	autoCloseZooOpenedNewFiles: z.boolean().optional(),
 
 	rateLimitSeconds: z.number().optional(),
 	experiments: experimentsSchema.optional(),

packages/types/src/vscode-extension-host.ts

@@ -282,6 +282,9 @@ export type ExtensionState = Pick<
 	| "terminalProfile"
 	| "execaShellPath"
 	| "diagnosticsEnabled"
+	| "autoCloseZooOpenedFiles"
+	| "autoCloseZooOpenedFilesAfterUserEdited"
+	| "autoCloseZooOpenedNewFiles"
 	| "language"
 	| "modeApiConfigs"
 	| "customModePrompts"

pnpm-lock.yaml

@@ -181,4 +181,24 @@ describe("UnboundHandler", () => {
 			}),
 		)
 	})
+
+	it("completePrompt returns the response text", async () => {
+		const mockCreate = (OpenAI as unknown as any)().chat.completions.create
+		mockCreate.mockResolvedValue({
+			choices: [{ message: { content: "completed text" } }],
+		})
+
+		const handler = new UnboundHandler({
+			unboundApiKey: "test-key",
+			unboundModelId: "openai/gpt-4o",
+		})
+
+		const result = await handler.completePrompt("Write a haiku")
+		expect(result).toBe("completed text")
+		expect(mockCreate).toHaveBeenCalledWith(
+			expect.objectContaining({
+				messages: [{ role: "system", content: "Write a haiku" }],
+			}),
+		)
+	})
 })

src/api/providers/__tests__/unbound.spec.ts

@@ -71,7 +71,7 @@ export class AnthropicVertexHandler extends BaseProvider implements SingleComple
 		messages: Anthropic.Messages.MessageParam[],
 		metadata?: ApiHandlerCreateMessageMetadata,
 	): ApiStream {
-		let { id, info, temperature, maxTokens, reasoning: thinking, betas } = this.getModel()
+		const { id, info, temperature, maxTokens, reasoning: thinking, betas } = this.getModel()
 
 		const { supportsPromptCache } = info
 
@@ -210,7 +210,7 @@ export class AnthropicVertexHandler extends BaseProvider implements SingleComple
 
 	getModel() {
 		const modelId = this.options.apiModelId
-		let id = modelId && modelId in vertexModels ? (modelId as VertexModelId) : vertexDefaultModelId
+		const id = modelId && modelId in vertexModels ? (modelId as VertexModelId) : vertexDefaultModelId
 		let info: ModelInfo = vertexModels[id]
 
 		// Check if 1M context beta should be enabled for supported models
@@ -270,7 +270,7 @@ export class AnthropicVertexHandler extends BaseProvider implements SingleComple
 
 	async completePrompt(prompt: string) {
 		try {
-			let {
+			const {
 				id,
 				info: { supportsPromptCache },
 				temperature,