diff --git a/vscode-extension/extension.js b/vscode-extension/extension.js
index 7df0284..16eada4 100644
--- a/vscode-extension/extension.js
+++ b/vscode-extension/extension.js
@@ -762,7 +762,9 @@ class ClaudeCodeViewProvider {
async _runPrompt(message, contextFilePaths, fileRefs) {
this._isCancelled = false;
- let fullPrompt = message;
+ const shellHint = detectPreferredTerminalShell();
+ const basePrompt = `[Execution shell: ${shellHint.type} (${shellHint.syntax}). Generate shell commands that match this shell syntax.]\n\n${message}`;
+ let fullPrompt = basePrompt;
// Inject context file contents
const allPaths = new Set(contextFilePaths || []);
@@ -796,7 +798,7 @@ class ClaudeCodeViewProvider {
}
}
if (fileContents.length > 0) {
- fullPrompt = message + '\n\n[Context files:]' + fileContents.join('');
+ fullPrompt = basePrompt + '\n\n[Context files:]' + fileContents.join('');
}
}
@@ -1189,32 +1191,105 @@ function deactivate() {
const MAX_TERMINAL_BYTES = 512 * 1024; // 512 KB
-/**
- * Minimal PowerShell POSIX shims — same as bash.mjs but used here for the
- * integrated terminal panel in the extension webview.
- */
-const TERMINAL_PS_SHIMS = [
- 'function which { param([string]$cmd) $r = Get-Command $cmd -ErrorAction SilentlyContinue; if ($r) { $r.Source } else { Write-Error "which: $cmd not found" } }',
- 'function grep { param([string]$pattern, [Parameter(ValueFromRemainingArguments)][string[]]$paths) if ($paths) { Select-String -Pattern $pattern -Path $paths | ForEach-Object { "$($_.Path):$($_.LineNumber):$($_.Line)" } } else { $input | Select-String -Pattern $pattern | ForEach-Object { $_.Line } } }',
- 'function cat { param([Parameter(ValueFromRemainingArguments)][string[]]$paths) Get-Content $paths }',
- 'function touch { param([string]$path) if (Test-Path $path) { (Get-Item $path).LastWriteTime = Get-Date } else { New-Item -ItemType File -Path $path -Force | Out-Null } }',
- 'function wc { param([string]$flag) $lines = @($input); if ($flag -eq "-l") { $lines.Count } elseif ($flag -eq "-c") { ($lines -join "`n").Length } else { $lines.Count } }',
- 'function head { param([string]$flag="", [string]$file="") $n=10; if ($flag -match "^-(\\d+)$") { $n=[int]$Matches[1]; $file="" } elseif ($flag -eq "-n") { $n=[int]$file; $file="" } elseif ($flag -ne "") { $file=$flag }; if ($file) { Get-Content $file | Select-Object -First $n } else { $input | Select-Object -First $n } }',
- 'function tail { param([string]$flag="", [string]$file="") $n=10; if ($flag -match "^-(\\d+)$") { $n=[int]$Matches[1]; $file="" } elseif ($flag -eq "-n") { $n=[int]$file; $file="" } elseif ($flag -ne "") { $file=$flag }; if ($file) { Get-Content $file | Select-Object -Last $n } else { $input | Select-Object -Last $n } }',
- 'function find { param([string]$basePath=".", [string]$nameFlag="", [string]$namePattern="*") if ($nameFlag -ne "-name") { $namePattern=$nameFlag }; Get-ChildItem -Path $basePath -Recurse -Filter $namePattern -Force | ForEach-Object { $_.FullName } }',
- 'function pwd { (Get-Location).Path }',
-].join('; ');
+const TERMINAL_POWERSHELL_SHIMS_MODULE = `# freecode-shims.psm1 — FreeCode PowerShell POSIX compatibility shims
+function which { param([string]$cmd) $r = Get-Command $cmd -EA SilentlyContinue; if ($r) { $r.Source } else { Write-Error "which: $cmd: not found"; exit 1 } }
+function grep { param([string]$pat, [Parameter(ValueFromRemainingArguments)][string[]]$f) if ($f) { Select-String -Pattern $pat -Path $f | ForEach-Object { "$($_.Path):$($_.LineNumber):$($_.Line)" } } else { $input | Select-String -Pattern $pat | ForEach-Object { $_.Line } } }
+function cat { param([Parameter(ValueFromRemainingArguments)][string[]]$paths) if ($paths) { Get-Content $paths } else { $input } }
+function touch { param([string]$p) if (Test-Path $p) { (Get-Item $p).LastWriteTime = Get-Date } else { New-Item -ItemType File -Path $p -Force | Out-Null } }
+function wc { param([string]$flag="-l") $lines = @($input); switch ($flag) { "-l" { $lines.Count } "-c" { ($lines -join "\`n").Length } "-w" { ($lines -join " ").Split() | Where-Object { $_ } | Measure-Object | Select-Object -Expand Count } default { $lines.Count } } }
+function head { param([int]$n=10, [string]$file="") if ($file) { Get-Content $file -TotalCount $n } else { $input | Select-Object -First $n } }
+function tail { param([int]$n=10, [string]$file="") if ($file) { Get-Content $file -Tail $n } else { $input | Select-Object -Last $n } }
+function find { param([string]$path=".", [string]$name="*") Get-ChildItem -Path $path -Recurse -Filter $name -ErrorAction SilentlyContinue | Select-Object -Expand FullName }
+function pwd { (Get-Location).Path }
+function ls { param([Parameter(ValueFromRemainingArguments)][string[]]$a) Get-ChildItem @a }
+function mkdir { param([Parameter(ValueFromRemainingArguments)][string[]]$a) New-Item -ItemType Directory @a -Force }
+function rm { param([switch]$r, [switch]$f, [Parameter(ValueFromRemainingArguments)][string[]]$paths) Remove-Item $paths -Recurse:$r -Force:$f -ErrorAction SilentlyContinue }
+function cp { param([string]$src, [string]$dst) Copy-Item -Path $src -Destination $dst -Recurse -Force }
+function mv { param([string]$src, [string]$dst) Move-Item -Path $src -Destination $dst -Force }
+function echo { param([Parameter(ValueFromRemainingArguments)][string[]]$a) Write-Output ($a -join " ") }
+function sed { param([string]$expr, [string]$file="") if ($expr -match "^s/(.+)/(.+)/") { $pat=$Matches[1]; $rep=$Matches[2]; if ($file) { (Get-Content $file) -replace $pat,$rep | Set-Content $file } else { $input | ForEach-Object { $_ -replace $pat,$rep } } } }
+function awk { param([string]$prog, [Parameter(ValueFromRemainingArguments)][string[]]$files) Write-Warning "awk: limited PowerShell shim — consider installing gawk via winget" }
+Export-ModuleMember -Function *
+`;
+
+let _preferredTerminalShell = null;
+let _preferredTerminalShellName = null;
+
+function isPowerShellAvailable() {
+ const { spawnSync } = require('child_process');
+ try {
+ const r = spawnSync('powershell.exe', ['-NoProfile', '-Command', 'exit 0'], {
+ encoding: 'utf-8', timeout: 2000, windowsHide: true,
+ });
+ return r.status === 0;
+ } catch {
+ return false;
+ }
+}
+
+function resolveShellByName(name) {
+ const map = {
+ powershell: { type: 'powershell', exe: 'powershell.exe', args: ['-NoProfile', '-NonInteractive', '-Command'], syntax: 'powershell' },
+ wsl: { type: 'wsl', exe: 'wsl.exe', args: ['bash', '-c'], syntax: 'bash' },
+ ubuntu: { type: 'ubuntu', exe: 'wsl.exe', args: ['-d', 'Ubuntu', '--', 'bash', '-c'], syntax: 'bash' },
+ bash: { type: 'bash', exe: 'bash', args: ['-c'], syntax: 'bash' },
+ cmd: { type: 'cmd', exe: 'cmd.exe', args: ['/c'], syntax: 'cmd' },
+ };
+ return map[name] || map.powershell;
+}
+
+function detectPreferredTerminalShell() {
+ const config = vscode.workspace.getConfiguration('openClaudeCode');
+ const pref = config.get('defaultShell', 'auto');
+
+ if (_preferredTerminalShell && _preferredTerminalShellName === pref) {
+ return _preferredTerminalShell;
+ }
+
+ if (pref !== 'auto') {
+ _preferredTerminalShellName = pref;
+ _preferredTerminalShell = resolveShellByName(pref);
+ return _preferredTerminalShell;
+ }
+
+ if (process.platform !== 'win32') {
+ _preferredTerminalShellName = 'bash';
+ _preferredTerminalShell = resolveShellByName('bash');
+ return _preferredTerminalShell;
+ }
+
+ _preferredTerminalShellName = 'auto';
+ _preferredTerminalShell = isPowerShellAvailable()
+ ? resolveShellByName('powershell')
+ : resolveShellByName('cmd');
+ return _preferredTerminalShell;
+}
+
+function ensurePowerShellShimsModule() {
+ const fs = require('fs');
+ const baseDir = extensionContext?.globalStorageUri?.fsPath || __dirname;
+ try { fs.mkdirSync(baseDir, { recursive: true }); } catch { /* ignore */ }
+ const shimPath = path.join(baseDir, 'freecode-shims.psm1');
+ if (!fs.existsSync(shimPath)) {
+ fs.writeFileSync(shimPath, TERMINAL_POWERSHELL_SHIMS_MODULE, 'utf8');
+ }
+ return shimPath;
+}
+
+function quotePowerShellPath(p) {
+ return String(p || '').replace(/'/g, "''");
+}
/**
* Execute `command` in the workspace shell and stream output to the webview.
- * On Windows: tries WSL first, then falls back to PowerShell with POSIX shims.
- * On Unix: uses bash.
+ * Uses openClaudeCode.defaultShell when explicitly set.
+ * In auto mode: PowerShell is preferred on Windows; bash on Unix.
* @param {string} command
* @param {string|null} reqId
* @param {Function} send — webview.postMessage wrapper
*/
function runTerminalCommand(command, reqId, send) {
- const { spawn, spawnSync } = require('child_process');
+ const { spawn } = require('child_process');
const os = require('os');
const cwd = (() => {
@@ -1225,27 +1300,16 @@ function runTerminalCommand(command, reqId, send) {
}
})();
- let shellExe, shellArgs;
+ const shell = detectPreferredTerminalShell();
+ let shellExe = shell.exe;
+ let shellArgs = [...shell.args, command];
- if (process.platform === 'win32') {
- // Try WSL first for a proper POSIX bash environment
- let wslOk = false;
- try {
- const r = spawnSync('wsl.exe', ['--status'], { encoding: 'utf-8', timeout: 3000, windowsHide: true });
- wslOk = r.status === 0;
- } catch { /* ignore */ }
-
- if (wslOk) {
- shellExe = 'wsl.exe';
- shellArgs = ['bash', '-c', command];
- } else {
- // PowerShell with POSIX shims prepended
- shellExe = 'powershell.exe';
- shellArgs = ['-NoProfile', '-NonInteractive', '-Command', `${TERMINAL_PS_SHIMS}; ${command}`];
- }
- } else {
- shellExe = 'bash';
- shellArgs = ['-c', command];
+ if (shell.type === 'powershell') {
+ const modulePath = ensurePowerShellShimsModule();
+ shellArgs = [...shell.args, `Import-Module '${quotePowerShellPath(modulePath)}' -Force; ${command}`];
+ } else if (shell.type === 'cmd') {
+ shellExe = 'cmd.exe';
+ shellArgs = ['/c', command];
}
const proc = spawn(shellExe, shellArgs, {
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
index c3274dc..ac22b70 100644
--- a/vscode-extension/package.json
+++ b/vscode-extension/package.json
@@ -167,6 +167,27 @@
],
"description": "Permission mode for file and shell operations"
},
+ "openClaudeCode.defaultShell": {
+ "type": "string",
+ "enum": [
+ "auto",
+ "powershell",
+ "wsl",
+ "ubuntu",
+ "bash",
+ "cmd"
+ ],
+ "enumDescriptions": [
+ "Auto-detect best available shell (PowerShell preferred on Windows)",
+ "Windows PowerShell (default on Windows)",
+ "WSL — Windows Subsystem for Linux (generic)",
+ "WSL Ubuntu distro specifically",
+ "Bash (macOS/Linux default)",
+ "Windows Command Prompt (cmd.exe)"
+ ],
+ "default": "auto",
+ "description": "Default shell used by the AI agent for running commands. PowerShell is the default on Windows."
+ },
"openClaudeCode.maxTurns": {
"type": "number",
"default": 20,
From c6d3e88065ee87f77ddb1aecd05f2f8d0d2ce0fe Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 20 Apr 2026 11:29:46 +0000
Subject: [PATCH 3/9] chore: address validation feedback and finalize shell
updates
Agent-Logs-Url: https://github.com/codomium/FreeCode/sessions/8072f19d-aa04-4bb8-ac06-e402de917903
Co-authored-by: codomium <255525663+codomium@users.noreply.github.com>
---
electron-app/main.js | 2 +-
electron-app/renderer/chat.js | 4 ++--
vscode-extension/extension.js | 41 +----------------------------------
3 files changed, 4 insertions(+), 43 deletions(-)
diff --git a/electron-app/main.js b/electron-app/main.js
index 946c008..61dd71d 100644
--- a/electron-app/main.js
+++ b/electron-app/main.js
@@ -1333,7 +1333,7 @@ ipcMain.on('renderer-message', async (event, msg) => {
let _preferredShell = null;
const POWERSHELL_SHIMS_MODULE = `# freecode-shims.psm1 — FreeCode PowerShell POSIX compatibility shims
-function which { param([string]$cmd) $r = Get-Command $cmd -EA SilentlyContinue; if ($r) { $r.Source } else { Write-Error "which: $cmd: not found"; exit 1 } }
+function which { param([string]$cmd) $r = Get-Command $cmd -ErrorAction SilentlyContinue; if ($r) { $r.Source } else { Write-Error "which: $cmd: not found"; exit 1 } }
function grep { param([string]$pat, [Parameter(ValueFromRemainingArguments)][string[]]$f) if ($f) { Select-String -Pattern $pat -Path $f | ForEach-Object { "$($_.Path):$($_.LineNumber):$($_.Line)" } } else { $input | Select-String -Pattern $pat | ForEach-Object { $_.Line } } }
function cat { param([Parameter(ValueFromRemainingArguments)][string[]]$paths) if ($paths) { Get-Content $paths } else { $input } }
function touch { param([string]$p) if (Test-Path $p) { (Get-Item $p).LastWriteTime = Get-Date } else { New-Item -ItemType File -Path $p -Force | Out-Null } }
diff --git a/electron-app/renderer/chat.js b/electron-app/renderer/chat.js
index 5a9a6ee..533ab0b 100644
--- a/electron-app/renderer/chat.js
+++ b/electron-app/renderer/chat.js
@@ -3368,8 +3368,8 @@
}
function formatShellAvailability(shells) {
- const icon = (ok) => (ok ? '✅' : '❌');
- return `PowerShell ${icon(!!shells.powershell)} WSL ${icon(!!shells.wsl)} Ubuntu ${icon(!!shells.ubuntu)} Bash ${icon(!!shells.bash)} cmd ${icon(!!shells.cmd)}`;
+ const status = (ok) => (ok ? 'available' : 'unavailable');
+ return `PowerShell: ${status(!!shells.powershell)} · WSL: ${status(!!shells.wsl)} · Ubuntu: ${status(!!shells.ubuntu)} · Bash: ${status(!!shells.bash)} · cmd: ${status(!!shells.cmd)}`;
}
function openSettingsPanel() {
diff --git a/vscode-extension/extension.js b/vscode-extension/extension.js
index 16eada4..a9f472d 100644
--- a/vscode-extension/extension.js
+++ b/vscode-extension/extension.js
@@ -1191,27 +1191,6 @@ function deactivate() {
const MAX_TERMINAL_BYTES = 512 * 1024; // 512 KB
-const TERMINAL_POWERSHELL_SHIMS_MODULE = `# freecode-shims.psm1 — FreeCode PowerShell POSIX compatibility shims
-function which { param([string]$cmd) $r = Get-Command $cmd -EA SilentlyContinue; if ($r) { $r.Source } else { Write-Error "which: $cmd: not found"; exit 1 } }
-function grep { param([string]$pat, [Parameter(ValueFromRemainingArguments)][string[]]$f) if ($f) { Select-String -Pattern $pat -Path $f | ForEach-Object { "$($_.Path):$($_.LineNumber):$($_.Line)" } } else { $input | Select-String -Pattern $pat | ForEach-Object { $_.Line } } }
-function cat { param([Parameter(ValueFromRemainingArguments)][string[]]$paths) if ($paths) { Get-Content $paths } else { $input } }
-function touch { param([string]$p) if (Test-Path $p) { (Get-Item $p).LastWriteTime = Get-Date } else { New-Item -ItemType File -Path $p -Force | Out-Null } }
-function wc { param([string]$flag="-l") $lines = @($input); switch ($flag) { "-l" { $lines.Count } "-c" { ($lines -join "\`n").Length } "-w" { ($lines -join " ").Split() | Where-Object { $_ } | Measure-Object | Select-Object -Expand Count } default { $lines.Count } } }
-function head { param([int]$n=10, [string]$file="") if ($file) { Get-Content $file -TotalCount $n } else { $input | Select-Object -First $n } }
-function tail { param([int]$n=10, [string]$file="") if ($file) { Get-Content $file -Tail $n } else { $input | Select-Object -Last $n } }
-function find { param([string]$path=".", [string]$name="*") Get-ChildItem -Path $path -Recurse -Filter $name -ErrorAction SilentlyContinue | Select-Object -Expand FullName }
-function pwd { (Get-Location).Path }
-function ls { param([Parameter(ValueFromRemainingArguments)][string[]]$a) Get-ChildItem @a }
-function mkdir { param([Parameter(ValueFromRemainingArguments)][string[]]$a) New-Item -ItemType Directory @a -Force }
-function rm { param([switch]$r, [switch]$f, [Parameter(ValueFromRemainingArguments)][string[]]$paths) Remove-Item $paths -Recurse:$r -Force:$f -ErrorAction SilentlyContinue }
-function cp { param([string]$src, [string]$dst) Copy-Item -Path $src -Destination $dst -Recurse -Force }
-function mv { param([string]$src, [string]$dst) Move-Item -Path $src -Destination $dst -Force }
-function echo { param([Parameter(ValueFromRemainingArguments)][string[]]$a) Write-Output ($a -join " ") }
-function sed { param([string]$expr, [string]$file="") if ($expr -match "^s/(.+)/(.+)/") { $pat=$Matches[1]; $rep=$Matches[2]; if ($file) { (Get-Content $file) -replace $pat,$rep | Set-Content $file } else { $input | ForEach-Object { $_ -replace $pat,$rep } } } }
-function awk { param([string]$prog, [Parameter(ValueFromRemainingArguments)][string[]]$files) Write-Warning "awk: limited PowerShell shim — consider installing gawk via winget" }
-Export-ModuleMember -Function *
-`;
-
let _preferredTerminalShell = null;
let _preferredTerminalShellName = null;
@@ -1265,21 +1244,6 @@ function detectPreferredTerminalShell() {
return _preferredTerminalShell;
}
-function ensurePowerShellShimsModule() {
- const fs = require('fs');
- const baseDir = extensionContext?.globalStorageUri?.fsPath || __dirname;
- try { fs.mkdirSync(baseDir, { recursive: true }); } catch { /* ignore */ }
- const shimPath = path.join(baseDir, 'freecode-shims.psm1');
- if (!fs.existsSync(shimPath)) {
- fs.writeFileSync(shimPath, TERMINAL_POWERSHELL_SHIMS_MODULE, 'utf8');
- }
- return shimPath;
-}
-
-function quotePowerShellPath(p) {
- return String(p || '').replace(/'/g, "''");
-}
-
/**
* Execute `command` in the workspace shell and stream output to the webview.
* Uses openClaudeCode.defaultShell when explicitly set.
@@ -1304,10 +1268,7 @@ function runTerminalCommand(command, reqId, send) {
let shellExe = shell.exe;
let shellArgs = [...shell.args, command];
- if (shell.type === 'powershell') {
- const modulePath = ensurePowerShellShimsModule();
- shellArgs = [...shell.args, `Import-Module '${quotePowerShellPath(modulePath)}' -Force; ${command}`];
- } else if (shell.type === 'cmd') {
+ if (shell.type === 'cmd') {
shellExe = 'cmd.exe';
shellArgs = ['/c', command];
}
From bedb4bf38ca6f976f79d827661f11a5885d24cfd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 20 Apr 2026 13:19:46 +0000
Subject: [PATCH 4/9] feat: implement prompt history, @folder/@url/@symbols,
diff auto-show, MCP marketplace
Agent-Logs-Url: https://github.com/codomium/FreeCode/sessions/8aa8656d-2df8-4564-80f3-4db5a1ffed9f
Co-authored-by: codomium <255525663+codomium@users.noreply.github.com>
---
electron-app/main.js | 166 ++++++++++++
electron-app/renderer/chat.css | 86 +++++++
electron-app/renderer/chat.js | 423 +++++++++++++++++++++++++++++--
electron-app/renderer/index.html | 21 +-
4 files changed, 675 insertions(+), 21 deletions(-)
diff --git a/electron-app/main.js b/electron-app/main.js
index 61dd71d..144773b 100644
--- a/electron-app/main.js
+++ b/electron-app/main.js
@@ -101,6 +101,7 @@ const DEFAULT_SETTINGS = {
workspacePath: os.homedir(),
defaultShell: 'auto', // 'auto' | 'powershell' | 'wsl' | 'ubuntu' | 'bash' | 'cmd'
customProviders: [], // [{ id, name, baseUrl, apiKey, models:[{id,name}], headers:[{name,value}] }]
+ mcpServers: {}, // { serverId: { command, args } }
};
function getSettings() {
@@ -224,9 +225,33 @@ class InProcessAgentBridge {
const model = this._model || appSettings.model || 'claude-sonnet-4-6';
+ // Connect MCP servers saved in app settings
+ const mcpClients = [];
+ const appMcpServers = appSettings.mcpServers || {};
+ // Merge with any in ~/.claude/settings.json (already loaded in `settings`)
+ const allMcpServers = Object.assign({}, settings.mcpServers || {}, appMcpServers);
+ if (Object.keys(allMcpServers).length > 0) {
+ const { McpClient } = await import(v2url('mcp/client.mjs'));
+ for (const [name, config] of Object.entries(allMcpServers)) {
+ try {
+ const client = new McpClient(config);
+ await client.connect();
+ const mcpTools = await client.listTools();
+ tools.registerMcpTools(mcpTools, (toolName, toolArgs) => client.callTool(toolName, toolArgs));
+ mcpClients.push(client);
+ } catch (err) {
+ console.warn(`MCP server "${name}" failed to connect: ${err.message}`);
+ }
+ }
+ }
+
+ const mcpResourceTool = tools.get('ReadMcpResource');
+ if (mcpResourceTool) mcpResourceTool._mcpClients = mcpClients;
+
this._loop = createAgentLoop({ model, tools, permissions, settings, hooks });
this._loop.state._agentLoader = agentLoader;
this._loop.state._skillsLoader = skillsLoader;
+ this._loop.state._mcpClients = mcpClients;
this._loop.state._hooks = settings.hooks;
this._loop.state._permissionMode = permMode;
@@ -675,6 +700,7 @@ ipcMain.on('renderer-message', async (event, msg) => {
showToolOutput: s.showToolOutput !== false,
hasNvidiaKey: !!(s.nvidiaApiKey || process.env.NVIDIA_API_KEY),
customProviders: Array.isArray(s.customProviders) ? s.customProviders : [],
+ mcpServers: (s.mcpServers && typeof s.mcpServers === 'object') ? s.mcpServers : {},
});
// Report which shell the integrated terminal will use
@@ -870,6 +896,123 @@ ipcMain.on('renderer-message', async (event, msg) => {
break;
}
+ // ── Folder tree for @folder context chip ─────────────────────────────
+ case 'getFolderTree': {
+ const rootDir = getSettings().workspacePath || os.homedir();
+ const SKIP_DIRS = new Set(['node_modules','.git','dist','.next','__pycache__','.cache','.idea','.vscode','build','out','.DS_Store']);
+ function buildTextTree(dir, prefix, depth) {
+ if (depth > 4) return '';
+ let entries;
+ try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch { return ''; }
+ entries.sort((a, b) => {
+ if (a.isDirectory() !== b.isDirectory()) return a.isDirectory() ? -1 : 1;
+ return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' });
+ });
+ let out = '';
+ for (let i = 0; i < entries.length; i++) {
+ const e = entries[i];
+ if (e.isDirectory() && SKIP_DIRS.has(e.name)) continue;
+ const isLast = i === entries.length - 1;
+ const connector = isLast ? '└── ' : '├── ';
+ const childPrefix = prefix + (isLast ? ' ' : '│ ');
+ out += prefix + connector + e.name + (e.isDirectory() ? '/' : '') + '\n';
+ if (e.isDirectory()) {
+ out += buildTextTree(path.join(dir, e.name), childPrefix, depth + 1);
+ }
+ }
+ return out;
+ }
+ const tree = path.basename(rootDir) + '/\n' + buildTextTree(rootDir, '', 0);
+ send({ type: 'folderTree', content: tree });
+ break;
+ }
+
+ // ── Fetch URL for @url context chip ───────────────────────────────────
+ case 'fetchUrl': {
+ const targetUrl = String(msg.url || '');
+ if (!targetUrl || !/^https?:\/\//.test(targetUrl)) {
+ send({ type: 'urlContent', url: targetUrl, content: '(invalid URL)', error: 'Invalid URL' });
+ break;
+ }
+ try {
+ const content = await new Promise((resolve, reject) => {
+ const httpMod = targetUrl.startsWith('https://') ? require('https') : require('http');
+ const reqOpts = new URL(targetUrl);
+ const req = httpMod.get({ hostname: reqOpts.hostname, path: reqOpts.pathname + (reqOpts.search || ''),
+ port: reqOpts.port, headers: { 'User-Agent': 'FreeCode/1.0 (context-fetch)', 'Accept': 'text/html,text/plain' } },
+ (res) => {
+ if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+ resolve(`(redirect to ${res.headers.location} — please use the final URL directly)`);
+ return;
+ }
+ const chunks = [];
+ res.on('data', (c) => chunks.push(c));
+ res.on('end', () => {
+ let text = Buffer.concat(chunks).toString('utf8');
+ // Strip HTML tags for readability
+ text = text.replace(/
/gi, '')
+ .replace(//gi, '')
+ .replace(/<[^>]+>/g, ' ')
+ .replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
+ .replace(/"/g, '"').replace(/'/g, "'")
+ .replace(/\s{3,}/g, '\n\n')
+ .trim();
+ // Limit to ~20KB
+ if (text.length > 20000) text = text.slice(0, 20000) + '\n…(truncated)';
+ resolve(text);
+ });
+ }
+ );
+ req.setTimeout(10000, () => { req.destroy(); reject(new Error('Timeout')); });
+ req.on('error', reject);
+ });
+ send({ type: 'urlContent', url: targetUrl, content });
+ } catch (err) {
+ send({ type: 'urlContent', url: targetUrl, content: `(failed to fetch: ${err.message})`, error: err.message });
+ }
+ break;
+ }
+
+ // ── Grep workspace for function/class symbols ─────────────────────────
+ case 'getSymbols': {
+ const wsPath = getSettings().workspacePath || os.homedir();
+ const SYMBOL_EXTS = new Set(['.js','.ts','.jsx','.tsx','.mjs','.cjs','.py','.go','.rs','.java','.cpp','.c','.cs','.rb','.php','.swift','.kt']);
+ const SKIP_DIRS2 = new Set(['node_modules','.git','dist','.next','__pycache__','.cache','build','out']);
+ const results = [];
+ function scanDir(dir, depth) {
+ if (depth > 6 || results.length > 500) return;
+ let entries;
+ try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch { return; }
+ for (const e of entries) {
+ if (e.isDirectory()) {
+ if (!SKIP_DIRS2.has(e.name)) scanDir(path.join(dir, e.name), depth + 1);
+ } else {
+ const ext = path.extname(e.name).toLowerCase();
+ if (!SYMBOL_EXTS.has(ext)) continue;
+ try {
+ const relPath = path.relative(wsPath, path.join(dir, e.name));
+ const content = fs.readFileSync(path.join(dir, e.name), 'utf8');
+ const lines = content.split('\n');
+ for (let i = 0; i < lines.length && results.length < 500; i++) {
+ const line = lines[i];
+ // Match common function/class/method declarations
+ if (/^\s*(export\s+)?(default\s+)?(async\s+)?function\s+\w|^\s*(export\s+)?(abstract\s+)?class\s+\w|^\s*def\s+\w|^\s*func\s+\w|^\s*(pub\s+)?(async\s+)?fn\s+\w/
+ .test(line)) {
+ results.push(`${relPath}:${i + 1}: ${line.trim()}`);
+ }
+ }
+ } catch { /* skip */ }
+ }
+ }
+ }
+ scanDir(wsPath, 0);
+ const content = results.length > 0
+ ? results.join('\n')
+ : '(no function/class symbols found in workspace)';
+ send({ type: 'symbolsContext', content });
+ break;
+ }
+
// ── Workspace diagnostics (not available in standalone app) ──────────
case 'getWorkspaceDiagnostics': {
send({ type: 'workspaceDiagnostics', diagnostics: [] });
@@ -1179,6 +1322,29 @@ ipcMain.on('renderer-message', async (event, msg) => {
break;
}
+ // ── Save MCP servers config ────────────────────────────────────────────
+ case 'saveMcpServers': {
+ const mcpServers = (msg.mcpServers && typeof msg.mcpServers === 'object') ? msg.mcpServers : {};
+ // Write to ~/.claude/settings.json so the v2 agent-loop picks it up
+ try {
+ const claudeDir = path.join(require('os').homedir(), '.claude');
+ const settingsFile = path.join(claudeDir, 'settings.json');
+ fs.mkdirSync(claudeDir, { recursive: true });
+ let claudeSettings = {};
+ try { claudeSettings = JSON.parse(fs.readFileSync(settingsFile, 'utf8')); } catch { /* new file */ }
+ claudeSettings.mcpServers = mcpServers;
+ fs.writeFileSync(settingsFile, JSON.stringify(claudeSettings, null, 2), 'utf8');
+ } catch (err) {
+ console.warn('saveMcpServers: could not write ~/.claude/settings.json:', err.message);
+ }
+ // Also save in app settings for persistence across restarts
+ saveSetting('mcpServers', mcpServers);
+ // Reinit bridge so new servers are connected on the next turn
+ if (agentBridge) { captureAgentMessages(); agentBridge.reinit(); agentBridge = null; }
+ send({ type: 'mcpServersSaved', mcpServers });
+ break;
+ }
+
// ── Open settings / userData folder in system explorer ────────────────
case 'openSettingsFolder': {
shell.openPath(getUserData());
diff --git a/electron-app/renderer/chat.css b/electron-app/renderer/chat.css
index 38fb701..5e174b2 100644
--- a/electron-app/renderer/chat.css
+++ b/electron-app/renderer/chat.css
@@ -1583,6 +1583,27 @@ select:focus { border-color: var(--accent); }
color: var(--error-text);
}
+/* Folder tree chip */
+.context-chip.chip-folder {
+ background: rgba(80,180,80,0.1);
+ border-color: rgba(80,180,80,0.3);
+ color: #5ab55a;
+}
+
+/* URL chip */
+.context-chip.chip-url {
+ background: rgba(0,140,220,0.1);
+ border-color: rgba(0,140,220,0.3);
+ color: #3ab0e8;
+}
+
+/* Symbols chip */
+.context-chip.chip-symbols {
+ background: rgba(160,80,220,0.1);
+ border-color: rgba(160,80,220,0.3);
+ color: #b56ee8;
+}
+
/* Active state for context inject buttons (auto-attach on) */
.input-btn.active {
color: var(--accent);
@@ -3410,3 +3431,68 @@ select:focus { border-color: var(--accent); }
margin-top: 10px;
background: var(--bg-elevated);
}
+
+/* ── MCP Marketplace ──────────────────────────────────────────── */
+#mcp-list {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ margin-bottom: 8px;
+}
+
+.mcp-entry {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ background: var(--bg-elevated);
+ border: 1px solid var(--border);
+ border-radius: 8px;
+ padding: 10px 12px;
+ font-size: 12px;
+ transition: border-color 0.15s;
+}
+.mcp-entry:hover { border-color: var(--accent); }
+.mcp-entry.mcp-entry-enabled {
+ border-color: rgba(80,200,120,0.5);
+ background: rgba(80,200,120,0.05);
+}
+
+.mcp-entry-left {
+ display: flex;
+ align-items: flex-start;
+ gap: 10px;
+ flex: 1;
+ min-width: 0;
+}
+
+.mcp-entry-icon {
+ font-size: 22px;
+ flex-shrink: 0;
+ line-height: 1;
+ margin-top: 2px;
+}
+
+.mcp-entry-info {
+ flex: 1;
+ min-width: 0;
+}
+
+.mcp-entry-name {
+ font-weight: 600;
+ color: var(--text);
+ font-size: 13px;
+ margin-bottom: 2px;
+}
+
+.mcp-entry-desc {
+ color: var(--text-dim);
+ font-size: 11px;
+ line-height: 1.4;
+}
+
+.mcp-entry-hint {
+ font-size: 10px;
+ color: var(--accent);
+ margin-top: 3px;
+ font-family: var(--font-code);
+}
diff --git a/electron-app/renderer/chat.js b/electron-app/renderer/chat.js
index 533ab0b..67c32ba 100644
--- a/electron-app/renderer/chat.js
+++ b/electron-app/renderer/chat.js
@@ -52,7 +52,36 @@
let pendingApply = null; // { code, language }
let activeToolCards = {}; // toolName -> dom element
let sessionMessages = []; // tracked messages for history saving
- let lastUserMessage = ''; // for ↑ recall and regenerate
+ let lastUserMessage = ''; // for regenerate
+
+ // ── Prompt history (Ctrl+Up / Ctrl+Down cycling) ─────────────────────────
+ const PROMPT_HISTORY_MAX = 50;
+ let promptHistory = []; // newest first
+ let promptHistoryIdx = -1; // -1 = not cycling; 0..N = current position
+ let promptHistoryDraft = ''; // text saved before cycling began
+
+ (function loadPromptHistory() {
+ try {
+ const raw = localStorage.getItem('freecode_prompt_history');
+ if (raw) promptHistory = JSON.parse(raw).slice(0, PROMPT_HISTORY_MAX);
+ } catch { /* ignore */ }
+ }());
+
+ function savePromptHistory() {
+ try {
+ localStorage.setItem('freecode_prompt_history', JSON.stringify(promptHistory.slice(0, PROMPT_HISTORY_MAX)));
+ } catch { /* ignore */ }
+ }
+
+ function pushPromptHistory(text) {
+ if (!text || !text.trim()) return;
+ // Deduplicate: remove existing copy so it moves to front
+ promptHistory = promptHistory.filter(h => h !== text);
+ promptHistory.unshift(text);
+ if (promptHistory.length > PROMPT_HISTORY_MAX) promptHistory.length = PROMPT_HISTORY_MAX;
+ savePromptHistory();
+ promptHistoryIdx = -1;
+ }
let autoScroll = true; // auto-scroll while streaming
let pinnedFiles = []; // files pinned across sessions
let currentSessionId = null; // null for new sessions; history entry ID when continuing a saved session
@@ -1545,6 +1574,65 @@
vscode.postMessage({ type: 'getOpenEditors' });
}
+ // ── @folder — inject workspace directory tree as context chip ────────────
+ function requestFolderContext() {
+ vscode.postMessage({ type: 'getFolderTree' });
+ }
+ function addFolderContext(tree) {
+ if (contextFiles.find(f => f.isFolder)) {
+ contextFiles = contextFiles.filter(f => !f.isFolder);
+ }
+ contextFiles.push({
+ name: '📁 folder tree',
+ path: '__folder__',
+ isFolder: true,
+ content: tree,
+ isGit: false,
+ isErrors: false,
+ });
+ renderContextFiles();
+ }
+
+ // ── @url — fetch URL and inject content as context chip ───────────────────
+ function requestUrlContext(url) {
+ vscode.postMessage({ type: 'fetchUrl', url });
+ }
+ function addUrlContext(url, content) {
+ const shortName = url.replace(/^https?:\/\//, '').slice(0, 40) + (url.length > 43 ? '…' : '');
+ if (contextFiles.find(f => f.urlSource === url)) {
+ contextFiles = contextFiles.filter(f => f.urlSource !== url);
+ }
+ contextFiles.push({
+ name: `🌐 ${shortName}`,
+ path: `__url__:${url}`,
+ urlSource: url,
+ isUrl: true,
+ isGit: false,
+ isErrors: false,
+ content,
+ });
+ renderContextFiles();
+ }
+
+ // ── @symbols — grep workspace for function/class names ───────────────────
+ function requestSymbolsContext() {
+ vscode.postMessage({ type: 'getSymbols' });
+ }
+ function addSymbolsContext(symbols) {
+ if (contextFiles.find(f => f.isSymbols)) {
+ contextFiles = contextFiles.filter(f => !f.isSymbols);
+ }
+ contextFiles.push({
+ name: '🔍 symbols',
+ path: '__symbols__',
+ isSymbols: true,
+ isGit: false,
+ isErrors: false,
+ content: symbols,
+ });
+ renderContextFiles();
+ }
+
// ── Image paste chip ──────────────────────────────────────────────────────
function addImageContext(name, dataUrl) {
if (!contextFilesEl) return;
@@ -1947,6 +2035,18 @@
renderAutocomplete(msg.files || []);
break;
+ case 'folderTree':
+ addFolderContext(msg.content || '');
+ break;
+
+ case 'urlContent':
+ addUrlContext(msg.url || '', msg.content || '');
+ break;
+
+ case 'symbolsContext':
+ addSymbolsContext(msg.content || '');
+ break;
+
case 'autoAttachState':
autoAttachActive = !!msg.enabled;
if (autoAttachBtn) autoAttachBtn.classList.toggle('active', autoAttachActive);
@@ -2235,14 +2335,18 @@
for (const f of contextFiles) {
const chip = document.createElement('div');
chip.className = 'context-chip'
- + (f.pinned ? ' pinned' : '')
- + (f.isGit ? ' chip-git' : '')
- + (f.isErrors ? ' chip-errors' : '');
+ + (f.pinned ? ' pinned' : '')
+ + (f.isGit ? ' chip-git' : '')
+ + (f.isErrors ? ' chip-errors' : '')
+ + (f.isFolder ? ' chip-folder' : '')
+ + (f.isUrl ? ' chip-url' : '')
+ + (f.isSymbols ? ' chip-symbols' : '');
if (f.title) chip.title = f.title;
const nameSpan = document.createElement('span');
// Special chips carry their icon in the name; files get an icon prefix
- const icon = f.isImage ? '🖼 ' : (f.isCodebase || f.isGit || f.isErrors) ? '' : (f.pinned ? '📌 ' : '📄 ');
+ const isSpecial = f.isImage || f.isCodebase || f.isGit || f.isErrors || f.isFolder || f.isUrl || f.isSymbols;
+ const icon = f.isImage ? '🖼 ' : isSpecial ? '' : (f.pinned ? '📌 ' : '📄 ');
nameSpan.textContent = icon + f.name;
if (f.isImage && f.dataUrl) {
@@ -2255,7 +2359,7 @@
chip.appendChild(img);
}
- if (!f.isCodebase && !f.isImage && !f.isGit && !f.isErrors) {
+ if (!f.isCodebase && !f.isImage && !f.isGit && !f.isErrors && !f.isFolder && !f.isUrl && !f.isSymbols) {
const pinBtn = document.createElement('button');
pinBtn.className = 'pin-btn';
pinBtn.title = f.pinned ? 'Unpin file' : 'Pin to all sessions';
@@ -2339,6 +2443,37 @@
return;
}
+ // @folder — inject workspace directory tree as context chip
+ if (/@folder\b/.test(val)) {
+ inputEl.value = val.replace(/@folder\b/g, '').trim();
+ inputEl.style.height = 'auto';
+ inputEl.style.height = Math.min(inputEl.scrollHeight, 160) + 'px';
+ requestFolderContext();
+ hideAutocomplete();
+ return;
+ }
+
+ // @url: or @url — fetch URL and inject as context
+ const urlMention = val.match(/@url[:\s]+(https?:\/\/\S+)/);
+ if (urlMention) {
+ inputEl.value = val.replace(/@url[:\s]+https?:\/\/\S+/g, '').trim();
+ inputEl.style.height = 'auto';
+ inputEl.style.height = Math.min(inputEl.scrollHeight, 160) + 'px';
+ requestUrlContext(urlMention[1]);
+ hideAutocomplete();
+ return;
+ }
+
+ // @symbols — grep workspace for function/class symbols
+ if (/@symbols\b/.test(val)) {
+ inputEl.value = val.replace(/@symbols\b/g, '').trim();
+ inputEl.style.height = 'auto';
+ inputEl.style.height = Math.min(inputEl.scrollHeight, 160) + 'px';
+ requestSymbolsContext();
+ hideAutocomplete();
+ return;
+ }
+
// Slash command autocomplete (when first char is /)
const slashMatch = val.match(/^(\/[\w]*)$/);
if (slashMatch) {
@@ -2373,15 +2508,41 @@
}
if (e.key === 'Escape') { hideAutocomplete(); return; }
}
- // Up arrow in empty input → recall last message
- if (e.key === 'ArrowUp' && !inputEl.value && !autocompleteEl.classList.contains('visible')) {
- if (lastUserMessage) {
- e.preventDefault();
- inputEl.value = lastUserMessage;
- inputEl.style.height = 'auto';
- inputEl.style.height = Math.min(inputEl.scrollHeight, 160) + 'px';
- inputEl.setSelectionRange(inputEl.value.length, inputEl.value.length);
+ // Ctrl+Up / Ctrl+Down — cycle through prompt history
+ if ((e.ctrlKey || e.metaKey) && (e.key === 'ArrowUp' || e.key === 'ArrowDown') && !autocompleteEl.classList.contains('visible')) {
+ e.preventDefault();
+ if (promptHistory.length === 0) return;
+ if (e.key === 'ArrowUp') {
+ if (promptHistoryIdx === -1) promptHistoryDraft = inputEl.value;
+ promptHistoryIdx = Math.min(promptHistoryIdx + 1, promptHistory.length - 1);
+ } else {
+ promptHistoryIdx = promptHistoryIdx - 1;
}
+ const text = promptHistoryIdx < 0 ? promptHistoryDraft : (promptHistory[promptHistoryIdx] || '');
+ inputEl.value = text;
+ inputEl.style.height = 'auto';
+ inputEl.style.height = Math.min(inputEl.scrollHeight, 160) + 'px';
+ inputEl.setSelectionRange(inputEl.value.length, inputEl.value.length);
+ return;
+ }
+ // Any other key resets history cycling so the draft is correct next time
+ if (!e.ctrlKey && !e.metaKey && e.key !== 'Shift' && e.key !== 'Alt' &&
+ e.key !== 'ArrowLeft' && e.key !== 'ArrowRight') {
+ if (promptHistoryIdx !== -1) {
+ promptHistoryDraft = '';
+ promptHistoryIdx = -1;
+ }
+ }
+ // Up arrow in empty input → quick recall last message (keep legacy behavior)
+ if (e.key === 'ArrowUp' && !inputEl.value && !autocompleteEl.classList.contains('visible') &&
+ !e.ctrlKey && !e.metaKey && promptHistory.length > 0) {
+ e.preventDefault();
+ promptHistoryDraft = '';
+ promptHistoryIdx = 0;
+ inputEl.value = promptHistory[0] || '';
+ inputEl.style.height = 'auto';
+ inputEl.style.height = Math.min(inputEl.scrollHeight, 160) + 'px';
+ inputEl.setSelectionRange(inputEl.value.length, inputEl.value.length);
return;
}
// Escape cancels loading
@@ -2515,6 +2676,10 @@
const rawText = inputEl.value.trim();
if (!rawText || isLoading) return;
+ // Save to prompt history
+ pushPromptHistory(rawText);
+ promptHistoryIdx = -1;
+
// ── /team slash command: transform into a structured multi-agent prompt ──
// Syntax: first line = "/team [build|review|fullstack|debug]"
// remaining lines = the actual task description
@@ -2583,7 +2748,8 @@
setLoading(true, `${cfg.label}: Thinking…`);
const sendContextFiles = contextFiles
- .filter(f => !f.isImage && !f.isCodebase && !f.isGit && !f.isErrors)
+ .filter(f => !f.isImage && !f.isCodebase && !f.isGit && !f.isErrors &&
+ !f.isFolder && !f.isUrl && !f.isSymbols)
.map(f => f.path);
vscode.postMessage({
@@ -2610,11 +2776,14 @@
setSending(true);
setLoading(true, 'Thinking…');
- // Append inline content from special context chips (@git, @errors)
+ // Append inline content from special context chips (@git, @errors, @folder, @url, @symbols)
const specialParts = [];
for (const f of contextFiles) {
- if (f.isGit && f.content) specialParts.push('\n\n[Git Context]\n' + f.content);
- if (f.isErrors && f.content) specialParts.push('\n\n[Workspace Problems]\n' + f.content);
+ if (f.isGit && f.content) specialParts.push('\n\n[Git Context]\n' + f.content);
+ if (f.isErrors && f.content) specialParts.push('\n\n[Workspace Problems]\n' + f.content);
+ if (f.isFolder && f.content) specialParts.push('\n\n[Project Directory Tree]\n' + f.content);
+ if (f.isUrl && f.content) specialParts.push(`\n\n[Web Page: ${f.urlSource || ''}]\n` + f.content);
+ if (f.isSymbols && f.content) specialParts.push('\n\n[Workspace Symbols]\n' + f.content);
}
// Inject active plan context so the agent always remembers the to-do list
const planCtx = buildPlanContext();
@@ -2622,7 +2791,8 @@
// Separate file paths from image/codebase/special context entries
const sendContextFiles = contextFiles
- .filter(f => !f.isImage && !f.isCodebase && !f.isGit && !f.isErrors)
+ .filter(f => !f.isImage && !f.isCodebase && !f.isGit && !f.isErrors &&
+ !f.isFolder && !f.isUrl && !f.isSymbols)
.map(f => f.path);
const hasCodebase = contextFiles.some(f => f.isCodebase);
@@ -2644,6 +2814,36 @@
let acSelectedIdx = -1;
function showFileAutocomplete(query) {
+ // Show @ special mention suggestions first if query matches a keyword prefix
+ const AT_SPECIALS = [
+ { key: 'codebase', desc: 'Inject full codebase into context', icon: '📦' },
+ { key: 'folder', desc: 'Inject workspace directory tree', icon: '📁' },
+ { key: 'git', desc: 'Inject git status & diff summary', icon: '⎇' },
+ { key: 'errors', desc: 'Inject workspace errors/warnings', icon: '⚠' },
+ { key: 'symbols', desc: 'Inject function/class symbols list',icon: '🔍' },
+ { key: 'url', desc: 'Fetch a URL and inject its content (@url:https://…)', icon: '🌐' },
+ ];
+ const lq = query.toLowerCase();
+ const matched = AT_SPECIALS.filter(s => s.key.startsWith(lq));
+ if (matched.length > 0 && !query.includes('/') && !query.includes('\\') && !query.includes('.')) {
+ acItems = matched.map(s => ({ isAtSpecial: true, ...s }));
+ acSelectedIdx = 0;
+ autocompleteEl.innerHTML = '';
+ for (let i = 0; i < matched.length; i++) {
+ const s = matched[i];
+ const item = document.createElement('div');
+ item.className = 'ac-item' + (i === 0 ? ' selected' : '');
+ item.innerHTML = `
+ ${s.icon}
+ @${escapeHtml(s.key)}
+ ${escapeHtml(s.desc)}
+ `;
+ item.addEventListener('click', () => { acSelectedIdx = i; selectAcItem(); });
+ autocompleteEl.appendChild(item);
+ }
+ autocompleteEl.classList.add('visible');
+ return;
+ }
vscode.postMessage({ type: 'fileSearch', query });
}
@@ -2714,7 +2914,7 @@
case '/help':
addSystemMessage(
'Keyboard shortcuts: Enter=send · Shift+Enter=newline · @=add file · ' +
- '@codebase=full codebase · /=commands · ↑=recall last message · ' +
+ '@codebase=full codebase · /=commands · ↑=recall last · Ctrl+↑/↓=history · ' +
'Ctrl+L=focus input · Ctrl+F=search · Ctrl+K=inline edit · Ctrl+`=terminal · Esc=stop\n\n' +
'Template commands: /explain · /fix · /refactor · /test · /review · /docs · /commit · /optimize\n\n' +
'Multi-agent: /team build · /team review · /team fullstack · /team debug\n' +
@@ -2774,6 +2974,21 @@
return;
}
+ // @ special mention selection — inject the mention text which the input handler will process
+ if (item.isAtSpecial) {
+ const val = inputEl.value;
+ const cursorPos = inputEl.selectionStart;
+ const before = val.slice(0, cursorPos);
+ // Replace partial @query with the full @keyword
+ const replaced = before.replace(/@[\w./\\-]*$/, '@' + item.key + ' ');
+ inputEl.value = replaced + val.slice(cursorPos);
+ inputEl.setSelectionRange(replaced.length, replaced.length);
+ hideAutocomplete();
+ // Trigger the input event so the @ handler fires
+ inputEl.dispatchEvent(new Event('input'));
+ return;
+ }
+
// File selection — replace @query in input
const file = item;
const val = inputEl.value;
@@ -3365,6 +3580,169 @@
renderCustomProviders();
injectCustomProviderModels();
}
+ // MCP servers
+ if (msg.mcpServers) {
+ mcpEnabledServers = msg.mcpServers || {};
+ renderMcpMarketplace();
+ }
+ }
+
+ // ── MCP Server Marketplace ────────────────────────────────────────────────
+
+ /**
+ * Popular MCP servers registry.
+ * Each entry: { id, name, description, icon, command, args, installHint }
+ * - command/args: how the server is launched (passed to mcpServers config)
+ * - installHint: how to install if not present
+ */
+ const MCP_MARKETPLACE = [
+ {
+ id: 'filesystem',
+ name: 'Filesystem',
+ description: 'Read & write files outside the workspace; directory listings.',
+ icon: '📁',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-filesystem', '{workspace}'],
+ installHint: 'npx -y @modelcontextprotocol/server-filesystem',
+ },
+ {
+ id: 'github',
+ name: 'GitHub',
+ description: 'Search repos, read files, manage issues and pull requests via the GitHub API.',
+ icon: '🐙',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-github'],
+ installHint: 'Requires GITHUB_PERSONAL_ACCESS_TOKEN env var.',
+ },
+ {
+ id: 'brave-search',
+ name: 'Brave Search',
+ description: 'Web and local search powered by the Brave Search API.',
+ icon: '🦁',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-brave-search'],
+ installHint: 'Requires BRAVE_API_KEY env var.',
+ },
+ {
+ id: 'memory',
+ name: 'Memory',
+ description: 'Persistent key-value memory so the agent remembers facts across sessions.',
+ icon: '🧠',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-memory'],
+ installHint: 'npx -y @modelcontextprotocol/server-memory',
+ },
+ {
+ id: 'postgres',
+ name: 'PostgreSQL',
+ description: 'Connect to a Postgres database — run queries, inspect schema.',
+ icon: '🐘',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-postgres', 'postgresql://localhost/mydb'],
+ installHint: 'Edit connection string after enabling.',
+ },
+ {
+ id: 'sqlite',
+ name: 'SQLite',
+ description: 'Query and explore a local SQLite database file.',
+ icon: '🗄',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-sqlite', '--db-path', '{workspace}/data.db'],
+ installHint: 'Edit --db-path after enabling.',
+ },
+ {
+ id: 'puppeteer',
+ name: 'Puppeteer',
+ description: 'Control a headless Chrome browser — screenshot, click, scrape pages.',
+ icon: '🤖',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-puppeteer'],
+ installHint: 'npx -y @modelcontextprotocol/server-puppeteer',
+ },
+ {
+ id: 'slack',
+ name: 'Slack',
+ description: 'Read channels, post messages, and search Slack workspaces.',
+ icon: '💬',
+ command: 'npx',
+ args: ['-y', '@modelcontextprotocol/server-slack'],
+ installHint: 'Requires SLACK_BOT_TOKEN and SLACK_TEAM_ID env vars.',
+ },
+ ];
+
+ /** Currently enabled servers: { serverId: {command, args} } — mirrors mcpServers in settings.json */
+ let mcpEnabledServers = {};
+
+ const mcpListEl = document.getElementById('mcp-list');
+
+ function renderMcpMarketplace() {
+ if (!mcpListEl) return;
+ mcpListEl.innerHTML = '';
+ for (const srv of MCP_MARKETPLACE) {
+ const enabled = !!mcpEnabledServers[srv.id];
+ const row = document.createElement('div');
+ row.className = 'mcp-entry' + (enabled ? ' mcp-entry-enabled' : '');
+
+ const left = document.createElement('div');
+ left.className = 'mcp-entry-left';
+
+ const iconEl = document.createElement('span');
+ iconEl.className = 'mcp-entry-icon';
+ iconEl.textContent = srv.icon;
+
+ const info = document.createElement('div');
+ info.className = 'mcp-entry-info';
+ const nameEl = document.createElement('div');
+ nameEl.className = 'mcp-entry-name';
+ nameEl.textContent = srv.name;
+ const descEl = document.createElement('div');
+ descEl.className = 'mcp-entry-desc';
+ descEl.textContent = srv.description;
+ if (srv.installHint) {
+ const hint = document.createElement('div');
+ hint.className = 'mcp-entry-hint';
+ hint.textContent = srv.installHint;
+ info.appendChild(nameEl);
+ info.appendChild(descEl);
+ info.appendChild(hint);
+ } else {
+ info.appendChild(nameEl);
+ info.appendChild(descEl);
+ }
+
+ left.appendChild(iconEl);
+ left.appendChild(info);
+
+ const toggleLabel = document.createElement('label');
+ toggleLabel.className = 'toggle-switch';
+ const toggleInput = document.createElement('input');
+ toggleInput.type = 'checkbox';
+ toggleInput.checked = enabled;
+ toggleInput.addEventListener('change', () => {
+ if (toggleInput.checked) {
+ // Substitute {workspace} placeholder with actual workspace path
+ const ws = currentWorkspacePath || '';
+ const args = srv.args.map(a => a.replace('{workspace}', ws));
+ mcpEnabledServers[srv.id] = { command: srv.command, args };
+ } else {
+ delete mcpEnabledServers[srv.id];
+ }
+ row.classList.toggle('mcp-entry-enabled', toggleInput.checked);
+ saveMcpServers();
+ });
+ const toggleSlider = document.createElement('span');
+ toggleSlider.className = 'toggle-slider';
+ toggleLabel.appendChild(toggleInput);
+ toggleLabel.appendChild(toggleSlider);
+
+ row.appendChild(left);
+ row.appendChild(toggleLabel);
+ mcpListEl.appendChild(row);
+ }
+ }
+
+ function saveMcpServers() {
+ vscode.postMessage({ type: 'saveMcpServers', mcpServers: mcpEnabledServers });
}
function formatShellAvailability(shells) {
@@ -4092,6 +4470,11 @@
}
renderTabBar();
activateTab(filePath);
+
+ // Auto-show the editor panel so diffs are immediately visible
+ if (panelEditorEl && panelEditorEl.classList.contains('panel-collapsed')) {
+ panelEditorEl.classList.remove('panel-collapsed');
+ }
}
/** Make a tab active and render its content. */
diff --git a/electron-app/renderer/index.html b/electron-app/renderer/index.html
index 4c9c92e..cb686f7 100644
--- a/electron-app/renderer/index.html
+++ b/electron-app/renderer/index.html
@@ -252,6 +252,10 @@ FreeCode
Enter send message
Shift+Enter newline
@file add file to context
+ @folder inject directory tree
+ @url:https://… fetch page
+ @symbols workspace symbols
+ Ctrl+↑/↓ history cycling
📄 pick file from workspace