@devdogsuga/backstage 0.1.4 → 0.1.5

package/README.md

@@ -112,8 +112,10 @@ entry for them (`envFree` in the command tree).
 ## Shared logins: `creds`
 
 The club's shared logins (Instagram, Canva, ArchPass, Linktree, later project
-API keys) live only in the **Shared Accounts** collection of the DevDogs
-Bitwarden organization. `creds` hands them to officers as Bitwarden Sends:
+API keys) live in the DevDogs Bitwarden organization, in whatever collection
+suits them. `creds` hands any login or secure note there to officers as a
+Bitwarden Send. Personal items, other organizations' items and production
+secrets (which are in Secrets Manager, not the vault) are out of its reach.
 
 - **`send`** picks items and recipients (officers by name or by role, read live
   from production: everyone holding a role other than `Member`, by UGA MyID
@@ -122,16 +124,18 @@ Bitwarden organization. `creds` hands them to officers as Bitwarden Sends:
   recipients and deleted 30 days out. Removing an address revokes it. Addresses
   off the roster need `--allow-email`. Non-interactive: `--item`, `--to`,
   `--role`, `--yes`.
-- **`add`** saves a new login into the collection (org-owned), then sends it.
-  The password is typed at a hidden prompt, or read with `--password-stdin`;
-  never argv.
+- **`add`** saves a new login to the organization, then sends it. It goes in
+  the one collection you can see, or the one you pick (`--collection` with no
+  terminal). The password is typed at a hidden prompt, or read with
+  `--password-stdin`; never argv.
 - **`renew`** pushes each Send's deletion 30 days out in place (the link stays)
   and re-syncs its recipients and body from the item. It asks first for any Send
   with more than 7 days left.
 - **`list`** prints items, recipients and expiry (`--json` for scripts).
 - **`report`** regenerates the **Shared Accounts** Linear document (Platform &
-  DevOps initiative), which `send`, `add` and `renew` also do. It is generated
-  whole; edits there are overwritten.
+  DevOps initiative), which `send`, `add` and `renew` also do. It lists only
+  items that have been shared, and is generated whole; edits there are
+  overwritten.
 
 Each item's custom fields are the only access record: `Recipients`, `Owner`,
 `Send ID`, `Send link`, `Send expires`, `Send account`. Sends belong to the

package/dist/{catalog-BuNLUu08.js → catalog-BUOwCd2Q.js}

@@ -928,7 +928,7 @@ const completionsCommand = {
 const ITEM = {
 	flag: "--item",
 	value: "<name>",
-	summary: "A Shared Accounts item, by name or id. Repeat for several."
+	summary: "A DevDogs organization item, by name or id. Repeat for several."
 };
 const TO = {
 	flag: "--to",
@@ -982,7 +982,7 @@ const credsCommand = {
 		{
 			name: "add",
 			envFree: true,
-			summary: "Save a new shared login to the collection, then send it.",
+			summary: "Save a new login to the DevDogs organization, then send it.",
 			options: [
 				{
 					flag: "--name",
@@ -1004,6 +1004,11 @@ const credsCommand = {
 					value: "<name>",
 					summary: "The officer responsible for the account."
 				},
+				{
+					flag: "--collection",
+					value: "<name>",
+					summary: "Where to save it, when you can see more than one."
+				},
 				{
 					flag: "--password-stdin",
 					summary: "Read the password from stdin, for scripts."

package/dist/{cli-BI5Vn9sR.js → cli-B2S6gw9o.js}

@@ -1,5 +1,5 @@
 import { C as discoverRepoRoot, T as cliName, b as ownPackageDir, c as reportDevtoolsError, f as isNoEnv, l as reportDevtoolsFailure, n as captureDevtoolsError, o as initDevtoolsTelemetry, p as isNonInteractive, w as findRepoRoot, x as ownVersion } from "./telemetry-Bjoz29Hl.js";
-import { a as recordEnteredTier, f as helpPath, i as beginInvocation, l as dbPush, m as renderHelp, n as bareGroupStartPath, o as recordResolved, p as renderCommandList, r as runMenu, s as reproducibleCommand, t as catalog, u as dbPushDryRun } from "./catalog-BuNLUu08.js";
+import { a as recordEnteredTier, f as helpPath, i as beginInvocation, l as dbPush, m as renderHelp, n as bareGroupStartPath, o as recordResolved, p as renderCommandList, r as runMenu, s as reproducibleCommand, t as catalog, u as dbPushDryRun } from "./catalog-BUOwCd2Q.js";
 import { a as repoPeerUrl, n as loadEnv, r as loadEnvLoad, t as getEnvSync } from "./peers-B0KDkI6a.js";
 import { t as nonEmpty } from "./connection-D3XsOE3S.js";
 import { a as dryRunKind, l as wouldRunLine, o as isDryRun } from "./options-BTjOf5KP.js";
@@ -5270,7 +5270,7 @@ const HANDLERS = {
 	graphics: async (rest) => (await import("./commands-Dv5TXjvb.js")).handleGraphics(rest),
 	qr: async (rest) => (await import("./commands-Bk7IbhPD.js")).handleQr(rest),
 	newsletter: async (rest) => (await import("./commands-D345F-Od.js")).handleNewsletter(rest),
-	creds: async (rest) => (await import("./commands-Dl3UlhBf.js")).handleCreds(rest)
+	creds: async (rest) => (await import("./commands-BMQ1OZIr.js")).handleCreds(rest)
 };
 /**
 * Names that were commands of the contributor CLI, refused with where they

package/dist/{commands-Dl3UlhBf.js → commands-BMQ1OZIr.js}

@@ -4,7 +4,7 @@ import { a as explainError, i as explain, o as unwrap, r as errorMessage, t as U
 import { c as EnvDocument, i as readPasswordFromVault, n as bwArgs, r as openVault, s as bwCommand } from "./vault-C8LYJFOQ.js";
 import { t as DONE } from "./dispatch-D048O65I.js";
 import { resolve } from "node:path";
-import { confirm, log, multiselect, note, password, text } from "@clack/prompts";
+import { confirm, log, multiselect, note, password, select, text } from "@clack/prompts";
 import { readFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 import { parseArgs } from "node:util";
@@ -51,12 +51,12 @@ var CredsError = class extends Error {
 //#endregion
 //#region src/creds/item.ts
 /**
-* A shared account as `creds` sees it: a Bitwarden item in the Shared Accounts
-* collection, plus the custom fields that record who has it.
+* A shared account as `creds` sees it: a login or secure note in the DevDogs
+* Bitwarden organization, plus the custom fields that record who has it.
 *
 * Those fields are the only access record. The Send, the Linear report and
 * every "who has Canva?" answer are generated from them, so they are plain
-* text fields anyone in the collection can read and correct in Bitwarden
+* text fields anyone with the item can read and correct in Bitwarden
 * itself:
 *
 *   Recipients    comma-separated UGA emails, the Send's `--emails` list
@@ -194,8 +194,8 @@ function isoDay(date) {
 //#endregion
 //#region src/creds/bitwarden.ts
 /**
-* The Shared Accounts collection and the Sends made from it, through the
-* bundled `bw` on the officer's personal session (`bws/vault.ts`).
+* The DevDogs Bitwarden organization's items and the Sends made from them,
+* through the bundled `bw` on the officer's personal session (`bws/vault.ts`).
 *
 * Sends belong to the account that creates them, not to the organization, so
 * this always runs as a person and never on CI.
@@ -203,20 +203,23 @@ function isoDay(date) {
 * ## Secret handling
 *
 * * Every value travels to `bw` on **stdin**, base64 JSON as `bw create`,
-*   `bw edit` and `bw send create|edit` document. argv carries only ids,
-*   the collection id and the session key `bwArgs` already passes.
+*   `bw edit` and `bw send create|edit` document. argv carries only ids and
+*   the session key `bwArgs` already passes.
 * * `bw`'s stdout is parsed and never printed: an item or a Send read back
 *   holds the password.
 * * `bw`'s stderr is only shown through `CredsError`, which scrubs every value
 *   registered so far.
 *
-* ## The collection fence
+* ## The organization fence
 *
-* `creds` reads and writes items in ONE collection, found by name. An item
-* that is not in it (a personal login, a production secret) is never listed,
-* never edited and never sent; `updateItem` re-checks before every write.
+* `creds` reads and writes the logins and secure notes of ONE organization,
+* found by name. Anything else the account can see (a personal login, another
+* organization's item) is never listed, never edited and never sent;
+* `updateItem` re-checks before every write. Production secrets are not
+* vault items at all: they live in Secrets Manager, which `bw` cannot read.
 */
-const COLLECTION_NAME = "Shared Accounts";
+/** Matched case-insensitively against the organizations the account belongs to. */
+const ORGANIZATION_NAME = "DevDogs";
 function encode(value) {
 	return Buffer.from(JSON.stringify(value)).toString("base64");
 }
@@ -249,7 +252,7 @@ function spawnRunner(key) {
 	});
 }
 let runnerOverride;
-/** Opens the vault (asking first) and the Shared Accounts collection in it. */
+/** Opens the vault (asking first) and finds the DevDogs organization in it. */
 async function connectSharedVault() {
 	let runner = runnerOverride;
 	if (!runner) {
@@ -259,7 +262,7 @@ async function connectSharedVault() {
 	}
 	const shared = new SharedVault(runner);
 	await shared.sync();
-	await shared.collection();
+	await shared.organization();
 	return shared;
 }
 var SharedVault = class {
@@ -287,34 +290,45 @@ var SharedVault = class {
 	async account() {
 		return (await this.json(["status"])).userEmail ?? "unknown";
 	}
-	/** The one collection named {@link COLLECTION_NAME} this account can see. */
-	async collection() {
+	/** The one organization named like {@link ORGANIZATION_NAME} this account belongs to. */
+	async organization() {
 		if (this.found) return this.found;
-		const matches = (await this.json(["list", "collections"])).filter((c) => c.name === COLLECTION_NAME);
-		if (matches.length !== 1) throw new CredsError(matches.length === 0 ? `No "${COLLECTION_NAME}" collection is visible to your Bitwarden account. Ask a DevDogs organization admin to create it or give you access.` : `${matches.length} collections are called "${COLLECTION_NAME}"; rename the extras so \`creds\` cannot pick the wrong one.`);
+		const matches = (await this.json(["list", "organizations"])).filter((o) => o.name.toLowerCase().includes(ORGANIZATION_NAME.toLowerCase()));
+		if (matches.length !== 1) throw new CredsError(matches.length === 0 ? `Your Bitwarden account is not in the ${ORGANIZATION_NAME} organization. Ask an organization admin to invite you.` : `Your Bitwarden account is in ${matches.length} organizations named like "${ORGANIZATION_NAME}" (${matches.map((o) => o.name).join(", ")}); creds cannot tell which one to use.`);
 		this.found = matches[0];
 		return this.found;
 	}
-	inCollection(raw, collection) {
-		return raw.organizationId === collection.organizationId && (raw.collectionIds ?? []).includes(collection.id);
+	shareable(raw, org) {
+		return raw.organizationId === org.id && (raw.type === ITEM_TYPE.login || raw.type === ITEM_TYPE.secureNote);
 	}
-	/** Every item in the collection, by name. */
+	/** Every login and secure note in the organization, by name. */
 	async listItems() {
-		const collection = await this.collection();
+		const org = await this.organization();
 		return (await this.json([
 			"list",
 			"items",
-			"--collectionid",
-			collection.id
-		])).filter((item) => this.inCollection(item, collection)).map(parseItem).sort((a, b) => a.name.localeCompare(b.name));
+			"--organizationid",
+			org.id
+		])).filter((item) => this.shareable(item, org)).map(parseItem).sort((a, b) => a.name.localeCompare(b.name));
 	}
-	/** A new login, owned by the organization and placed in the collection. */
+	/** The organization's collections this account can see, by name. */
+	async collections() {
+		const org = await this.organization();
+		return (await this.json([
+			"list",
+			"collections",
+			"--organizationid",
+			org.id
+		])).filter((c) => c.organizationId === org.id).sort((a, b) => a.name.localeCompare(b.name));
+	}
+	/** A new login, owned by the organization and placed in `collection`. */
 	async createLogin(input) {
 		registerSecret(input.password);
-		const collection = await this.collection();
+		const org = await this.organization();
+		if (input.collection.organizationId !== org.id) throw new CredsError(`The "${input.collection.name}" collection is not in the ${org.name} organization.`);
 		const item = {
-			organizationId: collection.organizationId,
-			collectionIds: [collection.id],
+			organizationId: org.id,
+			collectionIds: [input.collection.id],
 			folderId: null,
 			type: 1,
 			name: input.name,
@@ -338,10 +352,10 @@ var SharedVault = class {
 		};
 		return parseItem(await this.json(["create", "item"], encode(item)));
 	}
-	/** Saves `raw`, which must still be an item of the collection. */
+	/** Saves `raw`, which must still be a login or secure note of the organization. */
 	async updateItem(raw) {
-		const collection = await this.collection();
-		if (!this.inCollection(raw, collection)) throw new CredsError(`"${raw.name}" is not in the ${COLLECTION_NAME} collection; creds will not change it.`);
+		const org = await this.organization();
+		if (!this.shareable(raw, org)) throw new CredsError(`"${raw.name}" is not a login or secure note of the ${org.name} organization; creds will not change it.`);
 		return parseItem(await this.json([
 			"edit",
 			"item",
@@ -420,7 +434,7 @@ function sendName(item) {
 }
 /** Private to the sender: how to find the item this Send came from. */
 function sendNotes(item) {
-	return `Made by backstage creds from the ${COLLECTION_NAME} item "${item.name}" (${item.id}).`;
+	return `Made by backstage creds from the ${ORGANIZATION_NAME} item "${item.name}" (${item.id}).`;
 }
 function deletionDate(now) {
 	return new Date(now.getTime() + 2592e6).toISOString();
@@ -653,17 +667,18 @@ function cell(text) {
 /** The document's markdown. Pure: `now` decides the statuses. */
 function renderReport(items, now, roster) {
 	const lines = [
-		"> Generated by `backstage creds` from the Shared Accounts collection in the DevDogs Bitwarden organization. Manual edits are overwritten on the next run; change the item's fields in Bitwarden, or run `backstage creds send`.",
+		"> Generated by `backstage creds` from the DevDogs Bitwarden organization: every item shared as a Send. Manual edits are overwritten on the next run; change the item's fields in Bitwarden, or run `backstage creds send`.",
 		"",
 		`Last generated ${now.toISOString().slice(0, 16).replace("T", " ")} UTC. Sends are deleted 30 days after they were last renewed; **Expires Soon** means within 7 days, so run \`backstage creds renew\`.`,
 		""
 	];
-	if (items.length === 0) {
-		lines.push("No shared accounts in the collection yet.");
+	const shared = items.filter((i) => i.recipients.length > 0 || i.send !== void 0);
+	if (shared.length === 0) {
+		lines.push("Nothing has been shared yet.");
 		return `${lines.join("\n")}\n`;
 	}
 	lines.push("| Credential | Account | Recipients | Owner | Status | Expires | Send |", "| --- | --- | --- | --- | --- | --- | --- |");
-	for (const item of items) {
+	for (const item of shared) {
 		const recipients = item.recipients.length > 0 ? item.recipients.map((e) => describeRecipient(roster, e)).join(", ") : "—";
 		const link = item.send?.link ? `[Open](${item.send.link})` : "—";
 		lines.push(`| ${[
@@ -729,7 +744,7 @@ async function writeReport(token, documentId, content, fetchImpl = fetch) {
 * shared as Bitwarden Sends that only the officers they name can open.
 *
 *   send    pick shared accounts and officers; create or update one Send each
-*   add     save a new login into the Shared Accounts collection, then send it
+*   add     save a new login to the DevDogs organization, then send it
 *   renew   push every Send's deletion 30 days out and re-sync its recipients
 *   list    what is shared with whom, until when
 *   report  regenerate the Shared Accounts Linear document
@@ -738,8 +753,8 @@ async function writeReport(token, documentId, content, fetchImpl = fetch) {
 *
 * ## Where things live
 *
-* The values live only in the DevDogs Bitwarden organization's Shared
-* Accounts collection. Each item's custom fields record its recipients and its
+* The values live only in the DevDogs Bitwarden organization: any login or
+* secure note in it can be shared. Each item's custom fields record its recipients and its
 * Send (`item.ts`); the Linear document is generated from them (`report.ts`);
 * the roster of who may receive one is read live from production
 * (`roster.ts`).
@@ -790,6 +805,7 @@ function parse(argv) {
 				url: { type: "string" },
 				username: { type: "string" },
 				owner: { type: "string" },
+				collection: { type: "string" },
 				"password-stdin": { type: "boolean" },
 				document: { type: "string" },
 				"dry-run": { type: "boolean" }
@@ -831,7 +847,7 @@ function findItem(items, typed) {
 }
 async function pickItems(items, typed, message) {
 	if (typed && typed.length > 0) return typed.map((t) => findItem(items, t));
-	if (items.length === 0) throw new UsageError("The Shared Accounts collection is empty. Add one with `backstage creds add`.");
+	if (items.length === 0) throw new UsageError("The DevDogs organization has no logins you can see. Add one with `backstage creds add`.");
 	if (!interactive()) throw new UsageError("Name the accounts with --item <name>.");
 	const ids = unwrap(await multiselect({
 		message,
@@ -1023,17 +1039,40 @@ async function ask(given, message, required) {
 		validate: required ? (v) => v?.trim() ? void 0 : "Required." : void 0
 	}))?.trim() || void 0;
 }
+/** `--collection`, the only one there is, or a choice. Every organization item needs one. */
+async function pickCollection(vault, typed) {
+	const all = await vault.collections();
+	if (typed !== void 0) {
+		const needle = typed.trim().toLowerCase();
+		const match = all.find((c) => c.name.toLowerCase() === needle);
+		if (!match) throw new UsageError(`No collection called "${typed}" that you can see. There are: ${all.map((c) => c.name).join(", ") || "none"}.`);
+		return match;
+	}
+	if (all.length === 0) throw new UsageError("You cannot see any collection in the DevDogs organization to save to. Ask an organization admin for access to one.");
+	if (all.length === 1) return all[0];
+	if (!interactive()) throw new UsageError(`Name the collection with --collection: ${all.map((c) => c.name).join(", ")}.`);
+	const id = unwrap(await select({
+		message: "Which collection?",
+		options: all.map((c) => ({
+			value: c.id,
+			label: c.name
+		}))
+	}));
+	return all.find((c) => c.id === id);
+}
 async function runAdd(vault, values, deps) {
 	const existing = await vault.listItems();
 	const name = await ask(values.name, "Name? (e.g. Instagram)", true);
-	if (existing.some((i) => i.name.toLowerCase() === name.toLowerCase())) throw new UsageError(`"${name}" is already in the collection. Use \`backstage creds send --item "${name}"\`.`);
+	if (existing.some((i) => i.name.toLowerCase() === name.toLowerCase())) throw new UsageError(`"${name}" is already in the organization. Use \`backstage creds send --item "${name}"\`.`);
 	const url = await ask(values.url, "Login page URL? (optional)", false);
 	const username = await ask(values.username, "Username or email? (optional)", false);
 	const password = await readPassword(values, deps);
 	registerSecret(password);
 	const notes = interactive() ? await ask(void 0, "Notes for recipients? (optional, never printed)", false) : void 0;
 	const owner = await ask(values.owner, "Owner? (the officer responsible)", false);
+	const collection = await pickCollection(vault, values.collection);
 	const item = await vault.createLogin({
+		collection,
 		name,
 		url,
 		username,
@@ -1041,7 +1080,7 @@ async function runAdd(vault, values, deps) {
 		notes,
 		owner
 	});
-	say(`Saved ${item.name} to the Shared Accounts collection.`, "success");
+	say(`Saved ${item.name} to the ${collection.name} collection.`, "success");
 	await sendItems(vault, [item], values, deps);
 }
 async function runRenew(vault, values, deps) {

package/dist/launch.js

@@ -1,5 +1,5 @@
 import { C as discoverRepoRoot, E as setCliName, S as RepoNotFoundError, T as cliName, _ as installFailureLog, d as hasYes, g as stripTierFlag, h as stripNoEnvFlag, m as setNoEnv, n as captureDevtoolsError, o as initDevtoolsTelemetry, p as isNonInteractive, s as lastSentryEventId } from "./telemetry-Bjoz29Hl.js";
-import { c as setMenuEnvHook, d as formatCommand, f as helpPath, n as bareGroupStartPath, t as catalog } from "./catalog-BuNLUu08.js";
+import { c as setMenuEnvHook, d as formatCommand, f as helpPath, n as bareGroupStartPath, t as catalog } from "./catalog-BUOwCd2Q.js";
 import { i as loadEnvSession, r as loadEnvLoad } from "./peers-B0KDkI6a.js";
 import { t as nonEmpty } from "./connection-D3XsOE3S.js";
 import { c as setDryRun, o as isDryRun, s as resolveDryRun } from "./options-BTjOf5KP.js";
@@ -322,7 +322,7 @@ async function launchWith(argv, options) {
 */
 async function launch(argv) {
 	await launchWith(argv, { dispatch: async (args) => {
-		const { main } = await import("./cli-BI5Vn9sR.js");
+		const { main } = await import("./cli-B2S6gw9o.js");
 		await main(args);
 	} });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devdogsuga/backstage",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": false,
   "type": "module",
   "description": "Officer and production CLI for DevDogsUGA: deploys, env sync with Bitwarden and GitHub, the migration planner role, club graphics and QR codes, GitHub rulesets and settings, and the newsletter. Ships built JS; run it anywhere with `pnpm dlx @devdogsuga/backstage` (no checkout needed to start; commands that read a checkout say so).",
@@ -40,10 +40,10 @@
     "tsx": "^4.23.12",
     "typescript": "^6.0.3",
     "zod": "4.4.3",
-    "@devdogsuga/telemetry": "0.1.3",
-    "@devdogsuga/brand": "0.1.5",
     "@devdogsuga/events": "0.1.5",
-    "@devdogsuga/newsletter": "0.1.9"
+    "@devdogsuga/newsletter": "0.1.10",
+    "@devdogsuga/brand": "0.1.5",
+    "@devdogsuga/telemetry": "0.1.3"
   },
   "peerDependencies": {
     "@devdogsuga/db": "*",
@@ -65,8 +65,8 @@
     "tsdown": "^0.23.0",
     "vitest": "^4.1.11",
     "@devdogsuga/cli-core": "0.0.0",
-    "@devdogsuga/db": "0.1.3",
     "@devdogsuga/config": "0.1.2",
+    "@devdogsuga/db": "0.1.3",
     "@devdogsuga/env": "0.1.5"
   },
   "scripts": {