@catladder/cli 0.0.0-next-2eda2fde → 0.0.0-next-a2f59d07

package/package.json

@@ -53,19 +53,19 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-next-2eda2fde",
+  "version": "0.0.0-next-a2f59d07",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
-    "test": "yarn run lint",
-    "build": "yarn build:compile && yarn build:bundle && yarn build:copy-images && yarn build:skill-cli-reference && yarn build:copy-skills",
+    "test": "pnpm run lint",
+    "build": "pnpm run build:compile && pnpm run build:bundle && pnpm run build:copy-images && pnpm run build:skill-cli-reference && pnpm run build:copy-skills",
     "build:bundle": "./scripts/bundle",
     "build:copy-images": "rm -rf dist/runner-images dist/bundles/runner-images && cp -R ../../runner-images dist/runner-images && cp -R ../../runner-images dist/bundles/runner-images",
     "build:copy-skills": "rm -rf dist/skills dist/bundles/skills && cp -R ../../skills dist/skills && cp -R ../../skills dist/bundles/skills",
     "build:skill-cli-reference": "tsx src/scripts/generateCliSkillReference.ts",
-    "build:compile": "yarn tsc && yarn tsc-alias",
+    "build:compile": "tsc && tsc-alias",
     "dev:own-catenv": "cd ../../ && node apps/cli/bin/catenv-dev",
-    "build:watch": "tsc-watch --onSuccess \"yarn dev:own-catenv\""
+    "build:watch": "tsc-watch --onSuccess \"pnpm run dev:own-catenv\""
   },
   "bin": {
     "catenv": "./bin/catenv",
@@ -80,10 +80,12 @@
     "@catladder/bash": "workspace:*",
     "@catladder/pipeline": "workspace:*",
     "@changesets/parse": "^0.4.3",
+    "@gitbeaker/core": "^39.28.0",
     "@gitbeaker/rest": "^39.28.0",
     "@inquirer/prompts": "^8.4.3",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
+    "@types/child-process-promise": "^2.2.6",
     "@types/common-tags": "^1.8.4",
     "@types/fs-extra": "^5.0.4",
     "@types/lodash-es": "^4.17.12",
@@ -102,17 +104,21 @@
     "connection-string-parser": "^1.0.4",
     "date-fns": "^3.6.0",
     "fs-extra": "^7.0.1",
+    "jiti": "^2.7.0",
     "lodash-es": "^4.18.1",
     "memoizee": "^0.4.17",
     "node-fetch": "^2.3.0",
     "open": "^8.4.0",
+    "path-equal": "1.2.5",
     "prettier": "^3.3.3",
+    "slugify": "^1.6.6",
     "tmp-promise": "^2.0.2",
     "ts-results-es": "^4.2.0",
     "tsc-alias": "^1.8.16",
     "tsc-watch": "^7.2.0",
     "typescript": "^5.4.5",
-    "yaml": "^2.5.0"
+    "yaml": "^2.5.0",
+    "zod": "^4.4.3"
   },
   "dependencies": {
     "tsx": "^4.21.0"

package/src/adapters/terminal.ts

@@ -7,6 +7,7 @@ import type {
   PromptChoice,
 } from "../core/types";
 import { MissingInputError } from "../core/types";
+import type { SecretsMode } from "../vault";
 import { BaseContext } from "./baseContext";
 import { createVaultManagerGetter } from "./vaultManagerAccess";
 
@@ -82,6 +83,13 @@ export interface TerminalOptions {
   interactive?: boolean;
   /** If true, all confirm() calls return true without prompting (--yes flag) */
   yes?: boolean;
+  /**
+   * log to stderr instead of stdout (catenv: stdout may be evaluated
+   * by direnv or piped, so only data belongs there)
+   */
+  logToStderr?: boolean;
+  /** how to interact with the secrets vault (--vault-mode) */
+  vaultMode?: SecretsMode;
 }
 
 class TerminalContext<
@@ -187,9 +195,15 @@ export function createTerminalContext<TInputs extends InputsSchema>(
 export function createTerminalIO(options: TerminalOptions = {}): IO {
   const io: IO = {
     interactive: options.interactive ?? process.stdin.isTTY === true,
-    getVaultManager: createVaultManagerGetter(() => io),
+    getVaultManager: createVaultManagerGetter(() => io, {
+      mode: options.vaultMode,
+    }),
     log(message: string): void {
-      console.log(message);
+      if (options.logToStderr) {
+        console.error(message);
+      } else {
+        console.log(message);
+      }
     },
     async confirm(message: string): Promise<boolean> {
       if (options.yes) return true;

package/src/apps/catenv/catenv.ts

@@ -10,11 +10,17 @@ import {
 } from "@catladder/pipeline";
 import type { SecretsMode } from "../../vault";
 import { createNonInteractiveIO } from "../../adapters/nonInteractive";
+import { createTerminalIO } from "../../adapters/terminal";
 
 type Options = {
   verbose?: boolean;
   printVariables?: boolean;
   vaultMode?: SecretsMode;
+  /**
+   * whether prompting is allowed (token setup, vault unlock). Callers
+   * pass the TTY detection result; direnv/turbo/CI runs come out false.
+   */
+  interactive?: boolean;
 };
 export default async (choice?: Choice, options?: Options) => {
   const config = await getProjectConfig();
@@ -22,7 +28,15 @@ export default async (choice?: Choice, options?: Options) => {
     return;
   }
 
-  const io = createNonInteractiveIO({ vaultMode: options?.vaultMode });
+  const io = options?.interactive
+    ? // logs still go to stderr: even on a TTY, stdout is reserved for
+      // data (--print-variables) and may be piped
+      createTerminalIO({
+        interactive: true,
+        logToStderr: true,
+        vaultMode: options?.vaultMode,
+      })
+    : createNonInteractiveIO({ vaultMode: options?.vaultMode });
   const context = { ...createCatenvContext(config), io };
   if (options?.verbose) {
     printVerboseBanner();

package/src/catenv.ts

@@ -27,6 +27,10 @@ program
       .choices(["auto", "no-prompt", "offline", "refresh"])
       .default("auto"),
   )
+  .option(
+    "--non-interactive",
+    "never prompt (token setup, vault unlock) — assumed automatically when not attached to a terminal (direnv, turbo, CI)",
+  )
   .action(
     (
       envComponent: string | undefined,
@@ -34,12 +38,20 @@ program
         verbose?: boolean;
         printVariables?: boolean;
         vaultMode: SecretsMode;
+        nonInteractive?: boolean;
       },
     ) => {
+      // interactive iff a human is attached: direnv captures stdout,
+      // turbo/CI pipe it — all of those auto-degrade to non-interactive
+      const interactive =
+        !opts.nonInteractive &&
+        process.stdin.isTTY === true &&
+        process.stdout.isTTY === true;
       catenv(envComponent ? parseChoice(envComponent) : null, {
         verbose: opts.verbose ?? false,
         printVariables: opts.printVariables ?? false,
         vaultMode: opts.vaultMode,
+        interactive,
       }).then(() => {
         // we have to exit manually, because we have some file watches
         process.exit();

package/src/utils/gitlab.ts

@@ -45,6 +45,13 @@ export const getGitlabToken = async (io: IO | null) => {
       );
       process.exit(1);
     }
+    if (!io.interactive) {
+      // don't start the setup wizard in a context that cannot prompt
+      // (direnv, turbo, CI) — fail with the remedy instead
+      throw new Error(
+        "gitlab token missing — run `catenv` (or any `catladder` command) once in a terminal to set it up",
+      );
+    }
     await setupGitlabToken(io);
   }
   return getPreference(TOKEN_KEY);

package/src/vault/VaultManager.ts

@@ -63,7 +63,10 @@ export class VaultManager {
         return new BitwardenVault(
           this.config,
           vaultConfig,
-          this.mode === "auto" || this.mode === "refresh",
+          // unlock prompts need a mode that allows them AND an IO that
+          // can actually prompt (catenv under direnv/turbo/CI cannot)
+          (this.mode === "auto" || this.mode === "refresh") &&
+            (this.io?.interactive ?? true),
         );
     }
   }