Merge branch 'main' into use-logging-output-vscode

EhabY · web-flow · commit 36302b92b7ac · 2025-07-18T20:13:30.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,10 @@
 
 - Update `/openDevContainer` to support all dev container features when hostPath
   and configFile are provided.
-- Coder output panel enhancements: All log entries now include timestamps, and you can filter messages by log level directly in the panel
+- Add `coder.disableUpdateNotifications` setting to disable workspace template
+  update notifications.
+- Coder output panel enhancements: All log entries now include timestamps, and you 
+  can filter messages by log level in the panel.
 
 ## [v1.9.2](https://github.com/coder/vscode-coder/releases/tag/v1.9.2) 2025-06-25
 
diff --git a/package.json b/package.json
@@ -109,6 +109,11 @@
 					"markdownDescription": "Automatically log into the default URL when the extension is activated. coder.defaultUrl is preferred, otherwise the CODER_URL environment variable will be used. This setting has no effect if neither is set.",
 					"type": "boolean",
 					"default": false
+				},
+				"coder.disableUpdateNotifications": {
+					"markdownDescription": "Disable notifications when workspace template updates are available.",
+					"type": "boolean",
+					"default": false
 				}
 			}
 		},
diff --git a/src/remote.ts b/src/remote.ts
@@ -593,11 +593,14 @@ export class Remote {
 			disposables.push(this.showNetworkUpdates(pid));
 			if (logDir) {
 				const logFiles = await fs.readdir(logDir);
-				this.commands.workspaceLogPath = logFiles
+				const logFileName = logFiles
 					.reverse()
 					.find(
 						(file) => file === `${pid}.log` || file.endsWith(`-${pid}.log`),
 					);
+				this.commands.workspaceLogPath = logFileName
+					? path.join(logDir, logFileName)
+					: undefined;
 			} else {
 				this.commands.workspaceLogPath = undefined;
 			}
diff --git a/src/workspaceMonitor.ts b/src/workspaceMonitor.ts
@@ -171,7 +171,16 @@ export class WorkspaceMonitor implements vscode.Disposable {
 
 	private maybeNotifyOutdated(workspace: Workspace) {
 		if (!this.notifiedOutdated && workspace.outdated) {
+			// Check if update notifications are disabled
+			const disableNotifications = vscode.workspace
+				.getConfiguration("coder")
+				.get<boolean>("disableUpdateNotifications", false);
+			if (disableNotifications) {
+				return;
+			}
+
 			this.notifiedOutdated = true;
+
 			this.restClient
 				.getTemplate(workspace.template_id)
 				.then((template) => {

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,11 @@`
`109`	`109`	`"markdownDescription": "Automatically log into the default URL when the extension is activated. coder.defaultUrl is preferred, otherwise the CODER_URL environment variable will be used. This setting has no effect if neither is set.",`
`110`	`110`	`"type": "boolean",`
`111`	`111`	`"default": false`
	`112`	`+ },`
	`113`	`+ "coder.disableUpdateNotifications": {`
	`114`	`+ "markdownDescription": "Disable notifications when workspace template updates are available.",`
	`115`	`+ "type": "boolean",`
	`116`	`+ "default": false`
`112`	`117`	`}`
`113`	`118`	`}`
`114`	`119`	`},`