@ory/codex 0.3.0 → 0.4.0

package/README.md

@@ -16,24 +16,20 @@ You don't need an Ory account or any prior Ory experience to start.
 No prior `npm install` required:
 
 ```bash
-npx @ory/codex install            # current project
-npx @ory/codex install --global   # all Codex projects
-npx @ory/codex uninstall
+npx @ory/codex install     # registers the Ory marketplace + plugin with `codex`
+npx @ory/codex uninstall   # removes both
 ```
 
-That's it — skills, hooks, and the Ory MCP server are now registered. Existing entries in your Codex config are preserved.
+Under the hood the installer runs `codex plugin marketplace add <local-dir>` and `codex plugin add ory-codex@ory`, so the plugin is owned by Codex's plugin system — same as every other Codex marketplace plugin. Skills, slash commands, hooks, and the Ory MCP server are all part of the plugin payload. Re-running `install` is idempotent and refreshes the rendered skills + commands from the latest template.
 
-<details>
-<summary>Alternative install</summary>
-
-If the installer can't locate your Codex config, this writes it directly:
+Verify the install with Codex's native tooling:
 
 ```bash
-npx -y -p @ory/codex ory-codex-setup
+codex plugin list      # shows ory-codex@ory installed + enabled
+codex mcp list         # shows the bundled `ory` MCP server
+codex doctor           # surfaces any config or MCP resolvability issues
 ```
 
-</details>
-
 ## Quickstart (≈ 3 minutes)
 
 From any project where you'd like Ory authentication, inside Codex:
@@ -48,6 +44,14 @@ From any project where you'd like Ory authentication, inside Codex:
 
 3. **Sign in.** Start your app, visit the login page Codex added, and sign in with the seeded credentials. You now have a real Ory session backed by a real Ory stack — locally, offline, with zero configuration.
 
+4. **Turn on Ory login for the Codex session itself.** *(Optional but recommended.)* Out of the box the plugin only governs your *app*. To also attach an Ory identity to *Codex's* session — so every tool call is attributed to you, not a fallback `session:<id>` subject — set:
+
+   ```bash
+   export ORY_AUTH_GATE=1
+   ```
+
+   Then restart Codex. On next session start, Codex opens an Ory login in your browser; sign in with the same seeded credentials from step 1. This is what makes `permissions enforce` (see [Agent security](#agent-security)) deny on the right identity later.
+
 That's the full Ory DX path. Stop here if you're just evaluating the plugin. Continue to [Agent security](#agent-security) when you're ready to enforce.
 
 ## What's included
@@ -146,7 +150,7 @@ After install the plugin runs in **observe mode**: every tool call is checked ag
 ## CLI reference
 
 ```
-npx -y -p @ory/codex ory-codex install | uninstall                 [--global]
+npx -y -p @ory/codex ory-codex install | uninstall
 npx -y -p @ory/codex ory-codex configure                            [--project-url <url>] [--api-key <key>] [--audit-only]
 npx -y -p @ory/codex ory-codex agent <status|unregister>            Manage the agent's OAuth2 identity
 npx -y -p @ory/codex ory-codex permissions <status|bootstrap|observe|enforce>
@@ -166,6 +170,8 @@ Highlights:
 - **`ory-local-up` fails.** Make sure Docker is running and ports `3000`, `4000`, `4100`, and `16686` are free.
 - **PKCE login loops.** Clear persisted state with `npx -y -p @ory/codex ory-codex agent unregister` and retry.
 - **`npx` fetches an old version.** Force a fresh fetch: `npx -y -p @ory/codex@latest ory-codex …`.
+- **`npm install … ENOVERSIONS`.** If your `~/.npmrc` sets `min-release-age`, npm filters out package versions newer than that threshold. Override per-call with `npm_config_min_release_age=0 npx @ory/codex install`.
+- **`codex doctor` reports `ory-mcp-server is not resolvable`.** The bundled MCP server resolves via `npx -y -p @ory/mcp-server` on demand — make sure `npm`/`npx` is on PATH. The first session start fetches the server tarball; subsequent sessions reuse the cache.
 - **Need more signal.** Set `ORY_AGENT_DEBUG=true` and `ORY_AGENT_LOG_FILE=/tmp/ory.log` to capture structured logs.
 
 ## Links

package/dist/cli/main.d.ts

@@ -3,10 +3,12 @@
  * Main CLI for @ory/codex.
  *
  * Usage:
- *   npx ory-codex install [--global]     Install hooks into Codex config
- *   npx ory-codex uninstall              Remove hooks from Codex config
- *   npx ory-codex configure              Set or view Ory project URL and API key
- *   npx ory-codex setup [--global]       Write hooks to config directly (fallback)
- *   npx ory-codex status                 Show plugin status
+ *   npx ory-codex install               Install the plugin via `codex plugin add`
+ *   npx ory-codex uninstall             Remove the plugin via `codex plugin remove`
+ *   npx ory-codex configure             Set or view Ory project URL and API key
+ *   npx ory-codex agent <cmd>           Manage the agent's OAuth2 identity
+ *   npx ory-codex permissions <cmd>     Manage permission mode and tool permissions
+ *   npx ory-codex local <cmd>           Manage local Ory dev environment
+ *   npx ory-codex status                Show plugin status and configuration
  */
 export {};

package/dist/cli/main.js

@@ -4,11 +4,13 @@
  * Main CLI for @ory/codex.
  *
  * Usage:
- *   npx ory-codex install [--global]     Install hooks into Codex config
- *   npx ory-codex uninstall              Remove hooks from Codex config
- *   npx ory-codex configure              Set or view Ory project URL and API key
- *   npx ory-codex setup [--global]       Write hooks to config directly (fallback)
- *   npx ory-codex status                 Show plugin status
+ *   npx ory-codex install               Install the plugin via `codex plugin add`
+ *   npx ory-codex uninstall             Remove the plugin via `codex plugin remove`
+ *   npx ory-codex configure             Set or view Ory project URL and API key
+ *   npx ory-codex agent <cmd>           Manage the agent's OAuth2 identity
+ *   npx ory-codex permissions <cmd>     Manage permission mode and tool permissions
+ *   npx ory-codex local <cmd>           Manage local Ory dev environment
+ *   npx ory-codex status                Show plugin status and configuration
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -47,19 +49,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
 const argus_1 = require("@ory/argus");
+const setup_js_1 = require("./setup.js");
 const PACKAGE_ROOT = path.resolve(__dirname, "..", "..");
 function main() {
     const [command, ...args] = process.argv.slice(2);
     switch (command) {
         case "install":
-            install(args);
+            (0, setup_js_1.install)(args);
             postInstallPermissions("ory-codex", "codex").then(() => process.exit(0), (err) => {
                 console.error(err.message ?? err);
                 process.exit(1);
             });
             break;
         case "uninstall":
-            uninstall(args);
+            (0, setup_js_1.uninstall)(args);
             break;
         case "configure":
             (0, argus_1.runConfigureCommand)("ory-codex", args);
@@ -76,11 +79,11 @@ function main() {
                 process.exit(1);
             });
             break;
-        case "setup":
-            require("./setup.js");
-            break;
         case "status":
-            status();
+            status().then(() => process.exit(0), (err) => {
+                console.error(err.message ?? err);
+                process.exit(1);
+            });
             break;
         case "local":
             (0, argus_1.runLocalCommand)("ory-codex", args).catch((err) => {
@@ -100,39 +103,21 @@ function main() {
             process.exit(1);
     }
 }
-function install(args) {
-    const isGlobal = args.includes("--global");
-    console.log(`Installing Ory hooks for Codex (scope: ${isGlobal ? "global" : "project"})...`);
-    manualSetup(isGlobal);
-}
-function uninstall(args) {
-    const setupArgs = ["--uninstall", ...args];
-    process.argv = ["node", "setup.js", ...setupArgs];
-    require("./setup.js");
-}
-function manualSetup(isGlobal) {
-    const setupArgs = isGlobal ? ["--global"] : [];
-    process.argv = ["node", "setup.js", ...setupArgs];
-    require("./setup.js");
-}
 async function postInstallPermissions(binName, harness) {
     const bootstrapped = await (0, argus_1.maybeAutoBootstrap)(binName, harness);
     (0, argus_1.printPermissionsOnboardingHelp)(binName, harness, {
         bootstrappedAutomatically: bootstrapped,
     });
 }
-function status() {
-    console.log("Ory Agent Plugin Status (Codex)");
-    console.log("================================");
-    console.log("");
-    (0, argus_1.printOryConfig)();
-    (0, argus_1.printEnvironment)();
-    // Plugin-specific status
-    console.log("");
-    console.log("Plugin:");
-    console.log(`  Directory: ${PACKAGE_ROOT}`);
-    console.log(`  Hook script: ${fs.existsSync(path.join(PACKAGE_ROOT, "dist", "hook.js")) ? "built" : "NOT BUILT (run pnpm build)"}`);
-    (0, argus_1.printLogTail)();
+async function status() {
+    await (0, argus_1.runStatusCommand)("ory-codex", "codex", {
+        title: "Codex",
+        printPluginSection: () => {
+            console.log("Hooks & plugin:");
+            console.log(`  Directory:   ${PACKAGE_ROOT}`);
+            console.log(`  Hook script: ${fs.existsSync(path.join(PACKAGE_ROOT, "dist", "hook.js")) ? "built" : "NOT BUILT (run pnpm build)"}`);
+        },
+    });
 }
 function help() {
     console.log(`
@@ -142,20 +127,25 @@ Usage:
   npx ory-codex <command> [options]
 
 Commands:
-  install [--global]   Install the Ory hooks into Codex configuration
-  uninstall            Remove the Ory hooks from Codex configuration
-  configure            Set or view Ory project URL and API key
-  permissions <cmd>    Manage permission mode and tool permissions (status, bootstrap, observe, enforce)
-  setup [--global]     Write hooks directly to config (fallback)
-  status               Show plugin status and configuration
-  local <cmd>          Manage local Ory dev environment (up, down, status, seed, ...)
+  install                  Install via \`codex plugin marketplace add\` + \`codex plugin add\`
+  uninstall                Remove via \`codex plugin remove\` + \`codex plugin marketplace remove\`
+  configure                Set or view Ory project URL and API key
+  agent <cmd>              Manage the agent's OAuth2 identity (status, unregister)
+  permissions <cmd>        Manage permission mode and tool permissions
+                             (status, bootstrap, observe, enforce)
+  local <cmd>              Manage local Ory dev environment
+                             (up, down, status, seed, logs, env, configure, reset)
+  status                   Show plugin status, config, and recent log lines
 
 Examples:
-  npx ory-codex install            # Install for current project
-  npx ory-codex install --global   # Install globally
-  npx ory-codex configure --project-url https://your-project.projects.oryapis.com --api-key ory_pat_...
-  npx ory-codex status             # Check configuration
-  npx ory-codex uninstall          # Remove hooks
+  npx ory-codex install
+  npx ory-codex configure --project-url https://<id>.projects.oryapis.com \\
+                          --api-key ory_pat_...
+  npx ory-codex permissions status
+  npx ory-codex status
+  npx ory-codex uninstall
+
+Requires the \`codex\` CLI on PATH.
 `);
 }
 main();

package/dist/cli/setup.d.ts

@@ -1,16 +1,28 @@
 #!/usr/bin/env node
 /**
- * Setup CLI for the Ory Codex plugin.
+ * Install/uninstall the Ory plugin via the `codex` CLI.
  *
- * Writes hooks to `.codex/hooks.json` and enables the codex_hooks feature
- * flag in `.codex/config.toml`. Codex does not read `.codex/config.json`
- * for hooks; that path is intentionally not used.
+ * Two-step model that mirrors how every other Codex marketplace plugin works:
+ *
+ *   1. Assemble a Codex marketplace under the shared per-harness data dir.
+ *      The marketplace skeleton (manifest, MCP config, plugin metadata) is
+ *      copied from `marketplace/` in this package; the dynamic parts
+ *      (`hooks.json`, skills, commands, plugin version) are generated /
+ *      rendered fresh from the shared `@ory/argus` templates.
+ *
+ *   2. Hand that directory to `codex` via `codex plugin marketplace add` +
+ *      `codex plugin add ory-codex@ory`. Codex copies the plugin into its
+ *      own cache (`~/.codex/plugins/cache/...`), so once installed the
+ *      plugin no longer depends on the assembled marketplace dir for
+ *      runtime — but Codex needs it to stay around for `marketplace upgrade`.
+ *
+ * Uninstall reverses both steps: `codex plugin remove` + `codex plugin
+ * marketplace remove`, then we delete the assembled dir.
  *
  * Usage:
- *   npx ory-codex-setup              # Auto-detect and configure
- *   npx ory-codex-setup --project-dir /path/to/repo
- *   npx ory-codex-setup --global     # Install to ~/.codex/
- *   npx ory-codex-setup --print      # Print config to stdout without writing
- *   npx ory-codex-setup --uninstall  # Remove Ory hooks from config
+ *   npx ory-codex-setup                Install
+ *   npx ory-codex-setup --uninstall    Remove
+ *   npx ory-codex-setup --help         Show this help
  */
-export {};
+export declare function install(_args: string[]): void;
+export declare function uninstall(_args: string[]): void;

package/dist/cli/setup.js

@@ -1,18 +1,29 @@
 #!/usr/bin/env node
 "use strict";
 /**
- * Setup CLI for the Ory Codex plugin.
+ * Install/uninstall the Ory plugin via the `codex` CLI.
  *
- * Writes hooks to `.codex/hooks.json` and enables the codex_hooks feature
- * flag in `.codex/config.toml`. Codex does not read `.codex/config.json`
- * for hooks; that path is intentionally not used.
+ * Two-step model that mirrors how every other Codex marketplace plugin works:
+ *
+ *   1. Assemble a Codex marketplace under the shared per-harness data dir.
+ *      The marketplace skeleton (manifest, MCP config, plugin metadata) is
+ *      copied from `marketplace/` in this package; the dynamic parts
+ *      (`hooks.json`, skills, commands, plugin version) are generated /
+ *      rendered fresh from the shared `@ory/argus` templates.
+ *
+ *   2. Hand that directory to `codex` via `codex plugin marketplace add` +
+ *      `codex plugin add ory-codex@ory`. Codex copies the plugin into its
+ *      own cache (`~/.codex/plugins/cache/...`), so once installed the
+ *      plugin no longer depends on the assembled marketplace dir for
+ *      runtime — but Codex needs it to stay around for `marketplace upgrade`.
+ *
+ * Uninstall reverses both steps: `codex plugin remove` + `codex plugin
+ * marketplace remove`, then we delete the assembled dir.
  *
  * Usage:
- *   npx ory-codex-setup              # Auto-detect and configure
- *   npx ory-codex-setup --project-dir /path/to/repo
- *   npx ory-codex-setup --global     # Install to ~/.codex/
- *   npx ory-codex-setup --print      # Print config to stdout without writing
- *   npx ory-codex-setup --uninstall  # Remove Ory hooks from config
+ *   npx ory-codex-setup                Install
+ *   npx ory-codex-setup --uninstall    Remove
+ *   npx ory-codex-setup --help         Show this help
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -48,141 +59,241 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.install = install;
+exports.uninstall = uninstall;
+const node_child_process_1 = require("node:child_process");
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const argus_1 = require("@ory/argus");
-const BIN_NAME = "ory-codex-hook";
-const PACKAGE_NAME = "@ory/codex";
+const PACKAGE_ROOT = path.resolve(__dirname, "..", "..");
+const PACKAGE_VERSION = readPackageVersion();
+const MARKETPLACE_NAME = "ory";
+const PLUGIN_NAME = "ory-codex";
+const PLUGIN_REF = `${PLUGIN_NAME}@${MARKETPLACE_NAME}`;
 const RENDER_OPTS = {
     binName: "ory-codex",
     packageName: "@ory/codex",
 };
-function getCodexDir(args) {
-    if (args.global) {
-        const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
-        return path.join(home, ".codex");
+/**
+ * Where the assembled marketplace lives. Codex stores a reference to this
+ * path in its own config (`[marketplaces.ory].source`), so the location
+ * needs to survive across sessions — it can't be the throwaway npx cache.
+ */
+const MARKETPLACE_ROOT = path.join((0, argus_1.getHarnessDataDir)("codex"), "marketplace");
+const PLUGIN_ROOT = path.join(MARKETPLACE_ROOT, "plugins", PLUGIN_NAME);
+/** Hook command that resolves via the npm registry on every invocation. */
+const HOOK_COMMAND = "npx -y -p @ory/codex ory-codex-hook";
+function readPackageVersion() {
+    try {
+        const pj = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, "package.json"), "utf-8"));
+        return pj.version ?? "0.0.0";
+    }
+    catch {
+        return "0.0.0";
     }
-    return path.join(args.projectDir, ".codex");
 }
-function generateHooksConfig() {
-    const cmd = (0, argus_1.resolveHookCommand)(PACKAGE_NAME, BIN_NAME);
-    return {
-        SessionStart: (0, argus_1.flatHookEntry)(cmd),
-        PreToolUse: (0, argus_1.flatHookEntry)(cmd),
-        PostToolUse: (0, argus_1.flatHookEntry)(cmd),
-        PermissionRequest: (0, argus_1.flatHookEntry)(cmd),
-        UserPromptSubmit: (0, argus_1.flatHookEntry)(cmd),
-        Stop: (0, argus_1.flatHookEntry)(cmd),
-    };
+function runCodex(args) {
+    const result = (0, node_child_process_1.spawnSync)("codex", args, {
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"],
+    });
+    const output = ((result.stdout ?? "") + (result.stderr ?? "")).trim();
+    return { ok: result.status === 0, output };
+}
+function checkCodexCli() {
+    const result = (0, node_child_process_1.spawnSync)("codex", ["--version"], {
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"],
+    });
+    return result.status === 0;
 }
 /**
- * Ensure `[features] codex_hooks = true` is present in config.toml.
- * Hand-rolled TOML editing — we only manage one line; full TOML parsing
- * is not warranted. Idempotent.
+ * Copy the static marketplace skeleton from the package into the persistent
+ * location. Overwrites any prior copy so out-of-date bundled assets get
+ * replaced on every install.
  */
-function ensureCodexHooksFeature(configTomlPath) {
-    let contents = "";
-    if (fs.existsSync(configTomlPath)) {
-        contents = fs.readFileSync(configTomlPath, "utf-8");
-    }
-    if (/^codex_hooks\s*=\s*true\b/m.test(contents)) {
-        return;
-    }
-    if (/^\[features\]\s*$/m.test(contents)) {
-        contents = contents.replace(/^\[features\]\s*$/m, (m) => `${m}\ncodex_hooks = true`);
+function copyMarketplaceSkeleton() {
+    const src = path.join(PACKAGE_ROOT, "marketplace");
+    if (!fs.existsSync(src)) {
+        throw new Error(`Marketplace template missing at ${src}. The npm package is incomplete.`);
     }
-    else {
-        const sep = contents.endsWith("\n") || contents.length === 0 ? "" : "\n";
-        contents += `${sep}\n[features]\ncodex_hooks = true\n`;
+    fs.rmSync(MARKETPLACE_ROOT, { recursive: true, force: true });
+    fs.cpSync(src, MARKETPLACE_ROOT, { recursive: true, force: true });
+}
+/**
+ * Patch the plugin manifest with the runtime values that depend on the
+ * installed npm package (currently just the version). Keeps the rest of the
+ * static manifest untouched.
+ */
+function updatePluginManifest() {
+    const manifestPath = path.join(PLUGIN_ROOT, ".codex-plugin", "plugin.json");
+    const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+    manifest.version = PACKAGE_VERSION;
+    fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n");
+}
+/**
+ * Render the shared skill catalog into the plugin's skills directory. Codex
+ * surfaces these in `/skills` and the model auto-invokes them by description.
+ * Wipe-and-rewrite so renames or removals in the shared templates take effect.
+ */
+function renderSkills() {
+    const skillsDir = path.join(PLUGIN_ROOT, "skills");
+    fs.rmSync(skillsDir, { recursive: true, force: true });
+    (0, argus_1.writeSkillTree)(skillsDir, (0, argus_1.renderOrySkills)("codex", RENDER_OPTS));
+}
+/**
+ * Render the local-up / local-down commands as Codex slash commands. Codex
+ * picks up Markdown files under `<plugin>/commands/` with frontmatter that
+ * declares the command's description and (optionally) allowed tools.
+ */
+function renderCommands() {
+    const commandsDir = path.join(PLUGIN_ROOT, "commands");
+    fs.rmSync(commandsDir, { recursive: true, force: true });
+    fs.mkdirSync(commandsDir, { recursive: true });
+    for (const cmd of (0, argus_1.renderOryCommands)("codex", RENDER_OPTS)) {
+        fs.writeFileSync(path.join(commandsDir, `${cmd.slug}.md`), (0, argus_1.commandToFrontmatterMarkdown)(cmd));
     }
-    fs.mkdirSync(path.dirname(configTomlPath), { recursive: true });
-    fs.writeFileSync(configTomlPath, contents);
 }
 /**
- * Materialize the Ory skill catalog (4 guide skills + 2 user-invocable
- * command-skills for local-up/local-down) into Codex's skills tree. Codex
- * surfaces them in the `/skills` picker and the model auto-invokes them
- * based on the SKILL.md descriptions.
- *
- * Codex's documented skill location is `~/.codex/skills/`; the `--global`
- * flag routes the install there. Project-scope installs land in
- * `<projectDir>/.codex/skills/` for parity with the hooks layout.
+ * Generate the hooks file. Hook command resolves the bin via `npx`, so the
+ * path is stable across npm cache evictions and version bumps.
  */
-function installOrySkills(codexDir) {
-    const skillsDir = path.join(codexDir, "skills");
-    const guideSkills = (0, argus_1.renderOrySkills)("codex", RENDER_OPTS);
-    const commandSkills = (0, argus_1.renderOryCommands)("codex", RENDER_OPTS).map(argus_1.commandToSkill);
-    (0, argus_1.writeSkillTree)(skillsDir, [...guideSkills, ...commandSkills]);
+function writeHooks() {
+    const hooksPath = path.join(PLUGIN_ROOT, "hooks.json");
+    const entry = [{ type: "command", command: HOOK_COMMAND }];
+    fs.writeFileSync(hooksPath, JSON.stringify({
+        hooks: {
+            SessionStart: entry,
+            PreToolUse: entry,
+            PostToolUse: entry,
+            PermissionRequest: entry,
+            UserPromptSubmit: entry,
+            Stop: entry,
+        },
+    }, null, 2) + "\n");
 }
-/** Remove every skill this plugin installed; tidy the dir if it ends up empty. */
-function uninstallOrySkills(codexDir) {
-    const skillsDir = path.join(codexDir, "skills");
-    if (!fs.existsSync(skillsDir))
-        return;
-    (0, argus_1.removeSkillDirs)(skillsDir, [...argus_1.ORY_SKILL_NAMES, ...argus_1.ORY_COMMAND_SKILL_NAMES]);
-    try {
-        if (fs.readdirSync(skillsDir).length === 0) {
-            fs.rmdirSync(skillsDir);
+/**
+ * Assemble the full marketplace tree in the persistent location. Idempotent.
+ */
+function assembleMarketplace() {
+    fs.mkdirSync(MARKETPLACE_ROOT, { recursive: true });
+    copyMarketplaceSkeleton();
+    updatePluginManifest();
+    renderSkills();
+    renderCommands();
+    writeHooks();
+}
+/**
+ * Register (or refresh) the local marketplace with Codex and install the
+ * plugin from it. Both steps are idempotent — re-running an already-installed
+ * plugin just refreshes it.
+ */
+function registerWithCodex() {
+    const addMp = runCodex(["plugin", "marketplace", "add", MARKETPLACE_ROOT]);
+    if (!addMp.ok) {
+        const lower = addMp.output.toLowerCase();
+        if (lower.includes("already") || lower.includes("exists")) {
+            // Local marketplaces don't need `upgrade` — the source is on disk and
+            // we just rewrote it. Codex re-reads it on every `plugin add`.
+        }
+        else {
+            throw new Error(`Failed to register marketplace: ${addMp.output}`);
         }
     }
-    catch {
-        /* ignore — directory still in use is fine. */
+    const addPlugin = runCodex(["plugin", "add", PLUGIN_REF]);
+    if (!addPlugin.ok) {
+        const lower = addPlugin.output.toLowerCase();
+        if (!(lower.includes("already") || lower.includes("installed"))) {
+            throw new Error(`Failed to add plugin: ${addPlugin.output}`);
+        }
     }
 }
-/** Remove `codex_hooks = true` from `[features]`. Leaves other entries alone. */
-function removeCodexHooksFeature(configTomlPath) {
-    if (!fs.existsSync(configTomlPath))
-        return;
-    const original = fs.readFileSync(configTomlPath, "utf-8");
-    const updated = original.replace(/^codex_hooks\s*=\s*true\s*\n?/m, "");
-    if (updated !== original) {
-        fs.writeFileSync(configTomlPath, updated);
+function install(_args) {
+    if (!checkCodexCli()) {
+        console.error("Error: 'codex' CLI not found in PATH.");
+        console.error("Install Codex first: https://github.com/openai/codex");
+        process.exit(1);
     }
+    console.log(`Assembling Ory plugin (skills, commands, hooks, MCP) at:`);
+    console.log(`  ${PLUGIN_ROOT}`);
+    assembleMarketplace();
+    console.log(`Registering marketplace and installing ${PLUGIN_REF}...`);
+    registerWithCodex();
+    console.log(`  Plugin installed.`);
+    printNextSteps();
 }
-function main() {
+function uninstall(_args) {
+    if (!checkCodexCli()) {
+        console.error("Error: 'codex' CLI not found in PATH.");
+        process.exit(1);
+    }
+    console.log(`Uninstalling ${PLUGIN_REF}...`);
+    const rm = runCodex(["plugin", "remove", PLUGIN_REF]);
+    if (!rm.ok && !/not\s+installed|not\s+found/i.test(rm.output)) {
+        console.warn(`  Warning: ${rm.output}`);
+    }
+    else {
+        console.log("  Plugin removed.");
+    }
+    const rmMp = runCodex(["plugin", "marketplace", "remove", MARKETPLACE_NAME]);
+    if (!rmMp.ok && !/not\s+found|no\s+such/i.test(rmMp.output)) {
+        console.warn(`  Warning: ${rmMp.output}`);
+    }
+    else {
+        console.log("  Marketplace removed.");
+    }
+    if (fs.existsSync(MARKETPLACE_ROOT)) {
+        fs.rmSync(MARKETPLACE_ROOT, { recursive: true, force: true });
+        console.log(`  Removed ${MARKETPLACE_ROOT}`);
+    }
+}
+function printNextSteps() {
+    console.log("");
+    console.log("Next steps:");
+    console.log("  1. (Optional) Point at an Ory project — without this, the plugin");
+    console.log("     runs in pass-through mode (skills work, nothing is blocked):");
+    console.log("       npx ory-codex configure --project-url https://<id>.projects.oryapis.com \\");
+    console.log("                              --api-key ory_pat_...");
+    console.log("");
+    console.log("  2. Or spin up the local Ory stack from inside Codex (`/skills` -> `ory-local-up`).");
+    console.log("");
+    console.log("  3. Turn on the interactive user login gate (opt-in):");
+    console.log("       export ORY_AUTH_GATE=1");
+    console.log("     Without this, Codex runs without a human Ory identity attached to the");
+    console.log("     session and permission checks fall back to a session:<id> subject.");
+    console.log("");
+    console.log("  4. Start a Codex session — Ory hooks are now wired in.");
+    console.log("");
+    console.log("To uninstall: npx ory-codex uninstall");
+}
+// --- Standalone binary entry point (ory-codex-setup) ---
+if (require.main === module) {
     if (process.argv.includes("--help") || process.argv.includes("-h")) {
-        (0, argus_1.printSetupHelp)("ory-codex-setup", "Codex", {
-            supportsGlobal: true,
-            globalPath: "~/.codex/hooks.json",
-        });
+        console.log(`
+ory-codex-setup — Install or remove the Ory plugin for Codex
+
+Usage:
+  npx ory-codex-setup [options]
+
+Options:
+  --uninstall    Remove the Ory plugin and marketplace
+  -h, --help     Show this help
+
+Registers a local marketplace at:
+  ${MARKETPLACE_ROOT}
+
+and runs \`codex plugin add ${PLUGIN_REF}\` to install. The local
+marketplace is the source of truth for upgrades — re-running install
+re-renders skills + commands from the shared @ory/argus templates and
+refreshes Codex's cache copy on the next session.
+`);
         process.exit(0);
     }
-    const args = (0, argus_1.parseSetupArgs)({ supportsGlobal: true });
-    const hooksConfig = generateHooksConfig();
-    if (args.print) {
-        console.log(JSON.stringify({ hooks: hooksConfig }, null, 2));
-        return;
-    }
-    const codexDir = getCodexDir(args);
-    const hooksPath = path.join(codexDir, "hooks.json");
-    const configTomlPath = path.join(codexDir, "config.toml");
-    const existing = (0, argus_1.readJsonFile)(hooksPath);
-    if (args.uninstall) {
-        if (!fs.existsSync(codexDir)) {
-            console.log("No Codex config directory found. Nothing to uninstall.");
-            return;
-        }
-        let updated = (0, argus_1.removeFlatHooks)(existing, BIN_NAME);
-        updated = (0, argus_1.removeMcpServer)(updated);
-        (0, argus_1.writeJsonFile)(hooksPath, updated);
-        removeCodexHooksFeature(configTomlPath);
-        uninstallOrySkills(codexDir);
-        console.log(`Removed Ory hooks and MCP server from ${hooksPath}`);
-        console.log(`Removed codex_hooks feature flag from ${configTomlPath}`);
-        console.log(`Removed Ory skills from ${path.join(codexDir, "skills")}`);
-        return;
-    }
-    let merged = (0, argus_1.mergeFlatHooks)(existing, hooksConfig, BIN_NAME);
-    merged = (0, argus_1.mergeMcpServer)(merged);
-    (0, argus_1.writeJsonFile)(hooksPath, merged);
-    ensureCodexHooksFeature(configTomlPath);
-    installOrySkills(codexDir);
-    console.log(`Ory hooks and MCP server installed to ${hooksPath}`);
-    console.log(`Enabled [features] codex_hooks = true in ${configTomlPath}`);
-    console.log(`Ory skills installed to ${path.join(codexDir, "skills")}`);
-    if (!args.global) {
-        console.log("  Tip: re-run with --global if Codex only discovers skills from ~/.codex/skills.");
-    }
-    (0, argus_1.printNextSteps)("Codex", "npx ory-codex-setup --uninstall");
+    const args = process.argv.slice(2);
+    if (args.includes("--uninstall")) {
+        uninstall(args);
+    }
+    else {
+        install(args);
+    }
 }
-main();

package/dist/index.d.ts

@@ -1,2 +1 @@
 export { handleHookEvent } from "./handlers.js";
-export { generateSettings } from "./settings.js";

package/dist/index.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSettings = exports.handleHookEvent = void 0;
+exports.handleHookEvent = void 0;
 var handlers_js_1 = require("./handlers.js");
 Object.defineProperty(exports, "handleHookEvent", { enumerable: true, get: function () { return handlers_js_1.handleHookEvent; } });
-var settings_js_1 = require("./settings.js");
-Object.defineProperty(exports, "generateSettings", { enumerable: true, get: function () { return settings_js_1.generateSettings; } });

package/marketplace/.agents/plugins/marketplace.json

@@ -0,0 +1,19 @@
+{
+  "name": "ory",
+  "interface": {
+    "displayName": "Ory"
+  },
+  "plugins": [
+    {
+      "name": "ory-codex",
+      "source": {
+        "source": "local",
+        "path": "./plugins/ory-codex"
+      },
+      "policy": {
+        "installation": "AVAILABLE"
+      },
+      "category": "Security"
+    }
+  ]
+}

package/marketplace/plugins/ory-codex/.codex-plugin/plugin.json

@@ -0,0 +1,37 @@
+{
+  "name": "ory-codex",
+  "version": "0.0.0",
+  "description": "Ory authentication, authorization, and audit for every Codex tool call.",
+  "author": {
+    "name": "Ory",
+    "url": "https://ory.com"
+  },
+  "homepage": "https://ory.com",
+  "repository": "https://github.com/ory/ory-agent-plugins",
+  "license": "Apache-2.0",
+  "keywords": [
+    "ory",
+    "authentication",
+    "authorization",
+    "permissions",
+    "audit",
+    "oauth2",
+    "zanzibar"
+  ],
+  "skills": "./skills/",
+  "mcpServers": "./.mcp.json",
+  "interface": {
+    "displayName": "Ory",
+    "shortDescription": "Authn/authz and audit for every Codex tool call",
+    "longDescription": "Adds Ory Identities, Permissions, and audit logging to Codex. Auth gate on session start, per-tool permission checks before every invocation, structured trace spans on every decision, and a bundled Ory MCP server for managing identities, OAuth2 clients, and permission tuples from inside Codex.",
+    "developerName": "Ory",
+    "category": "Security",
+    "capabilities": ["Write"],
+    "websiteURL": "https://ory.com",
+    "privacyPolicyURL": "https://www.ory.sh/privacy-policy",
+    "termsOfServiceURL": "https://www.ory.sh/tos",
+    "defaultPrompt": [
+      "Scaffold Ory auth into this app, or grant me 'use' on a tool"
+    ]
+  }
+}

package/marketplace/plugins/ory-codex/.mcp.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "ory": {
+      "command": "npx",
+      "args": ["-y", "-p", "@ory/mcp-server", "ory-mcp-server"]
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ory/codex",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Ory plugin for Codex: scaffolding skills, a local Ory instance, and authentication, authorization, and audit for every tool call",
   "license": "Apache-2.0",
   "homepage": "https://ory.com",
@@ -55,7 +55,6 @@
     }
   },
   "bin": {
-    "codex": "dist/cli/main.js",
     "ory-codex": "dist/cli/main.js",
     "ory-codex-hook": "dist/hook.js",
     "ory-codex-setup": "dist/cli/setup.js"
@@ -64,13 +63,13 @@
     "dist",
     "!dist/dev",
     "!dist/**/*.tsbuildinfo",
-    ".codex-plugin"
+    "marketplace"
   ],
   "dependencies": {
-    "@ory/argus": "0.3.0"
+    "@ory/argus": "0.4.0"
   },
   "engines": {
-    "node": ">=24"
+    "node": ">=22"
   },
   "scripts": {
     "build": "tsc",

package/.codex-plugin/plugin.json

@@ -1,10 +0,0 @@
-{
-  "name": "ory-codex",
-  "version": "0.1.0",
-  "description": "Ory authentication and authorization for Codex CLI — session auth, tool permissions, and audit logging",
-  "author": {
-    "name": "Ory",
-    "url": "https://ory.com"
-  },
-  "homepage": "https://ory.com"
-}

package/dist/settings.d.ts

@@ -1,16 +0,0 @@
-/**
- * Generate the hooks config that configures Ory hooks for Codex.
- *
- * Codex supports two hook events:
- *   - SessionStart: fired when the agent session begins
- *   - PreToolUse:   fired before each tool call (Bash only)
- */
-export declare function generateSettings(hookScriptPath: string): object;
-/**
- * Generate settings assuming the plugin is installed via npm/pnpm.
- */
-export declare function generateInstalledSettings(): object;
-/**
- * Generate settings pointing to a local dev build.
- */
-export declare function generateDevSettings(packageDir: string): object;

package/dist/settings.js

@@ -1,69 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSettings = generateSettings;
-exports.generateInstalledSettings = generateInstalledSettings;
-exports.generateDevSettings = generateDevSettings;
-const path = __importStar(require("node:path"));
-const argus_1 = require("@ory/argus");
-/**
- * Generate the hooks config that configures Ory hooks for Codex.
- *
- * Codex supports two hook events:
- *   - SessionStart: fired when the agent session begins
- *   - PreToolUse:   fired before each tool call (Bash only)
- */
-function generateSettings(hookScriptPath) {
-    const cmd = `node ${hookScriptPath}`;
-    return {
-        hooks: {
-            SessionStart: (0, argus_1.flatHookEntry)(cmd),
-            PreToolUse: (0, argus_1.flatHookEntry)(cmd),
-        },
-    };
-}
-/**
- * Generate settings assuming the plugin is installed via npm/pnpm.
- */
-function generateInstalledSettings() {
-    return generateSettings("ory-codex-hook");
-}
-/**
- * Generate settings pointing to a local dev build.
- */
-function generateDevSettings(packageDir) {
-    const hookPath = path.resolve(packageDir, "dist", "hook.js");
-    return generateSettings(hookPath);
-}