isorite 0.11.0 → 0.12.0

package/README.md

@@ -9,8 +9,7 @@ npm install -g isorite
 isorite guide               # the guide: a knowledge base about isorite, with things to do, in ~/isorite-guide
 ```
 
-On your own notes, a folder of Markdown files (`isorite new <notes>` starts one). They're drawn as you write them:
-maths, code coloured by its language, and Mermaid diagrams.
+On your own notes, a folder of Markdown files (`isorite new <notes>` starts one). They're drawn as you write them: maths, code coloured by its language, and Mermaid diagrams.
 
 ```sh
 isorite serve <notes>       # the browser, at http://localhost:4767/; set up Iso's provider in Iso's settings
@@ -19,9 +18,7 @@ isorite model               # optional: search by meaning (fetches a 53 MB model
 isorite memory              # optional: the agent's memory, a base of its own lent to every session
 ```
 
-Setting it up, at work too (a company's gateway, a client certificate, a proxy): `docs/setup.md` in this package.
-When something fails, `isorite doctor` says what to change; `isorite doctor --report` gives it as one block, its
-secrets hidden, to paste to someone helping. For an AI helping you: `isorite help setup`.
+Setting it up, at work too (a company's gateway, a client certificate, a proxy): `docs/setup.md` in this package. When something fails, `isorite doctor` says what to change; `isorite doctor --report` gives it as one block, its secrets hidden, to paste to someone helping. For an AI helping you: `isorite help setup`.
 
 The guide in a browser alone: https://lachlanjs.github.io/isorite/
 

package/dist/core.js

@@ -1201,6 +1201,76 @@ function spliceText(before, changes, body) {
 	return bom + head + newBody;
 }
 //#endregion
+//#region packages/core/src/unwrap.ts
+const ITEM = /^\s*([-*+]|\d+[.)])\s+/;
+const APART = /^\s*(#{1,6}\s|\||<|```|~~~|\$\$|>|---\s*$|\*\*\*\s*$|___\s*$|\[[^\]]+\]:\s)/;
+const QUOTED = /^\s*>\s?\S/;
+function unwrap(text) {
+	const lines = text.split("\n"), out = [];
+	let i = 0, fence = "", maths = false;
+	/** What the last line written may be continued by: prose, a quoted line, or nothing. */
+	let open = "";
+	if (lines[0] === "---") {
+		const end = lines.indexOf("---", 1);
+		if (end > 0) {
+			out.push(...lines.slice(0, end + 1));
+			i = end + 1;
+		}
+	}
+	for (; i < lines.length; i++) {
+		const l = lines[i], t = l.trim();
+		if (fence) {
+			out.push(l);
+			if (t.startsWith(fence)) fence = "";
+			continue;
+		}
+		if (maths) {
+			out.push(l);
+			if (t.endsWith("$$")) maths = false;
+			continue;
+		}
+		if (t.startsWith("```") || t.startsWith("~~~")) {
+			fence = t.slice(0, 3);
+			out.push(l);
+			open = "";
+			continue;
+		}
+		if (t.startsWith("$$") && !t.slice(2).includes("$$")) {
+			maths = true;
+			out.push(l);
+			open = "";
+			continue;
+		}
+		if (!t) {
+			out.push(l);
+			open = "";
+			continue;
+		}
+		const hard = /( {2}|\\)$/.test(out.at(-1) ?? "");
+		if (APART.test(l)) {
+			if (open === "quote" && QUOTED.test(l) && !/^\s*>\s*([-*+]|\d+[.)]|#)/.test(l) && !hard) {
+				out[out.length - 1] += " " + l.replace(/^\s*>\s?/, "").trim();
+				continue;
+			}
+			out.push(l);
+			open = QUOTED.test(l) ? "quote" : "";
+			continue;
+		}
+		if (ITEM.test(l)) {
+			out.push(l);
+			open = "prose";
+			continue;
+		}
+		if (open === "prose" && !hard) {
+			out[out.length - 1] += " " + t;
+			continue;
+		}
+		out.push(l);
+		open = open === "" && /^( {4}|\t)/.test(l) ? "" : "prose";
+	}
+	return out.join("\n");
+}
+//#endregion
 //#region packages/core/src/search.ts
 const TOKEN = /[a-z0-9]+(?:['’][a-z]+)?/g;
 const STOP = new Set("a an and are as at be by for from has have in is it its of on or that the this to was were will with not but if then than so do does did can could should would into about".split(" "));
@@ -1647,6 +1717,8 @@ const KINDS$1 = [
 ];
 const SNAPSHOT_EVERY = 40;
 const SESSION_GAP_MS = 18e5;
+/** Your edits in a row are one moment, one layer of a note's history (M24, T), until 10 minutes pass with none. */
+const LAYER_IDLE_MS = 6e5;
 const hashText = (text) => sha256(text).slice(0, 16);
 /** A stamp for a new entry. `last` is the newest entry anywhere in the study base, which decides the session. */
 function stamp(who, device, last, now = Date.now()) {
@@ -1999,16 +2071,21 @@ function insertAt(note, line) {
 		before: prev + 1 < all.length ? anchorOf(all, prev + 1) : null
 	};
 }
-/** The journal as the timeline shows it. Your own edits in a row within a session are one moment; a proposal is
-*  one moment whose `what` says how it ended. Revisions are not moments. */
+/** The journal as the timeline shows it. Your own edits in a row within a session are one moment, until ten minutes
+*  pass with none (LAYER_IDLE_MS); a proposal is one moment whose `what` says how it ended. Revisions are not
+*  moments. */
 function moments(entries) {
 	const out = [], offered = /* @__PURE__ */ new Map(), asked = /* @__PURE__ */ new Map();
+	/** Lines a change put in and took out: a note's first entry, all of its text. */
+	const size = (c) => c.why === "start" || !c.hunks.length && c.before === null ? [(c.text ?? "").split("\n").length, 0] : [c.hunks.reduce((n, h) => n + h.ins.length, 0), c.hunks.reduce((n, h) => n + h.del.length, 0)];
 	for (const e of entries) {
 		const base = {
 			ids: [e.id],
 			at: e.at,
 			session: e.session,
-			who: e.who
+			who: e.who,
+			added: 0,
+			removed: 0
 		};
 		if (e.kind === "proposal") {
 			const m = {
@@ -2027,22 +2104,29 @@ function moments(entries) {
 			}
 		} else if (e.kind === "change") {
 			const m = e.proposal ? offered.get(e.proposal) : void 0;
+			const [added, removed] = size(e);
 			if (e.why === "keep" && m) {
 				m.what = "kept";
 				m.ids.push(e.id);
 				m.at = e.at;
+				m.added += added;
+				m.removed += removed;
 				continue;
 			}
 			const last = out[out.length - 1];
-			if (e.why === "edit" && last && last.what === "edited" && last.who === e.who && last.session === e.session) {
+			if (e.why === "edit" && last && last.what === "edited" && last.who === e.who && last.session === e.session && Date.parse(e.at) - Date.parse(last.at) <= 6e5) {
 				last.ids.push(e.id);
 				last.at = e.at;
+				last.added += added;
+				last.removed += removed;
 				continue;
 			}
 			const what = e.why === "start" ? e.who === "external" ? "found" : "wrote" : e.why === "edit" ? "edited" : e.why === "restore" ? "restored" : e.why === "keep" ? "kept" : e.why === "move" ? "moved" : "changed elsewhere";
 			out.push({
 				...base,
 				what,
+				added,
+				removed,
 				...e.asked ? { asked: e.asked } : {}
 			});
 		}
@@ -2137,8 +2221,8 @@ function checkId(id) {
 	if (!SAFE.test(id) || id.startsWith("/") || id.split("/").some((part) => part === ".." || part === "." || !part)) throw new Error(`not a note's id: ${JSON.stringify(id)}`);
 	return id;
 }
-/** Where a note's journal is. Drafts and Understanding notes are journalled under their `@draft/` and
-*  `@understanding/` ids. */
+/** Where a note's journal is. Drafts are journalled under their `@draft/` ids (and Understanding notes were, before
+*  M24, under `@understanding/`). */
 const journalPath = (noteId) => `journal/${checkId(noteId)}.jsonl`;
 /** This device's record of usage: what was cleared from Iso's context, and what each turn cost (record.ts). */
 const recordPath = (device) => `record/${checkId(device)}.jsonl`;
@@ -2377,4 +2461,4 @@ function ago(at, now = Date.now()) {
 /** A moment is named by its last entry: the one the note is shown at. */
 const momentKey = (m) => m.ids.at(-1);
 //#endregion
-export { ABOUT, AGENTS_FILE, Bundle, CONFIG_FILE, Concept, DEVICE_RE, DONE, DiffError, Directory, FrontmatterError, GITATTRIBUTES, ID_RE, KINDS, LearnerError, MAX_EVENT_BYTES, OKF_VERSION, OWN_DIR, OWN_FORMAT, RATINGS, SESSION_GAP_MS, SETTINGS_FILE, SNAPSHOT_EVERY, STRENGTH, STUDY_DIR, STUDY_FORMAT, SearchIndex, StudyError, agentName, ago, anchorOf, applyHunks, authors, blocks, change, citeKind, cleanEvent, cmp, cmpTuple, codeTarget, contentHash, describe, diffLines, doneOf, dumpFrontmatter, editFrontmatter, embedFor, embedRefs, fileType, findAnchor, findPassage, floatRepr, frontmatterText, hashText, headings, idsOf, impliedLinks, insertAt, isFileRef, iso, journalLine, journalPath, kindOf, legacyId, linkRefs, linkTexts, locate, mapModel, mergeRecords, momentKey, moments, newId, noteIds, outwardLinks, pagerank, parseSettings, parseStudyConfig, parseYaml, passageOf, pending, pictureSize, pictureType, pyRepr, rating, reach, readJournal, readRecord, reconcile, recordPath, replay, round3, section, sessionMoments, settingsText, sha256, slugify, snippet, spliceText, splitFrontmatter, splitSource, stamp, strengthEdges, strip, stronglyConnected, text, textAt, toTime, tokenize, touched, wordAuthors, written };
+export { ABOUT, AGENTS_FILE, Bundle, CONFIG_FILE, Concept, DEVICE_RE, DONE, DiffError, Directory, FrontmatterError, GITATTRIBUTES, ID_RE, KINDS, LAYER_IDLE_MS, LearnerError, MAX_EVENT_BYTES, OKF_VERSION, OWN_DIR, OWN_FORMAT, RATINGS, SESSION_GAP_MS, SETTINGS_FILE, SNAPSHOT_EVERY, STRENGTH, STUDY_DIR, STUDY_FORMAT, SearchIndex, StudyError, agentName, ago, anchorOf, applyHunks, authors, blocks, change, citeKind, cleanEvent, cmp, cmpTuple, codeTarget, contentHash, describe, diffLines, doneOf, dumpFrontmatter, editFrontmatter, embedFor, embedRefs, fileType, findAnchor, findPassage, floatRepr, frontmatterText, hashText, headings, idsOf, impliedLinks, insertAt, isFileRef, iso, journalLine, journalPath, kindOf, legacyId, linkRefs, linkTexts, locate, mapModel, mergeRecords, momentKey, moments, newId, noteIds, outwardLinks, pagerank, parseSettings, parseStudyConfig, parseYaml, passageOf, pending, pictureSize, pictureType, pyRepr, rating, reach, readJournal, readRecord, reconcile, recordPath, replay, round3, section, sessionMoments, settingsText, sha256, slugify, snippet, spliceText, splitFrontmatter, splitSource, stamp, strengthEdges, strip, stronglyConnected, text, textAt, toTime, tokenize, touched, unwrap, wordAuthors, written };