turnzero 0.39.0 → 0.41.0-next.1

package/dist/turnzero-cloud.mjs

@@ -840,9 +840,9 @@ var updateCredentialFile = (io2, place, tag, change) => {
   return "written" in written ? { written: true, before: read2.state } : written;
 };
 var dropCredentialWriting = (io2, place, tag) => dropWritingFile(io2, place.path, tag);
-var withAuthorized = (origin, entry) => (state) => ({
+var withAuthorized = (origin, entry, from = origin) => (state) => ({
   origins: new Map([...state.origins, [origin, entry]]),
-  pending: new Map([...state.pending].filter(([key]) => key !== origin))
+  pending: new Map([...state.pending].filter(([key]) => key !== origin && key !== from))
 });
 var withPending = (origin, entry) => (state) => ({
   origins: state.origins,
@@ -1362,7 +1362,7 @@ var otherLivingRequestOf = (pending, origin, now) => {
   }
   return found?.origin ?? null;
 };
-var elsewhereRequestSentence = (origin, other) => `A request is pending on this computer for ${other} instead, so the first act ran against ${other}. Where the mint was made at ${origin}, run the first act above. Where it was made at ${other}, run the line its ${MINT_TOKEN_ACTION} call answered exactly as given.`;
+var otherRequestPresentedSentence = (origin, other) => `No request is pending for ${origin} on this computer, so the one its first act made for ${other} is presented at ${origin} instead.`;
 var markerDisagreesSentence = (kind, origin = DEFAULT_COMMAND_ORIGIN) => kind === "authorized computer" ? `The exchange minted a token that is not an authorized computer's, and ${AUTHORIZE_SUBCOMMAND} keeps only an authorized computer's, so nothing of its value was printed or kept. Call ${MINT_TOKEN_ACTION} from your tool again naming ${AUTHORIZED_COMPUTER_MEMBER}: true, as ${AUTHORIZE_SUBCOMMAND} prints it, and run the line it answers.` : `The exchange minted an authorized computer's token, and ${TOKEN_SUBCOMMAND} ${TOKEN_CLAIM_ACT} prints only a token that is not one, so nothing of its value was printed or kept. Call ${MINT_TOKEN_ACTION} from your tool again without ${AUTHORIZED_COMPUTER_MEMBER}, as ${TOKEN_SUBCOMMAND} ${TOKEN_REQUEST_ACT} prints it, and run the line it answers; to authorize this computer, run ${AUTHORIZE_SUBCOMMAND}${originWordsOf(origin)}.`;
 var unclaimableFormSentence = (origin = DEFAULT_COMMAND_ORIGIN) => `The exchange minted a token whose value is of no form ${TOKEN_SUBCOMMAND} ${TOKEN_CLAIM_ACT} prints, so nothing of its value was printed or kept. ${mintAgainSentence("general", origin)}`;
 var mintedRevocationLines = (revocation, minted) => "lines" in revocation ? [...revocation.lines, standsSentence(`The token it minted, ${minted.id},`, minted.id, minted.expiresAt)] : [`The token it minted, ${minted.id}, is revoked.`];
@@ -1405,13 +1405,17 @@ async function completeAct(io2, origin, kind, presentation, userAgent, say, deli
     return COMMAND_STATUS.nothing_started;
   }
   hideStandingTokens(io2, read2.state);
-  const pending = read2.state.pending.get(origin);
-  if (pending === void 0) {
+  const now = io2.clock();
+  const own = read2.state.pending.get(origin);
+  const firstParty = (key) => FIRST_PARTY_COMMAND_ORIGINS.includes(key);
+  const crossing = (own === void 0 || !pendingLives(own, now)) && firstParty(origin) ? otherLivingRequestOf(new Map([...read2.state.pending].filter(([key]) => firstParty(key))), origin, now) : null;
+  const from = crossing ?? (own !== void 0 ? origin : null);
+  const pending = from === null ? void 0 : read2.state.pending.get(from);
+  if (from === null || pending === void 0) {
     say(noPendingSentence(origin, kind, held ? "mint" : "code"));
-    const other = otherLivingRequestOf(read2.state.pending, origin, io2.clock());
-    if (other !== null) say(elsewhereRequestSentence(origin, other));
     return COMMAND_STATUS.nothing_started;
   }
+  if (from !== origin) say(otherRequestPresentedSentence(origin, from));
   io2.hide(pending.verifier, REDACTED_VERIFIER);
   io2.hide(pending.challenge, REDACTED_CHALLENGE);
   const tag = runTagOf();
@@ -1519,9 +1523,9 @@ async function completeAct(io2, origin, kind, presentation, userAgent, say, deli
     stage.now = "minted";
     io2.hide(minted.value, REDACTED_TOKEN);
     if (kind === "tzmesh" && carried !== null) {
-      const ended = updateCredentialFile(io2, place, tag, withoutPending(origin));
+      const ended = updateCredentialFile(io2, place, tag, withoutPending(from));
       if (stage.ended) return COMMAND_STATUS.unknown;
-      if (!("written" in ended)) say(`The request pending for ${origin} stands in the credential file, which could not be written now: it ends at its expiry, or when ${firstActNamed(kind, origin)} replaces it.`);
+      if (!("written" in ended)) say(`The request pending for ${from} stands in the credential file, which could not be written now: it ends at its expiry, or when ${firstActNamed(kind, from)} replaces it.`);
       return isTzmeshSignedToken(minted.value) && !minted.authorizedComputer ? await carried.deliver(minted) : await carried.refuse(minted);
     }
     if (kind === "general" && !isClaimableToken(minted.value)) {
@@ -1534,27 +1538,27 @@ async function completeAct(io2, origin, kind, presentation, userAgent, say, deli
       for (const line of mintedRevocationLines(await revokeUnder(io2, origin, minted.value, minted.id, userAgent), minted)) say(line);
       return COMMAND_STATUS.failed;
     }
-    if (kind === "general") return claimed(io2, place, tag, origin, minted, say, deliver);
-    return await kept(io2, place, tag, origin, minted, userAgent, say, login2 !== null);
+    if (kind === "general") return claimed(io2, place, tag, origin, minted, say, deliver, from);
+    return await kept(io2, place, tag, origin, minted, userAgent, say, login2 !== null, from);
   } finally {
     release();
     dropCredentialWriting(io2, place, tag);
     carried?.drop();
   }
 }
-function claimed(io2, place, tag, origin, minted, say, deliver) {
-  const ended = updateCredentialFile(io2, place, tag, withoutPending(origin));
+function claimed(io2, place, tag, origin, minted, say, deliver, from = origin) {
+  const ended = updateCredentialFile(io2, place, tag, withoutPending(from));
   deliver(minted);
   say(
     `${CLAIMED_LINE_HEAD}token ${minted.id} at ${origin}, label ${minted.label !== null ? JSON.stringify(minted.label) : "none"}, expiring ${minted.expiresAt !== null ? `at ${minted.expiresAt}` : "never"}; its value is printed once, on standard output, and kept nowhere.`
   );
-  if (!("written" in ended)) say(`The request pending for ${origin} stands in the credential file, which could not be written now: it ends at its expiry, or when ${firstActNamed("general", origin)} replaces it.`);
+  if (!("written" in ended)) say(`The request pending for ${from} stands in the credential file, which could not be written now: it ends at its expiry, or when ${firstActNamed("general", from)} replaces it.`);
   return COMMAND_STATUS.done;
 }
-async function kept(io2, place, tag, origin, minted, userAgent, say, named = false) {
+async function kept(io2, place, tag, origin, minted, userAgent, say, named = false, from = origin) {
   const now = io2.clock();
   const entry = { token: minted.value, token_id: minted.id, label: minted.label, expires_at: minted.expiresAt, authorized_at: now.toISOString() };
-  const written = updateCredentialFile(io2, place, tag, withAuthorized(origin, entry));
+  const written = updateCredentialFile(io2, place, tag, withAuthorized(origin, entry, from));
   if (!("written" in written)) {
     say(
       "unwritten" in written ? `${unwritableFileSentence(place.path, written.unwritten)} So the token the exchange minted was not kept.` : `${readRefusalOf(written, place.path)} So the token the exchange minted was not kept.`
@@ -4009,7 +4013,7 @@ var DEPLOY_CREDENTIAL = Object.freeze({
   piped: false,
   places: NO_INPUT_PLACES
 });
-var DEPLOY_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the login route if the address is admitted`;
+var DEPLOY_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the sign-in route if the address is admitted`;
 var DEPLOY_AFTER_LOGIN = `Once login has printed authorized:, run this deploy line again. ${NOTHING_SENT_OR_STARTED}`;
 var PREPARE_ACT = "prepare";
 var PREPARE_AGAIN = "Nothing was started. Run the line again: it prepares a fresh upload, which replaces any upload this run prepared.";
@@ -4461,7 +4465,7 @@ async function deployRun(named, io2, flags) {
 var DEPLOY_AFTER_OWN_ERROR = "the deploy may or may not have started. Call tzcloud_read_status from your tool first, make the start-only retry a pending upload it answers carries, and run the line again only where it shows neither";
 var DEPLOY_ROW = Object.freeze({
   name: DEPLOY_SUBCOMMAND,
-  summary: "Deploys the application folder, or a .zip file. It zips the folder, makes the preparing deploy call, uploads the zip under the upload grant that call returns, starts the deploy, and waits for it, printing each step and the outcome. It runs under this computer's token. A tool connected by a minted token, or a job with no tool, runs it under a minted token. With no credential, it sends nothing and prints the two routes to get one: the minted token's variables first, then the login route if the address is admitted.",
+  summary: "Deploys the application folder, or a .zip file. It zips the folder, makes the preparing deploy call, uploads the zip under the upload grant that call returns, starts the deploy, and waits for it, printing each step and the outcome. It runs under this computer's token. A tool connected by a minted token, or a job with no tool, runs it under a minted token. With no credential, it sends nothing and prints the two routes to get one: the minted token's variables first, then the sign-in route if the address is admitted.",
   example: `${DEPLOY_SUBCOMMAND} ${DEPLOY_OPTION.application} <application id> ${DEPLOY_OPTION.path} <folder>`,
   options: DEPLOY_OPTIONS,
   credential: DEPLOY_CREDENTIAL,
@@ -4554,7 +4558,7 @@ var CHECK_CREDENTIAL = Object.freeze({
   piped: false,
   places: NO_INPUT_PLACES
 });
-var CHECK_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the login route if the address is admitted`;
+var CHECK_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the sign-in route if the address is admitted`;
 var checkAnswerOf = (answer) => {
   const { refusals, first_deploy: firstDeploy, recorded_health_path: recordedHealthPath } = answer;
   if (!Array.isArray(refusals) || typeof firstDeploy !== "boolean" || typeof recordedHealthPath !== "string") return null;
@@ -5370,7 +5374,7 @@ var SESSION_CREDENTIAL = Object.freeze({
   piped: false,
   places: NO_INPUT_PLACES
 });
-var SESSION_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the login route if the address is admitted`;
+var SESSION_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the sign-in route if the address is admitted`;
 var missingOptionSentence = (option) => `${SESSION_SUBCOMMAND} needs ${option.name} ${option.value}, as the line a ${toolNameOf(SIGN_IN_TEST_END_USER_ACTION)} call answers names it. ${NOTHING_SENT_OR_WRITTEN}`;
 var ENVIRONMENT_REFUSAL = `${SESSION_OPTION.environment} names the environment the end user signs in to, ${COMMAND_ENVIRONMENTS.join(" or ")}. ${NOTHING_SENT_OR_WRITTEN}`;
 var OUT_STANDS_REFUSAL = `A file stands where ${SESSION_OPTION.out} names the cookie jar, and ${SESSION_SUBCOMMAND} replaces one only where the line names ${SESSION_OPTION.force}. Name a new file, or add ${SESSION_OPTION.force} to replace it. ${NOTHING_SENT_OR_WRITTEN}`;
@@ -6258,7 +6262,7 @@ var LIBRARY_CREDENTIAL = Object.freeze({
   piped: false,
   places: NO_INPUT_PLACES
 });
-var LIBRARY_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the login route if the address is admitted`;
+var LIBRARY_READS = `no standard input. It reads a minted token from ${MINTED_TOKEN_VARIABLE} if that is set. Otherwise it reads this computer's token for the platform's address from its credential file, which ${LOGIN_SUBCOMMAND} and ${AUTHORIZE_SUBCOMMAND} write, and sends it only to that address. With neither, it prints the variable route first, then the sign-in route if the address is admitted`;
 var TAKE_AFTER_LOGIN = `Once ${LOGIN_SUBCOMMAND} has printed authorized:, run this take line again. ${NOTHING_WRITTEN2}`;
 var takeRedirectedLine = (status) => `${LIBRARY_READ_ACTION} was answered ${status >= 100 ? `${answeredHow(status)}, a redirect` : answeredHow(status)}, which the command never follows, so the credential was sent to no second address. ${NOTHING_WRITTEN2}`;
 async function readTakeCredential(io2, named, afterLogin, why) {
@@ -7398,7 +7402,7 @@ async function whoami(call, io2) {
 }
 var WHOAMI_ROW = Object.freeze({
   name: WHOAMI_SUBCOMMAND,
-  summary: `Shows the account this computer's token acts as at the platform's address. It reads the token the credential file keeps for the address, and makes one ${READ_ACCOUNT_ACTION} call under it. It prints the address, the account's sign-in address and id, and the token's label and expiry. With no token for the address, it sends nothing. It lists the routes a tool takes itself (${AUTHORIZE_SUBCOMMAND}, tzcloud_deploy_files, the upload route, and ${PROVISION_SUBCOMMAND}), then the device line and the person's login route. It prints no token.`,
+  summary: `Shows the account this computer's token acts as at the platform's address. It reads the token the credential file keeps for the address, and makes one ${READ_ACCOUNT_ACTION} call under it. It prints the address, the account's sign-in address and id, and the token's label and expiry. With no token for the address, it sends nothing. It lists the routes a tool takes itself (${AUTHORIZE_SUBCOMMAND}, tzcloud_deploy_files, the upload route, and ${PROVISION_SUBCOMMAND}), then the device line and the person's sign-in route. It prints no token.`,
   example: WHOAMI_SUBCOMMAND,
   options: WHOAMI_OPTIONS,
   credential: null,
@@ -7407,10 +7411,10 @@ var WHOAMI_ROW = Object.freeze({
     done: "the account was read",
     failed: "the platform refused the read, for example because it no longer accepts the token: the printed lines name login",
     unknown: "the read got no response, or a response that is not a refusal",
-    nothing_started: "nothing was read. An option or the credential file was refused, or the platform was too old. Or no live token exists for the address, and the printed lines give the next steps that need no login, then the login route"
+    nothing_started: "nothing was read. An option or the credential file was refused, or the platform was too old. Or no live token exists for the address, and the printed lines give the next steps that need no new sign-in, then the sign-in route"
   },
   variables: [[ORIGIN_VARIABLE, `the platform's address whose token is read if the command has no ${DEPLOY_OPTION.origin}.`]],
-  note: [`${WHOAMI_SUBCOMMAND} reads which account a login or an authorize on this computer kept a token for, so you can tell it from your tool's own connection. The credential file is ${CREDENTIAL_FILE_WORDS}.`],
+  note: [`${WHOAMI_SUBCOMMAND} reads which account the token kept by login or authorize on this computer belongs to, so you can tell it from your tool's own connection. The credential file is ${CREDENTIAL_FILE_WORDS}.`],
   afterOwnError: "nothing was changed, since whoami only reads; run it again",
   run: whoami
 });
@@ -10410,7 +10414,7 @@ var SCAFFOLD_AFTER_LOGIN = `Once ${LOGIN_SUBCOMMAND} has printed authorized:, ru
 var SCAFFOLD_SIGN_IN_WHY = `A template that takes library entries needs a sign-in, since the library's reads are under a credential. The ${SCAFFOLD_DEFAULT_TEMPLATE} template, which takes none, runs without one.`;
 var SCAFFOLD_ROW = Object.freeze({
   name: SCAFFOLD_SUBCOMMAND,
-  summary: `Writes a new service from a template into a project, ${SCAFFOLD_DEFAULT_TEMPLATE} if the command has no ${SCAFFOLD_OPTION.template}. It writes the template's files under app/, runs npm install and npm test there, and prints the next steps. It starts a new application, and writes over no file. Some templates take library entries: database-service takes the Database entry, and web-app takes three. Such a template takes each entry as library take does, under the same credential and with the same checks, before it writes anything. It fills the manifest's packages member from the library folder's rows. With no credential, it writes nothing, and prints the login route and this command to run again once you are signed in. A template that takes no entry reads no credential.`,
+  summary: `Writes a new service from a template into a project, ${SCAFFOLD_DEFAULT_TEMPLATE} if the command has no ${SCAFFOLD_OPTION.template}. It writes the template's files under app/, runs npm install and npm test there, and prints the next steps. It starts a new application, and writes over no file. Some templates take library entries: database-service takes the Database entry, and web-app takes three. Such a template takes each entry as library take does, under the same credential and with the same checks, before it writes anything. It fills the manifest's packages member from the library folder's rows. With no credential, it writes nothing, and prints the sign-in route and this command to run again once you are signed in. A template that takes no entry reads no credential.`,
   example: `${SCAFFOLD_SUBCOMMAND} ${SCAFFOLD_OPTION.template} database-service ${SCAFFOLD_OPTION.path} <project root>`,
   options: SCAFFOLD_OPTIONS,
   credential: SCAFFOLD_CREDENTIAL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turnzero",
-  "version": "0.39.0",
+  "version": "0.41.0-next.1",
   "type": "module",
   "description": "Deploy and run AI-built apps with Turn Zero Cloud hosting and backend services.",
   "license": "Apache-2.0",