@junoflow/cli 0.15.0 → 0.17.0

package/src/index.js

@@ -1,15 +1,12 @@
 import { parseArgs } from 'node:util';
 
-import {
-  AGENT_SKILL_INSTALL_USAGE,
-  agentSkillInstall,
-} from './commands/agent-skill-install.js';
 import { APP_CHECK_USAGE, appCheck } from './commands/app-check.js';
 import { APP_DEPLOY_USAGE, appDeploy } from './commands/app-deploy.js';
 import { APP_DEV_USAGE, appDev } from './commands/app-dev.js';
 import { APP_GEN_TYPES_USAGE, appGenTypes } from './commands/app-gen-types.js';
 import { APP_INIT_USAGE, appInit } from './commands/app-init.js';
 import { APP_PULL_USAGE, appPull } from './commands/app-pull.js';
+import { APPROVAL_WAIT_USAGE, approvalWait } from './commands/approval-wait.js';
 import { ASK_USAGE, ask } from './commands/ask.js';
 import { CHECK_USAGE, check } from './commands/check.js';
 import { CONFIG_SET_USAGE, configSet } from './commands/config.js';
@@ -36,13 +33,33 @@ import {
   taskRun,
 } from './commands/task-run.js';
 import { PULL_USAGE, pull } from './commands/pull.js';
+import { PERMISSIONS_USAGE, permissions } from './commands/permissions.js';
 import { SKILL_USAGE, skill } from './commands/skill.js';
 import {
   SESSION_APPROVE_USAGE,
   sessionApprove,
 } from './commands/session-approve.js';
+import { runFollow } from './commands/run-follow.js';
+import {
+  SESSION_CANCEL_USAGE,
+  SESSION_EXPORT_USAGE,
+  SESSION_GET_USAGE,
+  SESSION_LIST_USAGE,
+  SESSION_RATE_USAGE,
+  sessionCancel,
+  sessionExport,
+  sessionGet,
+  sessionList,
+  sessionRate,
+} from './commands/session.js';
 import { runTool } from './commands/tool.js';
 import { VERIFY_TYPES_USAGE, verifyTypes } from './commands/verify-types.js';
+import {
+  VERSION_USAGE,
+  WHOAMI_USAGE,
+  version,
+  whoami,
+} from './commands/whoami.js';
 import {
   ConflictError,
   DiagnosticsError,
@@ -58,15 +75,15 @@ import {
   EXIT_UNREACHABLE,
   EXIT_USAGE,
 } from './exit.js';
-import {
-  groupHelp,
-  nonToolHelp,
-  verbHelp,
-  WORKING_COPY_HEADING,
-  workingCopyListing,
-} from './help.js';
+import { groupHelp, nonToolHelp, rootHelp, verbHelp } from './help.js';
 import { closest, closestByVerb, levenshtein } from './suggest.js';
-import { groupOf, normalizeVerb, rowFor, rows } from './verbs.js';
+import {
+  groupOf,
+  groupSummaries,
+  normalizeVerb,
+  rowFor,
+  rows,
+} from './verbs.js';
 
 /**
  * The two flags every command that reaches an instance takes, and the two a
@@ -94,11 +111,58 @@ const NON_TOOL = {
     },
     usage: ASK_USAGE,
   },
+  whoami: { run: whoami, options: URL_OPTION, usage: WHOAMI_USAGE },
+  version: { run: version, options: URL_OPTION, usage: VERSION_USAGE },
+  permissions: {
+    run: permissions,
+    options: {
+      ...URL_OPTION,
+      'allow-change': { type: 'boolean', default: false },
+      'working-copy': { type: 'boolean', default: false },
+      json: { type: 'boolean', default: false },
+    },
+    usage: PERMISSIONS_USAGE,
+  },
+  'session list': {
+    run: sessionList,
+    options: {
+      ...URL_OPTION,
+      rating: { type: 'string' },
+      profile: { type: 'string' },
+      limit: { type: 'string' },
+    },
+    usage: SESSION_LIST_USAGE,
+  },
+  'session get': {
+    run: sessionGet,
+    options: { ...URL_OPTION, transcript: { type: 'boolean', default: false } },
+    usage: SESSION_GET_USAGE,
+  },
+  'session export': {
+    run: sessionExport,
+    options: URL_OPTION,
+    usage: SESSION_EXPORT_USAGE,
+  },
+  'session rate': {
+    run: sessionRate,
+    options: { ...URL_OPTION, rating: { type: 'string' } },
+    usage: SESSION_RATE_USAGE,
+  },
+  'session cancel': {
+    run: sessionCancel,
+    options: URL_OPTION,
+    usage: SESSION_CANCEL_USAGE,
+  },
   'session approve': {
     run: sessionApprove,
     options: { ...URL_OPTION, wait: { type: 'string' } },
     usage: SESSION_APPROVE_USAGE,
   },
+  'approval wait': {
+    run: approvalWait,
+    options: { ...URL_OPTION, wait: { type: 'string' } },
+    usage: APPROVAL_WAIT_USAGE,
+  },
   'credential set': {
     run: credentialSet,
     options: {
@@ -135,18 +199,6 @@ const NON_TOOL = {
     usage: TASK_PING_USAGE,
   },
   'config set': { run: configSet, options: {}, usage: CONFIG_SET_USAGE },
-  'agent-skill install': {
-    run: agentSkillInstall,
-    options: {
-      ...URL_OPTION,
-      dir: { type: 'string' },
-      'allow-change': { type: 'boolean', default: false },
-      'working-copy': { type: 'boolean', default: false },
-      'agents-md': { type: 'boolean', default: false },
-      json: { type: 'boolean', default: false },
-    },
-    usage: AGENT_SKILL_INSTALL_USAGE,
-  },
 };
 
 /**
@@ -301,6 +353,21 @@ const WORKING_COPY = {
   },
 };
 
+/**
+ * Flags a tool row takes beyond its verbs.json ones, which name no field of
+ * the tool's input and so cannot be in the table: what the CLI does around
+ * the call. `run get --follow` streams the run's steps to stderr until it is
+ * done, then prints get_run as without it.
+ */
+const TOOL_EXTRAS = {
+  'run get': {
+    options: { follow: { type: 'boolean', default: false } },
+    help: "flag: --follow → no input field: stream the run's steps to stderr until it ends, then print the run",
+    run: (row, args, io) =>
+      args.follow ? runFollow(row, args, io) : runTool(row, args, io),
+  },
+};
+
 /** The handler of a non-tool row, working-copy or not, or undefined. */
 function handlerFor(row) {
   if (row.tool) return undefined;
@@ -320,26 +387,6 @@ function dispatchable(command) {
   return row && DISPATCHABLE.includes(row) ? row : undefined;
 }
 
-const USAGE = `juno — operate a Juno instance, and develop flows, integrations and apps for it
-
-Usage: juno <command> [options]
-       juno <group> <verb> [id] [--input <json>|-|@file] [--jq <expr>]
-
-Groups: ${[...GROUPS].join(', ')}
-Commands: ${DISPATCHABLE.filter((r) => !groupOf(r))
-  .map((r) => r.command)
-  .join(', ')}
-Run \`juno <group> --help\` for a group's commands.
-
-${WORKING_COPY_HEADING}:
-${workingCopyListing(DISPATCHABLE, handlerFor)}
-
---url <url> picks the instance; else $JUNO_URL, package.json juno.target,
-then the user config (juno config set url <url>).
---token <key> is the API key to send; else $JUNO_TOKEN, then the user config
-(juno config set token <key>). Create one under Settings → API keys.
-`;
-
 /**
  * run is the whole CLI, injectable so the tests drive it without spawning a
  * process: io carries cwd, env, the TTY bit, stdin and the three output
@@ -387,9 +434,11 @@ async function dispatch(argv, io) {
   const { leading, rest } = leadingFlags(argv);
   const [first, ...tail] = rest;
 
+  // Bare `juno` is `juno --help`, exit 0: it is where an agent with nothing
+  // installed starts, and the primer is the answer it came for.
   if (!first || first === '--help' || first === '-h' || first === 'help') {
-    io.log(USAGE);
-    return first ? EXIT_OK : EXIT_USAGE;
+    const show = (args) => showRootHelp(args, io);
+    return runCommand({ options: URL_OPTION }, tail, leading, io, show, show);
   }
 
   const top = dispatchable(first);
@@ -428,6 +477,11 @@ async function dispatch(argv, io) {
   throw unknownTopLevel(first, first, [first]);
 }
 
+async function showRootHelp(args, io) {
+  io.log(await rootHelp(DISPATCHABLE, handlerFor, groupSummaries, args, io));
+  return EXIT_OK;
+}
+
 async function showGroupHelp(group, args, io, code) {
   io.log(await groupHelp(group, DISPATCHABLE, handlerFor, args, io));
   return code;
@@ -468,21 +522,28 @@ function runRow(row, argv, leading, io) {
     );
   }
 
+  // --wait is how long a destructive tool's approval is waited for; every
+  // tool row takes it, since which tools are destructive is the server's.
   const options = {
     ...URL_OPTION,
     input: { type: 'string' },
     jq: { type: 'string' },
+    wait: { type: 'string' },
   };
   for (const [flag, spec] of Object.entries(row.flags ?? {})) {
     options[flag] = { type: 'string', multiple: spec.multiple === true };
   }
+  const extras = TOOL_EXTRAS[row.command];
+  Object.assign(options, extras?.options);
+  const run = extras?.run ?? runTool;
   return runCommand(
-    { run: (args) => runTool(row, args, io), options },
+    { run: (args) => run(row, args, io), options },
     argv,
     leading,
     io,
     async (args) => {
-      io.log(await verbHelp(row, args, io));
+      const help = await verbHelp(row, args, io);
+      io.log(extras?.help ? `${help}\n${extras.help}` : help);
       return EXIT_OK;
     }
   );
@@ -611,6 +672,12 @@ export function defaultIO() {
     write: (text) => process.stdout.write(text),
     warn: (msg) => process.stderr.write(`${msg}\n`),
     error: (msg) => process.stderr.write(`${msg}\n`),
+    // Ctrl-C while waiting for an approval: the handler says how to resume,
+    // and the wait returns rather than the process dying mid-line.
+    onInterrupt: (fn) => {
+      process.once('SIGINT', fn);
+      return () => process.off('SIGINT', fn);
+    },
   };
 }
 

package/src/prompt.js

@@ -182,6 +182,15 @@ function nextStep(event, id) {
     return `still running; keep waiting with: juno ask --session ${id}`;
   }
   if (event.type !== 'awaiting_input') return null;
+  const approvalID = event.pending_input?.approval_id;
+  if (approvalID) {
+    // A destructive call's approval record: only a person in Juno answers it.
+    const url = event.pending_input.approval_url ?? `/approvals/${approvalID}`;
+    return (
+      `waiting for a person to approve it in Juno: ${url}\n` +
+      `wait for the outcome with: juno ask --session ${id}`
+    );
+  }
   if (event.pending_input?.kind === 'approval') {
     return (
       `awaiting approval; approve with: juno session approve ${id}\n` +

package/src/verbs.js

@@ -2,7 +2,9 @@ import { createRequire } from 'node:module';
 
 // createRequire rather than an import attribute: `with { type: 'json' }` needs
 // Node 20.10+, and engines says >=20.
-const { commands: ROWS } = createRequire(import.meta.url)('../verbs.json');
+const { commands: ROWS, groups: GROUPS } = createRequire(import.meta.url)(
+  '../verbs.json'
+);
 
 /**
  * verbs.json is the command table: every `juno <group> <verb>` the CLI
@@ -12,6 +14,9 @@ const { commands: ROWS } = createRequire(import.meta.url)('../verbs.json');
  */
 export const rows = ROWS;
 
+/** The one line `juno --help` lists each group by, keyed by group. */
+export const groupSummaries = GROUPS;
+
 const byCommand = new Map(ROWS.map((row) => [row.command, row]));
 
 /** The row for a command string ("state get"), or undefined. */