@rfany/rf 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rfany/rf",
-  "version": "0.1.0",
+  "version": "0.2.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

@@ -8,11 +8,10 @@ import { basename, dirname, join, relative, resolve, sep } from 'node:path';
 const USAGE = `rf login URL TOKEN
 rf ls
 rf pull DIR                       a read-only mirror of what you can see, in the layout agents see
-rf comment PATH TEXT [--item ID] [--ref REF] [--thread T] [--wait]
-rf answer PATH NOTE CHOICE        CHOICE the option's number, from 0
+rf comment PATH TEXT [--item ID] [--ref REF] [--thread T] [--wait]   a new thread, or a reply in T, as to an agent's ask
 rf upload PATH FILE [--onto ITEM] [--output]
 rf wake PATH AT REASON [--label LABEL]   AT now, +<n>m|h|d or a date; PATH an open instance, or a series with LABEL
-rf guidance [WORKSPACE] [--set FILE|-]   the company's, or a workspace's; setting the company's is for admins
+rf agents [WORKSPACE] [--set FILE|-]     the company's AGENTS.md, or a workspace's; setting the company's is for admins
 rf skills
 rf websites
 
@@ -72,9 +71,9 @@ const under = (base        , rel        ) => resolve(base, rel).startsWith(resol
 async function pull(dir        ) {
   const manifest = join(dir, '.rf-pull.json'), had = existsSync(manifest) ? JSON.parse(readFileSync(manifest, 'utf8')) : {};
   const now                                                                  = {}, tree = await get('/api');
-  write(join(dir, 'GUIDANCE.md'), (await get('/guidance')).text);
+  write(join(dir, 'AGENTS.md'), (await get('/agents')).text);
   for (const w of tree) {
-    write(join(dir, w.name, 'GUIDANCE.md'), w.guidance);
+    write(join(dir, w.name, 'AGENTS.md'), w.agents);
     for (const s of w.series) for (const i of s.instances) now[i.id] = { path: join(w.name, s.name, i.label), files: {} };
   }
   for (const [id, old] of Object.entries                  (had)) if (now[id]?.path !== old.path) rmSync(join(dir, old.path), { recursive: true, force: true });
@@ -117,7 +116,7 @@ if (cmd === 'login' && url && token) {
 } else if (cmd === 'ls') {
   for (const w of await get('/api')) for (const s of w.series) {
     console.log(`${w.name}/${s.name}${s.wake ? `  wakes ${s.wake.at} to start ${s.wake.label}: ${s.wake.reason}` : ''}${s.requests.length ? `  ${s.requests.length} asking to start` : ''}`);
-    for (const i of s.instances) console.log(`${w.name}/${s.name}/${i.label}  ${i.status}${i.running ? ', running' : ''}${i.questions.length ? `, ${i.questions.length} questions` : ''}${i.wake ? `, wakes ${i.wake}` : ''}, runner ${i.runner}`);
+    for (const i of s.instances) console.log(`${w.name}/${s.name}/${i.label}  ${i.status}${i.running ? ', running' : ''}${i.asks.length ? `, ${i.asks.length} asks waiting` : ''}${i.wake ? `, wakes ${i.wake}` : ''}, runner ${i.runner}`);
   }
 } else if (cmd === 'pull' && args[0]) await pull(args[0]);
 else if (cmd === 'comment' && args.length === 2) {
@@ -131,13 +130,10 @@ else if (cmd === 'comment' && args.length === 2) {
     const log = (await get(at)).log, done = log.find(e => e.op === 'done' && e.seen >= seq);
     if (!done) continue;
     const from = Math.max(seq, log.find(e => e.op === 'run' && e.run === done.run).seq);
-    for (const e of log.filter(e => e.seq > from && e.seq < done.seq && ((e.op === 'comment' && e.by === 'agent') || e.op === 'report'))) console.log(`${e.op === 'comment' ? `In thread ${e.thread}` : 'Report'}:\n${e.text}\n`);
+    for (const e of log.filter(e => e.seq > from && e.seq < done.seq && ((e.op === 'comment' && e.by === 'agent') || e.op === 'report'))) console.log(`${e.op === 'report' ? 'Report' : `${e.ask ? 'Asks' : 'Says'} in ${e.thread}`}:\n${e.text}\n`);
     if (done.error) console.log(`The run failed: ${done.error}`);
     break;
   }
-} else if (cmd === 'answer' && args.length === 3) {
-  await post(`${(await find(args[0])).at}/answer`, { note: args[1], choice: Number(args[2]) });
-  console.log('answered');
 } else if (cmd === 'upload' && args.length === 2) {
   const q = new URLSearchParams({ name: basename(args[1]), pane: flags.output ? 'out' : 'in', ...(typeof flags.onto === 'string' && { onto: flags.onto }) });
   await api(`${(await find(args[0])).at}/upload?${q}`, { method: 'POST', body: readFileSync(args[1]) });
@@ -147,13 +143,13 @@ else if (cmd === 'comment' && args.length === 2) {
   const at = args[1] === 'now' ? Date.now() : args[1].startsWith('+') ? Date.now() + Number(args[1].slice(1, -1)) * { m: 60e3, h: 3600e3, d: 86400e3 }[args[1].at(-1) ]  : Date.parse(args[1]);
   const w = await (await post(`/api/wakes/${inst?.id ?? series.id}`, { at: new Date(at).toISOString(), reason: args.slice(2).join(' '), label: flags.label }, 'PUT')).json();
   console.log(`wakes at ${w.at}`);
-} else if (cmd === 'guidance' && args.length <= 1) {
+} else if (cmd === 'agents' && args.length <= 1) {
   const ws = args[0] === undefined ? undefined : (await get('/api')).find(w => w.name === args[0]);
   if (args[0] !== undefined && !ws) throw new Error(`no workspace ${args[0]}`);
-  if (typeof flags.set !== 'string') console.log(ws ? ws.guidance : (await get('/guidance')).text);
+  if (typeof flags.set !== 'string') console.log(ws ? ws.agents : (await get('/agents')).text);
   else {
     const text = readFileSync(flags.set === '-' ? 0 : flags.set, 'utf8');
-    await (ws ? post(`/api/workspaces/${ws.id}`, { guidance: text }, 'PUT') : api('/guidance', { method: 'PUT', body: text }));
+    await (ws ? post(`/api/workspaces/${ws.id}`, { agents: text }, 'PUT') : api('/agents', { method: 'PUT', body: text }));
     console.log('saved');
   }
 } else if (cmd === 'skill' && args[0] === 'push' && args[1]) {