Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export default tseslint.config(
menuMemoryCheck: "writable",
menuProvider: "writable",
menuReload: "writable",
menuReloadSkills: "writable",
menuSessions: "writable",
menuSettings: "writable",
menuSkills: "writable",
Expand Down
1 change: 1 addition & 0 deletions media/dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const menuDelegationCheck = document.getElementById("menu-delegation-check");
const menuMemory = document.getElementById("menu-memory");
const menuMemoryCheck = document.getElementById("menu-memory-check");
const menuMcp = document.getElementById("menu-mcp");
const menuReloadSkills = document.getElementById("menu-reload-skills");
const menuReload = document.getElementById("menu-reload");
const menuSettings = document.getElementById("menu-settings");
const statusDot = document.getElementById("status-dot");
Expand Down
1 change: 1 addition & 0 deletions media/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ onMenuClick(menuSkills, () => vscode.postMessage({ type: "toggleSkills", next: !
onMenuClick(menuDelegation, () => vscode.postMessage({ type: "toggleDelegation", next: !delegationEnabled }));
onMenuClick(menuMemory, () => vscode.postMessage({ type: "toggleMemory", next: !memoryEnabled }));
onMenuClick(menuMcp, () => vscode.postMessage({ type: "manageMcpServers" }));
onMenuClick(menuReloadSkills, () => vscode.postMessage({ type: "reloadSkills" }));
onMenuClick(menuReload, () => vscode.postMessage({ type: "reload" }));
onMenuClick(menuSettings, () => vscode.postMessage({ type: "openSettings" }));

Expand Down
4 changes: 4 additions & 0 deletions src/core-client/process-args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export interface ServeArgsOptions {
workspace: boolean;
autoApprove: boolean;
mcpServers: string[];
skillsRefresh?: boolean;
resolveSetting: (value: string) => string;
}

Expand All @@ -26,6 +27,9 @@ export function buildServeArgs(options: ServeArgsOptions): string[] {
if (!options.skills) {
args.push("--no-skills");
}
if (options.skillsRefresh) {
args.push("--skills-refresh");
}
if (options.delegation) {
args.push("--delegate");
}
Expand Down
10 changes: 10 additions & 0 deletions src/features/chat/chat.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { FORWARDED_NOTIFICATIONS, PostMessage, ResolveSetting } from "./chat.typ

export class ChatController {
private client: RpcClient | undefined;
private pendingSkillsRefresh = false;

constructor(
private readonly context: vscode.ExtensionContext,
Expand All @@ -30,10 +31,12 @@ export class ChatController {

async startConnection(): Promise<void> {
if (!readSettings().provider) {
this.pendingSkillsRefresh = false;
this.post({ type: "needsSetup" });
return;
}
if (!(await this.hasCli())) {
this.pendingSkillsRefresh = false;
this.post({ type: "cliMissing", command: this.resolveSetting(readSettings().command) });
return;
}
Expand Down Expand Up @@ -158,8 +161,10 @@ export class ChatController {
workspace: settings.workspace,
autoApprove: settings.autoApprove,
mcpServers: settings.mcpServers,
skillsRefresh: this.pendingSkillsRefresh,
resolveSetting: (value) => this.resolveSetting(value),
});
this.pendingSkillsRefresh = false;
const apiKey = await this.context.secrets.get(API_KEY_SECRET);
const auth = this.readAuthFor(settings.provider);
Comment thread
FernandoCelmer marked this conversation as resolved.
const env = spawnEnvForApiKey(apiKey, providerApiKeyEnvNames(auth));
Expand Down Expand Up @@ -227,4 +232,9 @@ export class ChatController {
this.dispose();
void this.startConnection();
}

reloadSkills(): void {
this.pendingSkillsRefresh = true;
this.reload();
}
}
3 changes: 3 additions & 0 deletions src/vscode/sidebar/chatSidebarProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ export class ChatViewProvider implements vscode.WebviewViewProvider {
case "reload":
this.chat.reload();
break;
case "reloadSkills":
this.chat.reloadSkills();
break;
case "installCli":
this.chat.installCli();
break;
Expand Down
1 change: 1 addition & 0 deletions src/vscode/webview/html.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export function renderChatHtml(options: ChatHtmlOptions): string {
<span id="menu-memory-check" class="check-box"></span> Project memory
</button>
<button id="menu-mcp" class="menu-item">MCP Servers</button>
<button id="menu-reload-skills" class="menu-item">Reload Skills</button>
<button id="menu-reload" class="menu-item">Reload Connection</button>
<button id="menu-settings" class="menu-item">Open Settings</button>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/vscode/webview/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export type WebviewMessage =
| { type: "toggleMemory"; next: boolean }
| { type: "manageMcpServers" }
| { type: "reload" }
| { type: "reloadSkills" }
| { type: "installCli" }
| { type: "updateCli" }
| { type: "openSettings" }
Expand Down
Loading