address feedback

Author: StellaHuang95

src/common/inlineScriptCacheKey.ts

@@ -31,6 +31,7 @@ function normalizeExtras(inner: string): string {
     return deduped.length > 0 ? `[${deduped.join(',')}]` : '';
 }
 
+/** ` >=  2 ; python_version  <  "3.13"` becomes `>=2 ; python_version<"3.13"`. */
 function normalizeRequirementTail(value: string): string {
     let result = '';
     let unquoted = '';

src/common/inlineScriptCacheLayout.ts

@@ -284,6 +284,10 @@ function isDescendantPath(rootPath: string, candidatePath: string): boolean {
     );
 }
 
+function isNonEmptyTrimmedString(value: unknown): value is string {
+    return typeof value === 'string' && value.length > 0 && value.trim() === value;
+}
+
 function validateMeta(value: unknown): InlineScriptEnvMeta | undefined {
     if (typeof value !== 'object' || value === null || Array.isArray(value)) {
         return undefined;
@@ -292,19 +296,10 @@ function validateMeta(value: unknown): InlineScriptEnvMeta | undefined {
     if (obj.schemaVersion !== META_SCHEMA_VERSION) {
         return undefined;
     }
-    if (
-        typeof obj.baseInterpreterPath !== 'string' ||
-        obj.baseInterpreterPath.length === 0 ||
-        obj.baseInterpreterPath.trim() !== obj.baseInterpreterPath ||
-        !path.isAbsolute(obj.baseInterpreterPath)
-    ) {
+    if (!isNonEmptyTrimmedString(obj.baseInterpreterPath) || !path.isAbsolute(obj.baseInterpreterPath)) {
         return undefined;
     }
-    if (
-        typeof obj.baseInterpreterVersion !== 'string' ||
-        obj.baseInterpreterVersion.trim().length === 0 ||
-        obj.baseInterpreterVersion.trim() !== obj.baseInterpreterVersion
-    ) {
+    if (!isNonEmptyTrimmedString(obj.baseInterpreterVersion)) {
         return undefined;
     }
     if (!isCanonicalIsoTimestamp(obj.lastUsedAt)) {

src/test/common/inlineScriptCacheLayout.unit.test.ts

@@ -471,6 +471,13 @@ suite('inlineScriptCacheLayout', () => {
             assert.strictEqual(await resolveCacheEntryPath(cacheRoot, externalEnv), undefined);
         });
 
+        test('rejects a nested descendant of the cache root', async () => {
+            const nestedEnv = Uri.joinPath(cacheRoot, 'nested', '0123456789abcdef');
+            await fs.ensureDir(nestedEnv.fsPath);
+
+            assert.strictEqual(await resolveCacheEntryPath(cacheRoot, nestedEnv), undefined);
+        });
+
         test('surfaces a missing entry', async () => {
             await assert.rejects(
                 resolveCacheEntryPath(cacheRoot, Uri.joinPath(cacheRoot, '0123456789abcdef')),
@@ -519,13 +526,23 @@ suite('inlineScriptCacheLayout', () => {
             assert.strictEqual(await inspectOwnedCacheEntry(otherManager, cacheRoot, envDir), 'uncertain');
         });
 
-        test('classifies an inline environment resolving elsewhere as stale', async () => {
+        test('classifies an inline environment with a mismatched sysPrefix as stale', async () => {
+            const externalPrefix = path.join(tmpDir, 'external-env');
+            await fs.ensureDir(externalPrefix);
+            const mismatched = {
+                ...environment,
+                sysPrefix: externalPrefix,
+            };
+
+            assert.strictEqual(await inspectOwnedCacheEntry(mismatched, cacheRoot, envDir), 'stale');
+        });
+
+        test('classifies an inline environment with a mismatched environmentPath as stale', async () => {
             const externalPrefix = path.join(tmpDir, 'external-env');
             const externalPython = getVenvPythonPath(externalPrefix);
             await fs.outputFile(externalPython, '');
             const mismatched = {
                 ...environment,
-                sysPrefix: externalPrefix,
                 environmentPath: Uri.file(externalPython),
             };