Rewrite cschat by extending chat, and clean up the codebase

Author: ghostwriternr

.codestory.json

@@ -1,10 +1,11 @@
 * text=auto
+
 LICENSE.txt eol=crlf
 ThirdPartyNotices.txt eol=crlf
+
 *.bat eol=crlf
 *.cmd eol=crlf
 *.ps1 eol=lf
 *.sh eol=lf
 *.rtf -text
 **/*.json linguist-language=jsonc
-*.onnx filter=lfs diff=lfs merge=lfs -text

.gitattributes

@@ -20,7 +20,3 @@ vscode.db
 product.overrides.json
 *.snap.actual
 .vscode-test
-
-# CodeStory
-.codestory.json
-.aider*

.gitignore

@@ -32,7 +32,7 @@
 		"src/vs/base/test/common/filters.perf.data.js": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
 		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
-		"src/vs/editor/test/node/diffing/fixtures/**": true
+		"src/vs/editor/test/node/diffing/fixtures/**": true,
 	},
 	"files.readonlyInclude": {
 		"**/node_modules/**/*.*": true,
@@ -51,7 +51,7 @@
 		"extensions/**/out/**": true,
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
-		"test/integration/browser/out/**": true
+		"test/integration/browser/out/**": true,
 	},
 	"files.readonlyExclude": {
 		"build/builtin/*.js": true,
@@ -80,16 +80,24 @@
 	"typescript.preferences.quoteStyle": "single",
 	"json.schemas": [
 		{
-			"fileMatch": ["cgmanifest.json"],
-			"url": "https://json.schemastore.org/component-detection-manifest.json"
+			"fileMatch": [
+				"cgmanifest.json"
+			],
+			"url": "https://json.schemastore.org/component-detection-manifest.json",
 		},
 		{
-			"fileMatch": ["cglicenses.json"],
+			"fileMatch": [
+				"cglicenses.json"
+			],
 			"url": "./.vscode/cglicenses.schema.json"
 		}
 	],
 	"git.ignoreLimitWarning": true,
-	"git.branchProtection": ["main", "distro", "release/*"],
+	"git.branchProtection": [
+		"main",
+		"distro",
+		"release/*"
+	],
 	"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
 	"git.branchRandomName.enable": true,
 	"git.pullBeforeCheckout": true,
@@ -112,9 +120,11 @@
 	},
 	"[rust]": {
 		"editor.defaultFormatter": "rust-lang.rust-analyzer",
-		"editor.formatOnSave": true
+		"editor.formatOnSave": true,
 	},
-	"rust-analyzer.linkedProjects": ["cli/Cargo.toml"],
+	"rust-analyzer.linkedProjects": [
+		"cli/Cargo.toml"
+	],
 	"typescript.tsc.autoDetect": "off",
 	"testing.autoRun.mode": "rerun",
 	"conventionalCommits.scopes": [
@@ -135,11 +145,15 @@
 		]
 	},
 	"extension-test-runner.debugOptions": {
-		"outFiles": ["${workspaceFolder}/extensions/*/out/**/*.js"]
+		"outFiles": [
+			"${workspaceFolder}/extensions/*/out/**/*.js",
+		]
 	},
 	"githubPullRequests.assignCreated": "${user}",
 	"githubPullRequests.defaultMergeMethod": "squash",
-	"githubPullRequests.ignoredPullRequestBranches": ["main"],
+	"githubPullRequests.ignoredPullRequestBranches": [
+		"main"
+	],
 	"application.experimental.rendererProfiling": true,
 	"editor.experimental.asyncTokenization": true,
 	"editor.experimental.asyncTokenizationVerification": true,

.vscode/settings.json

@@ -12,7 +12,6 @@ const nodeUtil = require('util');
 const es = require('event-stream');
 const filter = require('gulp-filter');
 const util = require('./lib/util');
-const os = require('os');
 const { getVersion } = require('./lib/getVersion');
 const task = require('./lib/task');
 const watcher = require('./lib/watch');
@@ -32,9 +31,9 @@ const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 // });
 const compilations = [
 	'authentication-proxy/tsconfig.json',
+	'codestory/tsconfig.json',
 	'configuration-editing/build/tsconfig.json',
 	'configuration-editing/tsconfig.json',
-	'codestory/tsconfig.json',
 	'css-language-features/client/tsconfig.json',
 	'css-language-features/server/tsconfig.json',
 	'debug-auto-launch/tsconfig.json',

build/gulpfile.extensions.js

@@ -331,7 +331,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
 				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename('bin/' + product.applicationName));
+				.pipe(rename('bin/code'));
 
 			all = es.merge(all, shortcut);
 		}

build/gulpfile.vscode.js

@@ -39,7 +39,7 @@ const root = path.dirname(path.dirname(__dirname));
 const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
 const builtInExtensions = <IExtensionDefinition[]>productjson.builtInExtensions || [];
 const webBuiltInExtensions = <IExtensionDefinition[]>productjson.webBuiltInExtensions || [];
-const controlFilePath = path.join(os.homedir(), '.aide-dev', 'extensions', 'control.json');
+const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
 
 function log(...messages: string[]): void {

build/lib/builtInExtensions.js

@@ -5,7 +5,6 @@
 
 import * as es from 'event-stream';
 import * as fs from 'fs';
-import * as os from 'os';
 import * as cp from 'child_process';
 import * as glob from 'glob';
 import * as gulp from 'gulp';
@@ -22,8 +21,6 @@ import * as ansiColors from 'ansi-colors';
 const buffer = require('gulp-buffer');
 import * as jsoncParser from 'jsonc-parser';
 import webpack = require('webpack');
-// const pLimit = require('p-limit');
-// const os = require('os');
 import { getProductionDependencies } from './dependencies';
 import { IExtensionDefinition, getExtensionStream } from './builtInExtensions';
 import { getVersion } from './getVersion';
@@ -33,28 +30,19 @@ const root = path.dirname(path.dirname(__dirname));
 const commit = getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
 
-// Determine the maximum number of file descriptors the system allows
-// const maxFileDescriptors = os.platform() === 'win32' ? 2048 : os.sysconf('SC_OPEN_MAX');
-
-// Calculate the limit based on available file descriptors
-// const limitValue = Math.min(100, 100); // You can adjust this as needed
-
-// Create the dynamic limit function
-// const limit = pLimit(limitValue);
-
 function minifyExtensionResources(input: Stream): Stream {
 	const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true });
 	return input
 		.pipe(jsonFilter)
 		.pipe(buffer())
-		.pipe(es.map((f: File, callback) => {
+		.pipe(es.mapSync((f: File) => {
 			const errors: jsoncParser.ParseError[] = [];
 			const value = jsoncParser.parse(f.contents.toString('utf8'), errors, { allowTrailingComma: true });
 			if (errors.length === 0) {
 				// file parsed OK => just stringify to drop whitespace and comments
 				f.contents = Buffer.from(JSON.stringify(value));
 			}
-			callback(undefined, f);
+			return f;
 		}))
 		.pipe(jsonFilter.restore);
 }
@@ -210,8 +198,6 @@ function fromLocalNormal(extensionPath: string): Stream {
 
 	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
 		.then(fileNames => {
-			fancyLog(`Listing out files for extension: ${ansiColors.yellow(path.basename(extensionPath))}`);
-			fancyLog(`Files present: ${fileNames}`);
 			const files = fileNames
 				.map(fileName => path.join(extensionPath, fileName))
 				.map(filePath => new File({
@@ -347,32 +333,21 @@ export function packageLocalExtensionsStream(forWeb: boolean, disableMangle: boo
 				const absoluteManifestPath = path.join(root, manifestPath);
 				const extensionPath = path.dirname(path.join(root, manifestPath));
 				const extensionName = path.basename(extensionPath);
-				fancyLog(`Manifest Path: ${ansiColors.yellow(absoluteManifestPath)} ${absoluteManifestPath} ${root}...`);
 				return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
 			})
-			.filter(({ name }) => {
-				fancyLog(`Extension name which will be packaged: ${name}...`);
-				return excludedExtensions.indexOf(name) === -1;
-			})
+			.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
 			.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
 			.filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true))
 	);
 	const localExtensionsStream = minifyExtensionResources(
 		es.merge(
 			...localExtensionsDescriptions.map(extension => {
-				fancyLog(`Extension name to package: ${extension.name}...`);
 				return fromLocal(extension.path, forWeb, disableMangle)
-					.pipe(rename(p => {
-						const currentDirName = p.dirname;
-						const newDirName = `extensions/${extension.name}/${p.dirname}`;
-						p.dirname = `extensions/${extension.name}/${p.dirname}`;
-						fancyLog(`Extension directory name changed from ${currentDirName} to ${newDirName}`);
-					}));
+					.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
 			})
 		)
 	);
 
-
 	let result: Stream;
 	if (forWeb) {
 		result = localExtensionsStream;
@@ -395,20 +370,10 @@ export function packageLocalExtensionsStream(forWeb: boolean, disableMangle: boo
 }
 
 export function packageMarketplaceExtensionsStream(forWeb: boolean): Stream {
-	const platform = os.platform();
-	fancyLog('platform', platform);
-	let marketplaceExtensionsDescriptions: any[] = [];
-	if (platform !== 'win32' && platform !== 'darwin') {
-		// If we are in any environment other than windows and mac, we should
-		// switch to not bundling the extensions here from the marketplace.
-		marketplaceExtensionsDescriptions = [];
-	} else {
-		marketplaceExtensionsDescriptions = [
-			...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)),
-			...(forWeb ? webBuiltInExtensions : [])
-		];
-	}
-	fancyLog('marketplaceExtensions: ', marketplaceExtensionsDescriptions.length);
+	const marketplaceExtensionsDescriptions = [
+		...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)),
+		...(forWeb ? webBuiltInExtensions : [])
+	];
 	const marketplaceExtensionsStream = minifyExtensionResources(
 		es.merge(
 			...marketplaceExtensionsDescriptions

build/lib/builtInExtensions.ts

@@ -186,6 +186,10 @@
 			"name": "vs/workbench/contrib/csChat",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/aiModel",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/quickaccess",
 			"project": "vscode-workbench"
@@ -430,10 +434,6 @@
 			"name": "vs/workbench/services/keybinding",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/aiModel",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/lifecycle",
 			"project": "vscode-workbench"