fix: Fixes for docker and uv. Added global parameter for uv

Author: kevinwang5658

src/resources/docker/docker.ts

@@ -175,7 +175,7 @@ export class DockerResource extends Resource<DockerConfig> {
       { requiresRoot: true }
     );
     await $.spawn(
-      'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg',
+      'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o --batch --yes /etc/apt/keyrings/docker.gpg',
       { requiresRoot: true }
     );
     await $.spawn(
@@ -189,7 +189,7 @@ export class DockerResource extends Resource<DockerConfig> {
     const distro = await this.getDebianDistro($);
 
     await $.spawn(
-      `echo "deb [arch=${arch} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/${distro} $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null`,
+      `bash -c 'echo "deb [arch=${arch} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/${distro} $(lsb_release -cs 2>/dev/null) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null'`,
       { requiresRoot: true }
     );
 

src/resources/python/uv/global-parameter.ts

@@ -0,0 +1,57 @@
+import { getPty, ParameterSetting, SpawnStatus, StatefulParameter } from '@codifycli/plugin-core';
+
+import { UvConfig } from './uv.js';
+
+/**
+ * Manages the global default Python version exposed on PATH via uv.
+ *
+ * `uv python install <version> --default` installs unversioned `python` and
+ * `python3` symlinks into ~/.local/bin, making that version the system-wide
+ * default outside of any project context.
+ *
+ * To detect the current default, we read the symlink at ~/.local/bin/python
+ * and parse the cpython version string from the target path.
+ */
+export class UvGlobalParameter extends StatefulParameter<UvConfig, string> {
+  getSettings(): ParameterSetting {
+    return {
+      type: 'version',
+    };
+  }
+
+  override async refresh(): Promise<string | null> {
+    const $ = getPty();
+
+    // Check if ~/.local/bin/python exists and points to a uv-managed interpreter.
+    // `readlink` resolves the symlink target; if it contains cpython we know it
+    // was installed by uv with --default.
+    const { status, data } = await $.spawnSafe('readlink ~/.local/bin/python');
+    if (status === SpawnStatus.ERROR || !data.trim()) {
+      return null;
+    }
+
+    // Symlink target is a path like .../cpython-3.12.3-.../bin/python3.12
+    const match = data.trim().match(/cpython-(\d+\.\d+(?:\.\d+)?)/);
+
+    return match ? match[1] : null;
+  }
+
+  override async add(version: string): Promise<void> {
+    const $ = getPty();
+    await $.spawn(`uv python install ${version} --default`, { interactive: true });
+  }
+
+  override async modify(newVersion: string): Promise<void> {
+    const $ = getPty();
+    await $.spawn(`uv python install ${newVersion} --default`, { interactive: true });
+  }
+
+  override async remove(_version: string): Promise<void> {
+    const $ = getPty();
+    // uv has no "unset default" command. Remove the unversioned symlinks that
+    // --default created in ~/.local/bin so `python` / `python3` no longer
+    // resolve to this uv-managed interpreter. The versioned binary is left
+    // intact because it may still be listed in pythonVersions.
+    await $.spawnSafe('rm -f ~/.local/bin/python ~/.local/bin/python3');
+  }
+}

src/resources/python/uv/python-versions-parameter.ts

@@ -50,7 +50,7 @@ function parseInstalledPythonVersions(output: string): string[] {
   return output
     .split('\n')
     .map((line) => {
-      const match = line.match(/cpython-(\d+\.\d+\.\d+)/);
+      const match = line.match(/cpython-(\d+\.\d+(?:\.\d+)?)/);
       return match ? match[1] : null;
     })
     .filter((v): v is string => v !== null);

src/resources/python/uv/tools-parameter.ts

@@ -27,12 +27,12 @@ export class UvToolsParameter extends ArrayStatefulParameter<UvConfig, string> {
 
   override async addItem(tool: string): Promise<void> {
     const $ = getPty();
-    await $.spawn(`uv tool install ${tool}`, { interactive: true });
+    await $.spawnSafe(`uv tool install --force ${tool}`, { interactive: true });
   }
 
   override async removeItem(tool: string): Promise<void> {
     const $ = getPty();
-    await $.spawn(`uv tool uninstall ${tool}`, { interactive: true });
+    await $.spawnSafe(`uv tool uninstall ${tool}`, { interactive: true });
   }
 }
 

src/resources/python/uv/uv.ts

@@ -13,6 +13,7 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
+import { UvGlobalParameter } from './global-parameter.js';
 import { UvPythonVersionsParameter } from './python-versions-parameter.js';
 import { UvToolsParameter } from './tools-parameter.js';
 
@@ -24,6 +25,10 @@ const schema = z.object({
     .array(z.string())
     .describe('Python versions to install via uv (e.g. ["3.12", "3.11"])')
     .optional(),
+  global: z
+    .string()
+    .describe('Python version to set as the global default (exposes `python` and `python3` on PATH via --default flag)')
+    .optional(),
   tools: z
     .array(z.string())
     .describe('Global CLI tools to install via uv tool install (e.g. ["ruff", "black"])')
@@ -41,19 +46,21 @@ const defaultConfig: Partial<UvConfig> = {
 
 const examplePython: ExampleConfig = {
   title: 'Install uv with Python versions',
-  description: 'Install uv and pin one or more Python versions for use across projects.',
+  description: 'Install uv, pin one or more Python versions, and set one as the global default accessible as `python` on PATH.',
   configs: [{
     type: 'uv',
     pythonVersions: ['3.12', '3.11'],
+    global: '3.12',
   }]
 }
 
 const exampleWithTools: ExampleConfig = {
   title: 'Install uv with Python and global tools',
-  description: 'Install uv, pin a Python version, and install commonly used global CLI tools like ruff and black.',
+  description: 'Install uv, set a global default Python, and install commonly used global CLI tools like ruff and black.',
   configs: [{
     type: 'uv',
     pythonVersions: ['3.12'],
+    global: '3.12',
     tools: ['ruff', 'black', 'httpie'],
   }]
 }
@@ -71,7 +78,8 @@ export class UvResource extends Resource<UvConfig> {
       schema,
       parameterSettings: {
         pythonVersions: { type: 'stateful', definition: new UvPythonVersionsParameter(), order: 1 },
-        tools: { type: 'stateful', definition: new UvToolsParameter(), order: 2 },
+        global: { type: 'stateful', definition: new UvGlobalParameter(), order: 2 },
+        tools: { type: 'stateful', definition: new UvToolsParameter(), order: 3 },
       },
       dependencies: [...(Utils.isMacOS() ? ['homebrew'] : [])],
     };

test/python/uv.test.ts

@@ -25,6 +25,24 @@ describe('uv resource integration tests', () => {
     });
   });
 
+  it('Installs uv and sets a global default Python', { timeout: 300_000 }, async () => {
+    await PluginTester.fullTest(pluginPath, [
+      {
+        type: 'uv',
+        pythonVersions: ['3.12'],
+        global: '3.12',
+      },
+    ], {
+      validateApply: async () => {
+        const { data: version } = await testSpawn('python --version');
+        expect(version).toContain('3.12');
+      },
+      validateDestroy: async () => {
+        expect(await testSpawn('uv --version')).toMatchObject({ status: SpawnStatus.ERROR });
+      },
+    });
+  });
+
   it('Installs uv and manages global tools', { timeout: 300_000 }, async () => {
     await PluginTester.fullTest(pluginPath, [
       {