refactor(supportBundle): share Remote-SSH layout predicates

Address PR #971 CRF-8: extract the Remote-SSH log layout knowledge
(extension exthost dirs, `output_logging_` prefix, `Remote - SSH`
filename fragment) into `sshExtension.ts` as predicates and consume
them from both `sshProcess.ts` and `supportBundle/logFiles.ts`. A
future VS Code log layout change now touches one place.

Author: EhabY

src/remote/sshExtension.ts

@@ -10,6 +10,28 @@ export const REMOTE_SSH_EXTENSION_IDS = [
 
 export type RemoteSshExtensionId = (typeof REMOTE_SSH_EXTENSION_IDS)[number];
 
+/**
+ * VS Code Remote-SSH log layout, shared by the live SSH monitor and the
+ * support-bundle collector so a future layout change updates one place.
+ */
+const OUTPUT_LOGGING_DIR_PREFIX = "output_logging_";
+const REMOTE_SSH_LOG_NAME_FRAGMENT = "Remote - SSH";
+
+/** True if `dirName` is the exthost dir of a known Remote-SSH extension. */
+export function isRemoteSshExtensionDir(dirName: string): boolean {
+	return (REMOTE_SSH_EXTENSION_IDS as readonly string[]).includes(dirName);
+}
+
+/** True if `dirName` is a VS Code shared output channel dir. */
+export function isOutputLoggingDir(dirName: string): boolean {
+	return dirName.startsWith(OUTPUT_LOGGING_DIR_PREFIX);
+}
+
+/** True if `fileName` is the Remote-SSH log inside a shared output channel. */
+export function isSharedChannelRemoteSshLog(fileName: string): boolean {
+	return fileName.includes(REMOTE_SSH_LOG_NAME_FRAGMENT);
+}
+
 type RemoteSshExtension = vscode.Extension<unknown> & {
 	id: RemoteSshExtensionId;
 };

src/remote/sshProcess.ts

@@ -8,6 +8,10 @@ import { findPort } from "../util";
 import { cleanupFiles } from "../util/fileCleanup";
 
 import { NetworkStatusReporter } from "./networkStatus";
+import {
+	isOutputLoggingDir,
+	isSharedChannelRemoteSshLog,
+} from "./sshExtension";
 
 import type { Logger } from "../logging/logger";
 import type { TelemetryReporter } from "../telemetry/reporter";
@@ -514,7 +518,7 @@ async function findRemoteSshLogPath(
 	try {
 		const dirs = await fs.readdir(logsParentDir);
 		const outputDirs = dirs
-			.filter((d) => d.startsWith("output_logging_"))
+			.filter(isOutputLoggingDir)
 			.sort((a, b) => a.localeCompare(b))
 			.reverse();
 
@@ -541,6 +545,6 @@ async function findRemoteSshLogPath(
 
 async function findSshLogInDir(dirPath: string): Promise<string | undefined> {
 	const files = await fs.readdir(dirPath);
-	const remoteSshLog = files.find((f) => f.includes("Remote - SSH"));
+	const remoteSshLog = files.find(isSharedChannelRemoteSshLog);
 	return remoteSshLog ? path.join(dirPath, remoteSshLog) : undefined;
 }

src/supportBundle/files.ts

@@ -46,7 +46,7 @@ function isEnoent(error: unknown): boolean {
 	);
 }
 
-// lstat rejects symlinks so a planted link can't pull host files in.
+/** Read a file with an lstat guard that rejects symlinks. */
 export async function readLogFile(
 	filePath: string,
 	logger: Logger,

src/supportBundle/logFiles.ts

@@ -1,7 +1,11 @@
 import * as path from "node:path";
 
 import { type Logger } from "../logging/logger";
-import { REMOTE_SSH_EXTENSION_IDS } from "../remote/sshExtension";
+import {
+	isOutputLoggingDir,
+	isRemoteSshExtensionDir,
+	isSharedChannelRemoteSshLog,
+} from "../remote/sshExtension";
 
 import {
 	addFiles,
@@ -42,16 +46,11 @@ function isRemoteSshLog(relativePath: string, fileName: string): boolean {
 	}
 	const parts = normalizeZipPath(relativePath).split("/");
 	// Whole exthost dir belongs to one extension; output_logging_* is shared.
-	if (
-		parts.some((part) =>
-			(REMOTE_SSH_EXTENSION_IDS as readonly string[]).includes(part),
-		)
-	) {
+	if (parts.some(isRemoteSshExtensionDir)) {
 		return true;
 	}
 	return (
-		parts.some((part) => part.startsWith("output_logging_")) &&
-		fileName.includes("Remote - SSH")
+		parts.some(isOutputLoggingDir) && isSharedChannelRemoteSshLog(fileName)
 	);
 }