@ory/argus 0.13.9 → 1.0.0

package/dist/setup.d.ts

@@ -28,13 +28,14 @@ export declare function readJsonFile(filePath: string): Record<string, unknown>;
 export declare function writeJsonFile(filePath: string, data: unknown): void;
 /**
  * Check if a hook command belongs to an Ory plugin.
+ *
+ * The command written today is `node "<dataDir>/bin/ory-hook-<harness>.js"`, so
+ * the harness's own bin name no longer appears in it — matching goes through
+ * the shared runtime predicate, which also still recognizes the version-pinned
+ * `npx` commands earlier releases wrote so an install merge replaces them
+ * instead of running both.
  */
 export declare function isOryHookCommand(h: HookCommand, binName: string): boolean;
-/**
- * Resolve the hook command string for a plugin.
- * Tries require.resolve first, falls back to the global bin name.
- */
-export declare function resolveHookCommand(packageName: string, binName: string): string;
 /**
  * Build a matcher-based hook entry: `[{ matcher: "", hooks: [{ type: "command", command }] }]`
  */
@@ -59,27 +60,20 @@ export declare function mergeFlatHooks(existing: Record<string, unknown>, newHoo
  * Remove all Ory flat hooks from existing config.
  */
 export declare function removeFlatHooks(existing: Record<string, unknown>, binName: string): Record<string, unknown>;
-/**
- * Resolve the command + args needed to run the Ory MCP server.
- * Tries require.resolve first, falls back to the global bin name.
- */
-export declare function resolveMcpServerCommand(): {
-    command: string;
-    args: string[];
-};
 /**
  * Generate the mcpServers config object for the Ory MCP server.
+ *
+ * The command is always supplied by the caller: it is the MCP shim written when
+ * the runtime was resolved at install time. There is deliberately no fallback
+ * that re-resolves the package — a registration that resolves at *run* time is
+ * the thing this design removes.
  */
-export declare function mcpServerEntry(cmd?: {
+export declare function mcpServerEntry(cmd: {
     command: string;
     args: string[];
 }): Record<string, unknown>;
-/**
- * Merge the Ory MCP server into an existing settings object's `mcpServers` key.
- * Pass an optional `cmd` to override the default resolution (useful when the
- * caller can resolve the mcp-server entry point more reliably than core can).
- */
-export declare function mergeMcpServer(existing: Record<string, unknown>, cmd?: {
+/** Merge the Ory MCP server into an existing settings object's `mcpServers` key. */
+export declare function mergeMcpServer(existing: Record<string, unknown>, cmd: {
     command: string;
     args: string[];
 }): Record<string, unknown>;
@@ -125,7 +119,7 @@ export type NextStepsRenderer = (opts: {
 export declare function beginDeferNextSteps(): void;
 /**
  * Print any captured next-steps output and stop deferring. `configured` tells
- * the renderer whether the wizard finished configuring Ory (so it can drop the
+ * the renderer whether the install finished configuring Ory (so it can drop the
  * manual setup steps, which would only contradict what's already saved).
  */
 export declare function emitDeferredNextSteps(configured?: boolean): void;
@@ -133,22 +127,23 @@ export declare function emitDeferredNextSteps(configured?: boolean): void;
  * Either run the next-steps printer now, or capture it for later when
  * deferral is active. Harness-specific next-steps printers (e.g. Codex's)
  * route through this so they participate in the same deferral. When run inline
- * (e.g. the standalone setup binary) no wizard configured anything, so the
+ * (e.g. the standalone setup binary) nothing configured a connection, so the
  * renderer is invoked with `configured: false`.
  */
 export declare function nextStepsSink(fn: NextStepsRenderer): void;
 /**
  * Print the "Next steps" text after successful setup. Deferred to the end of
- * an interactive install via {@link nextStepsSink} (see above). When the wizard
- * already connected Ory, prints a short launch summary instead of the manual
- * env-var setup steps.
+ * an install via {@link nextStepsSink} (see above). When the install already
+ * connected Ory, prints a short launch summary instead of the manual env-var
+ * setup steps.
  */
 export declare function printNextSteps(harnessName: string, uninstallCmd: string, opts?: NextStepsOpts): void;
 /**
  * Identity a harness passes to {@link printNextSteps} so the "you're all set"
- * message can emit copy-pasteable `status` / `watch` / `permissions` commands
- * and tailor itself to the mode the wizard actually configured (audit-only has
- * no enforcement step). Optional so older callers still get the short summary.
+ * message can emit copy-pasteable `status` / `permissions` commands
+ * and tailor itself to what the install configured (with Agent Security not
+ * connected there is no enforcement step to describe). Optional so older
+ * callers still get the short summary.
  */
 export interface NextStepsOpts {
     /** CLI bin name, e.g. `ory-claude` — used to render follow-up commands. */

package/dist/setup.js

@@ -37,14 +37,12 @@ exports.parseSetupArgs = parseSetupArgs;
 exports.readJsonFile = readJsonFile;
 exports.writeJsonFile = writeJsonFile;
 exports.isOryHookCommand = isOryHookCommand;
-exports.resolveHookCommand = resolveHookCommand;
 exports.matcherHookEntry = matcherHookEntry;
 exports.mergeMatcherHooks = mergeMatcherHooks;
 exports.removeMatcherHooks = removeMatcherHooks;
 exports.flatHookEntry = flatHookEntry;
 exports.mergeFlatHooks = mergeFlatHooks;
 exports.removeFlatHooks = removeFlatHooks;
-exports.resolveMcpServerCommand = resolveMcpServerCommand;
 exports.mcpServerEntry = mcpServerEntry;
 exports.mergeMcpServer = mergeMcpServer;
 exports.removeMcpServer = removeMcpServer;
@@ -60,6 +58,7 @@ const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 const cli_invocation_js_1 = require("./cli-invocation.js");
 const config_js_1 = require("./config.js");
+const runtime_js_1 = require("./runtime.js");
 const ui = __importStar(require("./ui.js"));
 // ─── Arg Parsing ───────────────────────────────────────────────────
 /**
@@ -119,25 +118,17 @@ function writeJsonFile(filePath, data) {
 // ─── Hook Command Utilities ────────────────────────────────────────
 /**
  * Check if a hook command belongs to an Ory plugin.
+ *
+ * The command written today is `node "<dataDir>/bin/ory-hook-<harness>.js"`, so
+ * the harness's own bin name no longer appears in it — matching goes through
+ * the shared runtime predicate, which also still recognizes the version-pinned
+ * `npx` commands earlier releases wrote so an install merge replaces them
+ * instead of running both.
  */
 function isOryHookCommand(h, binName) {
-    return h.command?.includes(binName) || h.command?.includes("ory-agent-plugins");
-}
-/**
- * Resolve the hook command string for a plugin.
- * Tries require.resolve first, falls back to the global bin name.
- */
-function resolveHookCommand(packageName, binName) {
-    try {
-        const binPath = require.resolve(packageName);
-        // The package root resolves to the main entry (dist/index.js).
-        // The hook script lives alongside it as dist/hook.js.
-        const hookPath = path.resolve(path.dirname(binPath), "hook.js");
-        return `node "${hookPath}"`;
-    }
-    catch {
-        return binName;
-    }
+    return ((0, runtime_js_1.isOryRuntimeCommand)(h.command) ||
+        h.command?.includes(binName) ||
+        h.command?.includes("ory-agent-plugins"));
 }
 // ─── Matcher-Based Hooks (Claude Code, Gemini CLI) ─────────────────
 /**
@@ -225,35 +216,21 @@ function removeFlatHooks(existing, binName) {
 }
 // ─── MCP Server Config ────────────────────────────────────────────
 const MCP_SERVER_NAME = "ory";
-const MCP_SERVER_PACKAGE = "@ory/mcp-server";
-/**
- * Resolve the command + args needed to run the Ory MCP server.
- * Tries require.resolve first, falls back to the global bin name.
- */
-function resolveMcpServerCommand() {
-    try {
-        const entryPoint = require.resolve(MCP_SERVER_PACKAGE);
-        return { command: "node", args: [entryPoint] };
-    }
-    catch {
-        return { command: "ory-mcp-server", args: [] };
-    }
-}
 /**
  * Generate the mcpServers config object for the Ory MCP server.
+ *
+ * The command is always supplied by the caller: it is the MCP shim written when
+ * the runtime was resolved at install time. There is deliberately no fallback
+ * that re-resolves the package — a registration that resolves at *run* time is
+ * the thing this design removes.
  */
 function mcpServerEntry(cmd) {
-    const resolved = cmd ?? resolveMcpServerCommand();
     return {
-        command: resolved.command,
-        ...(resolved.args.length > 0 ? { args: resolved.args } : {}),
+        command: cmd.command,
+        ...(cmd.args.length > 0 ? { args: cmd.args } : {}),
     };
 }
-/**
- * Merge the Ory MCP server into an existing settings object's `mcpServers` key.
- * Pass an optional `cmd` to override the default resolution (useful when the
- * caller can resolve the mcp-server entry point more reliably than core can).
- */
+/** Merge the Ory MCP server into an existing settings object's `mcpServers` key. */
 function mergeMcpServer(existing, cmd) {
     const merged = { ...existing };
     const servers = (merged.mcpServers ?? {});
@@ -378,13 +355,11 @@ Options:
 
 Environment variables:
   ORY_PROJECT_URL       Your Ory project URL (required at runtime)
-  ORY_AGENT_API_KEY     Agent API key / OAuth2 bearer (preferred name;
-                        ORY_API_KEY is honored as a deprecated alias)
-  ORY_OAUTH2_CLIENT_ID  Public OAuth2 client id for the user PKCE flow
-                        (required when ORY_USER_LOGIN=true)
-  ORY_USER_LOGIN        Set to "true" to enable the interactive user login
-                        (or persist it with: configure --user-login)
-  ORY_PERMISSION_MODE   "observe" (default) or "enforce" — what to do on deny
+  ORY_AGENT_SECURITY_URL Canonical Agent Security origin (legacy fallback: project URL)
+  ORY_AGENT_CLIENT_ID   Static agent OAuth2 client_credentials (with
+  ORY_AGENT_CLIENT_SECRET   …SECRET) — otherwise the agent self-registers
+  ORY_OAUTH2_CLIENT_ID  Override the public OAuth2 client id for the user PKCE flow
+                        (default: ory-agent-security-login)
   ORY_AGENT_DEBUG       Set to "true" for debug logging
   ORY_AGENT_LOG_FILE    Path to write debug logs
   ORY_AGENT_SUBJECT_ID  Override the subject ID for permission checks
@@ -399,7 +374,7 @@ function beginDeferNextSteps() {
 }
 /**
  * Print any captured next-steps output and stop deferring. `configured` tells
- * the renderer whether the wizard finished configuring Ory (so it can drop the
+ * the renderer whether the install finished configuring Ory (so it can drop the
  * manual setup steps, which would only contradict what's already saved).
  */
 function emitDeferredNextSteps(configured = false) {
@@ -413,7 +388,7 @@ function emitDeferredNextSteps(configured = false) {
  * Either run the next-steps printer now, or capture it for later when
  * deferral is active. Harness-specific next-steps printers (e.g. Codex's)
  * route through this so they participate in the same deferral. When run inline
- * (e.g. the standalone setup binary) no wizard configured anything, so the
+ * (e.g. the standalone setup binary) nothing configured a connection, so the
  * renderer is invoked with `configured: false`.
  */
 function nextStepsSink(fn) {
@@ -425,9 +400,9 @@ function nextStepsSink(fn) {
 }
 /**
  * Print the "Next steps" text after successful setup. Deferred to the end of
- * an interactive install via {@link nextStepsSink} (see above). When the wizard
- * already connected Ory, prints a short launch summary instead of the manual
- * env-var setup steps.
+ * an install via {@link nextStepsSink} (see above). When the install already
+ * connected Ory, prints a short launch summary instead of the manual env-var
+ * setup steps.
  */
 function printNextSteps(harnessName, uninstallCmd, opts) {
     nextStepsSink(({ configured }) => configured
@@ -435,44 +410,45 @@ function printNextSteps(harnessName, uninstallCmd, opts) {
         : printNextStepsNow(harnessName, uninstallCmd));
 }
 /**
- * The closing message when the interactive wizard already configured Ory.
+ * The closing message when the install already configured a connection.
  * Everything the manual steps would ask for is done, so this points the user
- * at the next things they'll actually want: see what Ory is doing (status /
- * live trace watch), promote to enforcement, and turn on debug logging. When
+ * at the next things they'll actually want: see what Ory is doing, enable the
+ * live debug stream, and promote to enforcement. When
  * no {@link NextStepsOpts} is supplied it degrades to the short launch summary.
  */
 function printConfiguredNextStepsNow(harnessName, uninstallCmd, opts) {
     ui.heading("Next steps:");
-    ui.success(`Ory is configured — start ${harnessName} in your project directory.`);
+    ui.success((0, config_js_1.resolveConfig)().security.connected
+        ? `Ory Agent Security is connected — start ${harnessName} in your project directory.`
+        : `Start ${harnessName} in your project directory.`);
     if (!opts) {
         ui.blank();
         ui.hint(`To uninstall: ${ui.inlineCommand(uninstallCmd)}`);
         return;
     }
     const npx = (0, cli_invocation_js_1.oryNpx)(opts.binName);
-    const auditOnly = (0, config_js_1.resolveConfig)().auditOnly;
-    if (auditOnly) {
-        ui.hint("Audit-only mode: tool calls are traced locally — no checks run, nothing is blocked.");
+    const security = (0, config_js_1.resolveConfig)().security;
+    if (!security.connected) {
+        ui.hint("Ory Agent Security is not connected: tool activity is logged locally, nothing is checked or blocked.");
+        ui.hint(`Connect it any time with ${ui.inlineCommand(`${npx} configure --project-url <URL> --agent-security-url <URL>`)}.`);
         ui.blank();
-        ui.bullet("1. See what's been traced:");
+        ui.bullet("1. See what's happening — config and recent activity:");
         ui.command(`${npx} status`);
-        ui.hint(`     ...or watch it live: ${ui.inlineCommand(`${npx} watch`)}`);
         ui.blank();
-        ui.bullet("2. Want more detail? Turn on debug logging:");
+        ui.bullet("2. Stream complete activity and debug output live:");
         ui.command("export ORY_AGENT_DEBUG=true");
     }
     else {
-        ui.hint("It starts in watch mode: every tool call is checked, but nothing is blocked yet.");
+        ui.hint("It starts in observe mode: every tool call is checked, but nothing is blocked yet.");
         ui.blank();
-        ui.bullet("1. See what Ory is doing — config, permission coverage, recent activity:");
+        ui.bullet("1. See what's happening — config and permission coverage:");
         ui.command(`${npx} status`);
-        ui.hint(`     ...or watch the trace stream live: ${ui.inlineCommand(`${npx} watch`)}`);
         ui.blank();
-        ui.bullet("2. Turn on enforcement once the watch-mode traces look right:");
-        ui.command(`${npx} permissions enforce`);
-        ui.hint(`     denied tools are then blocked; return to watch with ${ui.inlineCommand(`${npx} permissions observe`)}`);
+        ui.bullet("2. Turn on enforcement once the activity log looks right:");
+        ui.hint("     the deny posture is controlled on the Ory project (Agent Security).");
+        ui.hint(`     Check the live mode with ${ui.inlineCommand(`${npx} permissions status`)}.`);
         ui.blank();
-        ui.bullet("3. Want more detail? Turn on debug logging:");
+        ui.bullet("3. Stream complete activity and debug output live:");
         ui.command("export ORY_AGENT_DEBUG=true");
     }
     ui.blank();
@@ -480,24 +456,21 @@ function printConfiguredNextStepsNow(harnessName, uninstallCmd, opts) {
 }
 function printNextStepsNow(harnessName, uninstallCmd) {
     ui.heading("Next steps:");
-    ui.bullet("1. Set required environment variables:");
+    ui.bullet("1. Optional — connect Ory Agent Security with the project URL from the Ory Console:");
+    ui.command("configure --project-url <URL>");
+    ui.hint("     ...or set it per-session via an env var:");
     ui.command("export ORY_PROJECT_URL=https://your-project.projects.oryapis.com");
-    ui.command("export ORY_AGENT_API_KEY=ory_pat_...");
-    ui.blank();
-    ui.bullet("2. Turn on the interactive user login (opt-in). Either persist it:");
-    ui.command("configure --user-login --oauth2-client-id <public OAuth2 client id>");
-    ui.hint("     ...or set it per-session via env vars:");
-    ui.command("export ORY_USER_LOGIN=true");
-    ui.command("export ORY_OAUTH2_CLIENT_ID=<public OAuth2 client id>");
-    ui.hint(`     Without these, ${harnessName} runs without a human Ory identity attached`);
-    ui.hint("     to the session and permission checks fall back to a session:<id> subject.");
-    ui.hint("     The OAuth2 client id is the public client (no secret) you registered in");
-    ui.hint("     your Ory project with the four loopback redirect URIs.");
+    ui.hint("     ORY_AGENT_SECURITY_URL optionally overrides the production broker.");
+    ui.hint("     ORY_OAUTH2_CLIENT_ID optionally overrides ory-agent-security-login.");
+    ui.hint(`     Without a project URL, checks stay off and ${harnessName} only logs tool activity locally.`);
+    ui.hint("     Everything else the plugin installs works without them.");
+    ui.hint("     The reserved public login client is provisioned in the Ory Console");
+    ui.hint("     along with the permission model, grants, and enforce posture.");
     ui.blank();
-    ui.bullet("3. Optionally enable debug logging:");
+    ui.bullet("2. Optionally enable debug logging:");
     ui.command("export ORY_AGENT_DEBUG=true");
     ui.blank();
-    ui.bullet(`4. Start ${harnessName} in your project directory.`);
+    ui.bullet(`3. Start ${harnessName} in your project directory.`);
     ui.blank();
     ui.hint(`To uninstall: ${ui.inlineCommand(uninstallCmd)}`);
 }

package/dist/status-cli.d.ts

@@ -1,18 +1,33 @@
 /**
- * Render the "User identity" block. Shows the `ORY_USER_LOGIN` state and,
- * when a PKCE token is cached, the resolved subject and expiry.
+ * Render the "User identity" block. The interactive PKCE login runs every
+ * session; this shows the cached token's subject and expiry, if any.
  */
 export declare function printUserIdentitySection(): void;
 /**
  * Render the "Agent identity" block. Summarizes the resolved machine
- * credential — static env override, persisted DCR, or unconfigured.
+ * credential — static env override, persisted DCR, or unconfigured. Each
+ * installed harness has its own agent registration, so the report is for
+ * `harness`'s identity only.
  */
-export declare function printAgentIdentitySection(): void;
+export declare function printAgentIdentitySection(harness: string): void;
 /**
- * Render the "Permissions" block. Always prints the configured mode and
- * namespace; runs a network probe of the harness's built-in tool catalog
- * only when a project URL is configured *and* a user identity is
- * available (cached PKCE tokens or `ORY_USER_SUBJECT_ID`).
+ * Render the "Sub-agent identities" block — one entry per typed sub-agent
+ * (e.g. `Explore`, `general-purpose`) the agent has registered a distinct
+ * OAuth2 client for via DCR. All sub-agent identities are dynamic
+ * registrations. Scoped to `harness` — sub-agents belong to that harness's
+ * agent. A no-op when none exist yet.
+ */
+export declare function printSubAgentIdentitiesSection(harness: string): void;
+/**
+ * Render the "Permissions" block: the deny posture, the namespace, and the
+ * coverage of the harness's built-in tool catalog.
+ *
+ * The network probe runs only when a project URL is configured *and* a user
+ * identity is available (cached PKCE tokens or `ORY_USER_SUBJECT_ID`). When it
+ * runs, the reported **Mode is read live from the project** in the same pass, so
+ * this line answers "what would a tool call do right now?" rather than echoing a
+ * cache that is only refreshed at session start. On every other path the last
+ * cached value is reported, annotated as such.
  */
 export declare function printPermissionsSection(binName: string, harness: string): Promise<void>;
 export interface StatusCommandOptions {
@@ -21,17 +36,18 @@ export interface StatusCommandOptions {
     /**
      * Optional renderer for the "Hooks & plugin" section. Each harness owns
      * the layout for its plugin-specific registration data (extension dir,
-     * marketplace plugin ID, hook script path, etc.).
+     * marketplace plugin ID, hook script path, etc.). May be async — some
+     * harnesses have to reach the network to report what will actually load.
      */
-    printPluginSection?: () => void;
+    printPluginSection?: () => void | Promise<void>;
 }
 /**
  * Compose the unified `status` output for a plugin CLI. Sections render
  * in this order: title → configuration → user identity → agent identity
- * → permissions → hooks & plugin → environment → recent activity
- * (traces + debug log).
+ * → sub-agent identities → permissions → hooks & plugin → environment →
+ * recent activity from the unified activity/debug log.
  *
- * Each section degrades gracefully — missing project URL, audit-only
+ * Each section degrades gracefully — Agent Security not connected
  * mode, and empty token caches all surface as inline "n/a" lines rather
  * than aborting the command.
  */