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: 0 additions & 1 deletion src/api/providers/openrouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
const baseURL = this.options.openRouterBaseUrl || "https://api.matterai.so/v1/web"
const apiKey = this.options.openRouterApiKey ?? "not-provided"

// this.client = new OpenAI({ baseURL, apiKey, defaultHeaders: DEFAULT_HEADERS })
this.client = new OpenAI({ baseURL, apiKey, defaultHeaders: DEFAULT_HEADERS })
}

Expand Down
42 changes: 42 additions & 0 deletions src/core/prompts/system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,48 @@ Before submitting, verify:
### Remember

**Always quote the file_pattern value or use null. Never use bare/unquoted glob patterns.**

## execute_command

### Common CLI packages

- \`npm\` - Node Package Manager
- \`yarn\` - Yarn Package Manager
- \`pnpm\` - PNPM Package Manager
- \`git\` - Git Version Control System
- \`docker\` - Docker Container Management
- \`kubectl\` - Kubernetes Command Line Tool
- \`helm\` - Helm Package Manager
- \`kubectl\` - Kubernetes Command Line Tool
- \`aws\` - AWS Command Line Tool
- \`gcloud\` - Google Cloud Command Line Tool
- \`az\` - Azure Command Line Tool
- \`heroku\` - Heroku Command Line Tool
- \`terraform\` - Terraform Command Line Tool
- \`ansible\` - Ansible Command Line Tool
- \`chef\` - Chef Command Line Tool
- \`puppet\` - Puppet Command Line Tool
- \`java\` - Java Development Kit
- \`javac\` - Java Compiler
- \`javap\` - Java Decompiler
- \`javapackager\` - Java Packager
- \`javapackager\` - Java Packager
- \`python\` - Python Programming Language
- \`pip\` - Python Package Manager
- \`pipenv\` - Python Package Manager
- \`poetry\` - Python Package Manager
- \`virtualenv\` - Python Virtual Environment


CRITICAL:
1. A command never starts with \`:\`
2. A command never uses <|tool_call_argument_begin|> OR any <> TAG
3. A command is never empty or \`:\`
4. A command is never a single word or a single word with a space
5. Commands are always valid for the user's operating system
6. Commands are always valid for the user's shell
7. Commands are always valid with executable permissions
8. Commands are always valid with the user's current working directory
`

async function generatePrompt(
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/locales/en/kilocode.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"message": "Check to see if you can top up with free credits or purchase some more!"
},
"task": {
"noAssistantMessages": "The model's response ended unexpectedly (no assistant messages). This may be a sign of rate limiting.",
"noAssistantMessages": "Encountered an error while generating a response. Trying auto-repair, if I'm unable to repair the error, please send a 'Continue' message.",
"notLoggedInError": "Cannot complete request, make sure you are connected and logged in with the selected provider.\n\n{{error}}",
"maxCompletionTokens": "The maximum number of completion tokens was reached.",
"disableApplyDiff": "If this error keep reoccuring, please disable Editing Through Diffs in Advanced Settings.",
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "%extension.displayName%",
"description": "%extension.description%",
"publisher": "matterai",
"version": "4.116.0",
"version": "4.117.0",
"icon": "assets/icons/matterai-ic.png",
"galleryBanner": {
"color": "#FFFFFF",
Expand Down
18 changes: 9 additions & 9 deletions webview-ui/src/components/chat/ChatView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,11 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
setSecondaryButtonText(t("chat:reject.title"))
break
case "command_output":
setSendingDisabled(false)
// setSendingDisabled(false)
setClineAsk("command_output")
setEnableButtons(true)
setPrimaryButtonText(t("chat:proceedWhileRunning.title"))
setSecondaryButtonText(t("chat:killCommand.title"))
// setEnableButtons(false)
// setPrimaryButtonText(t("chat:proceedWhileRunning.title"))
// setSecondaryButtonText(t("chat:killCommand.title"))
break
case "use_mcp_server":
if (!isAutoApproved(lastMessage) && !isPartial) {
Expand Down Expand Up @@ -2146,11 +2146,11 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
: primaryButtonText === t("chat:runCommand.title")
? t("chat:runCommand.tooltip")
: primaryButtonText === t("chat:proceedAnyways.title")
? t("chat:proceedAnyways.tooltip")
: primaryButtonText ===
t("chat:proceedWhileRunning.title")
? t("chat:proceedWhileRunning.tooltip")
: undefined
// ? t("chat:proceedAnyways.tooltip")
// : primaryButtonText ===
// t("chat:proceedWhileRunning.title")
// ? t("chat:proceedWhileRunning.tooltip")
// : undefined
}>
<VSCodeButton
appearance="primary"
Expand Down
Loading