Skip to content

Commit 1f997c0

Browse files
authored
Merge branch 'main' into roo-v3.25.23
2 parents c99ae40 + 57233d0 commit 1f997c0

File tree

8 files changed

+37
-23
lines changed

8 files changed

+37
-23
lines changed

.changeset/eight-coats-cover.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/great-goats-try.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/metal-feet-dream.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"kilo-code": patch
3+
---
4+
5+
Added support to Qwen Code for a custom OAuth credential storage path

.changeset/tricky-kids-fold.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# kilo-code
22

3+
## [v4.84.1]
4+
5+
- [#2113](https://github.com/Kilo-Org/kilocode/pull/2113) [`d40b35a`](https://github.com/Kilo-Org/kilocode/commit/d40b35a3a1efcc2fbfca51d4ca64a8da2aa321e5) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - The model selector below the chat now shows the correct model list for Qwen Code and some other providers
6+
7+
- [#2116](https://github.com/Kilo-Org/kilocode/pull/2116) [`61e18d6`](https://github.com/Kilo-Org/kilocode/commit/61e18d60f54d11d63a64cd674474a68fa398c3b9) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Checkpoints now work when using Morph fast apply
8+
9+
- [#2130](https://github.com/Kilo-Org/kilocode/pull/2130) [`78aaf7c`](https://github.com/Kilo-Org/kilocode/commit/78aaf7c4607c5a98174a26b99973e379b87e5893) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Added support for Grok Code Fast to the xAI provider
10+
11+
- [#2109](https://github.com/Kilo-Org/kilocode/pull/2109) [`173ecf4`](https://github.com/Kilo-Org/kilocode/commit/173ecf4983449a4b7766ba900f736a57b7d5d525) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - A solitary "0" that was sometimes shown on the Kilo Code and OpenRouter API provider settings page was removed.
12+
313
## [v4.84.0]
414

515
- [#1961](https://github.com/Kilo-Org/kilocode/pull/1961) [`d4a7cb6`](https://github.com/Kilo-Org/kilocode/commit/d4a7cb6300d8e00d5889e1079057e43de19ff95e) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Updates to the experimental Morph FastApply support

packages/types/src/providers/xai.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ export type XAIModelId = keyof typeof xaiModels
66
export const xaiDefaultModelId: XAIModelId = "grok-4"
77

88
export const xaiModels = {
9+
"grok-code-fast-1": {
10+
maxTokens: 16_384,
11+
contextWindow: 262_144,
12+
supportsImages: false,
13+
supportsPromptCache: true,
14+
inputPrice: 0.2,
15+
outputPrice: 1.5,
16+
cacheWritesPrice: 0.02,
17+
cacheReadsPrice: 0.02,
18+
description: "xAI's Grok Code Fast model with 256K context window",
19+
},
920
"grok-4": {
1021
maxTokens: 8192,
1122
contextWindow: 256000,

src/api/providers/qwen-code.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ interface QwenOAuthCredentials {
3535
resource_url?: string
3636
}
3737

38-
function getQwenCachedCredentialPath(): string {
39-
return path.join(os.homedir(), QWEN_DIR, QWEN_CREDENTIAL_FILENAME)
40-
}
41-
4238
function objectToUrlEncoded(data: Record<string, string>): string {
4339
return Object.keys(data)
4440
.map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(data[key])}`)
@@ -62,13 +58,20 @@ export class QwenCodeHandler extends BaseProvider implements SingleCompletionHan
6258
})
6359
}
6460

61+
private getQwenCachedCredentialPath(): string {
62+
if (this.options.qwenCodeOAuthPath) {
63+
return this.options.qwenCodeOAuthPath
64+
}
65+
return path.join(os.homedir(), QWEN_DIR, QWEN_CREDENTIAL_FILENAME)
66+
}
67+
6568
private async loadCachedQwenCredentials(): Promise<QwenOAuthCredentials> {
69+
const keyFile = this.getQwenCachedCredentialPath()
6670
try {
67-
const keyFile = getQwenCachedCredentialPath()
6871
const credsStr = await fs.readFile(keyFile, "utf-8")
6972
return JSON.parse(credsStr)
7073
} catch (error) {
71-
console.error(`Error reading or parsing credentials file at ${getQwenCachedCredentialPath()}`)
74+
console.error(`Error reading or parsing credentials file at ${keyFile}`)
7275
throw new Error(t("common:errors.qwenCode.oauthLoadFailed", { error }))
7376
}
7477
}
@@ -112,7 +115,7 @@ export class QwenCodeHandler extends BaseProvider implements SingleCompletionHan
112115
expiry_date: Date.now() + tokenData.expires_in * 1000,
113116
}
114117

115-
const filePath = getQwenCachedCredentialPath()
118+
const filePath = this.getQwenCachedCredentialPath()
116119
await fs.writeFile(filePath, JSON.stringify(newCredentials, null, 2))
117120

118121
return newCredentials

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "%extension.displayName%",
44
"description": "%extension.description%",
55
"publisher": "kilocode",
6-
"version": "4.84.0",
6+
"version": "4.84.1",
77
"icon": "assets/icons/logo-outline-black.png",
88
"galleryBanner": {
99
"color": "#FFFFFF",

0 commit comments

Comments
 (0)