@ory/argus 0.13.1 → 0.13.3

package/dist/build-info.json

@@ -1,9 +1,9 @@
 {
   "repo": "ory-agent-plugins",
-  "commit": "8a7c3508e54376b6dda634dc54f8c5891d499a7a",
-  "commitShort": "8a7c350",
+  "commit": "c04784bfd67acdce0133aca0ebcd335e326b9251",
+  "commitShort": "c04784b",
   "branch": "main",
-  "commitDate": "2026-07-14T12:09:14-07:00",
+  "commitDate": "2026-07-14T15:46:39-07:00",
   "dirty": false,
-  "builtAt": "2026-07-14T19:13:39.008Z"
+  "builtAt": "2026-07-14T22:51:01.241Z"
 }

package/dist/interactive-setup.js

@@ -650,15 +650,20 @@ async function completeFullSetup(binName, harness, ctx) {
  * The tuples reference the permission namespace (default `AgentTools`), which
  * must be defined in the project's permission model or the write fails with
  * `NotFound`. So we inspect the model first (see {@link inspectPermissionModel})
- * and act on what's actually there:
+ * and act on what's actually there. We provision in every case *except* when
+ * the namespace already exists:
  *
+ *   - **Namespace already defined** → grant directly, touch nothing.
  *   - **No model yet** (a freshly created Ory Network project) → offer to
  *     provision a minimal `<namespace>` model (`ory update opl`), then grant.
- *   - **Namespace already defined** → grant directly.
- *   - **Model exists but defines only *other* namespaces** → we can't
- *     auto-provision, because `ory update opl` overwrites the whole OPL and
- *     would clobber the existing model. Print the exact snippet to add and skip
- *     the grant (it would only `NotFound`).
+ *   - **Model exists (OPL source fetchable) but lacks `<namespace>`** → offer
+ *     to *merge* the namespace into the existing OPL and re-upload it, leaving
+ *     the other namespaces untouched, then grant. Ory Network serves the OPL
+ *     source at a `location` URL in the permission config, which makes this
+ *     non-destructive merge possible.
+ *   - **Model provably exists but its source couldn't be read** → we can't
+ *     merge and `ory update opl` overwrites the whole OPL, so we refuse to
+ *     clobber it: print the exact snippet to add and skip the grant.
  *
  * Best-effort throughout: any failure prints a short, actionable note rather
  * than a wall of errors. Observe mode (the install default) keeps tools working
@@ -670,10 +675,36 @@ async function bootstrapPermissionsViaOry(runner, projectId, harness, subject, p
     if (tools.length === 0)
         return;
     // Ensure the namespace the tuples reference exists, or the write NotFounds.
-    const modelState = inspectPermissionModel(runner, projectId, namespace);
-    if (modelState === "empty") {
-        // No model yet — safe to provision a minimal one (prompted).
-        ui.heading(`This project has no permission model, so '${namespace}' isn't defined yet —`);
+    // We only skip provisioning when the namespace is already defined; every
+    // other state provisions. When we can fetch the existing OPL source we merge
+    // our namespace into it (non-destructive); otherwise we create a fresh
+    // minimal model. The one case we refuse is a model that provably exists but
+    // whose source we couldn't read — overwriting it would clobber it.
+    const model = await inspectPermissionModel(runner, projectId, namespace);
+    if (model.kind === "merge") {
+        // A model exists and we have its OPL source — append our namespace without
+        // disturbing the others (prompted).
+        ui.heading(`This project has a permission model, but it doesn't define '${namespace}'.`);
+        ui.hint("It can be added to the existing model without changing the other namespaces.");
+        ui.blank();
+        const answer = await prompt(ui.promptLine(`Add '${namespace}' to this project's permission model now?`, {
+            hint: "[Y/n]",
+        }));
+        if (isNo(answer)) {
+            printPermissionModelHelp(namespace);
+            return;
+        }
+        if (!provisionPermissionModel(runner, projectId, namespace, model.opl)) {
+            ui.warning(`Could not add '${namespace}' to the permission model automatically.`);
+            printPermissionModelHelp(namespace);
+            return;
+        }
+        ui.success(`Added '${namespace}' to the permission model.`);
+    }
+    else if (model.kind === "empty" || model.kind === "unknown") {
+        // No model (or one we couldn't read at all) — provision a minimal one
+        // (prompted). Reading the config failing is treated as "nothing there".
+        ui.heading(`This project has no '${namespace}' permission model yet —`);
         ui.hint("without it, permission checks can't be granted or enforced.");
         ui.blank();
         const answer = await prompt(ui.promptLine(`Create a minimal '${namespace}' permission model on this project now?`, { hint: "[Y/n]" }));
@@ -688,16 +719,15 @@ async function bootstrapPermissionsViaOry(runner, projectId, harness, subject, p
         }
         ui.success(`Created the '${namespace}' permission model.`);
     }
-    else if (modelState === "missing") {
-        // A model exists but defines other namespaces — provisioning would
-        // overwrite it, so guide the user instead of clobbering their model.
-        ui.heading(`This project has a permission model, but it doesn't define '${namespace}'.`);
-        ui.hint("Adding it automatically would overwrite the existing model, so we won't.");
+    else if (model.kind === "blocked") {
+        // A model provably exists but we couldn't fetch its source, so we can't
+        // merge and `ory update opl` would overwrite it. Guide instead of clobber.
+        ui.heading(`This project has a permission model, but it doesn't define '${namespace}'`);
+        ui.hint("and its source couldn't be read, so adding it automatically might overwrite it.");
         printPermissionModelHelp(namespace);
         return;
     }
-    // "present" (namespace already defined) or "unknown" (couldn't read the
-    // model) fall through and attempt the grant best-effort.
+    // "present" (namespace already defined) falls through and grants directly.
     const subjectPatch = "subjectSet" in subject
         ? {
             subject_set: {
@@ -727,26 +757,13 @@ async function bootstrapPermissionsViaOry(runner, projectId, harness, subject, p
     printPermissionModelHelp(namespace);
 }
 /**
- * Inspect the project's permission model to decide how to make `<namespace>`
- * grantable:
- *
- *   - `present` — the namespace is already defined; grant directly.
- *   - `empty`   — the project has no model at all. A freshly created Ory
- *                 Network project reports this as an empty list, a `null`, or
- *                 an absent `namespaces` key — all of which mean "nothing
- *                 defined yet", so provisioning a minimal model is safe.
- *   - `missing` — a model exists and defines *other* namespaces but not this
- *                 one. `ory update opl` overwrites the whole OPL, so we must
- *                 not auto-provision (it would clobber the existing model).
- *   - `unknown` — the config couldn't be read/parsed; make no assumptions and
- *                 attempt the grant best-effort.
- *
- * The earlier version only recognized the exact `namespaces: []` shape as
- * "empty", so a fresh project reporting `null`/absent namespaces (or one that
- * already had unrelated namespaces) silently skipped provisioning and the grant
- * then failed with `NotFound`.
+ * Inspect the project's permission model. Ory Network reports the config in one
+ * of two shapes: `{ namespaces: [] }` (or `null`) for a project with no model,
+ * and `{ namespaces: { location: "https://….txt" } }` for an OPL-configured
+ * one — where the `.txt` is the full OPL *source*. We fetch that source so a
+ * missing namespace can be merged in rather than clobbering the whole model.
  */
-function inspectPermissionModel(runner, projectId, namespace) {
+async function inspectPermissionModel(runner, projectId, namespace) {
     const r = runner.exec([
         "get",
         "permission-config",
@@ -756,47 +773,75 @@ function inspectPermissionModel(runner, projectId, namespace) {
         "json",
     ]);
     if (r.status !== 0)
-        return "unknown";
+        return { kind: "unknown" };
     const cfg = safeJsonParse(r.stdout);
     if (!cfg || typeof cfg !== "object")
-        return "unknown";
+        return { kind: "unknown" };
     const ns = cfg.namespaces;
-    // A fresh project reports no model as null / an absent key / an empty list.
+    // A fresh project reports no model as null / an absent key.
     if (ns == null)
-        return "empty";
-    if (!Array.isArray(ns))
-        return "unknown";
-    if (ns.length === 0)
-        return "empty";
-    const names = ns
-        .map((n) => n && typeof n === "object"
-        ? n.name
-        : undefined)
-        .filter((n) => typeof n === "string");
-    return names.includes(namespace) ? "present" : "missing";
+        return { kind: "empty" };
+    // OPL-configured form: { namespaces: { location: "https://….txt" } }.
+    // The .txt holds the full OPL source, so we can merge into it.
+    if (!Array.isArray(ns) && typeof ns === "object") {
+        const location = ns.location;
+        if (typeof location !== "string" || !location)
+            return { kind: "empty" };
+        const opl = await fetchOplSource(location);
+        // A model exists but its source is unreadable — can't merge, mustn't clobber.
+        if (opl == null)
+            return { kind: "blocked" };
+        return oplDefinesClass(opl, namespace)
+            ? { kind: "present" }
+            : { kind: "merge", opl };
+    }
+    // Inline compiled form: { namespaces: [{ name, id }, …] } (legacy / self-hosted).
+    // We only have names, not source, so a missing namespace can't be merged.
+    if (Array.isArray(ns)) {
+        if (ns.length === 0)
+            return { kind: "empty" };
+        const names = ns
+            .map((n) => n && typeof n === "object"
+            ? n.name
+            : undefined)
+            .filter((n) => typeof n === "string");
+        return names.includes(namespace) ? { kind: "present" } : { kind: "blocked" };
+    }
+    return { kind: "unknown" };
+}
+/** Fetch the OPL source served at a permission-config `location` URL. */
+async function fetchOplSource(url) {
+    try {
+        const res = await fetch(url);
+        if (!res.ok)
+            return null;
+        return await res.text();
+    }
+    catch {
+        return null;
+    }
+}
+/** Whether an OPL source defines `class <name>`. */
+function oplDefinesClass(opl, name) {
+    const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return new RegExp(`\\bclass\\s+${escaped}\\b`).test(opl);
 }
 /**
- * Provision a minimal permission model that defines `<namespace>` with a
- * `use` relation, via `ory update opl`. The namespace becomes an OPL class, so
- * it must be a valid identifier; if not, we bail (caller guides instead).
- * Writes the OPL to a temp file because `ory update opl` reads `--file` only
- * (no stdin). Returns true on success.
+ * Provision a permission model that defines `<namespace>` with a `use`
+ * relation, via `ory update opl`. The namespace becomes an OPL class, so it
+ * must be a valid identifier; if not, we bail (caller guides instead).
+ *
+ * When `existingOpl` is given, the namespace is appended to that source
+ * (preserving the model's other namespaces); otherwise a fresh minimal model
+ * is generated. Writes the OPL to a temp file because `ory update opl` reads
+ * `--file` only (no stdin). Returns true on success.
  */
-function provisionPermissionModel(runner, projectId, namespace) {
+function provisionPermissionModel(runner, projectId, namespace, existingOpl) {
     if (!/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(namespace))
         return false;
-    const opl = [
-        'import { Namespace } from "@ory/permission-namespace-types"',
-        "",
-        "class User implements Namespace {}",
-        "",
-        `class ${namespace} implements Namespace {`,
-        "  related: {",
-        "    use: User[]",
-        "  }",
-        "}",
-        "",
-    ].join("\n");
+    const opl = existingOpl !== undefined
+        ? mergeNamespaceIntoOpl(existingOpl, namespace)
+        : freshOpl(namespace);
     let dir;
     try {
         dir = fs.mkdtempSync(path.join(os.tmpdir(), "ory-opl-"));
@@ -832,6 +877,39 @@ function provisionPermissionModel(runner, projectId, namespace) {
         }
     }
 }
+/** A minimal standalone OPL defining `User` and `<namespace>` with `use`. */
+function freshOpl(namespace) {
+    return [
+        'import { Namespace } from "@ory/permission-namespace-types"',
+        "",
+        "class User implements Namespace {}",
+        "",
+        `class ${namespace} implements Namespace {`,
+        "  related: {",
+        "    use: User[]",
+        "  }",
+        "}",
+        "",
+    ].join("\n");
+}
+/**
+ * Append a `<namespace>` class (with a `use: User[]` relation) to an existing
+ * OPL source, leaving every other namespace untouched. Adds a `User` class too
+ * when the source doesn't already define one, since `use` is typed `User[]`.
+ */
+function mergeNamespaceIntoOpl(existingOpl, namespace) {
+    let opl = existingOpl.replace(/\s*$/, "\n");
+    if (!oplDefinesClass(opl, "User")) {
+        opl += "\nclass User implements Namespace {}\n";
+    }
+    opl +=
+        `\nclass ${namespace} implements Namespace {\n` +
+            "  related: {\n" +
+            "    use: User[]\n" +
+            "  }\n" +
+            "}\n";
+    return opl;
+}
 function printPermissionModelHelp(namespace) {
     // When the namespace is a valid OPL class name, show the exact snippet to
     // paste into the model — that's the concrete "how" behind "define it". The
@@ -1013,13 +1091,39 @@ async function createProjectInteractive(runner, prompt, workspace, harness) {
 }
 /** JSON-Patch path (relative to the oauth2 service config) that toggles DCR. */
 const DCR_ENABLED_PATH = "/oidc/dynamic_client_registration/enabled";
+/**
+ * Read the project's current DCR state via `ory get oauth2-config`.
+ * Returns `true`/`false` when the value is known, or `null` when it can't be
+ * determined (CLI error, unparseable output) so the caller falls open and
+ * prompts anyway rather than assuming a state.
+ */
+function dcrEnabled(runner, projectId) {
+    const r = runner.exec([
+        "get",
+        "oauth2-config",
+        "--project",
+        projectId,
+        "--format",
+        "json",
+    ]);
+    if (r.status !== 0)
+        return null;
+    const config = parseObject(r.stdout);
+    if (!config)
+        return null;
+    const enabled = config.oidc?.dynamic_client_registration?.enabled;
+    return typeof enabled === "boolean" ? enabled : null;
+}
 /**
  * Enable OAuth2 Dynamic Client Registration on the project so the agent
- * identity can self-register (RFC 7591) at runtime. Prompts first (default
- * yes) since it changes project-wide config; best-effort and fail-open — a
- * decline or failure just prints the manual command and continues.
+ * identity can self-register (RFC 7591) at runtime. First probes the project's
+ * current DCR state and skips silently when it's already enabled. Otherwise
+ * prompts (default yes) since it changes project-wide config; best-effort and
+ * fail-open — a decline or failure just prints the manual command and continues.
  */
 async function maybeEnableDcr(runner, prompt, projectId) {
+    if (dcrEnabled(runner, projectId) === true)
+        return;
     ui.heading("Dynamic Client Registration");
     ui.info("The agent identity registers itself via OAuth2 Dynamic Client Registration");
     ui.hint("(DCR), which Ory Network projects disable by default.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ory/argus",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "description": "Ory Argus: the core API for building authentication, authorization, and audit into AI agent harness plugins, extensions, and custom integrations",
   "license": "Apache-2.0",
   "homepage": "https://ory.com",