diff --git a/docs/configuration.md b/docs/configuration.md index c6fec2e..dce3b1c 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -223,8 +223,8 @@ team, so no team made on the replaced list carries over; instead Models holds th write and says which list the edit is on, what the write does to that list and what each fix does: **save**, for an edit of the team in use, keeps the edit on the list in use, and **discard edit**, which the import dialog offers too, drops it. Once a staged -list is put in use, the readout says when the saved team gave way to that list's -default team. While a Models write is in flight the gate counts it as a step in +list is put in use, the readout says **the profile is the new list's default now** when the +saved team gave way to it. While a Models write is in flight the gate counts it as a step in progress, so no edit lands before its receipt does. Only an untouched draft gives way to the record, as the bundled preview does to a list imported into a workspace without one. A draft @@ -807,7 +807,7 @@ saving the profile, the team) stays as it was. A staged list offers **use staged list**, which reviews the staged list at its revision and promotes exactly that review with the list's own default team, and **discard**. An unsaved edit made on the list a write would replace holds it, saying what the write does -to that list (a staged list put in use starts from its own default team), with **save** +to that list (putting a staged list in use resets the profile to the staged list's default), with **save** (an edit of the team in use, kept on the list in use) and **discard edit** beside it. Verifying refused for want of discovery offers **enable in setup**; another refusal names itself with its fix (show diff --git a/plugins/code/generator/models-sheet.tsx b/plugins/code/generator/models-sheet.tsx index 6781bb6..d881ebe 100644 --- a/plugins/code/generator/models-sheet.tsx +++ b/plugins/code/generator/models-sheet.tsx @@ -110,7 +110,7 @@ export function ModelsSheet({ host, model, machine, onBack, backRef, onPlace }: const madeOn = model.localDraft?.source === "active" ? "the list in use" : model.localDraft?.source === "draft" ? "the staged list" : "the bundled starter"; const editHold = (kind: CatalogWrite): string | null => { if (!editHoldsCatalogWrite(model.localDraft, model.edited, kind)) return null; - const effect = kind === "use" ? `using ${model.localDraft?.source === "draft" ? "it" : "the staged list"} starts from its own default team` + const effect = kind === "use" ? `using ${model.localDraft?.source === "draft" ? "it" : "the staged list"} resets the profile to the staged list's default` : kind === "discard" ? "discarding drops that list" : "an import replaces that list"; return `Your unsaved edit is on ${madeOn}, and ${effect}. ${savable ? "Save keeps the edit on the list in use; discard edit drops it." : "Discard edit drops the edit."}`; }; @@ -157,7 +157,7 @@ export function ModelsSheet({ host, model, machine, onBack, backRef, onPlace }: wrote(revision, promoted); // The staged list goes in use with its own default team; a saved team it does not repeat is said to be gone. const reset = saved !== null && promoted.selection !== null && !sameTeam(promoted.selection, saved); - return { value: "in use", text: ["the staged list replaced the one in use", ...reset ? ["the profile is its default team now"] : [], ...verified ? [] : ["verify it next"]].join("; ") }; + return { value: "in use", text: ["the staged list replaced the one in use", ...reset ? ["the profile is the new list's default now"] : [], ...verified ? [] : ["verify it next"]].join("; ") }; }, setFailure); } function discard() { diff --git a/plugins/code/workflow.ts b/plugins/code/workflow.ts index 40c403e..f0f82bb 100644 --- a/plugins/code/workflow.ts +++ b/plugins/code/workflow.ts @@ -39,7 +39,7 @@ const messages: Readonly> = { code_probe_missing_probe: "OMP's results do not match the models it was asked to check. Verify again.", code_probe_insufficient_ladder: "No model answered its check, so there is no list to build.", code_ladder_regression: "Among the models that answered, a higher tier thinks less than a lower one that costs no more.", - code_models_unanswered: "Models the list in use or this team needs gave no clear answer, so the list and team stayed as they were. Verify again later, or choose a team or accounts without them.", + code_models_unanswered: "Models the list in use or this profile needs gave no clear answer, so the list and profile stayed as they were. Verify again later, or choose a profile or accounts without them.", code_verification_cancelled: "Verification cancelled.", code_verification_changed: "The machine, workspace or edit access changed, so the verification stopped.", code_verification_confirmed: "That charge was already confirmed.", diff --git a/plugins/scripts/verify-browser.ts b/plugins/scripts/verify-browser.ts index d854b45..0aa3b04 100755 --- a/plugins/scripts/verify-browser.ts +++ b/plugins/scripts/verify-browser.ts @@ -2793,7 +2793,7 @@ async function modelsSheetScenario(browser: BrowserInstance, server: TestServer, from = trace.requests.length; await click(browser, goButton); await until(browser, "a held press says what using the staged list and each fix do", `${sheetSays(modelsSheet)} === ${JSON.stringify( - "use staged list · Your unsaved edit is on the list in use, and using the staged list starts from its own default team. Save keeps the edit on the list in use; discard edit drops it.")}`); + "use staged list · Your unsaved edit is on the list in use, and using the staged list resets the profile to the staged list's default. Save keeps the edit on the list in use; discard edit drops it.")}`); assert.deepEqual(writes(from), [], "A held press writes nothing"); await click(browser, goFix(modelsSheet, "save")); await until(browser, "saved, the edit lets the staged list be used", `${goIs(modelsSheet, "use staged list")} && JSON.stringify(${goFixes(modelsSheet)}) === '["discard"]'`); @@ -2821,7 +2821,7 @@ async function modelsSheetScenario(browser: BrowserInstance, server: TestServer, heldReview.release(); await until(browser, "use staged list puts it in use with its own default team, unverified, and says so", `${phaseIs("unverified")} && ${goIs(modelsSheet, "verify models")} && ${sheetState(modelsSheet)} === ${JSON.stringify(`${listOf(slower).length} models · unverified`)} && - ${sheetSays(modelsSheet)} === 'in use · the staged list replaced the one in use; the profile is its default team now; verify it next'`); + ${sheetSays(modelsSheet)} === ${JSON.stringify("in use · the staged list replaced the one in use; the profile is the new list's default now; verify it next")}`); const review = reviews.at(-1); assert(review, "The real server reviewed the staged list"); assert.equal(review.catalogDigest, before.configuration?.draft?.digest, "The review is of exactly the staged list");