Skip to content

Commit bf5906f

Browse files
sestinjclaude
andcommitted
fix: resolve TypeScript compilation errors from merge
- Fix LocalProfileLoader test: remove controlPlaneClient refs, update default title to match "Main Config" - Remove showStagingIndicator from Layout.tsx (variable was undefined) - Remove usePlatform from MockIdeMessenger (removed from config types) - Add GithubIcon component and DISCUSSIONS_LINK to StreamError.tsx - Add overloaded retry constants to streamThunkWrapper.tsx Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 86567d6 commit bf5906f

5 files changed

Lines changed: 23 additions & 22 deletions

File tree

core/config/profile/LocalProfileLoader.vitest.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,9 @@ describe("LocalProfileLoader", () => {
6262
configName: "My Custom Config",
6363
});
6464

65-
const loader = new LocalProfileLoader(
66-
testIde,
67-
controlPlaneClient,
68-
llmLogger,
69-
);
65+
const loader = new LocalProfileLoader(testIde, llmLogger);
7066

71-
expect(loader.description.title).toBe("Local Config");
67+
expect(loader.description.title).toBe("Main Config");
7268

7369
await loader.doLoadConfig();
7470

@@ -82,14 +78,10 @@ describe("LocalProfileLoader", () => {
8278
configLoadInterrupted: false,
8379
});
8480

85-
const loader = new LocalProfileLoader(
86-
testIde,
87-
controlPlaneClient,
88-
llmLogger,
89-
);
81+
const loader = new LocalProfileLoader(testIde, llmLogger);
9082

9183
await loader.doLoadConfig();
9284

93-
expect(loader.description.title).toBe("Local Config");
85+
expect(loader.description.title).toBe("Main Config");
9486
});
9587
});

gui/src/components/Layout.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,6 @@ const Layout = () => {
208208
<LocalStorageProvider>
209209
<AuthProvider>
210210
<LayoutTopDiv>
211-
{showStagingIndicator && (
212-
<span
213-
title="Staging environment"
214-
className="absolute right-0 mx-1.5 h-1.5 w-1.5 rounded-full"
215-
style={{
216-
backgroundColor: "var(--vscode-list-warningForeground)",
217-
}}
218-
/>
219-
)}
220211
<OSRContextMenu />
221212
<div
222213
style={{

gui/src/context/MockIdeMessenger.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ const DEFAULT_MOCK_CORE_RESPONSES: MockResponses = {
4848
slashCommands: [],
4949
contextProviders: [],
5050
mcpServerStatuses: [],
51-
usePlatform: true,
5251
modelsByRole: {
5352
chat: [],
5453
apply: [],

gui/src/pages/gui/StreamError.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ import {
66
KeyIcon,
77
} from "@heroicons/react/24/outline";
88
import { useContext, useMemo } from "react";
9+
10+
const DISCUSSIONS_LINK = "https://github.com/continuedev/continue/discussions";
11+
12+
function GithubIcon({ className }: { className?: string }) {
13+
return (
14+
<svg className={className} fill="currentColor" viewBox="0 0 24 24">
15+
<path d="M12 0C5.37 0 0 5.37 0 12c0 5.31 3.435 9.795 8.205 11.385.6.105.825-.255.825-.57 0-.285-.015-1.23-.015-2.235-3.015.555-3.795-.735-4.035-1.41-.135-.345-.72-1.41-1.23-1.695-.42-.225-1.02-.78-.015-.795.945-.015 1.62.87 1.845 1.23 1.08 1.815 2.805 1.305 3.495.99.105-.78.42-1.305.765-1.605-2.67-.3-5.46-1.335-5.46-5.925 0-1.305.465-2.385 1.23-3.225-.12-.3-.54-1.53.12-3.18 0 0 1.005-.315 3.3 1.23.96-.27 1.98-.405 3-.405s2.04.135 3 .405c2.295-1.56 3.3-1.23 3.3-1.23.66 1.65.24 2.88.12 3.18.765.84 1.23 1.905 1.23 3.225 0 4.605-2.805 5.625-5.475 5.925.435.375.81 1.095.81 2.22 0 1.605-.015 2.895-.015 3.3 0 .315.225.69.825.57A12.02 12.02 0 0 0 24 12c0-6.63-5.37-12-12-12z" />
16+
</svg>
17+
);
18+
}
919
import { GhostButton } from "../../components";
1020
import { useEditModel } from "../../components/mainInput/Lump/useEditBlock";
1121
import { useMainEditor } from "../../components/mainInput/TipTapEditor";

gui/src/redux/thunks/streamThunkWrapper.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ import { createAsyncThunk } from "@reduxjs/toolkit";
22

33
import StreamErrorDialog from "../../pages/gui/StreamError";
44
import { analyzeError } from "../../util/errorAnalysis";
5+
6+
const OVERLOADED_RETRIES = 3;
7+
const OVERLOADED_DELAY_MS = 2000;
8+
9+
function isOverloadedErrorMessage(message?: string): boolean {
10+
if (!message) return false;
11+
const lower = message.toLowerCase();
12+
return lower.includes("overloaded") || lower.includes("529");
13+
}
514
import { selectSelectedChatModel } from "../slices/configSlice";
615
import { setDialogMessage, setShowDialog } from "../slices/uiSlice";
716
import { ThunkApiType } from "../store";

0 commit comments

Comments
 (0)