Merge branch 'main' into feat/terminal-command-generation

Author: Alorse

.gitignore

@@ -45,3 +45,6 @@ logs
 .qodo/
 .vercel
 .roo/mcp.json
+
+# Ignore copilot instructions file
+.github/copilot-instructions.md

.husky/pre-commit

@@ -1,9 +1,10 @@
 branch="$(git rev-parse --abbrev-ref HEAD)"
 
-if [ "$branch" = "main" ]; then
-  echo "You can't commit directly to main - please check out a branch."
-  exit 1
-fi
+# Disabled for personal fork - allow commits to main
+# if [ "$branch" = "main" ]; then
+#   echo "You can't commit directly to main - please check out a branch."
+#   exit 1
+# fi
 
 # Detect if running on Windows and use pnpm.cmd, otherwise use pnpm.
 if [ "$OS" = "Windows_NT" ]; then

.husky/pre-push

@@ -1,9 +1,10 @@
 branch="$(git rev-parse --abbrev-ref HEAD)"
 
-if [ "$branch" = "main" ]; then
-  echo "You can't push directly to main - please check out a branch."
-  exit 1
-fi
+# Comentamos la restricción de push a main para nuestro fork personal
+# if [ "$branch" = "main" ]; then
+#   echo "You can't push directly to main - please check out a branch."
+#   exit 1
+# fi
 
 # Detect if running on Windows and use pnpm.cmd, otherwise use pnpm.
 if [ "$OS" = "Windows_NT" ]; then

CHANGELOG.md

@@ -1,3 +1,5 @@
+**Modified Version Notice:** This installation has been modified by Alorse. For details, please check the [CHANGELOG.md](CHANGELOG.md)
+
 <div align="center">
 <sub>
 

README.md

@@ -78,12 +78,15 @@ export class XAIHandler extends BaseProvider implements SingleCompletionHandler
 			if (chunk.usage) {
 				// Extract detailed token information if available
 				// First check for prompt_tokens_details structure (real API response)
-				const promptDetails = "prompt_tokens_details" in chunk.usage ? chunk.usage.prompt_tokens_details : null;
-				const cachedTokens = promptDetails && "cached_tokens" in promptDetails ? promptDetails.cached_tokens : 0;
+				const promptDetails = "prompt_tokens_details" in chunk.usage ? chunk.usage.prompt_tokens_details : null
+				const cachedTokens = promptDetails && "cached_tokens" in promptDetails ? promptDetails.cached_tokens : 0
 
 				// Fall back to direct fields in usage (used in test mocks)
-				const readTokens = cachedTokens || ("cache_read_input_tokens" in chunk.usage ? (chunk.usage as any).cache_read_input_tokens : 0);
-				const writeTokens = "cache_creation_input_tokens" in chunk.usage ? (chunk.usage as any).cache_creation_input_tokens : 0;
+				const readTokens =
+					cachedTokens ||
+					("cache_read_input_tokens" in chunk.usage ? (chunk.usage as any).cache_read_input_tokens : 0)
+				const writeTokens =
+					"cache_creation_input_tokens" in chunk.usage ? (chunk.usage as any).cache_creation_input_tokens : 0
 
 				yield {
 					type: "usage",

src/api/providers/xai.ts

@@ -1364,6 +1364,29 @@ export const webviewMessageHandler = async (
 				}
 			}
 			break
+		case "getApiConfigurationById":
+			if (message.text) {
+				try {
+					const { name: _, ...providerSettings } = await provider.providerSettingsManager.getProfile({
+						id: message.text,
+					})
+					provider.postMessageToWebview({
+						type: "apiConfigurationById",
+						apiConfigById: providerSettings,
+						values: { configId: message.text },
+					})
+				} catch (error) {
+					provider.log(
+						`Error get api configuration by ID: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
+					)
+					provider.postMessageToWebview({
+						type: "apiConfigurationById",
+						apiConfigById: undefined,
+						values: { configId: message.text, error: error.message },
+					})
+				}
+			}
+			break
 		case "deleteApiConfiguration":
 			if (message.text) {
 				const answer = await vscode.window.showInformationMessage(

src/core/webview/webviewMessageHandler.ts

@@ -62,6 +62,7 @@ export interface ExtensionMessage {
 		| "enhancedPrompt"
 		| "commitSearchResults"
 		| "listApiConfig"
+		| "apiConfigurationById"
 		| "routerModels"
 		| "openAiModels"
 		| "ollamaModels"
@@ -136,6 +137,7 @@ export interface ExtensionMessage {
 	mcpServers?: McpServer[]
 	commits?: GitCommit[]
 	listApiConfig?: ProviderSettingsEntry[]
+	apiConfigById?: ProviderSettings
 	mode?: Mode
 	customMode?: ModeConfig
 	slug?: string

src/shared/ExtensionMessage.ts

@@ -27,6 +27,7 @@ export interface WebviewMessage {
 		| "deleteApiConfiguration"
 		| "loadApiConfiguration"
 		| "loadApiConfigurationById"
+		| "getApiConfigurationById"
 		| "renameApiConfiguration"
 		| "getListApiConfiguration"
 		| "customInstructions"

src/shared/WebviewMessage.ts

@@ -63,7 +63,7 @@ const ChatRow = memo(
 		const prevHeightRef = useRef(0)
 
 		const [chatrow, { height }] = useSize(
-			<div className="px-[15px] py-[10px] pr-[6px]">
+			<div className="px-[15px] py-[10px]">
 				<ChatRowContent {...props} />
 			</div>,
 		)
@@ -138,7 +138,7 @@ export const ChatRowContent = ({
 
 	const normalColor = "var(--vscode-foreground)"
 	const errorColor = "var(--vscode-errorForeground)"
-	const successColor = "var(--vscode-charts-green)"
+	const successColor = "var(--vscode-button-background)"
 	const cancelledColor = "var(--vscode-descriptionForeground)"
 
 	const [icon, title] = useMemo(() => {
@@ -263,13 +263,17 @@ export const ChatRowContent = ({
 		gap: "10px",
 		marginBottom: "10px",
 		wordBreak: "break-word",
+		fontSize: "var(--text-lg)",
+		lineHeight: "1.6",
 	}
 
 	const pStyle: React.CSSProperties = {
 		margin: 0,
 		whiteSpace: "pre-wrap",
 		wordBreak: "break-word",
 		overflowWrap: "anywhere",
+		fontSize: "var(--text-lg)",
+		lineHeight: "1.6",
 	}
 
 	const tool = useMemo(
@@ -716,6 +720,7 @@ export const ChatRowContent = ({
 									display: "flex",
 									alignItems: "center",
 									gap: "6px",
+									lineHeight: "1.6",
 								}}>
 								<span className="codicon codicon-arrow-right"></span>
 								{t("chat:subtasks.newTaskContent")}
@@ -753,6 +758,7 @@ export const ChatRowContent = ({
 									display: "flex",
 									alignItems: "center",
 									gap: "6px",
+									lineHeight: "1.6",
 								}}>
 								<span className="codicon codicon-check"></span>
 								{t("chat:subtasks.completionContent")}
@@ -792,6 +798,7 @@ export const ChatRowContent = ({
 										alignItems: "center",
 										justifyContent: "space-between",
 										cursor: "pointer",
+										lineHeight: "1.6",
 									}}
 									onClick={() => setIsDiffErrorExpanded(!isDiffErrorExpanded)}>
 									<div
@@ -883,6 +890,7 @@ export const ChatRowContent = ({
 										display: "flex",
 										alignItems: "center",
 										gap: "6px",
+										lineHeight: "1.6",
 									}}>
 									<span className="codicon codicon-arrow-left"></span>
 									{t("chat:subtasks.resultContent")}
@@ -979,26 +987,43 @@ export const ChatRowContent = ({
 					)
 				case "user_feedback":
 					return (
-						<div className="bg-vscode-editor-background border rounded-xs p-1 overflow-hidden whitespace-pre-wrap">
-							<div className="flex justify-between">
-								<div className="flex-grow px-2 py-1 wrap-anywhere">
-									<Mention text={message.text} withShadow />
+						<div className="w-[90%] flex justify-end mx-auto mr-0">
+							<div
+								className="rounded-lg p-1 overflow-hidden whitespace-pre-wrap w-full"
+								style={{
+									backgroundColor:
+										"color-mix(in srgb, var(--vscode-button-background) 20%, transparent)",
+									border: "1px solid color-mix(in srgb, var(--vscode-button-background) 20%, transparent)",
+								}}>
+								<div className="flex justify-between">
+									<div
+										className="flex-grow px-2 py-1 wrap-anywhere"
+										style={{
+											color: "var(--vscode-list-activeSelectionForeground)",
+											fontSize: "var(--text-lx)",
+											lineHeight: "1.6",
+										}}>
+										<Mention text={message.text} withShadow />
+									</div>
+									<Button
+										variant="ghost"
+										size="icon"
+										className="shrink-0"
+										disabled={isStreaming}
+										onClick={(e) => {
+											e.stopPropagation()
+											vscode.postMessage({ type: "deleteMessage", value: message.ts })
+										}}>
+										<span
+											className="codicon codicon-trash"
+											style={{ color: "var(--vscode-foreground)" }}
+										/>
+									</Button>
 								</div>
-								<Button
-									variant="ghost"
-									size="icon"
-									className="shrink-0"
-									disabled={isStreaming}
-									onClick={(e) => {
-										e.stopPropagation()
-										vscode.postMessage({ type: "deleteMessage", value: message.ts })
-									}}>
-									<span className="codicon codicon-trash" />
-								</Button>
+								{message.images && message.images.length > 0 && (
+									<Thumbnails images={message.images} style={{ marginTop: "8px" }} />
+								)}
 							</div>
-							{message.images && message.images.length > 0 && (
-								<Thumbnails images={message.images} style={{ marginTop: "8px" }} />
-							)}
 						</div>
 					)
 				case "user_feedback_diff":
@@ -1033,7 +1058,18 @@ export const ChatRowContent = ({
 								{icon}
 								{title}
 							</div>
-							<div style={{ color: "var(--vscode-charts-green)", paddingTop: 10 }}>
+							<div
+								style={{
+									backgroundColor:
+										"color-mix(in srgb, var(--vscode-button-background) 10%, transparent)",
+									color: "var(--vscode-list-activeSelectionForeground)",
+									paddingTop: 10,
+									padding: "10px",
+									borderRadius: "6px",
+									border: "1px solid color-mix(in srgb, var(--vscode-button-background) 20%, transparent)",
+									fontSize: "calc(var(--vscode-font-size) * 1.25)",
+									lineHeight: "1.6",
+								}}>
 								<Markdown markdown={message.text} />
 							</div>
 						</>
@@ -1189,7 +1225,7 @@ export const ChatRowContent = ({
 									{icon}
 									{title}
 								</div>
-								<div style={{ color: "var(--vscode-charts-green)", paddingTop: 10 }}>
+								<div style={{ color: "var(--vscode-button-background)", paddingTop: 10 }}>
 									<Markdown markdown={message.text} partial={message.partial} />
 								</div>
 							</div>