@cantinasecurity/apex-cli 0.1.4 → 0.1.5

package/dist/args.js

@@ -41,6 +41,12 @@ export function isJsonMode(flags) {
 export function isNonInteractive(flags) {
     return flags["non-interactive"] === true;
 }
+export function canPromptInteractively(flags) {
+    return (!isJsonMode(flags) &&
+        !isNonInteractive(flags) &&
+        process.stdin.isTTY === true &&
+        process.stdout.isTTY === true);
+}
 export function getFlagString(flags, key) {
     const value = flags[key];
     return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;

package/dist/commands.js

@@ -1,4 +1,4 @@
-import { getFlagList, getFlagString, isJsonMode, isNonInteractive } from "./args.js";
+import { canPromptInteractively, getFlagList, getFlagString, isJsonMode, } from "./args.js";
 import { logout } from "./auth.js";
 import { ApiError } from "./api-client.js";
 import { openInBrowser } from "./browser.js";
@@ -341,7 +341,7 @@ async function maybePersistFindingSelectionBinding(params) {
     return nextBinding;
 }
 function canPromptForConfirmation(flags) {
-    return !isNonInteractive(flags) && process.stdin.isTTY && process.stdout.isTTY;
+    return canPromptInteractively(flags);
 }
 async function findFallbackActiveScan(client, binding) {
     if (!binding?.lastScanId) {
@@ -572,7 +572,7 @@ export async function commandScan(client, cwd, flags) {
             throw new Error("Workspace resolution did not return a workspaceId.");
         }
         if (legacyResolve.missing.length > 0) {
-            if (isNonInteractive(flags)) {
+            if (!canPromptInteractively(flags)) {
                 throw new Error(`PR scans require connected provider access for ${formatMissingProviderConnections(legacyResolve.missing)}. Re-run interactively or pre-connect providers.`);
             }
             await remediateMissingConnections(legacyResolve.missing, flags);

package/dist/session.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { getFlagList, getFlagString, isJsonMode, isNonInteractive } from "./args.js";
+import { canPromptInteractively, getFlagList, getFlagString, isJsonMode, } from "./args.js";
 import { login } from "./auth.js";
 import { ApiError } from "./api-client.js";
 import { openInBrowser } from "./browser.js";
@@ -37,10 +37,13 @@ export async function chooseCompany(me, flags, binding) {
             throw new Error(`Unknown company: ${requested}`);
         }
     }
+    if (me.companies.length === 0) {
+        throw new Error("No Apex companies are available for this account.");
+    }
     if (me.companies.length === 1) {
         return me.companies[0];
     }
-    if (isNonInteractive(flags)) {
+    if (!canPromptInteractively(flags)) {
         throw new Error("Multiple companies available. Re-run with --company <id-or-handle>.");
     }
     const selected = await chooseOne("Select the Apex company to use for this directory:", me.companies.map((company) => ({
@@ -60,12 +63,21 @@ async function chooseWorkspaceName(cwd, flags, binding) {
         return binding.workspaceName;
     }
     const suggested = path.basename(cwd);
-    if (isNonInteractive(flags)) {
+    if (!canPromptInteractively(flags)) {
         return suggested;
     }
     const chosen = await promptText("Workspace name to use in Apex for this directory (press Enter to use the current folder name)", suggested);
     return chosen.trim().length > 0 ? chosen.trim() : suggested;
 }
+function selectBindingForWorkspaceName(flags, binding, workspaceName) {
+    const explicit = getFlagString(flags, "workspace-name");
+    if (!explicit || !binding) {
+        return binding;
+    }
+    return binding.workspaceName.trim().toLowerCase() === workspaceName.trim().toLowerCase()
+        ? binding
+        : null;
+}
 function getSourceMode(flags) {
     const value = getFlagString(flags, "source-mode");
     return value === "remote" || value === "local" ? value : "auto";
@@ -127,9 +139,10 @@ export async function resolveWorkspace(client, cwd, me, flags) {
     return resolveWorkspaceSelection(client, selection);
 }
 export async function selectWorkspaceTarget(cwd, me, flags) {
-    const binding = await loadWorkspaceBinding(cwd);
-    const company = await chooseCompany(me, flags, binding);
-    const workspaceName = await chooseWorkspaceName(cwd, flags, binding);
+    const loadedBinding = await loadWorkspaceBinding(cwd);
+    const company = await chooseCompany(me, flags, loadedBinding);
+    const workspaceName = await chooseWorkspaceName(cwd, flags, loadedBinding);
+    const binding = selectBindingForWorkspaceName(flags, loadedBinding, workspaceName);
     const sourceSelection = getFlagList(flags, "repo");
     const discovered = await discoverSources(cwd, sourceSelection);
     if (discovered.sources.length === 0) {
@@ -218,7 +231,7 @@ export async function remediateMissingConnections(missing, flags) {
     if (missing.length === 0) {
         return;
     }
-    if (isNonInteractive(flags)) {
+    if (!canPromptInteractively(flags)) {
         throw new Error("Missing provider connections. Re-run interactively or pre-connect providers.");
     }
     for (const item of missing) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cantinasecurity/apex-cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Standalone CLI and MCP server for Apex.",
   "private": false,
   "type": "module",