@aiaiai-pt/martha-cli 0.30.0 → 0.32.0

package/dist/index.js

@@ -3528,6 +3528,7 @@ var require_stringify = __commonJS((exports) => {
       nullStr: "null",
       simpleKeys: false,
       singleQuote: null,
+      trailingComma: false,
       trueStr: "true",
       verifyAliasOrder: true
     }, doc.schema.toStringOptions, options);
@@ -4036,13 +4037,20 @@ ${indent}${line}` : `
       if (comment)
         reqNewline = true;
       let str = stringify.stringify(item, itemCtx, () => comment = null);
-      if (i < items.length - 1)
+      reqNewline || (reqNewline = lines.length > linesAtValue || str.includes(`
+`));
+      if (i < items.length - 1) {
         str += ",";
+      } else if (ctx.options.trailingComma) {
+        if (ctx.options.lineWidth > 0) {
+          reqNewline || (reqNewline = lines.reduce((sum, line) => sum + line.length + 2, 2) + (str.length + 2) > ctx.options.lineWidth);
+        }
+        if (reqNewline) {
+          str += ",";
+        }
+      }
       if (comment)
         str += stringifyComment.lineComment(str, itemIndent, commentString(comment));
-      if (!reqNewline && (lines.length > linesAtValue || str.includes(`
-`)))
-        reqNewline = true;
       lines.push(str);
       linesAtValue = lines.length;
     }
@@ -6837,17 +6845,22 @@ var require_compose_node = __commonJS((exports) => {
       case "block-map":
       case "block-seq":
       case "flow-collection":
-        node = composeCollection.composeCollection(CN, ctx, token, props, onError);
-        if (anchor)
-          node.anchor = anchor.source.substring(1);
+        try {
+          node = composeCollection.composeCollection(CN, ctx, token, props, onError);
+          if (anchor)
+            node.anchor = anchor.source.substring(1);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          onError(token, "RESOURCE_EXHAUSTION", message);
+        }
         break;
       default: {
         const message = token.type === "error" ? token.message : `Unsupported token (type: ${token.type})`;
         onError(token, "UNEXPECTED_TOKEN", message);
-        node = composeEmptyNode(ctx, token.offset, undefined, null, props, onError);
         isSrcToken = false;
       }
     }
+    node ?? (node = composeEmptyNode(ctx, token.offset, undefined, null, props, onError));
     if (anchor && node.anchor === "")
       onError(anchor, "BAD_ALIAS", "Anchor cannot be an empty string");
     if (atKey && ctx.options.stringKeys && (!identity.isScalar(node) || typeof node.value !== "string" || node.tag && node.tag !== "tag:yaml.org,2002:str")) {
@@ -11063,7 +11076,7 @@ init_config();
 init_errors();
 
 // src/version.ts
-var CLI_VERSION = "0.30.0";
+var CLI_VERSION = "0.32.0";
 
 // src/commands/sessions.ts
 function relativeTime(iso) {
@@ -16738,6 +16751,52 @@ function registerAskCommands(program2) {
 import { readFileSync as readFileSync2 } from "node:fs";
 init_errors();
 var truncate2 = (s, n) => s.length > n ? s.slice(0, n - 1) + "…" : s;
+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 resolveAgentId(ctx, ref) {
+  if (UUID_RE.test(ref))
+    return ref;
+  try {
+    const agent = await ctx.api.get(`/api/admin/definitions/agents/${encodeURIComponent(ref)}`);
+    return agent.id;
+  } catch {
+    throw new CLIError(`Agent '${ref}' not found (pass a valid agent name or UUID)`, 4 /* Validation */);
+  }
+}
+async function resolveTeamId(ctx, ref) {
+  if (UUID_RE.test(ref))
+    return ref;
+  const teams = await ctx.api.get("/api/admin/teams");
+  const match = (Array.isArray(teams) ? teams : []).find((t) => t.name === ref);
+  if (!match) {
+    throw new CLIError(`Team '${ref}' not found (pass a valid team name or UUID)`, 4 /* Validation */);
+  }
+  return match.id;
+}
+async function buildCreateTaskBody(ctx, opts) {
+  if (opts.agent && opts.team) {
+    throw new CLIError("--agent and --team are mutually exclusive — a task has one assignee", 4 /* Validation */);
+  }
+  const body = {
+    goal: opts.goal,
+    priority: opts.priority
+  };
+  if (opts.agent)
+    body.agent_id = await resolveAgentId(ctx, opts.agent);
+  if (opts.team)
+    body.team_id = await resolveTeamId(ctx, opts.team);
+  if (opts.title)
+    body.title = opts.title;
+  if (opts.context) {
+    try {
+      body.context_data = JSON.parse(opts.context);
+    } catch {
+      throw new CLIError("--context must be valid JSON", 4 /* Validation */);
+    }
+  }
+  if (opts.sticky)
+    body.sticky_assignment = true;
+  return body;
+}
 var sleep4 = (ms, signal) => new Promise((resolve2) => {
   if (signal?.aborted) {
     resolve2();
@@ -16876,30 +16935,13 @@ ${items.length} task(s)`));
     }
     console.log(`Open: ${source_default.yellow(data.open ?? 0)}  ` + `Running: ${source_default.blue(data.running ?? 0)}  ` + `Claimed: ${source_default.magenta(data.claimed ?? 0)}  ` + `Completed: ${source_default.green(data.completed ?? 0)}  ` + `Failed: ${source_default.red(data.failed ?? 0)}  ` + `Cancelled: ${source_default.dim(data.cancelled ?? 0)}`);
   });
-  cmd.command("create").description("Create a new task").requiredOption("--agent <name-or-id>", "Agent definition ID").requiredOption("--goal <text>", "Goal / instruction for the agent").option("--title <text>", "Short title for the task").option("--priority <priority>", "Priority (low, medium, high, urgent)", "medium").option("--context <json>", "Structured context as JSON string").option("--team <team-id>", "Assign task to a team").option("--assigned-agent <agent-id>", "Assign task to a specific agent").option("--sticky", "Keep assignment even if agent goes offline").option("--no-auto-execute", "Create the task as claimable (open) for an external runner to pull, instead of auto-running it via the cloud workflow").action(async (opts) => {
+  cmd.command("create").description("Create a task. Assign it to an agent or a team to dispatch it, or omit " + "both to leave it in the backlog (#774: assignment is the dispatch moment).").requiredOption("--goal <text>", "Goal / instruction for the agent").option("--agent <name-or-id>", "Assign to an agent (dispatches; venue derives from its type)").option("--team <name-or-id>", "Assign to a team").option("--title <text>", "Short title for the task").option("--priority <priority>", "Priority (low, medium, high, urgent)", "medium").option("--context <json>", "Structured context as JSON string").option("--sticky", "Keep assignment even if agent goes offline").option("--no-auto-execute", "Deprecated (#774): venue now derives from the assignee. Accepted and ignored.").action(async (opts) => {
     const ctx = getCtx();
-    const body = {
-      agent_definition_id: opts.agent,
-      goal: opts.goal,
-      priority: opts.priority
-    };
-    if (opts.title)
-      body.title = opts.title;
-    if (opts.context) {
-      try {
-        body.context_data = JSON.parse(opts.context);
-      } catch {
-        throw new CLIError("--context must be valid JSON", 4 /* Validation */);
-      }
+    if (opts.autoExecute === false) {
+      process.stderr.write("Warning: --no-auto-execute is deprecated (#774) — the venue derives " + `from the assignee. Ignoring.
+`);
     }
-    if (opts.team)
-      body.assigned_team_id = opts.team;
-    if (opts.assignedAgent)
-      body.assigned_agent_id = opts.assignedAgent;
-    if (opts.sticky)
-      body.sticky_assignment = true;
-    if (opts.autoExecute === false)
-      body.auto_execute = false;
+    const body = await buildCreateTaskBody(ctx, opts);
     const result = await ctx.api.post("/api/admin/tasks", body);
     if (isJson()) {
       console.log(JSON.stringify(result, null, 2));
@@ -16959,7 +17001,7 @@ ${source_default.red("Error:")}`);
     }
     console.log(`Cancelled task ${id}`);
   });
-  cmd.command("poll").description("Poll for open tasks available for claiming").option("--agent <id>", "Filter by agent definition ID").option("--limit <n>", "Max results", "10").action(async (opts) => {
+  cmd.command("poll").description("Poll for open tasks available for claiming").option("--agent <id>", "Filter by agent definition ID (human tokens only; ignored under agent auth)").option("--team <name>", "Poll a team's queue (name or UUID)").option("--limit <n>", "Max results", "10").action(async (opts) => {
     const ctx = getCtx();
     const limitN = parseInt(opts.limit, 10);
     if (isNaN(limitN) || limitN < 1) {
@@ -16968,6 +17010,8 @@ ${source_default.red("Error:")}`);
     const params = { limit: String(limitN) };
     if (opts.agent)
       params.agent_id = opts.agent;
+    if (opts.team)
+      params.team_id = opts.team;
     const items = await ctx.api.get("/api/tasks/poll", { params });
     if (isJson()) {
       console.log(JSON.stringify(items, null, 2));
@@ -17226,16 +17270,18 @@ function heartbeatIntervalMs(leaseTimeoutS) {
   return Math.min(lease / 3, 60) * 1000;
 }
 async function runOnce(ctx, opts, handled) {
-  const tasks = await ctx.api.get("/api/tasks/poll", {
-    params: { agent_id: opts.agent, limit: String(opts.pollLimit ?? 5) }
-  });
+  const params = { limit: String(opts.pollLimit ?? 5) };
+  if (opts.team)
+    params.team_id = opts.team;
+  const tasks = await ctx.api.get("/api/tasks/poll", { params });
   const candidates = Array.isArray(tasks) ? tasks : [];
-  const task = candidates.find((t) => (t.status ?? "open") === "open" && !handled?.has(t.id));
+  const matchesAgent = (t) => !opts.agent || t.assigned_agent_id === opts.agent || t.agent_definition_id === opts.agent;
+  const task = candidates.find((t) => (t.status ?? "open") === "open" && !handled?.has(t.id) && matchesAgent(t));
   if (!task)
     return { ran: false };
-  if (!opts.autoYes) {
+  if (!opts.allowHostExec) {
     process.stderr.write(source_default.yellow(`
-[runner] refused task ${task.id} — re-run with --yes to allow host execution
+[runner] refused task ${task.id} — re-run with --allow-host-exec to allow host execution
 `));
     return { ran: false, taskId: task.id, status: "refused" };
   }
@@ -17297,8 +17343,14 @@ async function runOnce(ctx, opts, handled) {
 `));
   return { ran: true, taskId: task.id, status, exitCode: exit_code };
 }
+function startupEchoLine(who, opts) {
+  const identity2 = who ? who.kind === "agent" ? `agent ${who.agent_name ?? "?"} (${(who.agent_id ?? "").slice(0, 8)}…)` : `${who.kind} ${who.sub ?? ""}`.trim() : "identity unknown (whoami unavailable)";
+  const scope = opts.team ? `team:${opts.team}` : "direct";
+  const exec = opts.allowHostExec ? "host exec allowed" : "host exec refused (pass --allow-host-exec)";
+  return `[runner] authenticated as ${identity2}, scope ${scope}, cwd ${opts.cwd}, ${exec}${opts.once ? " — once" : ""}`;
+}
 function registerRunnerCommand(program2) {
-  program2.command("runner").description("Run as an external agent's executor: claim tasks and run them on this host.").requiredOption("--agent <id>", "Agent definition id this runner serves").option("--once", "Claim + run a single task, then exit").option("--poll-interval <ms>", "Poll interval when idle (ms)", "3000").option("--cwd <dir>", "Scoped workspace for task execution", process.cwd()).option("--yes", "Consent to run host commands (required to execute)").action(async (opts) => {
+  program2.command("runner").description("Run as an external agent's executor: claim tasks and run them on this host.").option("--agent <id>", "Deprecated: identity comes from the API token; applied as a client-side filter only").option("--team <name>", "Poll this team's queue (name or UUID) instead of direct-only").option("--once", "Claim + run a single task, then exit").option("--poll-interval <ms>", "Poll interval when idle (ms)", "3000").option("--cwd <dir>", "Scoped workspace for task execution", process.cwd()).option("--allow-host-exec", "Consent to run host commands (required to execute)").option("--yes", "Deprecated alias for --allow-host-exec").action(async (opts) => {
     const ctx = createContext({
       profileOverride: program2.opts().profile,
       verbose: program2.opts().verbose
@@ -17309,12 +17361,21 @@ function registerRunnerCommand(program2) {
     if (isNaN(pollInterval) || pollInterval < 250) {
       throw new CLIError("--poll-interval must be >= 250 (ms)", 4 /* Validation */);
     }
+    if (opts.agent) {
+      process.stderr.write(source_default.yellow(`[runner] --agent is deprecated — identity comes from the API token; the value is applied as a client-side filter only
+`));
+    }
     const runOpts = {
       agent: opts.agent,
+      team: opts.team,
       cwd: opts.cwd,
-      autoYes: !!opts.yes
+      allowHostExec: !!(opts.allowHostExec || opts.yes)
     };
-    process.stderr.write(source_default.dim(`[runner] serving agent ${opts.agent} (cwd ${opts.cwd})${opts.once ? " — once" : ""}
+    let who;
+    try {
+      who = await ctx.api.get("/api/tasks/whoami");
+    } catch {}
+    process.stderr.write(source_default.dim(`${startupEchoLine(who, { team: opts.team, cwd: opts.cwd, allowHostExec: runOpts.allowHostExec, once: !!opts.once })}
 `));
     if (opts.once) {
       await runOnce(ctx, runOpts);
@@ -20392,9 +20453,9 @@ 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;
+var UUID_RE2 = /^[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)) {
+  if (UUID_RE2.test(ref)) {
     return ref;
   }
   const all = await ctx.api.get("/api/admin/collections", {

package/package.json

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