turnzero 0.40.0-next.1 → 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.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turnzero",
-  "version": "0.40.0-next.1",
+  "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",