@@ -426,6 +426,7 @@
 						"%settings.workspace.rootResolution.firstFolder.description%"
 					],
 					"default": "activeEditor",
+					"scope": "machine",
 					"description": "%settings.workspace.rootResolution.description%",
 					"markdownDescription": "%settings.workspace.rootResolution.description%"
 				}
 
@@ -54,19 +54,25 @@ function withWorkspaceMock(opts: {
 	folders?: Array<{ uri: { fsPath: string }; name: string; index: number }> | undefined
 	getWorkspaceFolder?: (...args: unknown[]) => { uri: { fsPath: string } } | null | undefined
 	activeEditor?: { document: { uri: { fsPath: string } } } | null
+	getConfiguration?: (section?: string) => { get: (key: string, defaultValue?: unknown) => unknown }
 }): () => void {
 	const previousFolders = mockWorkspace.workspaceFolders
 	const previousGetWorkspaceFolder = mockWorkspace.getWorkspaceFolder
 	const previousActiveEditor = mockWindow.activeTextEditor
+	// Capture getConfiguration too: tests that mutate it must not leak a broken
+	// mock into sibling tests if the outer beforeEach is ever changed or moved.
+	const previousGetConfiguration = mockWorkspace.getConfiguration
 
 	if ("folders" in opts) mockWorkspace.workspaceFolders = opts.folders
 	if (opts.getWorkspaceFolder) mockWorkspace.getWorkspaceFolder = opts.getWorkspaceFolder
 	if ("activeEditor" in opts) mockWindow.activeTextEditor = opts.activeEditor ?? null
+	if (opts.getConfiguration) mockWorkspace.getConfiguration = opts.getConfiguration
 
 	return () => {
 		mockWorkspace.workspaceFolders = previousFolders
 		mockWorkspace.getWorkspaceFolder = previousGetWorkspaceFolder
 		mockWindow.activeTextEditor = previousActiveEditor
+		mockWorkspace.getConfiguration = previousGetConfiguration
 	}
 }
 
@@ -107,8 +113,6 @@ describe("Path Utilities", () => {
 			expect(getWorkspacePath(workspacePath)).toBe("/Users/test/project")
 		})
 
-		it("should return undefined when outside a workspace", () => {})
-
 		describe("rootResolution = 'activeEditor' (default)", () => {
 			it("prefers the workspace folder containing the active editor", () => {
 				setRootResolution("activeEditor")
@@ -203,13 +207,15 @@ describe("Path Utilities", () => {
 		})
 
 		it("falls back to default behavior when reading the setting throws", () => {
-			mockWorkspace.getConfiguration = () => {
-				throw new Error("not available in this context")
-			}
+			// Route the throwing config mock through withWorkspaceMock so it is
+			// restored by the cleanup callback and cannot leak into sibling tests.
 			const restore = withWorkspaceMock({
 				folders: [{ uri: { fsPath: "/test/workspace" }, name: "test", index: 0 }],
 				activeEditor: { document: { uri: { fsPath: "/test/workspaceFolder/file.ts" } } },
 				getWorkspaceFolder: () => ({ uri: { fsPath: "/test/workspaceFolder" } }),
+				getConfiguration: () => {
+					throw new Error("not available in this context")
+				},
 			})
 			try {
 				// Should not throw and should resolve via active-editor logic.
@@ -241,6 +247,22 @@ describe("Path Utilities", () => {
 			}
 		})
 
+		it("(activeEditor) falls back to getWorkspacePath when the context path has no workspace folder", () => {
+			setRootResolution("activeEditor")
+			// contextPath is provided but getWorkspaceFolder returns null, exercising
+			// the console.debug fallback branch in getWorkspacePathForContext.
+			const restore = withWorkspaceMock({
+				folders: [{ uri: { fsPath: "/test/workspace" }, name: "test", index: 0 }],
+				activeEditor: null,
+				getWorkspaceFolder: () => null,
+			})
+			try {
+				expect(getWorkspacePathForContext("/unknown/path/file.ts")).toBe("/test/workspace")
+			} finally {
+				restore()
+			}
+		})
+
 		it("(firstFolder) ignores the context path and returns workspaceFolders[0]", () => {
 			setRootResolution("firstFolder")
 			const spy = vi.fn(() => ({ uri: { fsPath: "/some/other/workspace" } }))
 
@@ -2,6 +2,8 @@ import * as path from "path"
 import os from "os"
 import * as vscode from "vscode"
 
+import { Package } from "../shared/package"
+
 /*
 The Node.js 'path' module resolves and normalizes paths differently depending on the platform:
 - On Windows, it uses backslashes (\) as the default path separator.
@@ -138,11 +140,8 @@ const DEFAULT_ROOT_RESOLUTION: WorkspaceRootResolution = "activeEditor"
  */
 function getRootResolutionStrategy(): WorkspaceRootResolution {
 	try {
-		// Read directly from the `zoo-code` section to avoid importing
-		// `Package` here (path.ts is a low-level utility and we want to keep
-		// it free of circular dependencies on shared/* and package.json).
 		const value = vscode.workspace
-			.getConfiguration("zoo-code")
+			.getConfiguration(Package.name)
 			.get<string>("workspace.rootResolution", DEFAULT_ROOT_RESOLUTION)
 		return value === "firstFolder" ? "firstFolder" : DEFAULT_ROOT_RESOLUTION
 	} catch {
Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,7 @@`
`426`	`426`	`"%settings.workspace.rootResolution.firstFolder.description%"`
`427`	`427`	`],`
`428`	`428`	`"default": "activeEditor",`
	`429`	`+ "scope": "machine",`
`429`	`430`	`"description": "%settings.workspace.rootResolution.description%",`
`430`	`431`	`"markdownDescription": "%settings.workspace.rootResolution.description%"`
`431`	`432`	`}`