Skip to content

Commit 0bcf4e7

Browse files
authored
Merge branch 'main' into virtual-quota-provider
2 parents db8032a + bf7fca8 commit 0bcf4e7

File tree

11 files changed

+37
-32
lines changed

11 files changed

+37
-32
lines changed

.changeset/bright-hornets-bow.md

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

.changeset/green-teams-pull.md

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

.changeset/grumpy-snails-walk.md

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

.changeset/hip-lands-search.md

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

CHANGELOG.md

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

3+
## [v4.111.0]
4+
5+
- [#3256](https://github.com/Kilo-Org/kilocode/pull/3256) [`f81b48b`](https://github.com/Kilo-Org/kilocode/commit/f81b48b8dec9cd276c3c7ba994d0512036abfa96) Thanks [@markijbema](https://github.com/markijbema)! - Switched autocomplete to showing completions inline
6+
7+
### Patch Changes
8+
9+
- [#3261](https://github.com/Kilo-Org/kilocode/pull/3261) [`bae048f`](https://github.com/Kilo-Org/kilocode/commit/bae048f914712439e54f29363d52dc24860000e7) Thanks [@mcowger](https://github.com/mcowger)! - Improve native tool calling consistency
10+
11+
- [#3281](https://github.com/Kilo-Org/kilocode/pull/3281) [`2586e9b`](https://github.com/Kilo-Org/kilocode/commit/2586e9b4f6cbea9734ff10df7086f2d999713448) Thanks [@hassoncs](https://github.com/hassoncs)! - Fix broken sign-in links
12+
13+
- [#3313](https://github.com/Kilo-Org/kilocode/pull/3313) [`2e61e91`](https://github.com/Kilo-Org/kilocode/commit/2e61e9152ae3be43ce12e9fd3c2f94c0d603d771) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Running commands are no longer sometimes shown twice in the chat
14+
315
## [v4.110.0]
416

517
### Patch Changes

cli/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @kilocode/cli
22

3+
## 0.0.11
4+
5+
### Patch Changes
6+
7+
- [#3278](https://github.com/Kilo-Org/kilocode/pull/3278) [`cba3d00`](https://github.com/Kilo-Org/kilocode/commit/cba3d005766c88200a2d170770dcaeaef172dfbd) Thanks [@catrielmuller](https://github.com/catrielmuller)! - Improved stability of the approval menu, preventing it from showing when you don't expect it
8+
39
## 0.0.10
410

511
### Patch Changes

cli/package.dist.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@kilocode/cli",
3-
"version": "0.0.10",
3+
"version": "0.0.11",
44
"description": "Terminal User Interface for Kilo Code",
55
"type": "module",
66
"main": "index.js",

cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@kilocode/cli",
3-
"version": "0.0.10",
3+
"version": "0.0.11",
44
"description": "Terminal User Interface for Kilo Code",
55
"type": "module",
66
"main": "dist/index.js",

src/core/task/Task.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,16 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
738738
return undefined
739739
}
740740

741+
async nextClineMessageTimestamp_kilocode() {
742+
let ts = Date.now()
743+
while (ts <= (this.clineMessages?.at(-1)?.ts ?? 0)) {
744+
console.warn("nextClineMessageTimeStamp: timestamp already taken", ts)
745+
await new Promise<void>((resolve) => setTimeout(() => resolve(), 1))
746+
ts = Date.now()
747+
}
748+
return ts
749+
}
750+
741751
// Note that `partial` has three valid states true (partial message),
742752
// false (completion of partial message), undefined (individual complete
743753
// message).
@@ -784,7 +794,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
784794
} else {
785795
// This is a new partial message, so add it with partial
786796
// state.
787-
askTs = Date.now()
797+
askTs = await this.nextClineMessageTimestamp_kilocode()
788798
this.lastMessageTs = askTs
789799
await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, partial, isProtected })
790800
throw new Error("Current ask promise was ignored (#2)")
@@ -821,7 +831,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
821831
this.askResponse = undefined
822832
this.askResponseText = undefined
823833
this.askResponseImages = undefined
824-
askTs = Date.now()
834+
askTs = await this.nextClineMessageTimestamp_kilocode()
825835
this.lastMessageTs = askTs
826836
await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, isProtected })
827837
}
@@ -831,7 +841,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
831841
this.askResponse = undefined
832842
this.askResponseText = undefined
833843
this.askResponseImages = undefined
834-
askTs = Date.now()
844+
askTs = await this.nextClineMessageTimestamp_kilocode()
835845
this.lastMessageTs = askTs
836846
await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, isProtected })
837847
}
@@ -1132,7 +1142,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
11321142
this.updateClineMessage(lastMessage)
11331143
} else {
11341144
// This is a new partial message, so add it with partial state.
1135-
const sayTs = Date.now()
1145+
const sayTs = await this.nextClineMessageTimestamp_kilocode()
11361146

11371147
if (!options.isNonInteractive) {
11381148
this.lastMessageTs = sayTs
@@ -1179,7 +1189,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
11791189
this.updateClineMessage(lastMessage)
11801190
} else {
11811191
// This is a new and complete message, so add it like normal.
1182-
const sayTs = Date.now()
1192+
const sayTs = await this.nextClineMessageTimestamp_kilocode()
11831193

11841194
if (!options.isNonInteractive) {
11851195
this.lastMessageTs = sayTs
@@ -1198,7 +1208,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
11981208
}
11991209
} else {
12001210
// This is a new non-partial message, so add it like normal.
1201-
const sayTs = Date.now()
1211+
const sayTs = await this.nextClineMessageTimestamp_kilocode()
12021212

12031213
// A "non-interactive" message is a message is one that the user
12041214
// does not need to respond to. We don't want these message types

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.110.0",
6+
"version": "4.111.0",
77
"icon": "assets/icons/logo-outline-black.png",
88
"galleryBanner": {
99
"color": "#FFFFFF",

0 commit comments

Comments
 (0)