@aiaiai-pt/martha-cli 0.18.0 → 0.19.0

package/dist/index.js

@@ -11059,7 +11059,7 @@ import { createInterface as createInterface2 } from "node:readline";
 init_errors();
 
 // src/version.ts
-var CLI_VERSION = "0.18.0";
+var CLI_VERSION = "0.19.0";
 
 // src/commands/sessions.ts
 function relativeTime(iso) {
@@ -13559,27 +13559,6 @@ var workflowsConfig = {
 
 // src/commands/agents.ts
 init_errors();
-
-// src/lib/collections.ts
-init_errors();
-var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-async function resolveCollectionIdForGrant(ctx, ref) {
-  if (UUID_RE.test(ref)) {
-    return ref;
-  }
-  const all = await ctx.api.get("/api/admin/collections", {
-    params: { active_only: "false" }
-  });
-  const bySlug = all.find((c) => c.slug === ref);
-  if (bySlug)
-    return bySlug.id;
-  const byName = all.find((c) => c.name === ref);
-  if (byName)
-    return byName.id;
-  throw new CLIError(`Collection '${ref}' not found (tried UUID, slug, and name).`, 3 /* NotFound */, "Run `martha documents collections --tree` to see available collections.");
-}
-
-// src/commands/agents.ts
 function parseSetFlags(items) {
   const result = {};
   for (const item of items) {
@@ -13756,7 +13735,10 @@ var agentsConfig = {
       console.log(`  Updated:     ${agent.updated_at}`);
   },
   extraCommands: (parentCmd, getCtx, isJson) => {
-    parentCmd.command("add-function <agent> <functionName>").description("Add a function to an agent").option("--set <items...>", "Config overrides (key=value)").option("--collection <slug-or-id>", "Scope the grant to one collection (#372 PR2). " + "Server rejects with 400 if the function is collection-agnostic.").action(async (agent, functionName, opts) => {
+    parentCmd.command("add-function <agent> <functionName>").description("Add a function to an agent").option("--set <items...>", "Config overrides (key=value)").option("--collection <slug-or-id>", "REMOVED (#609) — collection access is managed separately; see error").action(async (agent, functionName, opts) => {
+      if (opts.collection) {
+        throw new CLIError("`--collection` was removed; collection access is managed separately: " + "`martha collections grant <collection> --to agent:<id>`.", 4 /* Validation */);
+      }
       const ctx = getCtx();
       const body = {
         function_name: functionName
@@ -13764,36 +13746,29 @@ var agentsConfig = {
       if (opts.set) {
         body.config_overrides = parseSetFlags(opts.set);
       }
-      if (opts.collection) {
-        body.collection_id = await resolveCollectionIdForGrant(ctx, opts.collection);
-      }
       const result = await ctx.api.post(`${API_PATH}/${encodeURIComponent(agent)}/functions`, body);
       if (isJson()) {
         console.log(JSON.stringify(result, null, 2));
         return;
       }
-      const scopeLabel = opts.collection ? ` (scope: ${opts.collection})` : "";
-      console.log(`Added function '${functionName}' to agent '${agent}'${scopeLabel}`);
+      console.log(`Added function '${functionName}' to agent '${agent}'`);
     });
-    parentCmd.command("remove-function <agent> <functionName>").description("Remove a function from an agent").option("--collection <slug-or-id>", "Revoke just the given collection scope (#372 PR2). " + "Omit to revoke the root grant (collection_id IS NULL).").action(async (agent, functionName, opts) => {
-      const ctx = getCtx();
-      let endpoint = `${API_PATH}/${encodeURIComponent(agent)}/functions/${encodeURIComponent(functionName)}`;
+    parentCmd.command("remove-function <agent> <functionName>").description("Remove a function from an agent").option("--collection <slug-or-id>", "REMOVED (#609) — collection access is managed separately; see error").action(async (agent, functionName, opts) => {
       if (opts.collection) {
-        const collId = await resolveCollectionIdForGrant(ctx, opts.collection);
-        endpoint += `?collection_id=${encodeURIComponent(collId)}`;
+        throw new CLIError("`--collection` was removed; collection access is managed separately: " + "`martha collections revoke <collection> --to agent:<id>`.", 4 /* Validation */);
       }
+      const ctx = getCtx();
+      const endpoint = `${API_PATH}/${encodeURIComponent(agent)}/functions/${encodeURIComponent(functionName)}`;
       await ctx.api.del(endpoint);
       if (isJson()) {
         console.log(JSON.stringify({
           agent,
           function_name: functionName,
-          collection: opts.collection ?? null,
           removed: true
         }));
         return;
       }
-      const scopeLabel = opts.collection ? ` (scope: ${opts.collection})` : "";
-      console.log(`Removed function '${functionName}' from agent '${agent}'${scopeLabel}`);
+      console.log(`Removed function '${functionName}' from agent '${agent}'`);
     });
     parentCmd.command("provision-auth <agent>").description("Provision, switch, or rotate agent auth credentials").requiredOption("--method <method>", "Auth method: service-account or api-key").action(async (agent, opts) => {
       const ctx = getCtx();
@@ -17051,7 +17026,10 @@ ${clients.length} client(s)`));
     }
     console.log(`Deleted client '${nameOrId}'`);
   });
-  cmd.command("grant <clientNameOrId> <type> <defName>").description("Grant a client access to a function, workflow, or agent").option("--config <items...>", "Config overrides (key=value, functions/agents only)").option("--collection <slug-or-id>", "Scope the grant to one collection (function grants only; #372 PR2)").action(async (clientNameOrId, type, defName, opts) => {
+  cmd.command("grant <clientNameOrId> <type> <defName>").description("Grant a client access to a function, workflow, or agent").option("--config <items...>", "Config overrides (key=value, functions/agents only)").option("--collection <slug-or-id>", "REMOVED (#609) — collection access is managed separately; see error").action(async (clientNameOrId, type, defName, opts) => {
+    if (opts.collection) {
+      throw new CLIError("`--collection` was removed; collection access is managed separately: " + "`martha collections grant <collection> --to client:<id>`.", 4 /* Validation */);
+    }
     if (!VALID_TYPES.has(type)) {
       throw new CLIError(`Invalid type: '${type}'. Must be function, workflow, or agent.`, 4 /* Validation */);
     }
@@ -17079,30 +17057,23 @@ ${clients.length} client(s)`));
       }
       body.config_overrides = parseSetFlags(opts.config);
     }
-    if (opts.collection) {
-      if (accessType !== "function") {
-        throw new CLIError("--collection only applies to function grants (#372 PR2).", 4 /* Validation */);
-      }
-      body.collection_id = await resolveCollectionIdForGrant(ctx, opts.collection);
-    }
     const result = await ctx.api.post(endpoint, body);
     if (isJson()) {
       console.log(JSON.stringify(result, null, 2));
       return;
     }
-    const scopeLabel = opts.collection ? ` (scope: ${opts.collection})` : "";
-    console.log(`Granted ${accessType} '${defName}' to client '${clientNameOrId}'${scopeLabel}`);
+    console.log(`Granted ${accessType} '${defName}' to client '${clientNameOrId}'`);
   });
-  cmd.command("revoke <clientNameOrId> <type> <defName>").description("Revoke a client's access to a function, workflow, or agent").option("--collection <slug-or-id>", "Revoke just the given collection scope (function grants only; #372 PR2). " + "Omit to revoke the root grant (collection_id IS NULL).").action(async (clientNameOrId, type, defName, opts) => {
+  cmd.command("revoke <clientNameOrId> <type> <defName>").description("Revoke a client's access to a function, workflow, or agent").option("--collection <slug-or-id>", "REMOVED (#609) — collection access is managed separately; see error").action(async (clientNameOrId, type, defName, opts) => {
+    if (opts.collection) {
+      throw new CLIError("`--collection` was removed; collection access is managed separately: " + "`martha collections revoke <collection> --to client:<id>`.", 4 /* Validation */);
+    }
     if (!VALID_TYPES.has(type)) {
       throw new CLIError(`Invalid type: '${type}'. Must be function, workflow, or agent.`, 4 /* Validation */);
     }
     const accessType = type;
     const ctx = getCtx();
     const clientId = await resolveClientId(ctx, clientNameOrId);
-    if (opts.collection && accessType !== "function") {
-      throw new CLIError("--collection only applies to function grants (#372 PR2).", 4 /* Validation */);
-    }
     let endpoint;
     if (accessType === "agent") {
       endpoint = `${DEFS_API}/clients/${clientId}/agents/${encodeURIComponent(defName)}`;
@@ -17110,10 +17081,6 @@ ${clients.length} client(s)`));
       const defId = await resolveDefinitionId(ctx, accessType, defName);
       const typePlural = `${accessType}s`;
       endpoint = `${DEFS_API}/clients/${clientId}/${typePlural}/${encodeURIComponent(defId)}`;
-      if (opts.collection) {
-        const collId = await resolveCollectionIdForGrant(ctx, opts.collection);
-        endpoint += `?collection_id=${encodeURIComponent(collId)}`;
-      }
     }
     await ctx.api.del(endpoint);
     if (isJson()) {
@@ -17121,13 +17088,11 @@ ${clients.length} client(s)`));
         client: clientNameOrId,
         type: accessType,
         name: defName,
-        collection: opts.collection ?? null,
         revoked: true
       }));
       return;
     }
-    const scopeLabel = opts.collection ? ` (scope: ${opts.collection})` : "";
-    console.log(`Revoked ${accessType} '${defName}' from client '${clientNameOrId}'${scopeLabel}`);
+    console.log(`Revoked ${accessType} '${defName}' from client '${clientNameOrId}'`);
   });
   const embed = cmd.command("embed").description("Create, configure, and test embeddable chat clients");
   function addEmbedConfigOptions(command) {
@@ -18396,6 +18361,25 @@ function registerPolicyCommands(program2) {
 // src/commands/authz.ts
 init_errors();
 
+// src/lib/collections.ts
+init_errors();
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+async function resolveCollectionIdForGrant(ctx, ref) {
+  if (UUID_RE.test(ref)) {
+    return ref;
+  }
+  const all = await ctx.api.get("/api/admin/collections", {
+    params: { active_only: "false" }
+  });
+  const bySlug = all.find((c) => c.slug === ref);
+  if (bySlug)
+    return bySlug.id;
+  const byName = all.find((c) => c.name === ref);
+  if (byName)
+    return byName.id;
+  throw new CLIError(`Collection '${ref}' not found (tried UUID, slug, and name).`, 3 /* NotFound */, "Run `martha documents collections --tree` to see available collections.");
+}
+
 // src/lib/authz.ts
 init_errors();
 var EX_UNAVAILABLE = 69;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiaiai-pt/martha-cli",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Terminal-first client for the Martha AI platform",
   "homepage": "https://docs.martha.nomadriver.co",
   "repository": {