Skip to content

Commit fa9eb17

Browse files
committed
merge: main
2 parents 540ac78 + e609c34 commit fa9eb17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+5049
-3791
lines changed

.github/actions/run-jetbrains-tests/action.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ runs:
9393
path: binary/node_modules
9494
key: ${{ runner.os }}-binary-node-modules-${{ hashFiles('binary/package-lock.json') }}
9595

96+
- name: Install binary dependencies
97+
if: steps.binary-cache.outputs.cache-hit != 'true'
98+
shell: bash
99+
run: |
100+
cd binary
101+
npm ci
102+
96103
- name: Build the binaries
97104
shell: bash
98105
run: |

.github/workflows/beta-release.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,22 @@ jobs:
2424
token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
2525

2626
- name: Setup Node.js
27-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
2828
with:
2929
node-version: 20
3030
registry-url: "https://registry.npmjs.org"
3131
always-auth: true
3232

33-
- name: Install dependencies
33+
- name: Setup packages
34+
uses: ./.github/actions/setup-packages
35+
36+
- name: Setup core component
37+
uses: ./.github/actions/setup-component
38+
with:
39+
component: core
40+
include-root: true
41+
42+
- name: Install CLI dependencies
3443
working-directory: extensions/cli
3544
run: npm ci
3645
env:

.github/workflows/cli-pr-checks.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install dependencies
3737
run: |
3838
cd extensions/cli
39-
npm ci
39+
npm ci --include=optional
4040
4141
- name: Run linting
4242
run: |
@@ -58,8 +58,14 @@ jobs:
5858
uses: actions/setup-node@v4
5959
with:
6060
node-version: ${{ matrix.node-version }}
61-
cache: "npm"
62-
cache-dependency-path: extensions/cli/package-lock.json
61+
62+
- name: Cache CLI node_modules
63+
uses: actions/cache@v4
64+
with:
65+
path: extensions/cli/node_modules
66+
key: ${{ runner.os }}-node${{ matrix.node-version }}-cli-modules-${{ hashFiles('extensions/cli/package-lock.json') }}
67+
restore-keys: |
68+
${{ runner.os }}-node${{ matrix.node-version }}-cli-modules-
6369
6470
- name: Setup packages
6571
uses: ./.github/actions/setup-packages
@@ -72,13 +78,18 @@ jobs:
7278
- name: Install dependencies
7379
run: |
7480
cd extensions/cli
75-
npm ci
81+
npm ci --include=optional
7682
7783
- name: Build
7884
run: |
7985
cd extensions/cli
8086
npm run build
8187
88+
- name: Run smoke tests
89+
run: |
90+
cd extensions/cli
91+
npm run test:smoke
92+
8293
# e2e tests are failing on Windows specifically - likely due to stdout flush issues
8394
- name: Run tests
8495
if: matrix.os != 'windows-latest'

.github/workflows/jetbrains-release.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ jobs:
189189
cd ../../gui
190190
npm ci
191191
npm run build
192+
env:
193+
NODE_OPTIONS: "--max-old-space-size=8192"
192194

193195
# Run prepackage.js script
194196
- name: Run prepackage script

.github/workflows/stable-release.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
4141

4242
- name: Setup Node.js
43-
uses: actions/setup-node@v3
43+
uses: actions/setup-node@v4
4444
with:
4545
node-version: 20
4646
registry-url: "https://registry.npmjs.org"
@@ -141,6 +141,17 @@ jobs:
141141
# Update version to stable (remove beta suffix)
142142
npm version ${{ steps.find_beta.outputs.stable_version }} --no-git-tag-version
143143
144+
- name: Setup packages (for direct stable release)
145+
if: ${{ inputs.release_type == 'direct-stable' }}
146+
uses: ./.github/actions/setup-packages
147+
148+
- name: Setup core component (for direct stable release)
149+
if: ${{ inputs.release_type == 'direct-stable' }}
150+
uses: ./.github/actions/setup-component
151+
with:
152+
component: core
153+
include-root: true
154+
144155
- name: Prepare package for direct stable release
145156
if: ${{ inputs.release_type == 'direct-stable' }}
146157
working-directory: extensions/cli

core/config/loadContextProviders.ts

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,24 @@ export function loadConfigContextProviders(
2929
} {
3030
const providers: IContextProvider[] = [];
3131
const errors: ConfigValidationError[] = [];
32+
33+
const defaultProviders: IContextProvider[] = [
34+
new FileContextProvider({}),
35+
new CurrentFileContextProvider({}),
36+
new DiffContextProvider({}),
37+
new TerminalContextProvider({}),
38+
new ProblemsContextProvider({}),
39+
new RulesContextProvider({}),
40+
];
41+
3242
// Add from config
3343
if (configContext) {
3444
for (const config of configContext) {
3545
const cls = contextProviderClassFromName(config.provider) as any;
36-
if (!cls) {
46+
if (
47+
!cls &&
48+
!defaultProviders.find((p) => p.description.title === config.provider)
49+
) {
3750
errors.push({
3851
fatal: false,
3952
message: `Unknown context provider ${config.provider}`,
@@ -50,15 +63,6 @@ export function loadConfigContextProviders(
5063
}
5164

5265
// Add from defaults if not found in config
53-
const defaultProviders: IContextProvider[] = [
54-
new FileContextProvider({}),
55-
new CurrentFileContextProvider({}),
56-
new DiffContextProvider({}),
57-
new TerminalContextProvider({}),
58-
new ProblemsContextProvider({}),
59-
new RulesContextProvider({}),
60-
];
61-
6266
for (const defaultProvider of defaultProviders) {
6367
if (
6468
!providers.find(

core/context/providers/FileContextProvider.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@ class FileContextProvider extends BaseContextProvider {
3737
await extras.ide.getWorkspaceDirs(),
3838
);
3939

40-
if (isSecurityConcern(relativePathOrBasename)) {
41-
return [
42-
{
43-
description: last2Parts,
44-
content:
45-
"Content redacted, this file cannot be viewed for security reasons",
46-
name: baseName,
47-
uri: {
48-
type: "file",
49-
value: fileUri,
50-
},
51-
},
52-
];
53-
}
54-
5540
return [
5641
{
5742
name: baseName,

core/context/providers/ProblemsContextProvider.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ class ProblemsContextProvider extends BaseContextProvider {
2929
problem.filepath,
3030
workspaceDirs,
3131
);
32-
if (isSecurityConcern(relativePathOrBasename)) {
33-
return {
34-
description: "Problems in current file",
35-
content:
36-
"Content was redacted because the file is detected as a potential security concern",
37-
name: `Warnings in ${baseName}`,
38-
};
39-
}
4032
const content = await ide.readFile(problem.filepath);
4133
const lines = content.split("\n");
4234
const rangeContent = lines

core/context/providers/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import DebugLocalsProvider from "./DebugLocalsProvider";
1212
import DiffContextProvider from "./DiffContextProvider";
1313
import DiscordContextProvider from "./DiscordContextProvider";
1414
import DocsContextProvider from "./DocsContextProvider";
15+
import FileContextProvider from "./FileContextProvider";
1516
import FileTreeContextProvider from "./FileTreeContextProvider";
1617
import FolderContextProvider from "./FolderContextProvider";
1718
import GitCommitContextProvider from "./GitCommitContextProvider";
@@ -41,6 +42,7 @@ import WebContextProvider from "./WebContextProvider";
4142
* See this issue for details: https://github.com/continuedev/continue/issues/1365
4243
*/
4344
export const Providers: (typeof BaseContextProvider)[] = [
45+
FileContextProvider,
4446
DiffContextProvider,
4547
FileTreeContextProvider,
4648
GitHubIssuesContextProvider,

core/indexing/ignore.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@ export const DEFAULT_SECURITY_IGNORE_DIRS = [
6767
// Environment and configuration directories
6868
".env/",
6969
"env/",
70-
".venv/",
71-
"venv/",
72-
73-
// IDE directories that may contain cached credentials
74-
// For now excluding, reasons for this unclear
75-
// ".vscode/",
76-
// ".idea/",
77-
// ".vs/",
7870

7971
// Cloud provider credential directories
8072
".aws/",
@@ -168,6 +160,8 @@ export const ADDITIONAL_INDEXING_IGNORE_FILETYPES = [
168160
"*.swp",
169161
"*.jsonl",
170162
// "*.prompt", // can be incredibly confusing for the LLM to have another set of instructions injected into the prompt
163+
// Application specific
164+
".continue/",
171165
];
172166

173167
export const ADDITIONAL_INDEXING_IGNORE_DIRS = [
@@ -189,6 +183,13 @@ export const ADDITIONAL_INDEXING_IGNORE_DIRS = [
189183
".cache/",
190184
"gems/",
191185
"vendor/",
186+
187+
".venv/",
188+
"venv/",
189+
190+
".vscode/",
191+
".idea/",
192+
".vs/",
192193
];
193194

194195
// Combined patterns: security + additional

0 commit comments

Comments
 (0)