isorite 0.8.0 → 0.8.1

package/dist/main.js

@@ -8713,28 +8713,47 @@ var Setup = class {
 };
 //#endregion
 //#region packages/server/src/version.ts
-const VERSION = "0.8.0";
+const VERSION = "0.8.1";
 //#endregion
-//#region packages/server/src/studybase.ts
-init_src$1();
-function git(cwd, ...args) {
+//#region packages/server/src/git.ts
+/** The top of the repository `folder` is in, or null: the nearest folder holding `.git`, a directory or, in a
+*  worktree or submodule, a file. No `git` is run. */
+function repoOf(folder) {
+	for (let at = resolve(folder);; at = dirname(at)) {
+		if (existsSync(join(at, ".git"))) return at;
+		if (dirname(at) === at) return null;
+	}
+}
+/** The environment for a `git` isorite runs: none of the shell's GIT_* (a GIT_DIR would point it elsewhere), no
+*  system configuration (where a company's hooks and helpers are usually set), and no prompt for a password. */
+function plainGitEnv(env = process.env) {
+	return {
+		...Object.fromEntries(Object.entries(env).filter(([k]) => !k.startsWith("GIT_"))),
+		GIT_CONFIG_NOSYSTEM: "1",
+		GIT_TERMINAL_PROMPT: "0"
+	};
+}
+/** `git init` in a folder, given `timeout` ms; whether it was made a repository. */
+function gitInit(folder, { env = process.env, timeout = 1e4 } = {}) {
 	try {
-		return execFileSync("git", args, {
-			cwd,
-			encoding: "utf8",
-			stdio: [
-				"ignore",
-				"pipe",
-				"ignore"
-			]
-		}).trim();
+		execFileSync("git", ["init", "--quiet"], {
+			cwd: folder,
+			stdio: "ignore",
+			env: plainGitEnv(env),
+			timeout,
+			killSignal: "SIGKILL"
+		});
+		return existsSync(join(folder, ".git"));
 	} catch {
-		return null;
+		return false;
 	}
 }
+//#endregion
+//#region packages/server/src/studybase.ts
+init_src$1();
 /** Where format 1 put a study base when not told: beside the knowledge base's repository, named after it. */
 function defaultStudyPath(notes) {
-	const repo = git(notes, "rev-parse", "--show-toplevel") ?? notes;
+	const repo = repoOf(notes) ?? resolve(notes);
 	return join(dirname(repo), basename(repo) + "-study");
 }
 /** A study base's configuration, and its knowledge base's folder as an absolute path. */
@@ -8946,6 +8965,12 @@ function openBrowser(url) {
 		}).on("error", () => void 0).unref();
 	} catch {}
 }
+/** How long a step may take before it's said what is being waited for (M21), and where it's said: stderr, as
+*  `mcp` speaks on stdout. */
+const SLOW = 2e3;
+const waiting = (line) => {
+	process.stderr.write(line + "\n");
+};
 /** The name the server on this URL serves, or null when nothing answers. */
 async function serving(url) {
 	try {
@@ -8959,7 +8984,7 @@ async function serving(url) {
 *  well from now on, M20; or for any, when no base is named), or one started for the base, its output kept in a
 *  log. `url` is the base's own address there. A server this started stops once the last of those using it lets it
 *  go; one you started yourself goes on. */
-async function ensureServer(path, { port = 4767, env = process.env, wait = 12e4 } = {}) {
+async function ensureServer(path, { port = 4767, env = process.env, wait = 12e4, say = waiting } = {}) {
 	const root = `http://127.0.0.1:${port}`;
 	const opened = path === void 0 ? null : locate(path);
 	let name = await serving(root), started = null;
@@ -8985,7 +9010,12 @@ async function ensureServer(path, { port = 4767, env = process.env, wait = 12e4
 		});
 		const exited = new Promise((done) => started.once("exit", () => done()));
 		const begun = Date.now();
+		let told = false;
 		while ((name = await serving(root)) === null) {
+			if (!told && Date.now() - begun > SLOW) {
+				say(`isorite: waiting for the isorite server; its output is in ${log}`);
+				told = true;
+			}
 			if (started.exitCode !== null || Date.now() - begun > wait) {
 				started.kill();
 				throw new StudyError(`the isorite server did not start; its output is in ${log}`);
@@ -9054,7 +9084,7 @@ async function tell(url, path, body) {
 }
 /** OpenCode's own server, on this machine only, with a password of its own; its output kept in a log. The terminal
 *  attaches to it, and so does the isorite server, which shows its session in the Iso pane (M11). */
-async function startOpenCode(command, { cwd, env, wait = 6e4 }) {
+async function startOpenCode(command, { cwd, env, wait = 6e4, say = waiting }) {
 	const port = await freePort(), password = randomBytes(24).toString("base64url"), url = `http://127.0.0.1:${port}`;
 	const log = join(tmpdir(), `isorite-opencode-${port}.log`);
 	const out = openSync(log, "w");
@@ -9078,7 +9108,17 @@ async function startOpenCode(command, { cwd, env, wait = 6e4 }) {
 	});
 	const auth = { authorization: "Basic " + Buffer.from(`opencode:${password}`).toString("base64") };
 	const started = Date.now();
+	let told = 0;
 	for (;;) {
+		const waited = Date.now() - started;
+		if (told === 0 && waited > SLOW) {
+			say("isorite: waiting for OpenCode's server");
+			told = 1;
+		}
+		if (told === 1 && waited > 1e4) {
+			say(`isorite: OpenCode's server has not answered in 10 s (a git it runs may be waiting); its output is in ${log}`);
+			told = 2;
+		}
 		if (server.exitCode !== null || Date.now() - started > wait) {
 			server.kill();
 			throw new StudyError(`OpenCode's server did not start; its output is in ${log}`);
@@ -9176,7 +9216,8 @@ async function term(path, { port = 4767, cwd = process.cwd(), env: given = proce
 	const shared = {
 		...env,
 		OPENCODE_CONFIG_DIR: home,
-		ISORITE_URL: server.url
+		ISORITE_URL: server.url,
+		GIT_TERMINAL_PROMPT: "0"
 	};
 	let backend;
 	try {
@@ -9200,7 +9241,8 @@ async function term(path, { port = 4767, cwd = process.cwd(), env: given = proce
 			...given,
 			OPENCODE_CONFIG_DIR: home,
 			ISORITE_URL: server.url,
-			OPENCODE_PASSWORD: backend.password
+			OPENCODE_PASSWORD: backend.password,
+			GIT_TERMINAL_PROMPT: "0"
 		}
 	});
 	const forward = (signal) => () => child.kill(signal);
@@ -10941,7 +10983,7 @@ anything secret: keys, passwords, tokens.
 `;
 /** Make the memory, or say where it is: the folder (as isorite new makes it), a git repository of its own, its
 *  practice, and its row in bases.toml, lent. */
-function memory(folder = MEMORY_FOLDER, { config = configPath(), out = console.log } = {}) {
+function memory(folder = MEMORY_FOLDER, { config = configPath(), out = console.log, env = process.env } = {}) {
 	const at = resolve(folder), known = knownBases(config);
 	const had = known.find((b) => b.path === at) ?? (folder === MEMORY_FOLDER ? known.find((b) => b.name === "memory") : void 0);
 	if (had && existsSync(join(had.path, "AGENTS.md"))) {
@@ -10952,15 +10994,7 @@ function memory(folder = MEMORY_FOLDER, { config = configPath(), out = console.l
 		if (existsSync(at) && readdirSync(at).some((f) => f !== ".isorite" && f !== ".git")) throw new StudyError(`${at} has files in it already, and no ${AGENTS_FILE}: name another folder, isorite memory <folder>`);
 		newBase(at);
 		writeFileSync(join(at, AGENTS_FILE), MEMORY_AGENTS);
-		try {
-			if (!existsSync(join(at, ".git"))) execFileSync("git", ["init", "--quiet"], {
-				cwd: at,
-				stdio: "ignore"
-			});
-		} catch {
-			out("  (git is not here: the memory is not a repository yet)");
-		}
-		out(`isorite memory: made at ${at}, a private repository of its own: push it where you like`);
+		out(existsSync(join(at, ".git")) || gitInit(at, { env }) ? `isorite memory: made at ${at}, a private repository of its own: push it where you like` : `isorite memory: made at ${at}; not a git repository (git did not answer, or is not here): git init it yourself`);
 	}
 	const name = rememberBase(at, {
 		path: config,
@@ -11182,11 +11216,32 @@ function main(argv) {
 	process.stdout.write(USAGE);
 	return command && command !== "help" && command !== "--help" ? 2 : 0;
 }
+/** The commands that start something, which say so at once (M21): a subprocess that stalls after this is then
+*  seen to stall. To stderr, as `mcp` speaks on stdout; once, not again when the command runs itself again with
+*  the proxy on (ISORITE_STARTING). */
+const STARTS = /* @__PURE__ */ new Set([
+	"serve",
+	"term",
+	"mcp",
+	"guide",
+	"tutorial",
+	"--tutorial"
+]);
+function starting(argv, env = process.env, write = (s) => process.stderr.write(s)) {
+	if (!STARTS.has(argv[0] ?? "") || env.ISORITE_STARTING) return false;
+	write("isorite: starting…\n");
+	return true;
+}
 if (process.argv[1] && import.meta.url === pathToFileURL(realpathSync(resolve(process.argv[1]))).href) {
+	starting(process.argv.slice(2));
+	delete process.env.ISORITE_STARTING;
 	const env = proxied(process.env);
-	if (env) process.exit(await rerun(env));
+	if (env) process.exit(await rerun({
+		...env,
+		ISORITE_STARTING: "1"
+	}));
 	trustSystem();
 	process.exit(await main(process.argv.slice(2)));
 }
 //#endregion
-export { check, main };
+export { check, main, starting };

package/docs/setup-for-agents.md

@@ -157,6 +157,7 @@ Rules:
 | `The model could not be fetched:` and a line for npm, GitHub, Hugging Face | None reachable from here. | Copy the model's folder from a machine that has it (`isorite model` there says where), then `isorite model --from <folder>`; or any compatible model. |
 | `said 400: … stream_options` | The gateway refuses `stream_options`. | `stream_usage = false`. |
 | `✗ tools: … answered without calling the tool` | The model or gateway drops tools. | Choose a model that supports tool calls. Iso and the terminal need them. |
+| `isorite: starting…` and then nothing, or `waiting for OpenCode's server` | Something it starts is stalled. isorite runs no `git` to start (0.8.1); OpenCode may, and a company's `git` wrapper that waits on the network stalls it. | Read the log the line names. Check `git --version` answers at once in that folder; if not, the wrapper is the cause. |
 | `isorite term needs OpenCode 2` | OpenCode 1, or none. | `npm i -g @opencode/cli`, or `ISORITE_OPENCODE=…`. |
 | `port 4767 is serving <other>, not <notes>` | Another base is served there. | Stop it, or `--port`. |
 | The link doesn't open, over SSH | `localhost` is the remote machine. | `ssh -L 4767:localhost:4767 <host>` from the person's own machine. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isorite",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "An agentic harness for understanding: your notes as a knowledge base, an Atlas of them, an agent that reads them, and study.",
   "license": "MIT",
   "type": "module",

package/web/_app/immutable/chunks/{B-65IYX-.js → B2TCcw-P.js}

@@ -1,4 +1,4 @@
-import{$ as e,A as t,B as n,D as r,E as i,F as a,H as o,J as s,L as c,O as l,P as u,Q as d,S as f,T as p,U as m,X as h,Y as g,_,at as v,dt as y,f as ee,h as b,i as x,j as S,k as C,n as w,ot as T,q as E,rt as te,s as ne,tt as D,u as re,x as ie,z as ae}from"./nMarIA7J.js";import{t as O}from"./BrXPCJaM.js";import"./xihTtKlq.js";import{A as k,C as oe,D as se,F as ce,S as le,_ as ue,a as de,b as fe,c as pe,f as me,h as he,i as ge,k as _e,m as ve,n as ye,o as be,p as xe,r as Se,s as Ce,t as we,u as Te,v as Ee,y as De}from"./B91efLFT.js";import{a as Oe,n as ke,r as Ae,s as je,t as A}from"./CnP_Si9g.js";import{i as Me}from"./hOAYc4Tf.js";import{B as Ne,D as j,E as Pe,F as M,G as Fe,H as Ie,I as Le,J as N,K as Re,L as P,M as F,N as I,P as ze,R as Be,S as Ve,W as He,X as Ue,Y as We,at as Ge,ct as Ke,et as qe,it as Je,lt as Ye,mt as Xe,n as Ze,nt as L,rt as R,t as Qe,ut as $e,v as et,w as tt,x as nt,y as rt}from"./BxTFtVqu.js";import{i as it,l as at,n as ot,o as st,r as ct}from"./yxd8jSz3.js";var lt=class{note;#e=e([]);get entries(){return c(this.#e)}set entries(e){d(this.#e,e)}#t=e(null);get prompt(){return c(this.#t)}set prompt(e){d(this.#t,e)}#n=e(null);get asking(){return c(this.#n)}set asking(e){d(this.#n,e)}#r=e(null);get failed(){return c(this.#r)}set failed(e){d(this.#r,e)}get tier(){return xe.tier}#i=e(null);get cursor(){return c(this.#i)}set cursor(e){d(this.#i,e)}#a=e(``);get busy(){return c(this.#a)}set busy(e){d(this.#a,e,!0)}#o=e(null);get editing(){return c(this.#o)}set editing(e){d(this.#o,e,!0)}stop=null;constructor(e){this.note=e}#s=D(()=>oe(this.entries));get waiting(){return c(this.#s)}set waiting(e){d(this.#s,e)}#c=D(()=>this.waiting.filter(e=>e.form===`insert`));get proposals(){return c(this.#c)}set proposals(e){d(this.#c,e)}#l=D(()=>{let e=[],t=se(this.note.text);for(let n of this.waiting)if(n.form===`rewrite`)for(let r of n.open??[]){let i=n.regions[r],a=ue(this.note.text,i.old),o=a?this.note.text.slice(0,a.from).split(`
+import{$ as e,A as t,B as n,D as r,E as i,F as a,H as o,J as s,L as c,O as l,P as u,Q as d,S as f,T as p,U as m,X as h,Y as g,_,at as v,dt as y,f as ee,h as b,i as x,j as S,k as C,n as w,ot as T,q as E,rt as te,s as ne,tt as D,u as re,x as ie,z as ae}from"./nMarIA7J.js";import{t as O}from"./DtPULAe0.js";import"./xihTtKlq.js";import{A as k,C as oe,D as se,F as ce,S as le,_ as ue,a as de,b as fe,c as pe,f as me,h as he,i as ge,k as _e,m as ve,n as ye,o as be,p as xe,r as Se,s as Ce,t as we,u as Te,v as Ee,y as De}from"./D3BEa5-_.js";import{a as Oe,n as ke,r as Ae,s as je,t as A}from"./CurmVJyp.js";import{i as Me}from"./BAkGB2fM.js";import{B as Ne,D as j,E as Pe,F as M,G as Fe,H as Ie,I as Le,J as N,K as Re,L as P,M as F,N as I,P as ze,R as Be,S as Ve,W as He,X as Ue,Y as We,at as Ge,ct as Ke,et as qe,it as Je,lt as Ye,mt as Xe,n as Ze,nt as L,rt as R,t as Qe,ut as $e,v as et,w as tt,x as nt,y as rt}from"./BxTFtVqu.js";import{i as it,l as at,n as ot,o as st,r as ct}from"./yxd8jSz3.js";var lt=class{note;#e=e([]);get entries(){return c(this.#e)}set entries(e){d(this.#e,e)}#t=e(null);get prompt(){return c(this.#t)}set prompt(e){d(this.#t,e)}#n=e(null);get asking(){return c(this.#n)}set asking(e){d(this.#n,e)}#r=e(null);get failed(){return c(this.#r)}set failed(e){d(this.#r,e)}get tier(){return xe.tier}#i=e(null);get cursor(){return c(this.#i)}set cursor(e){d(this.#i,e)}#a=e(``);get busy(){return c(this.#a)}set busy(e){d(this.#a,e,!0)}#o=e(null);get editing(){return c(this.#o)}set editing(e){d(this.#o,e,!0)}stop=null;constructor(e){this.note=e}#s=D(()=>oe(this.entries));get waiting(){return c(this.#s)}set waiting(e){d(this.#s,e)}#c=D(()=>this.waiting.filter(e=>e.form===`insert`));get proposals(){return c(this.#c)}set proposals(e){d(this.#c,e)}#l=D(()=>{let e=[],t=se(this.note.text);for(let n of this.waiting)if(n.form===`rewrite`)for(let r of n.open??[]){let i=n.regions[r],a=ue(this.note.text,i.old),o=a?this.note.text.slice(0,a.from).split(`
 `).length-1:-1,s=t.find(e=>e.from<=o&&o<e.to);e.push({key:`r:${n.id}:${r}`,proposal:n,k:r,at:a,block:/\n/.test(i.old.text.trim())||/\n/.test(i.new.trim()),code:!!(s&&/^\s*(```|~~~)/.test(s.text))})}return e.sort((e,t)=>(e.at?.from??1/0)-(t.at?.from??1/0))});get changes(){return c(this.#l)}set changes(e){d(this.#l,e)}#u=D(()=>{try{let e=k(this.note.text)[0];return{lines:e.split(`
 `).length-1,chars:e.length}}catch{return{lines:0,chars:0}}});get head(){return c(this.#u)}set head(e){d(this.#u,e)}get foot(){return this.note.text.split(`
 `).length}spans(e){return e.flatMap(e=>{let t=ue(this.note.text,e);return t?[t]:[]})}placed(e){return fe(this.note.text,e)!==null}#d=D(()=>{let e=[];for(let t of this.proposals){let n=fe(this.note.text,t);e.push({key:`p:${t.id}`,line:n?.form===`insert`?n.line:this.foot})}this.changes.some(e=>!e.at)&&e.push({key:`lost`,line:this.foot}),this.asking&&e.push({key:`asking`,line:this.asking.line}),this.failed&&e.push({key:`failed`,line:this.failed.line}),this.prompt&&e.push({key:`prompt`,line:this.prompt.line});let t=this.changes.filter(e=>e.at);for(let n of t)n.block&&e.push({key:n.key,line:this.note.text.slice(0,n.at.to).split(`