@rfany/rf 0.5.0 → 0.6.0

package/README.md

@@ -3,6 +3,7 @@
 People's command line for [rollforward](https://github.com/spoj/rollforward): what its page does, from a shell or a desktop agent, as you.
 
     npm i -g @rfany/rf
-    rf login https://rollforward.example.com TOKEN
+    rf login https://rollforward.example.com
 
-Make the token on the page, under Tokens. `rf` alone lists the commands; `rf help` is the guide for an agent, read before it first uses rf.
+rf opens the page, which asks you to allow it if it shows the same code as rf; or make a token on the page, under Tokens, and
+`rf login URL TOKEN`. `rf` alone lists the commands; `rf help` is the guide for an agent, read before it first uses rf.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rfany/rf",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "rollforward's command line for people: what its page does, from a shell or a desktop agent, as you",
   "license": "MIT",
   "repository": { "type": "git", "url": "git+https://github.com/spoj/rollforward.git", "directory": "cli" },

package/rf.mjs

@@ -2,10 +2,11 @@
 // rf for people: what the page does, from a shell or a desktop agent, as you, with a personal token made on the page (Tokens).
 // Published to npm as @rfany/rf, from cli/. PATH is workspace/series/label, as `rf ls` prints it.
 import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, rmdirSync, rmSync, statSync, utimesSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
+import { spawn } from 'node:child_process';
+import { homedir, hostname } from 'node:os';
 import { basename, dirname, join, relative, resolve, sep } from 'node:path';
 
-const USAGE = `rf login URL TOKEN
+const USAGE = `rf login URL [TOKEN]                without a TOKEN, through the browser: allow it on the page, where it shows rf's code
 rf ls
 rf pull PATH DIR [--delete] [-n|--dry-run] [--exclude PATTERN]...
                                   PATH's files into DIR as rsync copies them, whole, if their size or time differ: PATH/ fills DIR,
@@ -54,15 +55,17 @@ What there is
   series, and a reply from whom an ask names; anyone else's is a note, which the agent takes up once the runner does.
 - A comment starts a thread, on the instance or on an item, at a cell such as Base!C25, and others reply in it. An ask is the
   agent's comment that waits on someone, the one it names or else the runner, until they reply or resolve it. rf ls says how many
-  asks wait in each instance.
+  asks wait in each instance. A sign-off, an ask with signoff true, waits on the runner, who approves or rejects it on the page:
+  either commits the instance's folder to its history, .git in it, as closing does.
 
 What rf pull copies, the folders as the agent sees them
   AGENTS.md                  the company's conventions; <workspace>/AGENTS.md the workspace's
   <workspace>/<series>/<label>/
     workspace.json           the screen: {rev, status, items: [{id, name, kind, file, from, headline, source}]}
     log.jsonl                every event, by seq: by is a person's email, "server" or "agent"; op is upload, comment (thread, item,
-                             ref, text, ask, to), resolve, point and item (the screen changing), run, report (the agent's account of
-                             a run), done (its cost, summary or error), close, and the rest
+                             ref, text, ask, to, signoff), resolve, signoff (the runner's answer, with its commit), commit, point and
+                             item (the screen changing), run, report (the agent's account of a run), done (its cost, summary or
+                             error), close, and the rest
     upload/                  what people uploaded, their comments' attachments in upload/attachments/
     working/                 what the agent made, its scripts, and process.md, how it does this series
     session/                 the agent's own session: every message and tool call of every run
@@ -98,18 +101,22 @@ const flags                                = {}, excludes           = [], args
 for (let i = 0; i < argv.length; i++) {
   const flag = argv[i] === '-n' ? 'dry-run' : argv[i].match(/^--(.+)$/)?.[1];
   if (!flag) args.push(argv[i]);
-  else if (flag === 'exclude') excludes.push(argv[++i]);
-  else flags[flag] = ['wait', 'output', 'delete', 'dry-run', 'force', 'json', 'failed', 'running', 'clear'].includes(flag) ? true : argv[++i];
+  else if (['wait', 'output', 'delete', 'dry-run', 'force', 'json', 'failed', 'running', 'clear'].includes(flag)) flags[flag] = true;
+  else if (argv[i + 1] === undefined) {
+    console.error(`--${flag} takes a value\n\n${USAGE}`);
+    process.exit(2);
+  } else if (flag === 'exclude') excludes.push(argv[++i]);
+  else flags[flag] = argv[++i];
 }
 if (cmd === 'help') {
   console.log(GUIDE);
   process.exit();
 }
 if (cmd !== 'login' && !existsSync(config)) {
-  console.error(`Sign in first, with a token made on the page under Tokens: rf login URL TOKEN\n\n${USAGE}`);
+  console.error(`Sign in first: rf login URL\n\n${USAGE}`);
   process.exit(2);
 }
-const { url, token } = cmd === 'login' ? { url: args[0], token: args[1] } : JSON.parse(readFileSync(config, 'utf8'));
+let { url, token } = cmd === 'login' ? { url: args[0]?.replace(/\/$/, ''), token: args[1] } : JSON.parse(readFileSync(config, 'utf8'));
 
 async function api(path        , init              = {}) {
   const r = await fetch(url + path, { ...init, headers: { authorization: `Bearer ${token}` } });
@@ -200,7 +207,22 @@ async function pull(path        , dir        ) {
   if (failed) process.exitCode = 1;
 }
 
-if (cmd === 'login' && url && token) {
+// The browser's sign-in: the server makes a request, the person allows it on the page, which shows its code, and rf collects the token.
+async function browserToken()                  {
+  const { id, code } = await (await fetch(`${url}/auth/cli`, { method: 'POST', body: JSON.stringify({ name: `rf on ${hostname()}` }) })).json();
+  const link = `${url}/cli?code=${code}`;
+  console.log(`Open ${link}\nand allow rf there if the page shows the code ${code}.`);
+  spawn(process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'explorer' : 'xdg-open', [link], { stdio: 'ignore', detached: true }).on('error', () => {}).unref();
+  for (;;) {
+    await new Promise(ok => setTimeout(ok, 2000));
+    const r = await fetch(`${url}/auth/cli/poll`, { method: 'POST', body: JSON.stringify({ id }) });
+    if (r.status === 200) return (await r.json()).token;
+    if (r.status !== 202) throw new Error(await r.text());
+  }
+}
+
+if (cmd === 'login' && url) {
+  token ??= await browserToken();
   const me = await get('/me');
   mkdirSync(dirname(config), { recursive: true });
   writeFileSync(config, JSON.stringify({ url, token }), { mode: 0o600 });
@@ -271,7 +293,7 @@ else if (cmd === 'comment' && args.length === 2) {
       [`Running`, s.running.map(r => `${r.path}  run ${r.run}  for ${took((Date.now() - Date.parse(r.at)) / 1000)}  ${usd(r.cost)}${Date.now() - Date.parse(r.at) > long * 60e3 ? `  LONG, past ${long}m` : ''}`)],
       [`Queued`, s.queued.map(q => `${q.path}  since ${when(q.since)}: ${q.why}`)],
       [`Waiting`, [
-        ...s.asks.sort((a, b) => a.who.localeCompare(b.who) || a.since.localeCompare(b.since)).map(a => `${a.who}  ${a.note ? 'a note' : 'an ask'} in ${a.path} since ${when(a.since)}: ${a.text.split('\n')[0].slice(0, 80)}`),
+        ...s.asks.sort((a, b) => a.who.localeCompare(b.who) || a.since.localeCompare(b.since)).map(a => `${a.who}  ${a.signoff ? 'a sign-off' : a.note ? 'a note' : 'an ask'} in ${a.path} since ${when(a.since)}: ${a.text.split('\n')[0].slice(0, 80)}`),
         ...s.expired.map(e => `${e.who}  their ${e.login} login expired${e.holding.length ? `, holding ${e.holding.join(', ')}` : ''}`),
         ...s.requests.map(r => `${r.path}  ${r.from} asks to start ${r.label}, since ${when(r.at)}: ${r.reason}`),
       ]],