unbound-cli 0.2.0 → 0.2.1

package/README.md

@@ -60,7 +60,9 @@ Automated setup (downloads scripts, sets env vars, configures tool):
 | `unbound setup claude-code --subscription` | Hooks only (keep your Claude subscription) |
 | `unbound setup claude-code --gateway` | Use Unbound as the AI provider |
 | `unbound setup gemini-cli` | Set GEMINI_API_KEY and base URL |
-| `unbound setup codex` | Set OPENAI_API_KEY and base URL |
+| `unbound setup codex` | Interactive mode selection (subscription or gateway) |
+| `unbound setup codex --subscription` | Hooks only (keep your OpenAI subscription) |
+| `unbound setup codex --gateway` | Use Unbound as the AI provider |
 
 Instruction-only (shows API key and base URL to configure manually):
 
@@ -87,12 +89,12 @@ Configure all users on a device via MDM. Requires root.
 | Command | Description |
 |---------|-------------|
 | `sudo unbound setup mdm --admin-api-key KEY --all` | Set up all tools |
-| `sudo unbound setup mdm --admin-api-key KEY cursor codex` | Set up specific tools |
+| `sudo unbound setup mdm --admin-api-key KEY cursor codex-subscription` | Set up specific tools |
 | `sudo unbound setup mdm --admin-api-key KEY --clear cursor` | Remove config for specific tools |
 
-Available tools: `cursor`, `claude-code-subscription`, `claude-code-gateway`, `gemini-cli`, `codex`
+Available tools: `cursor`, `claude-code-subscription`, `claude-code-gateway`, `gemini-cli`, `codex-subscription`, `codex-gateway`
 
-`claude-code-subscription` and `claude-code-gateway` are mutually exclusive. When using `--all`, `claude-code-subscription` is used by default.
+`claude-code-subscription` and `claude-code-gateway` are mutually exclusive. `codex-subscription` and `codex-gateway` are mutually exclusive. When using `--all`, subscription mode is used by default for Claude Code and Codex.
 
 ### MDM AI Tools Discovery
 
@@ -149,7 +151,7 @@ Alias: `unbound groups` works the same as `unbound user-groups`.
 | `unbound tools connect <type>` | Connect a tool |
 | `unbound tools approved` | List approved tool types |
 
-Supported tool types: `CLAUDE_CODE`, `CURSOR`, `COPILOT`, `ROO_CODE`, `CLINE`, `GEMINI_CLI`, `CODEX`, `KILO_CODE`, `CUSTOM_ACCESS`
+Supported tool types: `CLAUDE_CODE`, `UNBOUND_CLAUDE_CODE`, `CURSOR`, `COPILOT`, `ROO_CODE`, `CLINE`, `GEMINI_CLI`, `CODEX`, `UNBOUND_CODEX`, `KILO_CODE`, `CUSTOM_ACCESS`
 
 ## Configuration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unbound-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "CLI tool for Unbound - AI Gateway management",
   "main": "src/index.js",
   "bin": {

package/src/commands/setup.js

@@ -11,7 +11,8 @@ const SETUP_TOOLS = [
   { label: 'Claude Code \u2014 subscription (hooks)', value: 'claude-sub', script: 'claude-code/hooks/setup.py', group: 'claude-code' },
   { label: 'Claude Code \u2014 gateway (gateway)', value: 'claude-gw', script: 'claude-code/gateway/setup.py', group: 'claude-code' },
   { label: 'Gemini CLI', value: 'gemini', script: 'gemini-cli/gateway/setup.py' },
-  { label: 'Codex', value: 'codex', script: 'codex/gateway/setup.py' },
+  { label: 'Codex \u2014 subscription (hooks)', value: 'codex-sub', script: 'codex/hooks/setup.py', group: 'codex' },
+  { label: 'Codex \u2014 gateway (gateway)', value: 'codex-gw', script: 'codex/gateway/setup.py', group: 'codex' },
 ];
 
 const MDM_TOOLS = {
@@ -19,11 +20,12 @@ const MDM_TOOLS = {
   'claude-code-subscription': { label: 'Claude Code (subscription)', script: 'claude-code/hooks/mdm/setup.py' },
   'claude-code-gateway':      { label: 'Claude Code (gateway)',      script: 'claude-code/gateway/mdm/setup.py' },
   'gemini-cli':               { label: 'Gemini CLI',                 script: 'gemini-cli/gateway/mdm/setup.py' },
-  'codex':                    { label: 'Codex',                      script: 'codex/gateway/mdm/setup.py' },
+  'codex-subscription':       { label: 'Codex (subscription)',       script: 'codex/hooks/mdm/setup.py' },
+  'codex-gateway':            { label: 'Codex (gateway)',            script: 'codex/gateway/mdm/setup.py' },
 };
 
-// Default tools for --all (uses subscription mode for Claude Code since only one can be active)
-const MDM_ALL_TOOLS = ['cursor', 'claude-code-subscription', 'gemini-cli', 'codex'];
+// Default tools for --all (uses subscription mode for Claude Code and Codex since only one can be active)
+const MDM_ALL_TOOLS = ['cursor', 'claude-code-subscription', 'gemini-cli', 'codex-subscription'];
 
 /**
  * Builds a shell command that curls a setup script and pipes it to python3.
@@ -143,7 +145,7 @@ Single-tool setup (downloads scripts, sets env vars, configures tool):
   $ unbound setup cursor         # Download hooks, set env, restart Cursor
   $ unbound setup claude-code    # Set up gateway + hooks for Claude Code
   $ unbound setup gemini-cli     # Set GEMINI_API_KEY and base URL
-  $ unbound setup codex          # Set OPENAI_API_KEY and base URL
+  $ unbound setup codex          # Set up gateway + hooks for Codex
 
 Instruction-only (shows API key and base URL to configure manually):
   $ unbound setup roo-code       # Show Roo Code config values
@@ -309,15 +311,26 @@ Examples:
   setup
     .command('codex')
     .description(
-      'Set up Codex to use Unbound. Sets OPENAI_API_KEY and ' +
-      'OPENAI_BASE_URL environment variables.'
+      'Set up Codex to use Unbound. Prompts whether to use your existing ' +
+      'OpenAI subscription or use Unbound as the AI provider.'
     )
+    .option('--subscription', 'Use your existing OpenAI subscription (hooks only)')
+    .option('--gateway', 'Use Unbound as the AI provider (gateway mode)')
     .option('--clear', 'Remove Unbound configuration for Codex')
     .addHelpText('after', `
-What this does:
-  1. Sets OPENAI_API_KEY to your Unbound API key in your shell profile
-  2. Sets OPENAI_BASE_URL to the Unbound gateway endpoint
-  3. Codex will route all requests through Unbound
+Modes:
+  Subscription (hooks only):
+    Keep your existing OpenAI subscription. Installs Unbound hooks for
+    policy enforcement (security guardrails, cost limits) without changing
+    the AI provider. Runs codex/hooks/setup.py.
+
+  Gateway:
+    Use Unbound as the AI provider. Routes all Codex requests through
+    the Unbound gateway for full policy enforcement and model management.
+    Runs codex/gateway/setup.py.
+
+  If neither --subscription nor --gateway is provided, an interactive
+  prompt will ask you to choose.
 
 Prerequisites:
   - Must be logged in (will auto-open browser to authenticate if not)
@@ -325,10 +338,45 @@ Prerequisites:
   - Codex must be installed
 
 Examples:
-  $ unbound setup codex
-  $ unbound setup codex --clear   # Remove Unbound configuration
+  $ unbound setup codex                # Interactive mode selection
+  $ unbound setup codex --subscription # Hooks only (keep your subscription)
+  $ unbound setup codex --gateway      # Use Unbound as AI provider
+  $ unbound setup codex --clear        # Remove Unbound configuration
 `)
-    .action(makeAction('codex/gateway/setup.py'));
+    .action(async (opts) => {
+      try {
+        await ensureLoggedIn();
+        const apiKey = config.getApiKey();
+        const scriptOpts = { clear: opts.clear };
+
+        if (opts.subscription && opts.gateway) {
+          output.error('Cannot use both --subscription and --gateway. Choose one.');
+          process.exitCode = 1;
+          return;
+        }
+
+        let useSubscription = opts.subscription;
+        if (!opts.clear && !opts.subscription && !opts.gateway) {
+          const mode = await output.select('How do you want to use Codex with Unbound?', [
+            { label: 'Use my OpenAI subscription (hooks)', value: 'subscription' },
+            { label: 'Use Unbound as the AI provider (gateway)', value: 'gateway' },
+          ]);
+          useSubscription = mode === 'subscription';
+        }
+
+        if (opts.clear) {
+          runSetupScript('codex/hooks/setup.py', apiKey, scriptOpts);
+          runSetupScript('codex/gateway/setup.py', apiKey, scriptOpts);
+        } else if (useSubscription) {
+          runSetupScript('codex/hooks/setup.py', apiKey, scriptOpts);
+        } else {
+          runSetupScript('codex/gateway/setup.py', apiKey, scriptOpts);
+        }
+      } catch (err) {
+        output.error(err.message);
+        process.exitCode = 1;
+      }
+    });
 
   // --- Instruction-only tools ---
 
@@ -500,16 +548,18 @@ Available tools:
   claude-code-subscription  Claude Code with your own subscription (hooks only)
   claude-code-gateway       Claude Code with Unbound as AI provider
   gemini-cli                Gemini CLI
-  codex                     Codex CLI
+  codex-subscription        Codex with your own subscription (hooks only)
+  codex-gateway             Codex with Unbound as AI provider
 
 Note: claude-code-subscription and claude-code-gateway are mutually exclusive.
-When using --all, claude-code-subscription is used by default.
+      codex-subscription and codex-gateway are mutually exclusive.
+When using --all, subscription mode is used by default for Claude Code and Codex.
 
 Examples:
   $ sudo unbound setup mdm --admin-api-key KEY cursor
-  $ sudo unbound setup mdm --admin-api-key KEY cursor claude-code-subscription codex
+  $ sudo unbound setup mdm --admin-api-key KEY cursor claude-code-subscription codex-subscription
   $ sudo unbound setup mdm --admin-api-key KEY --all
-  $ sudo unbound setup mdm --admin-api-key KEY --clear cursor codex
+  $ sudo unbound setup mdm --admin-api-key KEY --clear cursor codex-subscription
 `)
     .action(async (tools, opts) => {
       try {
@@ -547,6 +597,12 @@ Examples:
           return;
         }
 
+        if (toolNames.includes('codex-subscription') && toolNames.includes('codex-gateway')) {
+          output.error('Cannot use both codex-subscription and codex-gateway. Choose one.');
+          process.exitCode = 1;
+          return;
+        }
+
         const resolvedTools = toolNames.map(name => ({ name, ...MDM_TOOLS[name] }));
         console.log('');
 

package/src/commands/tools.js

@@ -11,6 +11,7 @@ const SUPPORTED_TOOL_TYPES = [
   'CLINE',
   'GEMINI_CLI',
   'CODEX',
+  'UNBOUND_CODEX',
   'KILO_CODE',
   'CUSTOM_ACCESS',
 ];

package/src/index.js

@@ -30,7 +30,9 @@ TOOL SETUP
   $ unbound setup claude-code --gateway    Use Unbound as AI provider
   $ unbound setup claude-code --subscription  Hooks only (keep your subscription)
   $ unbound setup gemini-cli               Set up Gemini CLI
-  $ unbound setup codex                    Set up Codex
+  $ unbound setup codex                    Set up Codex (interactive mode selection)
+  $ unbound setup codex --gateway          Use Unbound as AI provider
+  $ unbound setup codex --subscription     Hooks only (keep your subscription)
 
   Instruction-only (shows config values to set manually):
   $ unbound setup roo-code                 Show Roo Code config values
@@ -46,9 +48,9 @@ TOOL SETUP
 
 MDM SETUP (admin, requires root)
   $ sudo unbound setup mdm --admin-api-key KEY --all
-  $ sudo unbound setup mdm --admin-api-key KEY cursor codex
-  $ sudo unbound setup mdm --admin-api-key KEY claude-code-subscription gemini-cli
-  $ sudo unbound setup mdm --admin-api-key KEY --clear cursor codex
+  $ sudo unbound setup mdm --admin-api-key KEY cursor codex-subscription
+  $ sudo unbound setup mdm --admin-api-key KEY claude-code-subscription codex-subscription gemini-cli
+  $ sudo unbound setup mdm --admin-api-key KEY --clear cursor codex-subscription
 
 MDM AI TOOLS DISCOVERY
   --domain defaults to https://backend.getunbound.ai