From 3f44e3f4a308dca3a5aa1a22f877a029412cad36 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sat, 9 Aug 2025 11:47:10 +0200
Subject: [PATCH] feat(1.104): update patches (#2448)

---
 patches/linux/fix-reh-bootstrap.patch             | 14 ++++++--------
 patches/merge-user-product.patch                  | 15 ++++++++-------
 .../{fix-codesign.patch => fix-codesign.patch.no} |  0
 product.json                                      |  9 ++++++---
 upstream/insider.json                             |  4 ++--
 5 files changed, 22 insertions(+), 20 deletions(-)
 rename patches/osx/{fix-codesign.patch => fix-codesign.patch.no} (100%)

diff --git a/patches/linux/fix-reh-bootstrap.patch b/patches/linux/fix-reh-bootstrap.patch
index b0e87e6..38167fe 100644
--- a/patches/linux/fix-reh-bootstrap.patch
+++ b/patches/linux/fix-reh-bootstrap.patch
@@ -1,25 +1,23 @@
 diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts
-index f2cf101..d974f65 100644
+index 188a25a..12b262d 100644
 --- a/src/bootstrap-esm.ts
 +++ b/src/bootstrap-esm.ts
-@@ -8,3 +8,3 @@ import * as fs from 'fs';
- import { fileURLToPath } from 'url';
+@@ -6,3 +6,3 @@
+ import * as fs from 'fs';
 -import { createRequire, register } from 'node:module';
 +import * as Module from 'node:module';
  import { product, pkg } from './bootstrap-meta.js';
-@@ -14,3 +14,4 @@ import { INLSConfiguration } from './vs/nls.js';
+@@ -12,6 +12,7 @@ import { INLSConfiguration } from './vs/nls.js';
  
 -const require = createRequire(import.meta.url);
-+// @ts-ignore
 +const require = Module.createRequire(import.meta.url);
- const __dirname = path.dirname(fileURLToPath(import.meta.url));
-@@ -18,3 +19,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
+ 
  // Install a hook to module resolution to map 'fs' to 'original-fs'
 -if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
 +// @ts-ignore
 +if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
  	const jsCode = `
-@@ -33,3 +35,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+@@ -30,3 +31,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
  	}`;
 -	register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
 +	// @ts-ignore
diff --git a/patches/merge-user-product.patch b/patches/merge-user-product.patch
index 391550a..1414971 100644
--- a/patches/merge-user-product.patch
+++ b/patches/merge-user-product.patch
@@ -1,16 +1,17 @@
 diff --git a/src/main.ts b/src/main.ts
-index fdc424e..46b014b 100644
+index 1600666..eb6eee9 100644
 --- a/src/main.ts
 +++ b/src/main.ts
 @@ -8,2 +8,3 @@ import * as fs from 'original-fs';
  import * as os from 'os';
 +import { createRequire } from 'node:module';
  import { performance } from 'perf_hooks';
-@@ -24,2 +25,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
- const __dirname = path.dirname(fileURLToPath(import.meta.url));
-+const require = createRequire(import.meta.url);
+@@ -22,2 +23,4 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
  
-@@ -112,2 +114,14 @@ registerListeners();
++const require = createRequire(import.meta.url);
++
+ perf.mark('code/didStartMain');
+@@ -109,2 +112,14 @@ registerListeners();
  
 +function resolveUserProduct() {
 +	const userProductPath = path.join(userDataPath, 'product.json');
@@ -25,12 +26,12 @@ index fdc424e..46b014b 100644
 +}
 +
  /**
-@@ -208,2 +222,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
+@@ -205,2 +220,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
  	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
 +	resolveUserProduct();
  
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index d27cdce..d758c5e 100644
+index a299f02..cca9de6 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -31,2 +31,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
diff --git a/patches/osx/fix-codesign.patch b/patches/osx/fix-codesign.patch.no
similarity index 100%
rename from patches/osx/fix-codesign.patch
rename to patches/osx/fix-codesign.patch.no
diff --git a/product.json b/product.json
index 5c9e760..b42055d 100644
--- a/product.json
+++ b/product.json
@@ -357,9 +357,6 @@
       "chatReferenceBinaryData",
       "codeActionAI"
     ],
-    "lramos15.model-playground": [
-      "chatProvider"
-    ],
     "ms-autodev.vscode-autodev": [
       "chatParticipantAdditions"
     ],
@@ -370,6 +367,12 @@
     "vscjava.vscode-java-upgrade": [
       "chatParticipantAdditions"
     ],
+    "FoundryLocal.foundry-local-chat": [
+      "chatProvider"
+    ],
+    "Microsoft.foundry-local-chat": [
+      "chatProvider"
+    ],
     "jeanp413.open-remote-ssh": [
       "resolvers",
       "tunnels",
diff --git a/upstream/insider.json b/upstream/insider.json
index 3923bb5..a15b48d 100644
--- a/upstream/insider.json
+++ b/upstream/insider.json
@@ -1,4 +1,4 @@
 {
-  "tag": "1.103.0",
-  "commit": "e3550cfac4b63ca4eafca7b601f0d2885817fd1f"
+  "tag": "1.104.0",
+  "commit": "2c749892adf66679e282a1b27ae526cf995d6f0c"
 }