@codifycli/plugin-core 1.2.5-beta.2 → 1.2.5-beta.4

package/dist/plan/change-set.d.ts

@@ -49,6 +49,6 @@ export declare class ChangeSet<T extends StringIndexedObject> {
      */
     private static calculateParameterChanges;
     private static combineResourceOperations;
-    private static isAbsent;
+    static isAbsent(v: unknown): boolean;
     private static isSame;
 }

package/dist/plan/plan.js

@@ -55,13 +55,24 @@ export class Plan {
             settings,
             isStateful
         });
-        const filteredCurrentParameters = Plan.filterCurrentParams({
+        let filteredCurrentParameters = Plan.filterCurrentParams({
             desired,
             current,
             state,
             settings,
             isStateful
         });
+        // A filtered result with at least one key, where every value is absent (empty array/object, null,
+        // undefined), carries no actionable state — treat it the same as no current parameters at all.
+        // This matters for resources managing an internal array (e.g. multiple declarations in one
+        // resource instance) where destroy-time filtering can legitimately narrow the array down to []
+        // once every declared item has been removed, without the resource itself disappearing from
+        // filteredCurrentParams. An empty object ({}, zero keys) is intentionally excluded — per the
+        // refresh() contract, {} means "exists with no state to track", distinct from "doesn't exist".
+        const filteredEntries = filteredCurrentParameters ? Object.values(filteredCurrentParameters) : [];
+        if (filteredCurrentParameters && filteredEntries.length > 0 && filteredEntries.every((v) => ChangeSet.isAbsent(v))) {
+            filteredCurrentParameters = null;
+        }
         // Empty
         if (!filteredCurrentParameters && !desired) {
             return new Plan(uuidV4(), ChangeSet.empty(), core, isStateful);

package/dist/pty/background-pty.js

@@ -18,7 +18,10 @@ EventEmitter.defaultMaxListeners = 1000;
  */
 export class BackgroundPty {
     historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
-    basePty = pty.spawn(this.getDefaultShell(), ['-i'], {
+    // Login + interactive (-l -i) so the user's rc files are sourced. GUI launches
+    // (e.g. the Codify desktop app) do not inherit env like TART_HOME / PATH additions
+    // from the parent process; these live in ~/.zshrc / ~/.zprofile.
+    basePty = pty.spawn(this.getDefaultShell(), ['-l', '-i'], {
         env: { ...process.env, ...this.historyIgnore },
         cols: 10_000, // Set to a really large value to prevent wrapping
         name: nanoid(6),
@@ -128,6 +131,6 @@ export class BackgroundPty {
         return [];
     }
     getDefaultShell() {
-        return process.env.SHELL;
+        return Utils.getDefaultShell();
     }
 }

package/dist/pty/seqeuntial-pty.js

@@ -70,7 +70,11 @@ export class SequentialPty {
             // the pty waiting for interactive input. Can't be disabled via env var; must unset the options explicitly.
             const disableAutocorrect = Utils.getShell() === Shell.ZSH ? 'unsetopt CORRECT CORRECT_ALL 2>/dev/null; ' : '';
             const wrappedCmd = `${disableAutocorrect}${cmd}`;
-            const args = options?.interactive ? ['-i', '-c', wrappedCmd] : ['-c', wrappedCmd];
+            // Use a login + interactive shell (-l -i) so the user's rc files are sourced.
+            // This matters for GUI launches (e.g. the Codify desktop app) where env vars
+            // like TART_HOME and PATH additions live in ~/.zshrc/~/.zprofile and are not
+            // inherited from the parent process.
+            const args = options?.interactive ? ['-l', '-i', '-c', wrappedCmd] : ['-c', wrappedCmd];
             // Run the command in a pty for interactivity
             const mPty = pty.spawn(this.getDefaultShell(), args, {
                 ...options,
@@ -134,6 +138,6 @@ export class SequentialPty {
         });
     }
     getDefaultShell() {
-        return process.env.SHELL;
+        return Utils.getDefaultShell();
     }
 }

package/dist/utils/index.d.ts

@@ -53,6 +53,17 @@ export declare const Utils: {
     isHomebrewInstalled(): Promise<boolean>;
     isRosetta2Installed(): Promise<boolean>;
     getShell(): Shell | undefined;
+    /**
+     * Resolves the shell binary to launch commands with. `process.env.SHELL` is
+     * only set when Codify is launched from a terminal — GUI launches (e.g. the
+     * Codify desktop app via launchd) do not export it, in which case
+     * `node-pty` would fall back to `/bin/sh`, which does not source the user's
+     * `~/.zshrc`/`~/.bash_profile`. That drops user env (e.g. TART_HOME, PATH
+     * additions), breaking resource refresh. Fall back to the login shell from
+     * the passwd database (os.userInfo().shell) so we always use the user's real
+     * shell regardless of how Codify was started.
+     */
+    getDefaultShell(): string;
     getPrimaryShellRc(): string;
     getShellRcFiles(): string[];
     isDirectoryOnPath(directory: string): Promise<boolean>;

package/dist/utils/index.js

@@ -85,6 +85,19 @@ export const Utils = {
         }
         return undefined;
     },
+    /**
+     * Resolves the shell binary to launch commands with. `process.env.SHELL` is
+     * only set when Codify is launched from a terminal — GUI launches (e.g. the
+     * Codify desktop app via launchd) do not export it, in which case
+     * `node-pty` would fall back to `/bin/sh`, which does not source the user's
+     * `~/.zshrc`/`~/.bash_profile`. That drops user env (e.g. TART_HOME, PATH
+     * additions), breaking resource refresh. Fall back to the login shell from
+     * the passwd database (os.userInfo().shell) so we always use the user's real
+     * shell regardless of how Codify was started.
+     */
+    getDefaultShell() {
+        return process.env.SHELL || os.userInfo().shell || '/bin/zsh';
+    },
     getPrimaryShellRc() {
         return this.getShellRcFiles()[0];
     },
@@ -180,7 +193,10 @@ Brew can be installed using Codify:
             if (brewOpts?.flags)
                 flags.push(...brewOpts.flags);
             const flagStr = flags.length > 0 ? `${flags.join(' ')} ` : '';
-            await $.spawn(`brew install ${flagStr}${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1, NONINTERACTIVE: 1 } });
+            // Redirect stdin from /dev/null so Homebrew's ask.rb detects a non-TTY stdin
+            // and skips any [y/n] confirmation prompts (e.g. "Do you want to proceed with the installation?").
+            // NONINTERACTIVE=1 alone is not sufficient — Homebrew's prompt only checks tty?, not that var.
+            await $.spawn(`brew install ${flagStr}${packageName} < /dev/null`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1, NONINTERACTIVE: 1 } });
             return;
         }
         const useApt = forcePackageManager === PackageManager.APT || (!forcePackageManager && Utils.isLinux());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codifycli/plugin-core",
-  "version": "1.2.5-beta.2",
+  "version": "1.2.5-beta.4",
   "description": "TypeScript library for building Codify plugins to manage system resources (applications, CLI tools, settings) through infrastructure-as-code",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/plan/change-set.ts

@@ -227,7 +227,7 @@ export class ChangeSet<T extends StringIndexedObject> {
     return orderOfOperations[Math.max(indexPrev, indexNext)];
   }
 
-  private static isAbsent(v: unknown): boolean {
+  static isAbsent(v: unknown): boolean {
     if (v === null || v === undefined) return true;
     if (Array.isArray(v)) return v.length === 0;
     if (typeof v === 'object') return Object.keys(v as object).length === 0;

package/src/plan/plan.test.ts

@@ -226,6 +226,39 @@ describe('Plan entity tests', () => {
     })
   })
 
+  it('Treats an empty-after-filtering array as no current state (already destroyed)', async () => {
+    const resource = new class extends TestResource {
+      getSettings(): ResourceSettings<any> {
+        return {
+          id: 'type',
+          operatingSystems: [OS.Darwin],
+          parameterSettings: {
+            propZ: { type: 'array', isElementEqual: (a, b) => a === b }
+          }
+        }
+      }
+
+      async refresh(): Promise<Partial<any> | null> {
+        // The declared item is already gone from the system, but other unrelated items remain —
+        // refresh() can't know which items belong to this resource's declared config, so it still
+        // returns a non-empty object overall.
+        return {
+          propZ: ['some-other-unmanaged-item']
+        }
+      }
+    }
+
+    const controller = new ResourceController(resource);
+    const plan = await controller.plan(
+      { type: 'type' },
+      null,
+      { propZ: ['20.15.0'] } as any,
+      true
+    )
+
+    expect(plan.changeSet.operation).to.eq(ResourceOperation.NOOP);
+  })
+
   it('Doesn\'t filters array parameters if filtering is disabled', async () => {
     const resource = new class extends TestResource {
       getSettings(): ResourceSettings<any> {

package/src/plan/plan.ts

@@ -96,7 +96,7 @@ export class Plan<T extends StringIndexedObject> {
       isStateful
     });
 
-    const filteredCurrentParameters = Plan.filterCurrentParams<T>({
+    let filteredCurrentParameters = Plan.filterCurrentParams<T>({
       desired,
       current,
       state,
@@ -104,6 +104,18 @@ export class Plan<T extends StringIndexedObject> {
       isStateful
     });
 
+    // A filtered result with at least one key, where every value is absent (empty array/object, null,
+    // undefined), carries no actionable state — treat it the same as no current parameters at all.
+    // This matters for resources managing an internal array (e.g. multiple declarations in one
+    // resource instance) where destroy-time filtering can legitimately narrow the array down to []
+    // once every declared item has been removed, without the resource itself disappearing from
+    // filteredCurrentParams. An empty object ({}, zero keys) is intentionally excluded — per the
+    // refresh() contract, {} means "exists with no state to track", distinct from "doesn't exist".
+    const filteredEntries = filteredCurrentParameters ? Object.values(filteredCurrentParameters) : [];
+    if (filteredCurrentParameters && filteredEntries.length > 0 && filteredEntries.every((v) => ChangeSet.isAbsent(v))) {
+      filteredCurrentParameters = null;
+    }
+
     // Empty
     if (!filteredCurrentParameters && !desired) {
       return new Plan(

package/src/pty/background-pty.ts

@@ -21,7 +21,10 @@ EventEmitter.defaultMaxListeners = 1000;
  */
 export class BackgroundPty implements IPty {
   private historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
-  private basePty = pty.spawn(this.getDefaultShell(), ['-i'], {
+  // Login + interactive (-l -i) so the user's rc files are sourced. GUI launches
+  // (e.g. the Codify desktop app) do not inherit env like TART_HOME / PATH additions
+  // from the parent process; these live in ~/.zshrc / ~/.zprofile.
+  private basePty = pty.spawn(this.getDefaultShell(), ['-l', '-i'], {
     env: { ...process.env, ...this.historyIgnore },
     cols: 10_000, // Set to a really large value to prevent wrapping
     name: nanoid(6),
@@ -156,6 +159,6 @@ export class BackgroundPty implements IPty {
   }
 
   private getDefaultShell(): string {
-    return process.env.SHELL!;
+    return Utils.getDefaultShell();
   }
 }

package/src/pty/seqeuntial-pty.ts

@@ -92,7 +92,11 @@ export class SequentialPty implements IPty {
       // the pty waiting for interactive input. Can't be disabled via env var; must unset the options explicitly.
       const disableAutocorrect = Utils.getShell() === Shell.ZSH ? 'unsetopt CORRECT CORRECT_ALL 2>/dev/null; ' : '';
       const wrappedCmd = `${disableAutocorrect}${cmd}`;
-      const args = options?.interactive ? ['-i', '-c', wrappedCmd] : ['-c', wrappedCmd]
+      // Use a login + interactive shell (-l -i) so the user's rc files are sourced.
+      // This matters for GUI launches (e.g. the Codify desktop app) where env vars
+      // like TART_HOME and PATH additions live in ~/.zshrc/~/.zprofile and are not
+      // inherited from the parent process.
+      const args = options?.interactive ? ['-l', '-i', '-c', wrappedCmd] : ['-c', wrappedCmd]
 
       // Run the command in a pty for interactivity
       const mPty = pty.spawn(this.getDefaultShell(), args, {
@@ -175,6 +179,6 @@ export class SequentialPty implements IPty {
   }
 
   private getDefaultShell(): string {
-    return process.env.SHELL!;
+    return Utils.getDefaultShell();
   }
 }

package/src/utils/index.ts

@@ -132,6 +132,20 @@ export const Utils = {
     return undefined;
   },
 
+  /**
+   * Resolves the shell binary to launch commands with. `process.env.SHELL` is
+   * only set when Codify is launched from a terminal — GUI launches (e.g. the
+   * Codify desktop app via launchd) do not export it, in which case
+   * `node-pty` would fall back to `/bin/sh`, which does not source the user's
+   * `~/.zshrc`/`~/.bash_profile`. That drops user env (e.g. TART_HOME, PATH
+   * additions), breaking resource refresh. Fall back to the login shell from
+   * the passwd database (os.userInfo().shell) so we always use the user's real
+   * shell regardless of how Codify was started.
+   */
+  getDefaultShell(): string {
+    return process.env.SHELL || os.userInfo().shell || '/bin/zsh';
+  },
+
 
   getPrimaryShellRc(): string {
     return this.getShellRcFiles()[0];
@@ -244,7 +258,10 @@ Brew can be installed using Codify:
       if (brewOpts?.adopt) flags.push('--adopt');
       if (brewOpts?.flags) flags.push(...brewOpts.flags);
       const flagStr = flags.length > 0 ? `${flags.join(' ')} ` : '';
-      await $.spawn(`brew install ${flagStr}${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1, NONINTERACTIVE: 1 } });
+      // Redirect stdin from /dev/null so Homebrew's ask.rb detects a non-TTY stdin
+      // and skips any [y/n] confirmation prompts (e.g. "Do you want to proceed with the installation?").
+      // NONINTERACTIVE=1 alone is not sufficient — Homebrew's prompt only checks tty?, not that var.
+      await $.spawn(`brew install ${flagStr}${packageName} < /dev/null`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1, NONINTERACTIVE: 1 } });
       return;
     }