Merge branch 'main' of github.com:coder/code-server into coder-main

Author: lutinglt

ci/build/build-release.sh

@@ -130,7 +130,7 @@ bundle_vscode() {
   # dependencies, since we want to ship this via NPM.
   # Also override the name to prevent vulnerability scanners from
   # misidentifying this package as VS Code (see #7071).
-  jq --slurp '.[0] * .[1] | .name = "code-oss-dev"' \
+  jq --slurp '.[0] * .[1] | .name = "code-oss"' \
     "$VSCODE_SRC_PATH/remote/package.json" \
     "$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged"
   mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json"

patches/integration.diff

@@ -189,9 +189,6 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 @@ -65,6 +65,8 @@ export type ExtensionVirtualWorkspaceSup
  };
 
-@@ -84,6 +84,8 @@ export interface IAgentSdkProductConfig
- }
-
  export interface IProductConfiguration {
 +	readonly codeServerVersion?: string
 +