fix: Fixed sudo, reporters, os filtering, and others (mainly linux related)

kevinwang5658 · kevinwang5658 · commit 4ff81524c04c · 2026-02-22T16:30:24.000-05:00
diff --git a/package.json b/package.json
@@ -143,7 +143,7 @@
     "start:vm": "npm run build && npm run pack:macos && npm run start:vm",
     "deploy": "npm run pkg && npm run notarize && npm run upload"
   },
-  "version": "1.0.0-beta2",
+  "version": "1.0.0-beta4",
   "bugs": "https://github.com/codifycli/codify/issues",
   "keywords": [
     "oclif",
diff --git a/src/common/initialize-plugins.ts b/src/common/initialize-plugins.ts
@@ -44,6 +44,8 @@ export class PluginInitOrchestrator {
     const resourceDefinitions = await pluginManager.initialize(project, args.secure, args.verbosityLevel);
     if (!args.noProgress) ctx.subprocessFinished(SubProcessName.INITIALIZE_PLUGINS)
 
+    project.removeResourcesUsingOsFilter();
+
     return { resourceDefinitions, pluginManager, project };
   }
 
diff --git a/src/entities/project.ts b/src/entities/project.ts
@@ -1,5 +1,5 @@
 import { OS, PlanRequestData, ResourceOperation, ValidateResponseData } from 'codify-schemas';
-import * as os from 'os'
+import * as os from 'node:os'
 import { validate } from 'uuid'
 
 import {
@@ -14,11 +14,12 @@ import { SourceMapCache } from '../parser/source-maps.js';
 import { ResourceDefinitionMap } from '../plugins/plugin-manager.js';
 import { DependencyGraphResolver } from '../utils/dependency-graph-resolver.js';
 import { groupBy } from '../utils/index.js';
+import { OsUtils } from '../utils/os-utils.js';
+import { ShellUtils } from '../utils/shell.js';
 import { ConfigBlock, ConfigType } from './config.js';
 import { type Plan } from './plan.js';
 import { ProjectConfig } from './project-config.js';
 import { ResourceConfig } from './resource-config.js';
-import { ShellUtils } from '../utils/shell.js';
 
 export class Project {
   projectConfig: ProjectConfig | null;
@@ -206,6 +207,16 @@ ${JSON.stringify(projectConfigs, null, 2)}`);
     }
   }
 
+  removeResourcesUsingOsFilter() {
+    this.resourceConfigs = this.resourceConfigs.filter((r) => {
+      if (!r.os) {
+        return true;
+      }
+
+      return r.os.includes(OsUtils.getOs());
+   });
+  }
+
   resolveDependenciesAndCalculateEvalOrder(resourceDefinitions?: ResourceDefinitionMap) {
     this.resolveResourceDependencies(resourceDefinitions);
     this.calculateEvaluationOrder();
diff --git a/src/entities/resource-config.ts b/src/entities/resource-config.ts
@@ -1,4 +1,4 @@
-import { ResourceJson, ResourceConfig as SchemaResourceConfig } from 'codify-schemas';
+import { ResourceJson, ResourceOs, ResourceConfig as SchemaResourceConfig } from 'codify-schemas';
 
 import { deepEqual } from '../utils/index.js';
 import { ConfigBlock, ConfigType } from './config.js';
@@ -28,6 +28,7 @@ export class ResourceConfig implements ConfigBlock {
   type: string;
   name?: string;
   dependsOn: string[];
+  os?: ResourceOs[];
   sourceMapKey?: string;
 
   // Calculated
@@ -37,11 +38,12 @@ export class ResourceConfig implements ConfigBlock {
   resourceInfo?: ResourceInfo;
 
   constructor(config: SchemaResourceConfig, sourceMapKey?: string) {
-    const { dependsOn, name, type, ...parameters } = config;
+    const { dependsOn, name, type, os, ...parameters } = config;
 
     this.raw = config;
     this.type = type;
     this.name = name;
+    this.os = os;
     this.parameters = parameters ?? {};
     this.dependsOn = dependsOn ?? []
     this.sourceMapKey = sourceMapKey;
@@ -62,16 +64,14 @@ export class ResourceConfig implements ConfigBlock {
     return {
       type: this.type,
       ...(excludeName || !this.name ? {} : { name: this.name }),
-      ...(this.dependsOn.length > 0 ? { dependsOn: this.dependsOn } : {})
+      ...(this.dependsOn.length > 0 ? { dependsOn: this.dependsOn } : {}),
+      ...(this.os && this.os?.length > 0 ? { os: this.os } : {})
     };
   }
 
   toJson(): ResourceJson {
     return {
-      core: {
-        type: this.type,
-        name: this.name,
-      },
+      core: this.core(),
       parameters: this.parameters ?? {},
     }
   }
diff --git a/src/events/context.ts b/src/events/context.ts
@@ -32,7 +32,7 @@ export enum ProcessName {
 }
 
 export enum SubProcessName {
-  APPLYING_RESOURCE = 'apply_resource',
+  APPLYING_RESOURCE = 'apply_resource_',
   GENERATE_PLAN = 'generate_plan',
   INITIALIZE_PLUGINS = 'initialize_plugins',
   PARSE = 'parse',
diff --git a/src/orchestrators/apply.ts b/src/orchestrators/apply.ts
@@ -29,6 +29,8 @@ export const ApplyOrchestrator = {
     const filteredPlan = plan.filterNoopResources()
 
     if (!args.noProgress) ctx.processStarted(ProcessName.APPLY);
+    if (!args.noProgress) await reporter.displayProgress();
+
     await pluginManager.apply(project, filteredPlan);
     if (!args.noProgress) ctx.processFinished(ProcessName.APPLY);
 
diff --git a/src/orchestrators/destroy.ts b/src/orchestrators/destroy.ts
@@ -53,6 +53,7 @@ export class DestroyOrchestrator {
 
     const filteredPlan = plan.filterNoopResources()
 
+    await reporter.displayProgress();
     await ctx.process(ProcessName.DESTROY, () =>
       pluginManager.apply(destroyProject, filteredPlan)
     )
diff --git a/src/orchestrators/plan.ts b/src/orchestrators/plan.ts
@@ -7,6 +7,7 @@ import { ProcessName, SubProcessName, ctx } from '../events/context.js';
 import { PluginManager } from '../plugins/plugin-manager.js';
 import { Reporter } from '../ui/reporters/reporter.js';
 import { createStartupShellScriptsIfNotExists } from '../utils/file.js';
+import { OsUtils } from '../utils/os-utils.js';
 import { ValidateOrchestrator } from './validate.js';
 
 export interface PlanArgs {
@@ -36,7 +37,9 @@ export class PlanOrchestrator {
 
     await ValidateOrchestrator.run({ existing: initializationResult, noProgress: args.noProgress }, reporter);
     project.resolveDependenciesAndCalculateEvalOrder(resourceDefinitions);
-    project.addXCodeToolsConfig(); // We have to add xcode-tools config always since almost every resource depends on it
+    if (OsUtils.isMacOS()) {
+      project.addXCodeToolsConfig(); // We have to add xcode-tools config always to MacOS since almost every resource depends on it
+    }
 
     const plan = await PlanOrchestrator.plan(project, pluginManager, args.noProgress);
     plan.sortByEvalOrder(project.evaluationOrder);
diff --git a/src/ui/components/progress/progress-display.tsx b/src/ui/components/progress/progress-display.tsx
@@ -1,11 +1,9 @@
-import { StatusMessage, Spinner as AutomatedSpinner } from '@inkjs/ui';
+import { Spinner as AutomatedSpinner, StatusMessage } from '@inkjs/ui';
 import { Box } from 'ink';
-import EventEmitter from 'node:events';
+import { useAtom } from 'jotai';
 import React from 'react';
 
-import Spinner from './spinner.js';
 import { store } from '../../store/index.js';
-import { useAtom } from 'jotai';
 
 export enum ProgressStatus {
   IN_PROGRESS,
@@ -16,7 +14,6 @@ export interface ProgressState {
   name: string,
   label: string;
   status: ProgressStatus;
-  logTriggeredSpinner: boolean;
   subProgresses: Array<{
     name: string,
     label: string;
diff --git a/src/ui/reporters/default-reporter.tsx b/src/ui/reporters/default-reporter.tsx
@@ -218,10 +218,6 @@ export class DefaultReporter implements Reporter {
     this.updateRenderState(RenderStatus.NOTHING, null);
     await sleep(50);
 
-    if (result) {
-      this.updateRenderState(RenderStatus.PROGRESS)
-    }
-
     return result;
   }
 
@@ -262,7 +258,6 @@ export class DefaultReporter implements Reporter {
       name,
       status: ProgressStatus.IN_PROGRESS,
       subProgresses: [],
-      logTriggeredSpinner: name === ProcessName.APPLY || name === ProcessName.DESTROY,
     };
 
     this.log(`${label} started`)
diff --git a/src/utils/os-utils.ts b/src/utils/os-utils.ts
@@ -0,0 +1,200 @@
+import { LinuxDistro, ResourceOs } from 'codify-schemas';
+import * as fsSync from 'node:fs';
+import * as fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+
+export enum Shell {
+  ZSH = 'zsh',
+  BASH = 'bash',
+  SH = 'sh',
+  KSH = 'ksh',
+  CSH = 'csh',
+  FISH = 'fish',
+}
+export const OsUtils = {
+  getUser(): string {
+    return os.userInfo().username;
+  },
+
+  getOs(): ResourceOs {
+    if (OsUtils.isMacOS()) {
+      return ResourceOs.MACOS;
+    }
+
+    if (OsUtils.isLinux()) {
+      return ResourceOs.LINUX;
+    }
+
+    if (OsUtils.isWindows()) {
+      return ResourceOs.WINDOWS;
+    }
+
+    throw new Error('Unsupported operating system');
+  },
+
+  getSystemInfo() {
+    return {
+      os: os.type(),
+      shell: this.getShell(),
+    }
+  },
+
+  isMacOS(): boolean {
+    return os.platform() === 'darwin';
+  },
+
+  isLinux(): boolean {
+    return os.platform() === 'linux';
+  },
+
+  isWindows(): boolean {
+    return os.platform() === 'win32'
+  },
+
+  getShell(): Shell | undefined {
+    const shell = process.env.SHELL || '';
+
+    if (shell.endsWith('bash')) {
+      return Shell.BASH
+    }
+
+    if (shell.endsWith('zsh')) {
+      return Shell.ZSH
+    }
+
+    if (shell.endsWith('sh')) {
+      return Shell.SH
+    }
+
+    if (shell.endsWith('csh')) {
+      return Shell.CSH
+    }
+
+    if (shell.endsWith('ksh')) {
+      return Shell.KSH
+    }
+
+    if (shell.endsWith('fish')) {
+      return Shell.FISH
+    }
+
+    return undefined;
+  },
+
+
+  getPrimaryShellRc(): string {
+    return this.getShellRcFiles()[0];
+  },
+
+  getShellRcFiles(): string[] {
+    const shell = process.env.SHELL || '';
+    const homeDir = os.homedir();
+
+    if (shell.endsWith('bash')) {
+      // Linux typically uses .bashrc, macOS uses .bash_profile
+      if (OsUtils.isLinux()) {
+        return [
+          path.join(homeDir, '.bashrc'),
+          path.join(homeDir, '.bash_profile'),
+          path.join(homeDir, '.profile'),
+        ];
+      }
+
+      return [
+        path.join(homeDir, '.bash_profile'),
+        path.join(homeDir, '.bashrc'),
+        path.join(homeDir, '.profile'),
+      ];
+    }
+
+    if (shell.endsWith('zsh')) {
+      return [
+        path.join(homeDir, '.zshrc'),
+        path.join(homeDir, '.zprofile'),
+        path.join(homeDir, '.zshenv'),
+      ];
+    }
+
+    if (shell.endsWith('sh')) {
+      return [
+        path.join(homeDir, '.profile'),
+      ]
+    }
+
+    if (shell.endsWith('ksh')) {
+      return [
+        path.join(homeDir, '.profile'),
+        path.join(homeDir, '.kshrc'),
+      ]
+    }
+
+    if (shell.endsWith('csh')) {
+      return [
+        path.join(homeDir, '.cshrc'),
+        path.join(homeDir, '.login'),
+        path.join(homeDir, '.logout'),
+      ]
+    }
+
+    if (shell.endsWith('fish')) {
+      return [
+        path.join(homeDir, '.config/fish/config.fish'),
+      ]
+    }
+
+    // Default to bash-style files
+    return [
+      path.join(homeDir, '.bashrc'),
+      path.join(homeDir, '.bash_profile'),
+      path.join(homeDir, '.profile'),
+    ];
+  },
+
+  async getLinuxDistro(): Promise<LinuxDistro | undefined> {
+    const osRelease = await fs.readFile('/etc/os-release', 'utf8');
+    const lines = osRelease.split('\n');
+    for (const line of lines) {
+      if (line.startsWith('ID=')) {
+        const distroId = line.slice(3).trim().replaceAll('"', '');
+        return Object.values(LinuxDistro).includes(distroId as LinuxDistro) ? distroId as LinuxDistro : undefined;
+      }
+    }
+
+    return undefined;
+  },
+  async isUbuntu(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.UBUNTU;
+  },
+
+  async isDebian(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.DEBIAN;
+  },
+
+  async isArch(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.ARCH;
+  },
+
+  async isCentOS(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.CENTOS;
+  },
+
+  async isFedora(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.FEDORA;
+  },
+
+  async isRHEL(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.RHEL;
+  },
+
+  isDebianBased(): boolean {
+    return fsSync.existsSync('/etc/debian_version');
+  },
+
+  isRedhatBased(): boolean {
+    return fsSync.existsSync('/etc/redhat-release');
+  }
+};
+
+
+
diff --git a/src/utils/sudo.ts b/src/utils/sudo.ts

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ export class PluginInitOrchestrator {`
`44`	`44`	`const resourceDefinitions = await pluginManager.initialize(project, args.secure, args.verbosityLevel);`
`45`	`45`	`if (!args.noProgress) ctx.subprocessFinished(SubProcessName.INITIALIZE_PLUGINS)`
`46`	`46`
	`47`	`+ project.removeResourcesUsingOsFilter();`
	`48`	`+`
`47`	`49`	`return { resourceDefinitions, pluginManager, project };`
`48`	`50`	`}`
`49`	`51`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export enum ProcessName {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`export enum SubProcessName {`
`35`		`- APPLYING_RESOURCE = 'apply_resource',`
	`35`	`+ APPLYING_RESOURCE = 'apply_resource_',`
`36`	`36`	`GENERATE_PLAN = 'generate_plan',`
`37`	`37`	`INITIALIZE_PLUGINS = 'initialize_plugins',`
`38`	`38`	`PARSE = 'parse',`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ export class DestroyOrchestrator {`
`53`	`53`
`54`	`54`	`const filteredPlan = plan.filterNoopResources()`
`55`	`55`
	`56`	`+ await reporter.displayProgress();`
`56`	`57`	`await ctx.process(ProcessName.DESTROY, () =>`
`57`	`58`	`pluginManager.apply(destroyProject, filteredPlan)`
`58`	`59`	`)`