Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 3 additions & 0 deletions assets/images/roo-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions src/core/webview/ClineProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
<link rel="stylesheet" type="text/css" href="${stylesUri}">
<link href="${codiconsUri}" rel="stylesheet" />
<script nonce="${nonce}">
window.IMAGES_BASE_URI = "${imagesUri}"
window.IMAGES_BASE_URI = "${imagesUri}"
</script>
<title>Roo Code</title>
</head>
Expand Down Expand Up @@ -1216,7 +1216,6 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
telemetrySetting,
showRooIgnoredFiles,
language,
showGreeting,
maxReadFileLine,
} = await this.getState()

Expand Down Expand Up @@ -1297,7 +1296,6 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
renderContext: this.renderContext,
maxReadFileLine: maxReadFileLine ?? 500,
settingsImportedAt: this.settingsImportedAt,
showGreeting: showGreeting ?? true, // Ensure showGreeting is included in the returned state
}
}

Expand Down Expand Up @@ -1385,7 +1383,6 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
telemetrySetting: stateValues.telemetrySetting || "unset",
showRooIgnoredFiles: stateValues.showRooIgnoredFiles ?? true,
maxReadFileLine: stateValues.maxReadFileLine ?? 500,
showGreeting: stateValues.showGreeting ?? true, // Ensure showGreeting is returned by getState
}
}

Expand Down
5 changes: 0 additions & 5 deletions src/core/webview/webviewMessageHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -645,11 +645,6 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
await updateGlobalState("diffEnabled", diffEnabled)
await provider.postStateToWebview()
break
case "showGreeting":
const showGreeting = message.bool ?? true
await updateGlobalState("showGreeting", showGreeting)
await provider.postStateToWebview()
break
case "enableCheckpoints":
const enableCheckpoints = message.bool ?? true
await updateGlobalState("enableCheckpoints", enableCheckpoints)
Expand Down
2 changes: 1 addition & 1 deletion src/exports/roo-code.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ type GlobalSettings = {
remoteBrowserHost?: string | undefined
cachedChromeHostUrl?: string | undefined
enableCheckpoints?: boolean | undefined
showGreeting?: boolean | undefined
checkpointStorage?: ("task" | "workspace") | undefined
ttsEnabled?: boolean | undefined
ttsSpeed?: number | undefined
soundEnabled?: boolean | undefined
Expand Down
2 changes: 1 addition & 1 deletion src/exports/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ type GlobalSettings = {
remoteBrowserHost?: string | undefined
cachedChromeHostUrl?: string | undefined
enableCheckpoints?: boolean | undefined
showGreeting?: boolean | undefined
checkpointStorage?: ("task" | "workspace") | undefined
ttsEnabled?: boolean | undefined
ttsSpeed?: number | undefined
soundEnabled?: boolean | undefined
Expand Down
4 changes: 0 additions & 4 deletions src/schemas/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,6 @@ export const globalSettingsSchema = z.object({

enableCheckpoints: z.boolean().optional(),

showGreeting: z.boolean().optional(),

ttsEnabled: z.boolean().optional(),
ttsSpeed: z.number().optional(),
soundEnabled: z.boolean().optional(),
Expand Down Expand Up @@ -606,8 +604,6 @@ const globalSettingsRecord: GlobalSettingsRecord = {

enableCheckpoints: undefined,

showGreeting: undefined,

ttsEnabled: undefined,
ttsSpeed: undefined,
soundEnabled: undefined,
Expand Down
1 change: 0 additions & 1 deletion src/shared/ExtensionMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ export type ExtensionState = Pick<
| "remoteBrowserEnabled"
| "remoteBrowserHost"
// | "enableCheckpoints" // Optional in GlobalSettings, required here.
| "showGreeting"
| "ttsEnabled"
| "ttsSpeed"
| "soundEnabled"
Expand Down
1 change: 0 additions & 1 deletion src/shared/WebviewMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ export interface WebviewMessage {
| "maxReadFileLine"
| "searchFiles"
| "toggleApiConfigPin"
| "showGreeting"
text?: string
disabled?: boolean
askResponse?: ClineAskResponse
Expand Down
5 changes: 2 additions & 3 deletions webview-ui/src/components/chat/ChatRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -854,11 +854,10 @@ export const ChatRowContent = ({
case "user_feedback":
return (
<div
className="outline rounded p-4"
style={{
backgroundColor: "var(--vscode-badge-background)",
color: "var(--vscode-badge-foreground)",
borderRadius: "3px",
padding: "9px",
padding: "4px",
overflow: "hidden",
whiteSpace: "pre-wrap",
wordBreak: "break-word",
Expand Down
10 changes: 3 additions & 7 deletions webview-ui/src/components/chat/ChatView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { getApiMetrics } from "../../../../src/shared/getApiMetrics"
import { useExtensionState } from "../../context/ExtensionStateContext"
import { vscode } from "../../utils/vscode"
import HistoryPreview from "../history/HistoryPreview"
import RooHero from "../welcome/RooHero"
import { normalizeApiConfiguration } from "../settings/ApiOptions"
import Announcement from "./Announcement"
import BrowserSessionRow from "./BrowserSessionRow"
Expand Down Expand Up @@ -76,7 +77,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
alwaysAllowSubtasks,
customModes,
telemetrySetting,
showGreeting,
} = useExtensionState()

//const task = messages.length > 0 ? (messages[0].say === "task" ? messages[0] : undefined) : undefined) : undefined
Expand Down Expand Up @@ -1224,12 +1224,8 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
}}>
{telemetrySetting === "unset" && <TelemetryBanner />}
{showAnnouncement && <Announcement version={version} hideAnnouncement={hideAnnouncement} />}
{showGreeting === true && (
<div style={{ padding: "0 20px", flexShrink: 0 }}>
<h2>{t("chat:greeting")}</h2>
<p>{t("chat:aboutMe")}</p>
</div>
)}

<RooHero />
{taskHistory.length > 0 && <HistoryPreview showHistoryView={showHistoryView} />}
</div>
)}
Expand Down
Loading
Loading