turnzero 0.21.4 → 0.21.5-next.1

package/dist/turnzero-cloud.mjs

@@ -917,7 +917,10 @@ var variableReadSentence = (origin, standing) => {
 };
 var fileReadSentence = (origin) => `The credential this run read was this computer's token for ${origin}, from its credential file: where the platform no longer accepts it, run ${LOGIN_SUBCOMMAND}${originWordsOf(origin)} to authorize this computer again.`;
 var noTokenSentence = (origin, expiredAt) => expiredAt === null ? `No credential was read, so nothing was sent: ${MINTED_TOKEN_VARIABLE} is not set, and this computer's credential file holds no token for ${origin}.` : `No credential was read, so nothing was sent: ${MINTED_TOKEN_VARIABLE} is not set, and this computer's token for ${origin} in its credential file expired at ${expiredAt}.`;
-var VARIABLE_ROUTE_SENTENCES = `A tool connected by a minted token, or a job, sets ${MINTED_TOKEN_VARIABLE} from where its token is kept, never by writing the value in a line, and ${ORIGIN_VARIABLE} to the address that minted the token where that is not ${DEFAULT_COMMAND_ORIGIN}, then runs the line again. Such a tool cannot use ${MINT_TOKEN_ACTION}, which takes a sign-in alone. A tool sets ${MINTED_TOKEN_VARIABLE} for the deploy, check, take, or scaffold line alone and unsets it once that line ends.`;
+var VARIABLE_ROUTE_SENTENCES = variableRouteSentencesOf("runs the line again");
+function variableRouteSentencesOf(then) {
+  return `A tool connected by a minted token, or a job, sets ${MINTED_TOKEN_VARIABLE} from where its token is kept, never by writing the value in a line, and ${ORIGIN_VARIABLE} to the address that minted the token where that is not ${DEFAULT_COMMAND_ORIGIN}, then ${then}. Such a tool cannot use ${MINT_TOKEN_ACTION}, which takes a sign-in alone. A tool sets ${MINTED_TOKEN_VARIABLE} for the deploy, check, take, or scaffold line alone and unsets it once that line ends.`;
+}
 var LOGIN_ROUTE_OPENER = "A person logs this computer in once, in a terminal of their own, and its token then stays on this computer for 30 days:";
 var DEPLOY_FILES_ROUTE_SENTENCE = "A folder within the caps of your tool's deploy_files call deploys now through deploy_files, with no login.";
 var loginRouteLines = (io2, origin, deployFiles = true) => [
@@ -4884,12 +4887,15 @@ async function readTakeCredential(io2, named, afterLogin, why) {
   const line = { named, closing: NOTHING_WRITTEN2 };
   const read2 = await readCredential(io2, LIBRARY_CREDENTIAL, "", line);
   if ("unauthorized" in read2) {
-    const lines = [noTokenSentence(read2.unauthorized.origin, read2.unauthorized.expiredAt), ...why !== void 0 ? [why] : [], VARIABLE_ROUTE_SENTENCES];
+    const head = [noTokenSentence(read2.unauthorized.origin, read2.unauthorized.expiredAt), ...why !== void 0 ? [why] : []];
     const origin = authorizationOriginOf(io2.env, named, NOTHING_WRITTEN2);
-    if ("refusal" in origin) return { lines: [...lines, origin.refusal] };
+    if ("refusal" in origin) return { lines: [...head, VARIABLE_ROUTE_SENTENCES, origin.refusal] };
     const unwritable = loginRouteRefusalOf(io2, NOTHING_WRITTEN2);
-    if (unwritable !== null) return { lines: [...lines, unwritable] };
-    return { lines: [...lines, ...loginRouteLines(io2, origin.origin, false), afterLogin] };
+    if (unwritable !== null) return { lines: [...head, VARIABLE_ROUTE_SENTENCES, unwritable] };
+    const route = loginRouteLines(io2, origin.origin, false);
+    if (typeof afterLogin === "string") return { lines: [...head, VARIABLE_ROUTE_SENTENCES, ...route, afterLogin] };
+    const close = afterLogin(origin.origin);
+    return { lines: [...head, close.variableRoute, ...route, close.afterLogin], signIn: origin.origin };
   }
   if ("refusal" in read2) return { lines: [read2.refusal] };
   io2.hide(read2.credential, REDACTED_TOKEN);
@@ -8511,18 +8517,21 @@ var folderRefusalOf = (io2, options, files, takeLines) => {
   return null;
 };
 var RUN_AGAIN = "Run the same line again.";
-var finishSentence = (entry, takeLine) => `To finish, run this line at the project's root, which takes the ${entry} entry again whole and installs, then run npm test in ${APPLICATION_FOLDER}/: ${takeLine}`;
+var FINISH_WORDS = Object.freeze({ opening: "To finish,", again: " again whole" });
+var AFTER_LOGIN_FINISH_WORDS = Object.freeze({ opening: `Once ${LOGIN_SUBCOMMAND} has printed authorized:,`, again: "" });
+var finishSentence = (entry, takeLine, words = FINISH_WORDS) => `${words.opening} run this line at the project's root, which takes the ${entry} entry${words.again} and installs, then run npm test in ${APPLICATION_FOLDER}/: ${takeLine}`;
 var LINE_COUNT_WORDS = Object.freeze({ 2: "two", 3: "three", 4: "four" });
-var finishEachSentence = (entries, takeLines) => [
-  `To finish, run each of these ${LINE_COUNT_WORDS[takeLines.length] ?? takeLines.length} lines at the project's root, in order, which take the ${listedAnd(entries)} entries again whole and install, then run npm test in ${APPLICATION_FOLDER}/:`,
+var finishEachSentence = (entries, takeLines, words = FINISH_WORDS) => [
+  `${words.opening} run each of these ${LINE_COUNT_WORDS[takeLines.length] ?? takeLines.length} lines at the project's root, in order, which take the ${listedAnd(entries)} entries${words.again} and install, then run npm test in ${APPLICATION_FOLDER}/:`,
   ...takeLines
 ].join("\n");
 var FINISH_UNTAKEN = `To finish, run npm install and then npm test in ${APPLICATION_FOLDER}/.`;
-var finishOf = (entry, takeLine) => {
+var finishOf = (entry, takeLine, words = FINISH_WORDS) => {
   const [entries, lines] = [listOf(entry), listOf(takeLine)];
   if (entries.length === 0 || lines.length !== entries.length) return FINISH_UNTAKEN;
-  return entries.length === 1 ? finishSentence(entries[0], lines[0]) : finishEachSentence(entries, lines);
+  return entries.length === 1 ? finishSentence(entries[0], lines[0], words) : finishEachSentence(entries, lines, words);
 };
+var afterLoginFinishOf = (entries, takeLines) => finishOf(entries, takeLines, AFTER_LOGIN_FINISH_WORDS);
 var writtenClause = (entry) => {
   const entries = listOf(entry);
   if (entries.length === 0) return "the service's files are written";
@@ -8567,11 +8576,11 @@ var standsWayOn = (template, takeLines) => {
   return `${takes.length > 0 ? `. ${takes.join("\n")}` : `: ${SCAFFOLD_SUBCOMMAND} starts a new application and writes over none.`}
 ${STANDS_DEPLOY_LINE}`;
 };
-var stoppedCloseOf = (state, template, takeLines) => {
+var stoppedCloseOf = (state, template, takeLines, words = FINISH_WORDS) => {
   const before = `before ${APPLICATION_FOLDER}/ was written`;
   switch (state) {
     case "template":
-      return `after ${APPLICATION_FOLDER}/ was written. ${finishOf(TEMPLATE_FACTS[template].takes.map((take) => take.entry), takeLines)}`;
+      return `after ${APPLICATION_FOLDER}/ was written. ${finishOf(TEMPLATE_FACTS[template].takes.map((take) => take.entry), takeLines, words)}`;
     case "absent":
       return `${before}, and no ${APPLICATION_FOLDER}/ stands. ${RUN_AGAIN}`;
     case "empty":
@@ -8584,8 +8593,8 @@ var stoppedCloseOf = (state, template, takeLines) => {
       return `${before}, and what stands at ${APPLICATION_FOLDER} could not be read: make it readable or move it, then run the same line again.`;
   }
 };
-var ownErrorLine = (error, state, template, takeLines) => `The command stopped on an error of its own (${errorWordOf(error)}) ${stoppedCloseOf(state, template, takeLines)}`;
-var signalEndedLine = (state, template, takeLines) => `A signal ended the command ${stoppedCloseOf(state, template, takeLines)}`;
+var ownErrorLine = (error, state, template, takeLines, words = FINISH_WORDS) => `The command stopped on an error of its own (${errorWordOf(error)}) ${stoppedCloseOf(state, template, takeLines, words)}`;
+var signalEndedLine = (state, template, takeLines, words = FINISH_WORDS) => `A signal ended the command ${stoppedCloseOf(state, template, takeLines, words)}`;
 var ApplicationArrived = class extends Error {
 };
 var arrivedLine = (template, takeLines) => `${APPLICATION_FOLDER}/ took a file or a folder while the scaffold ran, so an application stands there and the template was not written${standsWayOn(template, takeLines)}`;
@@ -8681,6 +8690,7 @@ async function scaffold(call, io2) {
   const takeLinesFor = (at) => takes.map((take) => machineLineOf(libraryTakeLineOf({ origin: at, entry: take.entry }), { windows: io2.windows ?? LINES_IN_WINDOWS_FORM, npx: ranThroughNpx(io2) }, at));
   let lineOrigin = origin;
   let takeLines = takeLinesFor(lineOrigin);
+  let finishWords = FINISH_WORDS;
   let reached = "checks";
   const stateNow = () => {
     if (reached === "template") return "template";
@@ -8702,26 +8712,44 @@ async function scaffold(call, io2) {
     if (refused !== null) return refuse(...refused);
     const checks = [];
     let held;
+    let unsigned = null;
+    const untaken = () => untakenLibraryOf(io2, root, (library) => writesOver(library, app));
     if (takes.length === 0) {
-      const found = untakenLibraryOf(io2, root, (library) => writesOver(library, app));
+      const found = untaken();
       if ("lines" in found) return refuse(...found.lines);
       held = found;
     } else {
-      const credential = await readTakeCredential(io2, call.named[SCAFFOLD_OPTION.origin], SCAFFOLD_AFTER_LOGIN, SCAFFOLD_SIGN_IN_WHY);
-      if ("lines" in credential) return refuse(...credential.lines);
-      lineOrigin = credential.origin;
-      takeLines = takeLinesFor(lineOrigin);
-      for (const take of takes) {
-        const copy = join10(app, "lib", take.entry);
-        const planOf = (library) => writesOver(library, copy) ? { refusal: LIBRARY_OVER_APPLICATION } : { application: app, copy, declared: null, declaredAt: null };
-        const read2 = await readTake(io2, { entry: take.entry, root, named: options.named, origin: credential.origin }, agent.userAgent, credential.bearer, planOf, checks.length > 0);
-        if ("lines" in read2) return refuse(...read2.lines);
-        if (read2.plan === null) {
-          return refuse(`The ${take.entry} entry the library served carries no compiled modules, which the service's package file declares and installs. That is the platform's to fix: report it. ${NOTHING_WRITTEN2}`);
+      const entries = takes.map((take) => take.entry);
+      const credential = await readTakeCredential(
+        io2,
+        call.named[SCAFFOLD_OPTION.origin],
+        (at) => ({ variableRoute: scaffoldVariableRouteOf(entries.length), afterLogin: afterLoginFinishOf(entries, takeLinesFor(at)) }),
+        SCAFFOLD_SIGN_IN_WHY
+      );
+      if ("lines" in credential) {
+        if (credential.signIn === void 0) return refuse(...credential.lines);
+        lineOrigin = credential.signIn;
+        takeLines = takeLinesFor(lineOrigin);
+        const found = untaken();
+        if ("lines" in found) return refuse(...found.lines);
+        held = found;
+        unsigned = credential.lines;
+        finishWords = AFTER_LOGIN_FINISH_WORDS;
+      } else {
+        lineOrigin = credential.origin;
+        takeLines = takeLinesFor(lineOrigin);
+        for (const take of takes) {
+          const copy = join10(app, "lib", take.entry);
+          const planOf = (library) => writesOver(library, copy) ? { refusal: LIBRARY_OVER_APPLICATION } : { application: app, copy, declared: null, declaredAt: null };
+          const read2 = await readTake(io2, { entry: take.entry, root, named: options.named, origin: credential.origin }, agent.userAgent, credential.bearer, planOf, checks.length > 0);
+          if ("lines" in read2) return refuse(...read2.lines);
+          if (read2.plan === null) {
+            return refuse(`The ${take.entry} entry the library served carries no compiled modules, which the service's package file declares and installs. That is the platform's to fix: report it. ${NOTHING_WRITTEN2}`);
+          }
+          checks.push(read2);
         }
-        checks.push(read2);
+        held = { library: checks[0].library, fresh: checks[0].fresh, packages: takenPackagesOf(checks) };
       }
-      held = { library: checks[0].library, fresh: checks[0].fresh, packages: takenPackagesOf(checks) };
     }
     const arrived = folderRefusalOf(io2, options, files, takeLines);
     if (arrived !== null) return refuse(...arrived);
@@ -8730,7 +8758,7 @@ async function scaffold(call, io2) {
     let ended = false;
     release = io2.whenEnded(() => {
       ended = true;
-      printEach(io2, signalEndedLine(stateNow(), template, takeLines));
+      printEach(io2, signalEndedLine(stateNow(), template, takeLines, finishWords));
     });
     reached = "writes";
     if (io2.stat(root) === null) io2.makeFolder(root);
@@ -8746,12 +8774,16 @@ async function scaffold(call, io2) {
     await io2.sleep(LOOP_TURN_MS);
     release();
     if (ended) return COMMAND_STATUS.unknown;
+    if (unsigned !== null) {
+      for (const line of unsigned) printEach(io2, line);
+      return COMMAND_STATUS.failed;
+    }
     const taken = checks.map((check2, index) => ({ entry: takes[index].entry, version: check2.entry.version, line: takeLines[index] }));
     return await installAndTest(io2, app, template, taken, lineOrigin, { tools, claude: claudeStands });
   } catch (error) {
     const state = stateNow();
     const arrivedAs = error instanceof ApplicationArrived ? state : null;
-    printEach(io2, arrivedAs === "held" ? arrivedLine(template, takeLines) : arrivedAs === "no folder" ? ARRIVED_NO_FOLDER_LINE : ownErrorLine(error, state, template, takeLines));
+    printEach(io2, arrivedAs === "held" ? arrivedLine(template, takeLines) : arrivedAs === "no folder" ? ARRIVED_NO_FOLDER_LINE : ownErrorLine(error, state, template, takeLines, finishWords));
     return COMMAND_STATUS.unknown;
   } finally {
     release();
@@ -8799,17 +8831,17 @@ async function installAndTest(io2, app, template, taken, origin, left) {
 }
 var SCAFFOLD_CREDENTIAL = LIBRARY_CREDENTIAL;
 var SCAFFOLD_READS = `under a template that takes library entries what library take reads, ${LIBRARY_READS}; and under a template that takes none, no credential`;
-var SCAFFOLD_AFTER_LOGIN = `Once ${LOGIN_SUBCOMMAND} has printed authorized:, run this scaffold line again. ${NOTHING_WRITTEN2}`;
+var scaffoldVariableRouteOf = (count) => variableRouteSentencesOf(count === 1 ? "runs the take line below at the project's root, and not this line again" : "runs the take lines below at the project's root, in order, and not this line again");
 var SCAFFOLD_SIGN_IN_WHY = `A template that takes library entries needs a sign-in, since the library's reads are under a credential; ${SCAFFOLD_DEFAULT_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} where the line names no ${SCAFFOLD_OPTION.template}. A template that takes library entries, as database-service takes the Database entry and web-app takes three, takes each as library take does, under the credential library take reads, checking each file's SHA-256 and each entry's closure hash before it writes anything. It then writes the template's files under app/, the manifest's packages member filled from the library folder's rows, runs npm install and npm test there, and prints the next steps. It starts a new application and writes over none. A template that takes no entry reads no credential.`,
+  summary: `Writes a new service from a template into a project, ${SCAFFOLD_DEFAULT_TEMPLATE} where the line names no ${SCAFFOLD_OPTION.template}. A template that takes library entries, as database-service takes the Database entry and web-app takes three, takes each as library take does, under the credential library take reads, checking each file's SHA-256 and each entry's closure hash before it writes anything. It then writes the template's files under app/, the manifest's packages member filled from the library folder's rows, runs npm install and npm test there, and prints the next steps. Where such a template reads no credential, it writes the template's files, takes no entry, runs no npm, and prints the login route and the take lines that finish the service. It starts a new application and writes over none. A template that takes no entry reads no credential.`,
   options: SCAFFOLD_OPTIONS,
   credential: SCAFFOLD_CREDENTIAL,
   reads: SCAFFOLD_READS,
   statuses: {
     done: "the files written and installed, the entries taken where the template takes any, and the tests passed",
-    failed: "the files written, and npm install or the tests failed",
+    failed: "the files written, and npm install or the tests failed, or no credential was read, so no library entry was taken",
     unknown: "the run stopped before its end, by an interrupt or another signal that ended npm, by an error of the command's own, or by something that came to stand at app while it wrote: the printed sentence names the way on",
     nothing_started: "nothing was written"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turnzero",
-  "version": "0.21.4",
+  "version": "0.21.5-next.1",
   "type": "module",
   "description": "The Turn Zero Cloud command, which an AI coding tool runs on your machine to deploy an application, store a secret, upload a file, download an export, take a library entry, write a local run's settings, start the application locally, and scaffold a new service from a template.",
   "license": "Apache-2.0",