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
5 changes: 5 additions & 0 deletions .changeset/thirty-kings-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@kilocode/cli": patch
---

Fix Wellcome Message regression
11 changes: 3 additions & 8 deletions cli/src/ui/utils/welcomeMessage.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import type { CliMessage, WelcomeMessageOptions } from "../../types/cli.js"
import type { ValidationResult } from "../../config/validation.js"
import { getConfigPath } from "../../config/persistence.js"

// Counter to ensure unique IDs even when created in the same millisecond
let messageCounter = 0
import { generateMessage } from "./messages.js"

/**
* Converts validation errors into user-friendly instructions
Expand Down Expand Up @@ -42,14 +40,11 @@ export function createConfigErrorInstructions(validation: ValidationResult): str
* @returns A CliMessage of type "welcome"
*/
export function createWelcomeMessage(options?: WelcomeMessageOptions): CliMessage {
const timestamp = Date.now()
const id = `welcome-${timestamp}-${messageCounter++}`

return {
id,
...generateMessage(),
type: "welcome",
content: "", // Content is rendered by WelcomeMessageContent component
ts: 0, // Welcome message should show at the top
ts: 1, // Welcome message should show at the top
metadata: {
welcomeOptions: options,
},
Expand Down
6 changes: 2 additions & 4 deletions cli/src/utils/auto-update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import packageJson from "package-json"
import { Package } from "../constants/package.js"
import { CliMessage } from "../types/cli.js"
import semver from "semver"
import { generateMessage } from "../ui/utils/messages.js"

type AutoUpdateStatus = {
name: string
Expand Down Expand Up @@ -31,11 +32,8 @@ export const getAutoUpdateStatus = async () => {
}

export const generateUpdateAvailableMessage = (status: AutoUpdateStatus): CliMessage => {
const timestamp = Date.now()

return {
id: `update-notification-${timestamp}`,
ts: timestamp,
...generateMessage(),
type: "system",
content: `## A new version of Kilo CLI is available!
You are using v${status.currentVersion}, the latest version is v${status.latestVersion}.
Expand Down
6 changes: 2 additions & 4 deletions cli/src/utils/notifications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { getKiloUrlFromToken } from "@roo-code/types"
import { logs } from "../services/logs.js"
import type { KilocodeNotification } from "../state/atoms/notifications.js"
import type { ProviderConfig } from "../config/types.js"
import { generateMessage } from "../ui/utils/messages.js"

/**
* Response from the Kilocode notifications API
Expand Down Expand Up @@ -72,17 +73,14 @@ export function supportsNotifications(provider: ProviderConfig): boolean {
* @returns A CLI message object
*/
export function generateNotificationMessage(notification: KilocodeNotification) {
const timestamp = Date.now()

let content = `## ${notification.title}\n\n${notification.message}`

if (notification.action) {
content += `\n\n[${notification.action.actionText}](${notification.action.actionURL})`
}

return {
id: `notification-${notification.id}-${timestamp}`,
ts: timestamp,
...generateMessage(),
type: "system" as const,
content,
}
Expand Down