fix: migrated to the Utils from @codifycli/plugin-core. Supports non-login shells

kevinwang5658 · kevinwang5658 · commit 09f69b71a445 · 2026-04-22T13:19:13.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "@codifycli/plugin-core": "1.1.0-beta6",
+    "@codifycli/plugin-core": "1.1.0-beta7",
     "@codifycli/schemas": "1.0.0",
     "ajv": "^8.18.0",
     "ajv-formats": "^2.1.1",
diff --git a/src/resources/android/android-studio.ts b/src/resources/android/android-studio.ts
@@ -135,7 +135,7 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
       throw new Error(`Unable to find desired version: ${plan.desiredConfig.version}`);
     }
 
-    const isArm = await LocalUtils.isArmArch();
+    const isArm = await Utils.isArmArch();
     const downloadLink = isArm
       ? versionToDownload.download.find((v) => v.link.includes('mac_arm.dmg'))!
       : versionToDownload.download.find((v) => v.link.includes('mac.dmg'))!
diff --git a/src/resources/asdf/asdf.ts b/src/resources/asdf/asdf.ts
@@ -1,10 +1,9 @@
-import { CreatePlan, ExampleConfig, FileUtils, Resource, ResourceSettings, SpawnStatus, Utils as CoreUtils, getPty, z } from '@codifycli/plugin-core';
+import { CreatePlan, ExampleConfig, FileUtils, Resource, ResourceSettings, SpawnStatus, Utils as CoreUtils, getPty, z, Utils } from '@codifycli/plugin-core';
 import { OS } from '@codifycli/schemas';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
-import { Utils } from '../../utils/index.js';
 import { AsdfPluginsParameter } from './plugins-parameter.js';
 
 const schema = z.object({
diff --git a/src/resources/docker/docker.ts b/src/resources/docker/docker.ts
@@ -1,12 +1,10 @@
-import { CreatePlan, DestroyPlan, Resource, ResourceSettings, getPty } from '@codifycli/plugin-core';
+import { CreatePlan, DestroyPlan, Resource, ResourceSettings, getPty, Utils, FileUtils } from '@codifycli/plugin-core';
 import { OS, StringIndexedObject } from '@codifycli/schemas';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
 import { SpawnStatus } from '../../utils/codify-spawn.js';
-import { FileUtils } from '../../utils/file-utils.js';
-import { Utils } from '../../utils/index.js';
 import Schema from './docker-schema.json';
 
 export interface DockerConfig extends StringIndexedObject {
@@ -74,7 +72,7 @@ export class DockerResource extends Resource<DockerConfig> {
       const downloadLink = await Utils.isArmArch() ? ARM_DOWNLOAD_LINK : INTEL_DOWNLOAD_LINK;
 
       const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'codify-docker'))
-      await Utils.downloadUrlIntoFile(path.join(tmpDir, 'Docker.dmg'), downloadLink);
+      await FileUtils.downloadFile(path.join(tmpDir, 'Docker.dmg'), downloadLink);
       const user = Utils.getUser();
 
       try {
@@ -93,7 +91,7 @@ export class DockerResource extends Resource<DockerConfig> {
       }
 
       await $.spawn('xattr -r -d com.apple.quarantine /Applications/Docker.app', { requiresRoot: true });
-      await FileUtils.addPathToPrimaryShellRc('/Applications/Docker.app/Contents/Resources/bin', false);
+      await FileUtils.addPathToShellRc('/Applications/Docker.app/Contents/Resources/bin', true);
     } else if (Utils.isLinux()) {
       // Detect Linux distribution
       const isDebianBased = await this.isDebianBased($);
@@ -121,7 +119,7 @@ export class DockerResource extends Resource<DockerConfig> {
       await fs.rm(path.join(os.homedir(), '.docker'), { recursive: true, force: true });
       await $.spawn('rm -rf /Applications/Docker.app')
 
-      await FileUtils.removeLineFromStartupFile('/Applications/Docker.app/Contents/Resources/bin')
+      await FileUtils.removeLineFromShellRc('/Applications/Docker.app/Contents/Resources/bin')
     } else if (Utils.isLinux()) {
       const isDebianBased = await this.isDebianBased($);
       const isRedHatBased = await this.isRedHatBased($);
diff --git a/src/resources/git/repository/git-repository.ts b/src/resources/git/repository/git-repository.ts
@@ -58,11 +58,11 @@ export class GitRepositoryResource extends Resource<GitRepositoryConfig> {
       allowMultiple: {
         matcher: (desired, current) => {
           const desiredPath = desired.parentDirectory
-            ? path.resolve(desired.parentDirectory, this.extractBasename(desired.repository)!)
+            ? path.resolve(desired.parentDirectory, this.extractBasename(desired.repository!)!)
             : path.resolve(desired.directory!);
 
           const currentPath = current.parentDirectory
-            ? path.resolve(current.parentDirectory, this.extractBasename(current.repository)!)
+            ? path.resolve(current.parentDirectory, this.extractBasename(current.repository!)!)
             : path.resolve(current.directory!);
 
           if (process.platform === 'darwin') {
diff --git a/src/resources/java/jenv/java-versions-parameter.ts b/src/resources/java/jenv/java-versions-parameter.ts
@@ -1,9 +1,8 @@
-import { ArrayParameterSetting, ArrayStatefulParameter, getPty, SpawnStatus } from '@codifycli/plugin-core';
+import { ArrayParameterSetting, ArrayStatefulParameter, getPty, SpawnStatus, Utils } from '@codifycli/plugin-core';
 import fs from 'node:fs/promises';
 import semver from 'semver';
 
 import { FileUtils } from '../../../utils/file-utils.js';
-import { Utils } from '../../../utils/index.js';
 import { JenvConfig } from './jenv.js';
 import { nanoid } from 'nanoid';
 
diff --git a/src/resources/java/jenv/jenv.ts b/src/resources/java/jenv/jenv.ts
@@ -1,9 +1,8 @@
-import { Resource, ResourceSettings, SpawnStatus, getPty } from '@codifycli/plugin-core';
+import { Resource, ResourceSettings, SpawnStatus, getPty, Utils } from '@codifycli/plugin-core';
 import { OS, ResourceConfig } from '@codifycli/schemas';
 import * as fs from 'node:fs';
 
 import { FileUtils } from '../../../utils/file-utils.js';
-import { Utils } from '../../../utils/index.js';
 import { JenvGlobalParameter } from './global-parameter.js';
 import {
   JenvAddParameter,
diff --git a/src/resources/javascript/nvm/nvm.ts b/src/resources/javascript/nvm/nvm.ts
@@ -1,9 +1,8 @@
-import { ExampleConfig, getPty, Resource, ResourceSettings, SpawnStatus } from '@codifycli/plugin-core';
+import { ExampleConfig, getPty, Resource, ResourceSettings, SpawnStatus, Utils } from '@codifycli/plugin-core';
 import { OS, ResourceConfig } from '@codifycli/schemas';
 import * as os from 'node:os';
 
 import { FileUtils } from '../../../utils/file-utils.js';
-import { Utils } from '../../../utils/index.js';
 import { NvmGlobalParameter } from './global-parameter.js';
 import { NvmNodeVersionsParameter } from './node-versions-parameter.js';
 import Schema from './nvm-schema.json';
diff --git a/src/resources/javascript/pnpm/pnpm.ts b/src/resources/javascript/pnpm/pnpm.ts
@@ -1,11 +1,10 @@
-import { CreatePlan, DestroyPlan, ExampleConfig, RefreshContext, Resource, ResourceSettings, getPty } from '@codifycli/plugin-core';
+import { CreatePlan, DestroyPlan, ExampleConfig, RefreshContext, Resource, ResourceSettings, getPty, Utils } from '@codifycli/plugin-core';
 import { OS, ResourceConfig } from '@codifycli/schemas';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
 import { FileUtils } from '../../../utils/file-utils.js';
-import { Utils } from '../../../utils/index.js';
 import { PnpmGlobalEnvStatefulParameter } from './pnpm-global-env-stateful-parameter.js';
 import schema from './pnpm-schema.json';
 
diff --git a/src/resources/macports/macports.ts b/src/resources/macports/macports.ts
@@ -1,11 +1,9 @@
-import { CreatePlan, Resource, ResourceSettings, SpawnStatus, getPty } from '@codifycli/plugin-core';
+import { CreatePlan, Resource, ResourceSettings, SpawnStatus, getPty, Utils, FileUtils } from '@codifycli/plugin-core';
 import { OS, ResourceConfig } from '@codifycli/schemas';
 import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
-import { FileUtils } from '../../utils/file-utils.js';
-import { Utils } from '../../utils/index.js';
 import { MacportsInstallParameter, PortPackage } from './install-parameter.js';
 import schema from './macports-schema.json';
 
@@ -67,12 +65,12 @@ export class MacportsResource extends Resource<MacportsConfig> {
     const installerPath = path.join(tmpDir, 'installer.pkg')
 
     console.log(`Downloading macports installer ${installerUrl}`)
-    await Utils.downloadUrlIntoFile(installerPath, installerUrl);
+    await FileUtils.downloadFile(installerPath, installerUrl);
 
     await $.spawn(`installer -pkg "${installerPath}" -target /;`, { requiresRoot: true })
 
-    await FileUtils.addToStartupFile('')
-    await FileUtils.addToStartupFile('export PATH=/opt/local/bin:/opt/local/sbin:$PATH')
+    await FileUtils.addToShellRc('')
+    await FileUtils.addToShellRc('export PATH=/opt/local/bin:/opt/local/sbin:$PATH')
   }
 
   override async destroy(): Promise<void> {
@@ -92,7 +90,7 @@ export class MacportsResource extends Resource<MacportsConfig> {
       '    /Library/Tcl/macports1.0 \\\n' +
       '    ~/.macports', { requiresRoot: true })
 
-    await FileUtils.removeLineFromStartupFile('export PATH=/opt/local/bin:/opt/local/sbin:$PATH');
+    await FileUtils.removeLineFromShellRc('export PATH=/opt/local/bin:/opt/local/sbin:$PATH');
 
   }
 
diff --git a/src/resources/ollama/models-parameter.ts b/src/resources/ollama/models-parameter.ts
@@ -1,6 +1,5 @@
-import { ArrayStatefulParameter, getPty, Plan, SpawnStatus } from '@codifycli/plugin-core';
+import { ArrayStatefulParameter, getPty, Plan, SpawnStatus, Utils } from '@codifycli/plugin-core';
 
-import { Utils } from '../../utils/index.js';
 import { OllamaConfig } from './ollama.js';
 
 async function ensureOllamaServerRunning(): Promise<void> {
diff --git a/src/resources/ollama/ollama.ts b/src/resources/ollama/ollama.ts
@@ -5,13 +5,12 @@ import {
   Resource,
   ResourceSettings,
   SpawnStatus,
-  Utils as CoreUtils,
+  Utils,
   getPty,
   z,
 } from '@codifycli/plugin-core';
 import { OS } from '@codifycli/schemas';
 
-import { Utils } from '../../utils/index.js';
 import { ModelsParameter } from './models-parameter.js';
 
 const schema = z
@@ -136,7 +135,7 @@ export class OllamaResource extends Resource<OllamaConfig> {
 
     const curlCheck = await $.spawnSafe('which curl');
     if (curlCheck.status === SpawnStatus.ERROR) {
-      await CoreUtils.installViaPkgMgr('curl');
+      await Utils.installViaPkgMgr('curl');
     }
 
     // The official install script installs the binary, creates the `ollama`
diff --git a/src/resources/shell/alias/alias-resource.ts b/src/resources/shell/alias/alias-resource.ts
@@ -7,13 +7,13 @@ import {
   ParameterChange,
   Resource,
   ResourceSettings,
-  SpawnStatus
+  SpawnStatus,
+  Utils
 } from '@codifycli/plugin-core';
 import { OS, StringIndexedObject } from '@codifycli/schemas';
 import fs from 'node:fs/promises';
 
 import { FileUtils } from '../../../utils/file-utils.js';
-import { Utils } from '../../../utils/index.js';
 import Schema from './alias-schema.json';
 
 export interface AliasConfig extends StringIndexedObject {
diff --git a/src/resources/shell/aliases/aliases-resource.ts b/src/resources/shell/aliases/aliases-resource.ts
@@ -9,13 +9,13 @@ import {
   ResourceSettings,
   SpawnStatus,
   getPty,
-  z
+  z,
+  Utils
 } from '@codifycli/plugin-core';
 import { OS } from '@codifycli/schemas';
 import fs from 'node:fs/promises';
 
 import { FileUtils } from '../../../utils/file-utils.js';
-import { Utils } from '../../../utils/index.js';
 import os from 'node:os';
 import path from 'node:path';
 
diff --git a/src/resources/shell/path/path-resource.ts b/src/resources/shell/path/path-resource.ts
@@ -8,14 +8,14 @@ import {
   RefreshContext,
   resolvePathWithVariables,
   Resource,
-  ResourceSettings
+  ResourceSettings,
+  Utils
 } from '@codifycli/plugin-core';
 import { OS, StringIndexedObject } from '@codifycli/schemas';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { FileUtils } from '../../../utils/file-utils.js';
-import { Utils } from '../../../utils/index.js';
 import { untildify } from '../../../utils/untildify.js';
 import Schema from './path-schema.json';
 
diff --git a/src/resources/syncthing/syncthing.ts b/src/resources/syncthing/syncthing.ts
@@ -9,10 +9,10 @@ import {
   SpawnStatus,
   getPty,
   z,
+  Utils
 } from '@codifycli/plugin-core';
 import { OS } from '@codifycli/schemas';
 
-import { Utils } from '../../utils/index.js';
 import { exampleSyncthingConfigs } from './examples.js';
 import {
   getCliConfigBool,
diff --git a/src/utils/codify-spawn.ts b/src/utils/codify-spawn.ts
@@ -1,5 +1,5 @@
 import { Ajv } from 'ajv';
-import { SudoError, VerbosityLevel } from '@codifycli/plugin-core';
+import { SudoError, VerbosityLevel, Utils } from '@codifycli/plugin-core';
 import {
   CommandRequestResponseData, CommandRequestResponseDataSchema,
   IpcMessageV2,
@@ -9,8 +9,6 @@ import { nanoid } from 'nanoid';
 import { SpawnOptions, spawn } from 'node:child_process';
 import stripAnsi from 'strip-ansi';
 
-import { Utils } from './index.js';
-
 const ajv = new Ajv({
   strict: true,
 });
diff --git a/src/utils/file-utils.ts b/src/utils/file-utils.ts
@@ -3,7 +3,7 @@ import * as fs from 'node:fs/promises';
 import os, { homedir } from 'node:os';
 import path from 'node:path';
 
-import { Utils } from './index.js';
+import { Utils } from '@codifycli/plugin-core';
 
 const SPACE_REGEX = /^\s*$/
 
diff --git a/src/utils/index.ts b/src/utils/index.ts

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {`
`135`	`135`	throw new Error(`Unable to find desired version: ${plan.desiredConfig.version}`);
`136`	`136`	`}`
`137`	`137`
`138`		`- const isArm = await LocalUtils.isArmArch();`
	`138`	`+ const isArm = await Utils.isArmArch();`
`139`	`139`	`const downloadLink = isArm`
`140`	`140`	`? versionToDownload.download.find((v) => v.link.includes('mac_arm.dmg'))!`
`141`	`141`	`: versionToDownload.download.find((v) => v.link.includes('mac.dmg'))!`