zowe
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 7 additions & 1 deletion b/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎packages/zowe-explorer-api/CHANGELOG.md‎
Lines changed: 4 additions & 2 deletions b/‎packages/zowe-explorer-api/CHANGELOG.md‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎packages/zowe-explorer-api/__mocks__/mockUtils.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/zowe-explorer-api/__mocks__/mockUtils.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/zowe-explorer-api/__tests__/__unit__/profiles/ZoweExplorerZosmfApi.unit.test.ts‎
Lines changed: 43 additions & 0 deletions b/‎packages/zowe-explorer-api/__tests__/__unit__/profiles/ZoweExplorerZosmfApi.unit.test.ts‎
Lines changed: 43 additions & 0 deletions
diff --git a/‎packages/zowe-explorer-api/__tests__/__unit__/utils/ErrorUtils.unit.test.ts‎
Lines changed: 108 additions & 0 deletions b/‎packages/zowe-explorer-api/__tests__/__unit__/utils/ErrorUtils.unit.test.ts‎
Lines changed: 108 additions & 0 deletions
diff --git a/‎packages/zowe-explorer-api/src/profiles/ProfilesCache.ts‎
Lines changed: 2 additions & 3 deletions b/‎packages/zowe-explorer-api/src/profiles/ProfilesCache.ts‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎packages/zowe-explorer-api/src/profiles/ZoweExplorerZosmfApi.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/zowe-explorer-api/src/profiles/ZoweExplorerZosmfApi.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/zowe-explorer-api/src/utils/ErrorUtils.ts‎
Lines changed: 28 additions & 0 deletions b/‎packages/zowe-explorer-api/src/utils/ErrorUtils.ts‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎packages/zowe-explorer-api/src/utils/FileManagement.ts‎
Lines changed: 4 additions & 3 deletions b/‎packages/zowe-explorer-api/src/utils/FileManagement.ts‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎packages/zowe-explorer-api/src/utils/index.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/zowe-explorer-api/src/utils/index.ts‎
Lines changed: 1 addition & 0 deletions
@@ -1,3 +1,7 @@
+<!-- 
+**NOTE:** The team reserves the right to close pull requests that fail to meet quality standards or lack human contribution.
+-->
+
 ## Proposed changes
 
 <!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. -->
@@ -40,13 +44,15 @@ Changelog:
 **Code coverage**
 
 - [ ] There is coverage for the code that I have added
-- [ ] I have added new test cases and they are passing
+- [ ] I have added new unit test cases and they are passing
+- [ ] I have added at least one end-to-end test for new features to validate behavior (if applicable)
 - [ ] I have manually tested the changes
 
 **Deployment**
 
 - [ ] I have tested new functionality with the FTP extension and profile verifying no extender profile type breakages introduced
 - [ ] I have added developer documentation (if applicable)
+- [ ] I have verified that all dependency updates (such as Zowe SDKs) in this pull request are compatible
 - [ ] Documentation should be added to Zowe Docs
   - If you're an outside contributor, please post in the [#zowe-doc Slack channel](https://openmainframeproject.slack.com/archives/CC961JYMQ) to coordinate documentation.
   - Otherwise, please check with the rest of the squad about any needed documentation before merging.
 
@@ -1,16 +1,19 @@
-# Change Log
+# Change Log
 
 All notable changes to the "zowe-explorer-api" extension will be documented in this file.
 
 ## TBD Release
 
 ### New features and enhancements
 
+- Added `handleError` and `errorMessage` utility functions to eliminate repetitive `if (err instanceof Error)` patterns across the codebase. [#4207](https://github.com/zowe/zowe-explorer-vscode/issues/4207)
+- Added a function `isEnabledInSettings` to the `FeatureFlags` class, which checks VS Code settings to see if a given Zowe Explorer feature ID is enabled. [#4242](https://github.com/zowe/zowe-explorer-vscode/issues/4242)
 - Added a function `trimExtension` in the `FsDatasetsUtils` class for stripping extension suffix off of a data set name. [#4326](https://github.com/zowe/zowe-explorer-vscode/pull/4326)
 
 ### Bug fixes
 
 - Fixed an issue where the `ZoweVsCodeExtension.workspaceRoot` function getter could return a non-existent local directory. Now, invalid directory paths are ignored by Zowe Explorer and only valid paths are considered as the workspace root. [#4271](https://github.com/zowe/zowe-explorer-vscode/issues/4271)
+- Fixed an issue where executing Unix commands could fail if the current working directory path contained certain special characters. [#4330](https://github.com/zowe/zowe-explorer-vscode/pull/4330)
 
 ## `3.5.0`
 
@@ -21,7 +24,6 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 - Enhanced `DataSetAttributesProvider` to pass raw API response attributes to extenders via the `DsInfo` context object. Extenders can now access the `attributes` field in the context to retrieve data set information without making additional API calls. [#3927](https://github.com/zowe/zowe-explorer-vscode/issues/3927)
 - Added `Name` and `DateCreated` to `Sorting.DatasetFilterOpts`. [#4075](https://github.com/zowe/zowe-explorer-vscode/pull/4075)
 - Moved the `AuthHandler` implementation from `profiles/AuthHandler` to `vscode/session/AuthHandler` and added a compatibility shim at the original path to preserve existing imports and API behavior for extenders. [4149](https://github.com/zowe/zowe-explorer-vscode/issues/4149)
-- Added a function `isEnabledInSettings` to the `FeatureFlags` class, which checks VS Code settings to see if a given Zowe Explorer feature ID is enabled. [#4242](https://github.com/zowe/zowe-explorer-vscode/issues/4242)
 
 ### Bug fixes
 
 
@@ -26,7 +26,7 @@ enum MockedValueType {
 /**
  *  _Please use this when possible instead of Object.defineProperty!_
  *
- * A safer approach to "mocking" the value for a property that cannot be easily mocked using Jest.\
+ * A safer approach to "mocking" the value for a property that cannot be easily mocked using Vitest.\
  * Uses TypeScript 5.2's Explicit Resource Management to restore the original value for the given object and property key.
  */
 export class MockedProperty {
 
@@ -919,6 +919,49 @@ describe("ZosmfCommandApi", () => {
             await expectUnixCommandApiWithSshSession(cmdApi, new ZoweExplorerZosmf.CommandApi(), SshSessionobj);
         });
     });
+
+    it("issueUnixCommand should pass cwd raw to executeSshCwd (as the SDK handles escaping)", async () => {
+        const obj = new ZoweExplorerZosmf.CommandApi();
+        const spy = sharedSpyOn(zosuss.Shell, "executeSshCwd");
+        spy.mockClear().mockResolvedValue(undefined);
+        await obj.issueUnixCommand("ls", "dir'with'quotes", SshSessionobj);
+        expect(spy).toHaveBeenCalledWith(SshSessionobj, "ls", "dir'with'quotes", expect.any(Function), true);
+    });
+
+    it("issueUnixCommand should pass cwd raw to executeSshCwd even with shell metacharacters", async () => {
+        const obj = new ZoweExplorerZosmf.CommandApi();
+        const spy = sharedSpyOn(zosuss.Shell, "executeSshCwd");
+        spy.mockClear().mockResolvedValue(undefined);
+
+        await obj.issueUnixCommand("pwd", "test'dir$(sleep 5)`whoami`", SshSessionobj);
+
+        expect(spy).toHaveBeenCalledWith(SshSessionobj, "pwd", "test'dir$(sleep 5)`whoami`", expect.any(Function), true);
+    });
+
+    it("issueUnixCommand should pass cwd raw to executeSshCwd even with consecutive/edge single quotes", async () => {
+        const obj = new ZoweExplorerZosmf.CommandApi();
+        const spy = sharedSpyOn(zosuss.Shell, "executeSshCwd");
+        spy.mockClear().mockResolvedValue(undefined);
+
+        await obj.issueUnixCommand("ls", "''weird''dir'", SshSessionobj);
+
+        expect(spy).toHaveBeenCalledWith(SshSessionobj, "ls", "''weird''dir'", expect.any(Function), true);
+    });
+
+    it("issueUnixCommand should call executeSsh directly if cwd is empty", async () => {
+        const obj = new ZoweExplorerZosmf.CommandApi();
+        const spySsh = sharedSpyOn(zosuss.Shell, "executeSsh");
+        const spySshCwd = sharedSpyOn(zosuss.Shell, "executeSshCwd");
+
+        spySsh.mockClear().mockResolvedValue(undefined);
+        spySshCwd.mockClear().mockResolvedValue(undefined);
+
+        await obj.issueUnixCommand("ls", "", SshSessionobj);
+
+        expect(spySshCwd).not.toHaveBeenCalled();
+        expect(spySsh).toHaveBeenCalledWith(SshSessionobj, "ls", expect.any(Function), true);
+    });
+
     it("check whether sshProfileNeeded", () => {
         const obj = new ZoweExplorerZosmf.CommandApi();
         expect(obj.sshProfileRequired?.()).toBe(true);
 
@@ -0,0 +1,108 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
+import { errorMessage, handleError } from "../../../src/utils/ErrorUtils";
+import { vi } from "vitest";
+
+describe("errorMessage", () => {
+    it("returns the message property when passed an Error instance", () => {
+        const err = new Error("something went wrong");
+        expect(errorMessage(err)).toBe("something went wrong");
+    });
+
+    it("returns String(err) when passed a plain string", () => {
+        expect(errorMessage("raw string error")).toBe("raw string error");
+    });
+
+    it("returns String(err) when passed a number", () => {
+        expect(errorMessage(42)).toBe("42");
+    });
+
+    it("returns String(err) when passed null", () => {
+        expect(errorMessage(null)).toBe("null");
+    });
+
+    it("returns String(err) when passed undefined", () => {
+        expect(errorMessage(undefined)).toBe("undefined");
+    });
+
+    it("returns String(err) when passed a plain object", () => {
+        const obj = { code: 404 };
+        expect(errorMessage(obj)).toBe(String(obj));
+    });
+
+    it("returns the message of an Error subclass", () => {
+        class CustomError extends Error {}
+        const err = new CustomError("custom failure");
+        expect(errorMessage(err)).toBe("custom failure");
+    });
+
+    it("returns an empty string when passed an Error with an empty message", () => {
+        const err = new Error("");
+        expect(errorMessage(err)).toBe("");
+    });
+});
+
+describe("handleError", () => {
+    it("invokes the callback when err is an Error instance", () => {
+        const callback = vi.fn();
+        const err = new Error("boom");
+        handleError(err, callback);
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(callback).toHaveBeenCalledWith(err);
+    });
+
+    it("does not invoke the callback when err is a string", () => {
+        const callback = vi.fn();
+        handleError("not an Error", callback);
+        expect(callback).not.toHaveBeenCalled();
+    });
+
+    it("does not invoke the callback when err is null", () => {
+        const callback = vi.fn();
+        handleError(null, callback);
+        expect(callback).not.toHaveBeenCalled();
+    });
+
+    it("does not invoke the callback when err is undefined", () => {
+        const callback = vi.fn();
+        handleError(undefined, callback);
+        expect(callback).not.toHaveBeenCalled();
+    });
+
+    it("does not invoke the callback when err is a plain object", () => {
+        const callback = vi.fn();
+        handleError({ message: "fake" }, callback);
+        expect(callback).not.toHaveBeenCalled();
+    });
+
+    it("does not invoke the callback when err is a number", () => {
+        const callback = vi.fn();
+        handleError(0, callback);
+        expect(callback).not.toHaveBeenCalled();
+    });
+
+    it("invokes the callback for an Error subclass instance", () => {
+        class CustomError extends Error {}
+        const callback = vi.fn();
+        const err = new CustomError("subclass error");
+        handleError(err, callback);
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(callback).toHaveBeenCalledWith(err);
+    });
+
+    it("passes the exact Error reference to the callback", () => {
+        const callback = vi.fn();
+        const err = new Error("reference check");
+        handleError(err, callback);
+        expect(callback.mock.calls[0][0]).toBe(err);
+    });
+});
@@ -12,6 +12,7 @@
 import * as imperative from "@zowe/imperative";
 import type { IRegisterClient } from "../extend/IRegisterClient";
 import { FileManagement } from "../utils/FileManagement";
+import { errorMessage } from "../utils/ErrorUtils";
 import { Validation } from "./Validation";
 import { ZosmfProfile } from "@zowe/zosmf-for-zowe-sdk";
 import { ZosTsoProfile } from "@zowe/zos-tso-for-zowe-sdk";
@@ -113,9 +114,7 @@ export class ProfilesCache {
             return undefined;
         } catch (err) {
             // Log the error but don't throw - credential manager options are optional
-            imperative.Logger.getAppLogger().warn(
-                `Failed to read credential manager options from imperative.json: ${err instanceof Error ? err.message : String(err)}`
-            );
+            imperative.Logger.getAppLogger().warn(`Failed to read credential manager options from imperative.json: ${errorMessage(err)}`);
             return undefined;
         }
     }
 
@@ -540,7 +540,7 @@ import { IDataSetCount } from "../dataset/IDataSetCount";
                 await zosuss.Shell.executeSshCwd(
                     sshSession,
                     command,
-                    '"' + cwd + '"',
+                    cwd,
                     (data: string) => {
                         stdout += data;
                     },
 
@@ -0,0 +1,28 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
+/**
+ * Returns the error message if `err` is an Error, otherwise converts it to a string.
+ * Replaces inline `err instanceof Error ? err.message : String(err)` ternaries.
+ */
+export function errorMessage(err: unknown): string {
+    return err instanceof Error ? err.message : String(err);
+}
+
+/**
+ * Calls the provided callback only if `err` is an instance of Error.
+ * Replaces repetitive `if (err instanceof Error) { ... }` patterns.
+ */
+export function handleError(err: unknown, callback: (error: Error) => void | Promise<void>): void | Promise<void> {
+    if (err instanceof Error) {
+        return callback(err);
+    }
+}
@@ -10,6 +10,7 @@
  */
 
 import { realpathSync } from "fs";
+import { handleError } from "./ErrorUtils";
 import { platform } from "os";
 import { Constants } from "../globals";
 import { ImperativeConfig, ConfigUtils } from "@zowe/imperative";
@@ -76,12 +77,12 @@ export class FileManagement {
                 // TODO: FEATURE-FLAG(fetchByDefault): remove fetch=true
                 await workspace.fs.stat(folder.uri.with({ query: "fetch=true" }));
             } catch (err) {
-                if (err instanceof Error) {
+                void handleError(err, (error) => {
                     // TODO: Remove console.error in favor of logger
                     // (need to move logger to ZE API)
                     // eslint-disable-next-line no-console
-                    console.error("reloadWorkspacesForProfile:", err.message);
-                }
+                    console.error("reloadWorkspacesForProfile:", error.message);
+                });
             }
         }
     }
 
@@ -17,6 +17,7 @@ export * from "./ErrorCorrelator";
 export * from "./Poller";
 export * from "./FileManagement";
 export * from "./FeatureFlags";
+export * from "./ErrorUtils";
 
 /**
  * Getter to check dirty flag for nodes opened in the editor.
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ enum MockedValueType {`
`26`	`26`	`/**`
`27`	`27`	`* _Please use this when possible instead of Object.defineProperty!_`
`28`	`28`	`*`
`29`		`- * A safer approach to "mocking" the value for a property that cannot be easily mocked using Jest.\`
	`29`	`+ * A safer approach to "mocking" the value for a property that cannot be easily mocked using Vitest.\`
`30`	`30`	`* Uses TypeScript 5.2's Explicit Resource Management to restore the original value for the given object and property key.`
`31`	`31`	`*/`
`32`	`32`	`export class MockedProperty {`