Skip to content

Commit 32d408d

Browse files
Merge branch 'main' into dallin/unknown-provider-fix
2 parents a5919e7 + 5a4c60a commit 32d408d

32 files changed

+3376
-3640
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/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'

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/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

core/indexing/ignore.vitest.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,7 @@ describe("isSecurityConcern", () => {
8181
it("should detect environment directories as security concerns", () => {
8282
expect(isSecurityConcern(".env/")).toBe(true);
8383
expect(isSecurityConcern("env/")).toBe(true);
84-
expect(isSecurityConcern(".venv/")).toBe(true);
85-
expect(isSecurityConcern("venv/")).toBe(true);
8684
expect(isSecurityConcern(".env/config")).toBe(true);
87-
expect(isSecurityConcern("project/.venv/lib")).toBe(true);
88-
});
89-
90-
it("should detect IDE directories as security concerns", () => {
91-
// expect(isSecurityConcern(".vscode/")).toBe(true);
92-
// expect(isSecurityConcern(".idea/")).toBe(true);
93-
// expect(isSecurityConcern(".vs/")).toBe(true);
94-
expect(isSecurityConcern(".vscode/settings.json")).toBe(true);
95-
// expect(isSecurityConcern(".idea/workspace.xml")).toBe(true);
9685
});
9786

9887
it("should detect cloud provider directories as security concerns", () => {

0 commit comments

Comments
 (0)