bavitutor 0.1.0 → 0.1.1

package/dist/bavitutor.mjs

@@ -25052,7 +25052,7 @@ const number = /*#__PURE__*/ new Number$2();
 * @category constructors
 * @since 4.0.0
 */
-const Boolean$2 = class extends ASTNodeImpl {
+const Boolean$3 = class extends ASTNodeImpl {
 	_tag = "Boolean";
 	/** @internal */
 	getParser() {
@@ -25077,7 +25077,7 @@ const Boolean$2 = class extends ASTNodeImpl {
 * @category constructors
 * @since 4.0.0
 */
-const boolean = /*#__PURE__*/ new Boolean$2();
+const boolean = /*#__PURE__*/ new Boolean$3();
 /**
 * Constructs a {@link Arrays}.
 *
@@ -30776,7 +30776,7 @@ const InetV6Proto = {
 		return this.toJSON();
 	}
 };
-const checkPort$1 = (port) => Number.isInteger(port) && port >= 0 && port <= 65535;
+const checkPort = (port) => Number.isInteger(port) && port >= 0 && port <= 65535;
 /**
 * Creates a checked IPv4 internet address.
 *
@@ -30785,7 +30785,7 @@ const checkPort$1 = (port) => Number.isInteger(port) && port >= 0 && port <= 655
 * @since 4.0.0
 */
 const inetAddressV4 = (address, port) => {
-	if (!checkPort$1(port)) return addressError(address, "port must be an integer from 0 through 65535");
+	if (!checkPort(port)) return addressError(address, "port must be an integer from 0 through 65535");
 	const self = Object.create(InetV4Proto);
 	self.address = address;
 	self.port = port;
@@ -30799,7 +30799,7 @@ const inetAddressV4 = (address, port) => {
 * @since 4.0.0
 */
 const inetAddressV6 = (address, port, options) => {
-	if (!checkPort$1(port)) return addressError(address, "port must be an integer from 0 through 65535");
+	if (!checkPort(port)) return addressError(address, "port must be an integer from 0 through 65535");
 	const scopeId = options?.scopeId ?? 0;
 	if (!Number.isInteger(scopeId) || scopeId < 0 || scopeId > 4294967295) return addressError(address, "scopeId must be an unsigned 32-bit integer");
 	const self = Object.create(InetV6Proto);
@@ -31552,7 +31552,7 @@ const Number$1 = /*#__PURE__*/ make$34(number);
 * @category schemas
 * @since 4.0.0
 */
-const Boolean$1 = /*#__PURE__*/ make$34(boolean);
+const Boolean$2 = /*#__PURE__*/ make$34(boolean);
 /**
 * Schema for a TypeScript `void` return value.
 *
@@ -31761,7 +31761,7 @@ const FalseLiterals = /*#__PURE__*/ Literals([
 	"n"
 ]);
 /** @internal */
-const BooleanLiterals = /*#__PURE__*/ Literals([...TrueLiterals.literals, ...FalseLiterals.literals]).pipe(/*#__PURE__*/ decodeTo(Boolean$1, /*#__PURE__*/ transform({
+const BooleanLiterals = /*#__PURE__*/ Literals([...TrueLiterals.literals, ...FalseLiterals.literals]).pipe(/*#__PURE__*/ decodeTo(Boolean$2, /*#__PURE__*/ transform({
 	decode: (value) => value === "true" || value === "yes" || value === "on" || value === "1" || value === "y",
 	encode: (value) => value ? "true" : "false"
 })));
@@ -38187,7 +38187,7 @@ function Int(name) {
 * @category constructors
 * @since 2.0.0
 */
-function Boolean(name) {
+function Boolean$1(name) {
 	return schema(BooleanLiterals, name);
 }
 //#endregion
@@ -46583,7 +46583,7 @@ const codeByLiteral = {
 const fromLiteral = (literal) => codeByLiteral[literal];
 //#endregion
 //#region package.json
-var version$1 = "0.1.0";
+var version$1 = "0.1.1";
 /**
 * Default Server-Sent Events encoder.
 *
@@ -48740,7 +48740,7 @@ const Concept = Struct({
 	estimatedMinutes: Number$1,
 	difficulty: Number$1,
 	depth: Number$1,
-	isGoal: Boolean$1,
+	isGoal: Boolean$2,
 	sourceIds: ArraySchema(SourceId)
 });
 /** `from` is the prerequisite, `to` is the concept that depends on it. */
@@ -49031,7 +49031,7 @@ const ReviewResult = Struct({
 	nextDueAt: Number$1,
 	nextDueInHours: Number$1,
 	/** Whether this attempt updated the memory model (first attempt of the day). */
-	counted: Boolean$1,
+	counted: Boolean$2,
 	/** Prerequisites whose next review was postponed by this success. */
 	creditedConcepts: ArraySchema(String$2),
 	/** After a lapse: quick checks on the weakest prerequisites (R3.3). */
@@ -49044,7 +49044,7 @@ const ReplacementAnswer = Struct({
 	goalId: GoalId,
 	conceptId: ConceptId,
 	verdict: Verdict,
-	isMultipleChoice: Boolean$1
+	isMultipleChoice: Boolean$2
 });
 const ReplacementSummary = Struct({
 	/** Answered well: processed as successful reviews. */
@@ -49097,7 +49097,7 @@ const StreakInfo = Struct({
 	freezesUsed: Number$1,
 	freezesLeft: Number$1,
 	/** A freeze kept the streak alive within the last week. */
-	isSavedByFreeze: Boolean$1
+	isSavedByFreeze: Boolean$2
 });
 const Today = Struct({
 	plan: DayPlan,
@@ -49312,7 +49312,7 @@ const TeachBackResult = Struct({
 });
 const LessonOutcome = Struct({
 	mastery: Mastery,
-	criterionMet: Boolean$1,
+	criterionMet: Boolean$2,
 	maybeNextReviewAt: OptionFromNullOr(Number$1),
 	message: String$2
 });
@@ -49329,7 +49329,7 @@ const AnswerContext = Literals([
 const AskTutorPayload = Struct({
 	question: String$2,
 	stepContext: String$2,
-	isGradedStep: Boolean$1,
+	isGradedStep: Boolean$2,
 	history: ArraySchema(Struct({
 		role: Literals(["Learner", "Tutor"]),
 		text: String$2
@@ -49364,7 +49364,7 @@ const PlacementBelief = Struct({
 		"ToLearn"
 	]),
 	/** True when the learner answered this concept directly. */
-	wasAsked: Boolean$1
+	wasAsked: Boolean$2
 });
 const PlacementAnswerReview = Struct({
 	conceptId: ConceptId,
@@ -49390,8 +49390,8 @@ const PlacementView = Union([
 		conceptTitle: String$2,
 		number: Number$1,
 		questionsLeft: Number$1,
-		canFinishEarly: Boolean$1,
-		isWarmup: Boolean$1
+		canFinishEarly: Boolean$2,
+		isWarmup: Boolean$2
 	}),
 	TaggedStruct("Summary", {
 		beliefs: ArraySchema(PlacementBelief),
@@ -49461,8 +49461,8 @@ const Calibration = Struct({
 	readings: ArraySchema(CalibrationReading),
 	/** Fewer answers than this in a bucket are too few to read. */
 	minimumAnswers: Number$1,
-	isOverconfident: Boolean$1,
-	isUnderconfident: Boolean$1
+	isOverconfident: Boolean$2,
+	isUnderconfident: Boolean$2
 });
 const Activity = Struct({
 	/** Whole weeks from a Sunday, oldest first, ending today. */
@@ -49538,7 +49538,7 @@ const ModelChoice = Struct({
 	/** An alias that follows the newest version (`opus`) or a pinned model id. */
 	model: String$2,
 	reasoning: Reasoning,
-	fastMode: Boolean$1
+	fastMode: Boolean$2
 });
 const ModelChoices = Struct({
 	deep: ModelChoice,
@@ -49552,16 +49552,16 @@ const ModelOption = Struct({
 	displayName: String$2,
 	description: String$2,
 	/** Aliases like `opus` move to each new version; ids stay pinned. */
-	isLatest: Boolean$1,
+	isLatest: Boolean$2,
 	reasoningLevels: ArraySchema(EffortLevel),
-	supportsFastMode: Boolean$1
+	supportsFastMode: Boolean$2
 });
 /**
 * A daily nudge at a fixed time (R14.6: a stable cue helps habits form).
 * Shown as a browser notification while BaviTutor is open in a tab.
 */
 const Reminder = Struct({
-	isOn: Boolean$1,
+	isOn: Boolean$2,
 	/** Local time of day, "HH:MM". */
 	time: String$2
 });
@@ -49579,7 +49579,7 @@ const Settings = Struct({
 	desiredRetention: Number$1,
 	/** Hard cap on new concepts per day: 3 by default, 5 for "intensive" (R12). */
 	maxNewLessonsPerDay: Number$1,
-	showVisuals: Boolean$1,
+	showVisuals: Boolean$2,
 	reminder: Reminder,
 	models: ModelChoices
 });
@@ -53464,8 +53464,8 @@ const askSdk = tryPromise({
 			const ask = async (attempt, best) => {
 				const models = await session.supportedModels();
 				const better = models.length >= best.length ? models : best;
-				if (isComplete(better) || attempt >= 3) return better;
-				await new Promise((done) => setTimeout(done, 1500));
+				if (isComplete(better) || attempt >= 5) return better;
+				await new Promise((done) => setTimeout(done, 2e3));
 				return ask(attempt + 1, better);
 			};
 			return await ask(1, []);
@@ -57715,7 +57715,7 @@ const AdapterChoice = Struct({
 	})).annotate({ description: "Achieve the Core coherence map (K-12 maths prerequisite graph). Use for school maths goals; null otherwise" }),
 	openStaxBooks: ArraySchema(String$2).annotate({ description: "OpenStax textbook titles to read the table of contents of (0-2), e.g. [\"Algebra 1\", \"Prealgebra 2e\"]" }),
 	exercismTracks: ArraySchema(String$2).annotate({ description: "Exercism language track slugs (0-2), e.g. [\"python\"], for programming-language goals" }),
-	ossu: Boolean$1.annotate({ description: "read the OSSU computer-science curriculum (CS goals)" }),
+	ossu: Boolean$2.annotate({ description: "read the OSSU computer-science curriculum (CS goals)" }),
 	ocwCourses: ArraySchema(String$2).annotate({ description: "MIT OpenCourseWare course numbers or exact titles you are confident exist (0-2), e.g. [\"6.100L\"]" }),
 	roadmapSh: ArraySchema(String$2).annotate({ description: "roadmap.sh roadmap slugs (0-2) for software and tech goals, the goal's own roadmap first, e.g. [\"backend\"], [\"react\"], [\"docker\"]" })
 });
@@ -57764,7 +57764,7 @@ const DiscoveryReport = Struct({
 		scores: JudgedScores,
 		fit: Confidence.annotate({ description: "goal fit: 0, 0.25, 0.5, 0.75 or 1" }),
 		flags: ArraySchema(GraderFlag),
-		complete: Boolean$1.annotate({ description: "false if you could only read part of the outline" }),
+		complete: Boolean$2.annotate({ description: "false if you could only read part of the outline" }),
 		topics: ArraySchema(SourceTopic).annotate({ description: "the outline in the order the source teaches it (up to 60 items)" })
 	})),
 	gaps: String$2.annotate({ description: "one sentence on what you looked for but could not find" })
@@ -57796,7 +57796,7 @@ const DraftConcept = Struct({
 	objectives: ArraySchema(String$2).annotate({ description: "2-3 testable objectives starting with a verb (\"Solve…\", \"Explain…\")" }),
 	estimatedMinutes: Int$1,
 	difficulty: Score,
-	isGoal: Boolean$1.annotate({ description: "true for the concepts that together constitute reaching the learner goal" }),
+	isGoal: Boolean$2.annotate({ description: "true for the concepts that together constitute reaching the learner goal" }),
 	sourceRefs: ArraySchema(String$2).annotate({ description: "source tags like \"S1\" that teach it" }),
 	prerequisites: ArraySchema(DraftPrerequisite).annotate({ description: "direct prerequisites only (keys of other concepts), never transitive ones" })
 });
@@ -58480,7 +58480,7 @@ const Difficulty = Int$1.check(isBetween$1({
 }));
 const DraftOption = Struct({
 	text: String$2.annotate({ description: "a bare claim or value, no justification, same grammatical skeleton and length as the other options" }),
-	isCorrect: Boolean$1,
+	isCorrect: Boolean$2,
 	misconception: String$2.annotate({ description: "for a distractor: the specific misconception that produces it (one short phrase). Empty for the correct option" })
 });
 const DiagnosticBatch = Struct({ questions: ArraySchema(Struct({
@@ -58998,7 +58998,7 @@ const decodeFrameEvent = decodeUnknownOption(Union([
 		index: Number$1,
 		count: Number$1,
 		caption: String$2,
-		playing: Boolean$1
+		playing: Boolean$2
 	}),
 	Struct({
 		type: Literal("bv:audit"),
@@ -59392,7 +59392,7 @@ var Visuals = class Visuals extends Service()("bavitutor/Visuals") {
 		const claude = yield* Claude;
 		const renderer = yield* Renderer;
 		const goals = yield* Goals;
-		const isEnabled = yield* Boolean("BAVI_VISUALS").pipe(withDefault$1(true));
+		const isEnabled = yield* Boolean$1("BAVI_VISUALS").pipe(withDefault$1(true));
 		const running = yield* make$18();
 		const slots = yield* make$50(CONCURRENT_GENERATIONS);
 		const visualRow = (goalId, visualId) => sql`
@@ -61874,13 +61874,57 @@ const isBaviTutor = async (port) => {
 	}
 };
 /**
-* Fails with a clear message if the port is taken. Also probes loopback: on
+* Whether something already listens on the port. Also probes loopback: on
 * Windows a second server can bind 127.0.0.1 next to one on all interfaces.
 */
-const checkPort = async (port, host) => {
+const isPortTaken = async (port, host) => {
 	const error = await canListen(port, host);
-	if (error?.code === "EADDRINUSE" || error === void 0 && (await answers(port, "127.0.0.1") || await answers(port, "::1"))) fail([`Port ${port} is already in use${await isBaviTutor(port) ? " by a BaviTutor server" : ""}.`, `Pick another one: bavitutor --port ${port === 65535 ? port - 1 : port + 1}`]);
-	if (error !== void 0) fail([`Can't listen on ${host}:${port}: ${error.message}`]);
+	if (error !== void 0 && error.code !== "EADDRINUSE") fail([`Can't listen on ${host}:${port}: ${error.message}`]);
+	return error !== void 0 || await answers(port, "127.0.0.1") || await answers(port, "::1");
+};
+/** A whole BaviTutor (web app included) is serving on this port already. */
+const servesBaviTutorApp = async (port) => {
+	try {
+		const response = await fetch(`http://127.0.0.1:${port}/`, {
+			headers: { accept: "text/html" },
+			signal: AbortSignal.timeout(1500)
+		});
+		return response.ok && (await response.text()).includes("BaviTutor");
+	} catch {
+		return false;
+	}
+};
+const SPARE_PORTS = 20;
+/**
+* The port to serve on. A port the learner asked for must be free. The
+* default moves on to the next free one, unless a BaviTutor app already runs
+* on one of them, which is then opened instead of starting a second copy.
+*/
+const choosePort = async (requested, isExplicit, host) => {
+	if (!await isPortTaken(requested, host)) return {
+		port: requested,
+		isRunning: false
+	};
+	if (await servesBaviTutorApp(requested)) return {
+		port: requested,
+		isRunning: true
+	};
+	if (isExplicit) return fail([`Port ${requested} is already in use${await isBaviTutor(requested) ? " by a BaviTutor server" : ""}.`, `Pick another one: bavitutor --port ${requested === 65535 ? requested - 1 : requested + 1}`]);
+	const candidates = Array.from({ length: SPARE_PORTS }, (_, offset) => requested + 1 + offset).filter((candidate) => candidate <= 65535);
+	for (const candidate of candidates) {
+		if (!await isPortTaken(candidate, host)) {
+			say(`  port     ${requested} is busy, so using ${candidate}`);
+			return {
+				port: candidate,
+				isRunning: false
+			};
+		}
+		if (await servesBaviTutorApp(candidate)) return {
+			port: candidate,
+			isRunning: true
+		};
+	}
+	return fail([`Ports ${requested}-${requested + SPARE_PORTS} are all in use.`, "Pick a free one: bavitutor --port <port>"]);
 };
 const openBrowser = (url) => {
 	const [command, args] = process.platform === "win32" ? ["cmd.exe", [
@@ -61917,16 +61961,17 @@ const main = async () => {
 	mkdirSync(dataDir, { recursive: true });
 	const envFile = join(dataDir, ".env");
 	if (existsSync(envFile)) process.loadEnvFile(envFile);
-	const port = options.port !== void 0 ? parsePort(options.port, "--port") : process.env["PORT"] ? parsePort(process.env["PORT"], "PORT") : DEFAULT_PORT;
-	process.env["PORT"] = String(port);
+	const isExplicitPort = options.port !== void 0 || Boolean(process.env["PORT"]);
+	const requestedPort = options.port !== void 0 ? parsePort(options.port, "--port") : process.env["PORT"] ? parsePort(process.env["PORT"], "PORT") : DEFAULT_PORT;
 	const host = options.host ?? DEFAULT_HOST;
-	const url = `http://${[
+	const isLocal = [
 		"127.0.0.1",
 		"localhost",
 		"::1",
 		"0.0.0.0",
 		"::"
-	].includes(host) ? "localhost" : host}:${port}`;
+	].includes(host);
+	const urlFor = (port) => `http://${isLocal ? "localhost" : host}:${port}`;
 	const staticDir = fileURLToPath(new URL("web", import.meta.url));
 	if (!existsSync(join(staticDir, "index.html"))) fail([`The web app isn't built (no ${join(staticDir, "index.html")}).`, "Build it from the repository with `vp run build`."]);
 	say(`BaviTutor ${version$1}`);
@@ -61948,7 +61993,16 @@ const main = async () => {
 		]);
 		else say(`  visuals  ${chrome}`);
 	}
-	await checkPort(port, host);
+	const choice = await choosePort(requestedPort, isExplicitPort, host);
+	if (choice.isRunning) {
+		say();
+		say(`BaviTutor is already running at ${urlFor(choice.port)}`);
+		if (options.open) openBrowser(urlFor(choice.port));
+		return;
+	}
+	const port = choice.port;
+	process.env["PORT"] = String(port);
+	const url = urlFor(port);
 	effectDiscard(gen(function* () {
 		yield* HttpServer;
 		say();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bavitutor",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Describe what you want to learn; BaviTutor researches it, maps it and teaches it.",
   "keywords": [
     "claude",