@augurworks/augur 0.15.4 → 0.15.6

package/agents/README.md

@@ -32,9 +32,11 @@ signed in to and types the code; the token lands in `~/.config/augur/tokens.json
 `augur ship` / `augur publish` use it from then on. `publish` runs the pairing itself when
 it finds no token, so inside a workspace tree nothing has to be done first. On a workspace
 that serves drafts (`/.well-known/augur.json` says `drafts.enabled`), the everyday verbs
-are `augur open` and `augur land` instead — see [drafts.md](./drafts.md). To get the
-tree from a hostname, pair first, then `npx @augurworks/augur clone --space <id>` — it reads the
-origin from the pairing.
+are `augur open` and `augur land` instead — see [drafts.md](./drafts.md). Where drafts
+are served you need no tree at all: `augur open <opportunity>/<prototype>` fetches that one
+prototype into a folder of its own (a cold agent that cloned a large workspace first spent
+most of its first turn waiting). Elsewhere, `npx @augurworks/augur clone --space <id>` fetches
+the tree — it reads the origin from the pairing.
 
 The instance says all of this itself at `GET /llms.txt` (and as data at
 `/.well-known/augur.json`); a signed-out request for an engine path answers `401` with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@augurworks/augur",
-  "version": "0.15.4",
+  "version": "0.15.6",
   "files": [
     "scripts/",
     "build.js",

package/scripts/connect.mjs

@@ -112,8 +112,15 @@ if (NO_WAIT) {
   process.exit(0);
 }
 console.log(`  ${C.dim}You can stop waiting (Ctrl-C) and run \`augur connect\` again after they approve —`);
-console.log(`  it collects the token for this same code. Talking to your person through messages`);
-console.log(`  rather than a terminal? Use \`augur connect --no-wait\`.${C.off}`);
+console.log(`  it collects the token for this same code.${C.off}`);
+console.log("");
+// Addressed to an agent, in the second person, because the polite version above was
+// read and ignored: an agent whose person only sees its messages once it finishes its
+// turn kept polling here for the code's whole life, twice, and nobody ever saw the code.
+console.log(`  ${C.warn}AGENTS: if your person reads your messages only after you finish, do not wait here.`);
+console.log(`  Stop now, send them the first line above, and run \`augur connect\` again once they say`);
+console.log(`  they have approved — it collects the token then. (\`augur connect --no-wait\` does`);
+console.log(`  exactly that in one step.)${C.off}`);
 console.log("");
 
 const deadline = Date.now() + (expiresInMs || 300000);

package/scripts/lib/store.mjs

@@ -39,10 +39,30 @@ export function resolveOrigin(root = ENGINE_ROOT) {
     cwdSpaceOrigin = JSON.parse(readFileSync(path.join(process.cwd(), "space.json"), "utf8")).siteOrigin || "";
   } catch (e) {}
   return (process.env.AUGUR_ORIGIN || env.AUGUR_ORIGIN ||
-    deployConfig(root, originHost(cwdSpaceOrigin)).siteOrigin || cwdSpaceOrigin || "")
+    deployConfig(root, originHost(cwdSpaceOrigin)).siteOrigin || cwdSpaceOrigin || pairedOrigin() || "")
     .replace(/\/+$/, "");
 }
 
+/**
+ * The origin this machine last paired with, when nothing else names one. A cold agent
+ * in an empty folder has just run `augur connect --origin X` and holds a token for X and
+ * nothing else — and `clone`/`open` then refused with "no target origin" until it typed
+ * AUGUR_ORIGIN, which the front door had told it the pairing would carry. One saved
+ * pairing is the answer; several is the most recent, said on stderr so a wrong guess is
+ * visible before anything is written.
+ */
+export function pairedOrigin() {
+  try {
+    const saved = JSON.parse(readFileSync(path.join(os.homedir(), ".config", "augur", "tokens.json"), "utf8"));
+    const hosts = Object.entries(saved).filter(([h, v]) => h && v && v.token);
+    if (!hosts.length) return "";
+    hosts.sort((a, b) => String(b[1].at || "").localeCompare(String(a[1].at || "")));
+    const [host] = hosts[0];
+    if (hosts.length > 1) console.error(`[augur] no origin named — using the last pairing, https://${host} (set AUGUR_ORIGIN to pick another)`);
+    return `https://${host}`;
+  } catch (e) { return ""; }
+}
+
 export function resolveToken(origin, root = ENGINE_ROOT) {
   const env = readEnvFile(path.join(root, ".env.deploy"));
   let token = process.env.AUGUR_TOKEN || env.AUGUR_TOKEN || "";

package/src/_worker.js

@@ -9133,12 +9133,17 @@ function doorText(f) {
       + `  ${f.connect}\n\n`
       + `It prints a link and a code. The owner of this workspace opens the link in a\n`
       + `browser they are already signed in to and enters the code. The token lands on\n`
-      + `that machine, and every verb below uses it from then on. Talking to that person\n`
-      + `through messages rather than a terminal? Add --no-wait: it prints the line and\n`
-      + `exits; run the same command again after they approve and the token is collected.\n`
-      + `With no\n`
-      + `source tree yet, \`npx @augurworks/augur clone --space ${f.workspace}\` then fetches one (it reads\n`
-      + `the origin from the pairing).\n\n`
+      + `that machine, and every verb below uses it from then on.\n\n`
+      + `AGENTS: if your person reads your messages only after you finish your turn, run\n`
+      + `it with --no-wait. It prints the line and exits; send them that line, end your\n`
+      + `turn, and run the same command again once they say they approved — the token is\n`
+      + `collected then, for that same code. Do not poll for the approval in one turn:\n`
+      + `the code lives five minutes and nobody sees it until you stop.\n\n`
+      + (f.drafts && f.drafts.enabled
+        ? `You need no source tree here: \`augur open <opportunity>/<prototype>\` fetches that one\n`
+          + `prototype into a folder of its own (see below). Do not clone the workspace first.\n\n`
+        : `With no source tree yet, \`npx @augurworks/augur clone --space ${f.workspace}\` then fetches\n`
+          + `one (it reads the origin from the pairing).\n\n`)
     : `Device pairing is switched off on this workspace. Ask an admin for an invite;\n`
       + `once you have signed in, \`augur login\` (email and password, meant for CI)\n`
       + `trades that for a publish token.\n\n`;