hollware 0.10.0 → 0.11.0

package/dist/{d1-CK4nF7p5.mjs → d1-BGChD8_u.mjs}

@@ -155,7 +155,7 @@ function sitesQuery() {
 /** The row of a new token. */
 function insertToken(token) {
 	const kind = token.kind === void 0 ? ["", ""] : [", kind", `, ${quote(token.kind)}`];
-	return `INSERT INTO tokens (id, site_id, user_id, label, hash, scopes, expires_at, created_at, updated_at${kind[0]}) VALUES (${quote(token.id)}, ${quote(token.site)}, ${quote(token.userId)}, ${quote(token.label)}, ${quote(token.hash)}, ${quote(JSON.stringify(token.scopes))}, ${quote(token.expiresAt)}, ${quote(token.now)}, ${quote(token.now)}${kind[1]});`;
+	return `INSERT INTO tokens (id, site_id, user_id, label, hash, scopes, expires_at, created_at, updated_at${kind[0]}) VALUES (${quote(token.id)}, ${quote(token.site)}, ${quote(token.userId)}, ${quote(token.label)}, ${quote(token.hash)}, ${quote(JSON.stringify(token.scopes))}, ${token.expiresAt === null ? "NULL" : quote(token.expiresAt)}, ${quote(token.now)}, ${quote(token.now)}${kind[1]});`;
 }
 /** The row of the site: with a definition, given only to a site that has none yet. */
 function siteRow(site, now, structure) {

package/dist/{deploy-4tusYOMV.mjs → deploy-8_Nvbr3b.mjs}

@@ -1,9 +1,9 @@
 import { r as CliError } from "./format-BpRYEsGB.mjs";
 import { n as failureReason, r as stripAnsi } from "./wrangler-BLIfwbcu.mjs";
 import { t as parseFlags } from "./args-CljWh-kZ.mjs";
-import { f as ownerQuery, i as resolveDatabase, r as query } from "./d1-CK4nF7p5.mjs";
-import { t as publicUrlOf } from "./public-url-NLPRzxCN.mjs";
-import { i as migrate } from "./migrate-BBfF-mkE.mjs";
+import { f as ownerQuery, i as resolveDatabase, r as query } from "./d1-BGChD8_u.mjs";
+import { t as publicUrlOf } from "./public-url-B2BXf_pj.mjs";
+import { i as migrate } from "./migrate-BqdgcoRJ.mjs";
 import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 //#region src/commands/deploy.ts

package/dist/{doctor-DiKAktVd.mjs → doctor-BT_bTF1M.mjs}

@@ -1,8 +1,8 @@
 import { r as CliError } from "./format-BpRYEsGB.mjs";
 import { n as failureReason } from "./wrangler-BLIfwbcu.mjs";
 import { t as parseFlags } from "./args-CljWh-kZ.mjs";
-import { S as parseJsonc, f as ownerQuery, r as query, t as chooseTarget } from "./d1-CK4nF7p5.mjs";
-import { a as parsePendingMigrations } from "./migrate-BBfF-mkE.mjs";
+import { S as parseJsonc, f as ownerQuery, r as query, t as chooseTarget } from "./d1-BGChD8_u.mjs";
+import { a as parsePendingMigrations } from "./migrate-BqdgcoRJ.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 //#region src/commands/doctor.ts

package/dist/index.mjs

@@ -102,12 +102,12 @@ async function main(argv, io) {
 }
 async function run(command, args, io) {
 	switch (command) {
-		case "init": return (await import("./init-CBZPzLBs.mjs")).init(args, io);
-		case "migrate": return (await import("./migrate-CRFTlOVG.mjs")).migrate(args, io);
-		case "deploy": return (await import("./deploy-4tusYOMV.mjs")).deploy(args, io);
-		case "doctor": return (await import("./doctor-DiKAktVd.mjs")).doctor(args, io);
-		case "token": return (await import("./token-BasKoAEC.mjs")).token(args, io);
-		case "invite": return (await import("./invite-Ck-aqpN8.mjs")).invite(args, io);
+		case "init": return (await import("./init-cS_QgC4n.mjs")).init(args, io);
+		case "migrate": return (await import("./migrate-BleH6hXz.mjs")).migrate(args, io);
+		case "deploy": return (await import("./deploy-8_Nvbr3b.mjs")).deploy(args, io);
+		case "doctor": return (await import("./doctor-BT_bTF1M.mjs")).doctor(args, io);
+		case "token": return (await import("./token-B0hS__kw.mjs")).token(args, io);
+		case "invite": return (await import("./invite-BvW1xuxU.mjs")).invite(args, io);
 		case "export": return (await import("./export-DprcsjU_.mjs")).exportContent(args, io);
 		default: return (await import("./import-JNLtBmyD.mjs")).importContent(args, io);
 	}

package/dist/{init-CBZPzLBs.mjs → init-cS_QgC4n.mjs}

@@ -1,15 +1,16 @@
 import { i as UsageError, r as CliError } from "./format-BpRYEsGB.mjs";
 import { t as parseFlags } from "./args-CljWh-kZ.mjs";
-import { _ as parseSiteKey, a as runFile, c as insertInvitation, f as ownerQuery, h as parseOwnerName, i as resolveDatabase, n as describeDatabase, o as anotherSiteScript, r as query, s as initScript, t as chooseTarget } from "./d1-CK4nF7p5.mjs";
-import { n as setupLink, t as publicUrlOf } from "./public-url-NLPRzxCN.mjs";
+import { _ as parseSiteKey, a as runFile, c as insertInvitation, f as ownerQuery, h as parseOwnerName, i as resolveDatabase, n as describeDatabase, o as anotherSiteScript, r as query, s as initScript, t as chooseTarget } from "./d1-BGChD8_u.mjs";
+import { n as setupLink, t as publicUrlOf } from "./public-url-B2BXf_pj.mjs";
 import { i as newPersonalToken, n as newId, r as newInvitationSecret, t as inDays } from "./entropy-5uxirwFD.mjs";
 import { existsSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { PERSONAL_TOKEN_TTL_DAYS, PRESETS, SCOPES, hashPersonalToken, sitePreset } from "@hollware/core";
+import { AUDIT_RETENTION_MAX_DAYS, AUDIT_RETENTION_MIN_DAYS, PERSONAL_TOKEN_TTL_DAYS, PRESETS, SCOPES, hashPersonalToken, sitePreset } from "@hollware/core";
 //#region src/commands/init.ts
 const INIT_USAGE = [
 	"Usage: hollware init --site <key> [--preset <blog | docs | empty>] [--locales <list>]",
 	"                     [--local | --remote] [--owner-name <name>] [--database <name>] [--url <url>]",
+	"                     [--ip-addresses <off | hashed>] [--audit-retention-days <n>]",
 	"",
 	"Creates a site, its owner and the owner's first personal token in the project's D1 database,",
 	"in one step, and prints the token once, with a link to set up the passkey of the admin (valid",
@@ -30,6 +31,11 @@ const INIT_USAGE = [
 	"  --owner-name <name>  The name of the owner",
 	"  --database <name>    The D1 database, by name or binding (default: the binding \"DB\" of wrangler.jsonc)",
 	"  --url <url>          The public URL of Hollware, for the link (default: HOLLWARE_PUBLIC_URL of wrangler.jsonc)",
+	"  --ip-addresses <off | hashed>",
+	"                       Whether the activity log keeps a keyed hash of the address of each request",
+	"                       (default: off, nothing of it): an address is personal data",
+	"  --audit-retention-days <n>",
+	"                       The days each line of the activity log is kept, 30 to 3650 (default: forever)",
 	"  --help               Show this help"
 ].join("\n");
 /** The label of the token `init` creates. */
@@ -47,6 +53,8 @@ async function init(argv, io) {
 			locales: { type: "string" },
 			database: { type: "string" },
 			url: { type: "string" },
+			"ip-addresses": { type: "string" },
+			"audit-retention-days": { type: "string" },
 			help: { type: "boolean" }
 		}
 	});
@@ -56,7 +64,8 @@ async function init(argv, io) {
 	}
 	if (values.site === void 0) throw new UsageError("--site is required: name the site, such as --site my-site.");
 	const site = parseSiteKey(values.site);
-	const definition = initialDefinition(io.cwd, values.preset, values.locales);
+	const audit = auditOf(values["ip-addresses"], values["audit-retention-days"]);
+	const definition = initialDefinition(io.cwd, values.preset, values.locales, audit);
 	const ownerName = values["owner-name"] === void 0 ? void 0 : parseOwnerName(values["owner-name"]);
 	const target = chooseTarget(values);
 	const database = resolveDatabase(io.cwd, values.database);
@@ -73,7 +82,8 @@ async function init(argv, io) {
 		ownerId: first["id"],
 		database,
 		target,
-		definition
+		definition,
+		audit
 	});
 	const now = io.now();
 	const timestamp = now.toISOString();
@@ -145,7 +155,8 @@ async function init(argv, io) {
 		"  Save the token in a file only you can read, then import content:",
 		"    hollware import <directory> --url <your Hollware URL> --token-file <file>",
 		"  An MCP client sends it as the header \"Authorization: Bearer <token>\" to <your Hollware URL>/mcp.",
-		"  More tokens: hollware token create --label <text>"
+		"  More tokens: hollware token create --label <text>",
+		...definition === null ? [] : ["", activityNote(audit)]
 	].join("\n"));
 	return 0;
 }
@@ -202,7 +213,8 @@ async function addSite(io, where) {
 		"",
 		secret,
 		"",
-		"The owner signs in to the admin as before, with the same passkey, and switches to the site."
+		"The owner signs in to the admin as before, with the same passkey, and switches to the site.",
+		...definition === null ? [] : ["", activityNote(where.audit)]
 	].join("\n"));
 	return 0;
 }
@@ -212,9 +224,9 @@ const LOCALE = /^[a-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/;
 * The first definition of the site (ADR-033), from `--preset` and `--locales`; `null` for a
 * project with a hollware.config.ts, whose Worker moves it into the database on its first request.
 */
-function initialDefinition(cwd, preset, locales) {
+function initialDefinition(cwd, preset, locales, audit = DEFAULT_AUDIT_CHOICE) {
 	if (existsSync(join(cwd, "hollware.config.ts"))) {
-		if (preset !== void 0 || locales !== void 0) throw new UsageError("this project has a hollware.config.ts, which the Worker moves into the database: leave out --preset and --locales, or delete the config first.");
+		if (preset !== void 0 || locales !== void 0 || audit.given) throw new UsageError("this project has a hollware.config.ts, which the Worker moves into the database: leave out --preset, --locales, --ip-addresses and --audit-retention-days, or delete the config first.");
 		return null;
 	}
 	const chosen = preset ?? "blog";
@@ -222,7 +234,36 @@ function initialDefinition(cwd, preset, locales) {
 	const list = (locales ?? "en").split(",").map((locale) => locale.trim()).filter((locale) => locale !== "");
 	const bad = list.find((locale) => !LOCALE.test(locale));
 	if (list.length === 0 || bad !== void 0) throw new UsageError(`--locales is a comma-separated list of locales, such as en,es; "${bad ?? ""}" is not one.`);
-	return sitePreset(chosen, list, list[0] ?? "en");
+	return {
+		...sitePreset(chosen, list, list[0] ?? "en"),
+		audit: {
+			ipAddresses: audit.ipAddresses,
+			retentionDays: audit.retentionDays
+		}
+	};
+}
+const DEFAULT_AUDIT_CHOICE = {
+	ipAddresses: "off",
+	retentionDays: null,
+	given: false
+};
+/** `--ip-addresses` and `--audit-retention-days`, checked; the defaults when both are left out. */
+function auditOf(addresses, days) {
+	if (addresses !== void 0 && addresses !== "off" && addresses !== "hashed") throw new UsageError(`--ip-addresses is off or hashed, not "${addresses}".`);
+	let retentionDays = null;
+	if (days !== void 0) {
+		retentionDays = /^\d+$/.test(days) ? Number(days) : NaN;
+		if (!Number.isInteger(retentionDays) || retentionDays < AUDIT_RETENTION_MIN_DAYS || retentionDays > AUDIT_RETENTION_MAX_DAYS) throw new UsageError(`--audit-retention-days is a whole number from ${AUDIT_RETENTION_MIN_DAYS} to ${AUDIT_RETENTION_MAX_DAYS}, not "${days}". Leave it out to keep every line.`);
+	}
+	return {
+		ipAddresses: addresses === "hashed" ? "hashed" : "off",
+		retentionDays,
+		given: addresses !== void 0 || days !== void 0
+	};
+}
+/** What `init` says of the activity log of the new site, and where its owner changes it. */
+function activityNote(audit) {
+	return `The activity log of the site ${audit.ipAddresses === "hashed" ? "keeps a keyed hash of the address of each request" : "keeps no address"} and ${audit.retentionDays === null ? "keeps every line" : `keeps each line ${audit.retentionDays} days`}; an owner changes that in the admin (Site, Activity log).`;
 }
 //#endregion
 export { init };

package/dist/{invite-Ck-aqpN8.mjs → invite-BvW1xuxU.mjs}

@@ -1,9 +1,9 @@
 import { i as UsageError, r as CliError } from "./format-BpRYEsGB.mjs";
 import { t as parseFlags } from "./args-CljWh-kZ.mjs";
-import { _ as parseSiteKey, c as insertInvitation, d as ownerOfSiteQuery, i as resolveDatabase, p as parseExpiresInDays, r as query, t as chooseTarget, x as sitesQuery } from "./d1-CK4nF7p5.mjs";
-import { n as setupLink, t as publicUrlOf } from "./public-url-NLPRzxCN.mjs";
+import { _ as parseSiteKey, c as insertInvitation, d as ownerOfSiteQuery, i as resolveDatabase, p as parseExpiresInDays, r as query, t as chooseTarget, x as sitesQuery } from "./d1-BGChD8_u.mjs";
+import { n as setupLink, t as publicUrlOf } from "./public-url-B2BXf_pj.mjs";
 import { n as newId, r as newInvitationSecret, t as inDays } from "./entropy-5uxirwFD.mjs";
-import { o as WHERE_OPTIONS, s as chooseSite } from "./token-CLQpD4ed.mjs";
+import { o as WHERE_OPTIONS, s as chooseSite } from "./token-CVPHV1K-.mjs";
 import { hashPersonalToken } from "@hollware/core";
 //#region src/commands/invite.ts
 const INVITE_USAGE = [

package/dist/migrate-BleH6hXz.mjs

@@ -0,0 +1 @@
+export { i as migrate } from "./migrate-BqdgcoRJ.mjs";

package/dist/{migrate-BBfF-mkE.mjs → migrate-BqdgcoRJ.mjs}

@@ -1,7 +1,7 @@
 import { r as CliError } from "./format-BpRYEsGB.mjs";
 import { n as failureReason, r as stripAnsi } from "./wrangler-BLIfwbcu.mjs";
 import { t as parseFlags } from "./args-CljWh-kZ.mjs";
-import { i as resolveDatabase, n as describeDatabase, t as chooseTarget } from "./d1-CK4nF7p5.mjs";
+import { i as resolveDatabase, n as describeDatabase, t as chooseTarget } from "./d1-BGChD8_u.mjs";
 import { existsSync, mkdirSync, statSync } from "node:fs";
 import { dirname, join } from "node:path";
 //#region src/commands/migrate.ts

package/dist/{public-url-NLPRzxCN.mjs → public-url-B2BXf_pj.mjs}

@@ -1,5 +1,5 @@
 import { i as UsageError } from "./format-BpRYEsGB.mjs";
-import { S as parseJsonc } from "./d1-CK4nF7p5.mjs";
+import { S as parseJsonc } from "./d1-BGChD8_u.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 //#region src/public-url.ts
@@ -26,7 +26,7 @@ function publicUrlOf(cwd, flag) {
 }
 /** The link that lets a person set up a passkey with an invitation. */
 function setupLink(url, secret) {
-	return `${url ?? "<your Hollware URL>"}/setup?invitation=${secret}`;
+	return `${url ?? "<your Hollware URL>"}/setup#invitation=${secret}`;
 }
 //#endregion
 export { setupLink as n, publicUrlOf as t };

package/dist/token-B0hS__kw.mjs

@@ -0,0 +1 @@
+export { c as token } from "./token-CVPHV1K-.mjs";

package/dist/{token-CLQpD4ed.mjs → token-CVPHV1K-.mjs}

@@ -1,8 +1,8 @@
 import { i as UsageError, n as table, r as CliError, t as printable } from "./format-BpRYEsGB.mjs";
 import { t as parseFlags } from "./args-CljWh-kZ.mjs";
-import { _ as parseSiteKey, b as sitesAndOwnerQuery, g as parseScopes, i as resolveDatabase, l as insertToken, m as parseLabel, p as parseExpiresInDays, r as query, t as chooseTarget, u as listTokens, v as parseTokenId, x as sitesQuery, y as revokeToken } from "./d1-CK4nF7p5.mjs";
+import { _ as parseSiteKey, b as sitesAndOwnerQuery, g as parseScopes, i as resolveDatabase, l as insertToken, m as parseLabel, p as parseExpiresInDays, r as query, t as chooseTarget, u as listTokens, v as parseTokenId, x as sitesQuery, y as revokeToken } from "./d1-BGChD8_u.mjs";
 import { a as newReadToken, i as newPersonalToken, n as newId, t as inDays } from "./entropy-5uxirwFD.mjs";
-import { PERSONAL_TOKEN_TTL_DAYS, hashPersonalToken } from "@hollware/core";
+import { hashPersonalToken } from "@hollware/core";
 //#region src/commands/token.ts
 const WHERE_FLAGS = [
 	"  --site <key>       The site (default: the only site of the database)",
@@ -34,7 +34,7 @@ const TOKEN_CREATE_USAGE = [
 	"  --read                  A read token: content:read, published content, the read API only",
 	"  --scopes <list>         Comma-separated: content:read, content:write, content:publish, schema:admin",
 	"                          (default: content:read,content:write)",
-	`  --expires-in-days <n>   Days until it expires, 1 to 365 (default: ${PERSONAL_TOKEN_TTL_DAYS})`,
+	"  --expires-in-days <n>   Days until it expires, 1 to 365; without it, the token never expires",
 	...WHERE_FLAGS
 ].join("\n");
 const TOKEN_LIST_USAGE = [
@@ -97,7 +97,7 @@ async function createToken(argv, io) {
 	const label = parseLabel(values.label);
 	const siteFlag = values.site === void 0 ? void 0 : parseSiteKey(values.site);
 	const scopes = read ? ["content:read"] : values.scopes === void 0 ? DEFAULT_SCOPES : parseScopes(values.scopes);
-	const days = values["expires-in-days"] === void 0 ? PERSONAL_TOKEN_TTL_DAYS : parseExpiresInDays(values["expires-in-days"]);
+	const days = values["expires-in-days"] === void 0 ? null : parseExpiresInDays(values["expires-in-days"]);
 	const target = chooseTarget(values);
 	const database = resolveDatabase(io.cwd, values.database);
 	const [siteRows = [], ownerRows = []] = await query(io.wrangler, database, target, sitesAndOwnerQuery());
@@ -107,7 +107,7 @@ async function createToken(argv, io) {
 	const now = io.now();
 	const id = newId(io, "token");
 	const secret = read ? newReadToken(io) : newPersonalToken(io);
-	const expiresAt = inDays(now, days);
+	const expiresAt = days === null ? null : inDays(now, days);
 	await query(io.wrangler, database, target, insertToken({
 		...read ? { kind: "read" } : {},
 		id,
@@ -124,7 +124,7 @@ async function createToken(argv, io) {
 		"",
 		`Label    ${label}`,
 		`Scopes   ${scopes.join(" ")}`,
-		`Expires  ${expiresAt} (in ${days} ${days === 1 ? "day" : "days"})`,
+		days === null || expiresAt === null ? "Expires  never (revoke it with hollware token revoke)" : `Expires  ${expiresAt} (in ${days} ${days === 1 ? "day" : "days"})`,
 		"",
 		"The token. It is shown only once: Hollware keeps just its hash.",
 		"",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hollware",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "The Hollware CLI: init, migrate, token, import and export.",
   "homepage": "https://hollware.com",
   "bugs": {
@@ -31,7 +31,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@hollware/core": "0.10.0",
+    "@hollware/core": "0.11.0",
     "@modelcontextprotocol/client": "2.3.1",
     "zod": "4.6.7"
   },

package/dist/migrate-CRFTlOVG.mjs

@@ -1 +0,0 @@
-export { i as migrate } from "./migrate-BBfF-mkE.mjs";

package/dist/token-BasKoAEC.mjs

@@ -1 +0,0 @@
-export { c as token } from "./token-CLQpD4ed.mjs";