@webinson/peer-core 0.1.975 → 0.1.976

package/README.md

@@ -16,4 +16,4 @@ peer core serve --detach          # or let the editor start it on demand
 `peer core status` says who runs Peer here; `peer core stop` stops Peer Core. The Peer desktop app,
 when it starts, takes coordination over. Any other `peer <command>` goes to the running Peer.
 
-Version 0.1.975 of Peer Local (https://github.com/SemanS/peer-app, branch `peer`), based on T3 Code.
+Version 0.1.976 of Peer Local (https://github.com/SemanS/peer-app, branch `peer`), based on T3 Code.

package/dist/bin.mjs

@@ -77,7 +77,7 @@ if (isEntrypoint({
 	} else {
 		const { attachConsoleStdin } = await import("./consoleStdin-DO-vIhyg.mjs");
 		attachConsoleStdin();
-		const { runCli } = await import("./binCli-CwrAHPco.mjs");
+		const { runCli } = await import("./binCli-CO9uk2ZU.mjs");
 		runCli(npmPeerBin ? "peer" : "t3");
 	}
 }

package/dist/{binCli-CwrAHPco.mjs → binCli-CO9uk2ZU.mjs}

@@ -27996,118 +27996,198 @@ async function findRepositories(home, limit = 25) {
 	await Promise.all([...new Set(roots.filter((root) => root !== null))].map((root) => look(root, 2)));
 	return [...found.entries()].sort((a, b) => b[1] - a[1]).slice(0, limit).map(([dir]) => dir);
 }
+const RECOMMENDED = "Recommended";
+/** `~/…` for a path under the home directory: the name matters, the full path is context. */
+const shortPath = (path, home) => path === home || path.startsWith(`${home}${NodePath.sep}`) ? `~${path.slice(home.length)}` : path;
+/** The lines above the menu: who, which workspace, and the project here. */
+const menuContext = (status, here, home) => {
+	const names = status.workspaces.map((w) => w.slug);
+	const lines = [`Signed in as ${status.email ?? "nobody"}`, names.length === 0 ? "Workspace: none yet" : names.length === 1 ? `Workspace: ${names[0]}` : `Workspaces: ${names.join(", ")}`];
+	if (here !== null) lines.push(`Current project: ${NodePath.basename(here.root)} (${shortPath(here.root, home)}) · ${here.state === "connected" ? `connected to ${here.workspace}/${here.project}` : here.state === "clone" ? `a clone of ${here.project}, not connected` : "not connected"}`);
+	return lines;
+};
 /**
-* What the menu offers now: what waits for the person first (invitations, foundings, a domain
-* match), then sharing `folder` when it is a repository no workspace has, inviting where they may,
-* creating and joining, an editor, and done.
+* What the menu offers, the step that gets the person to a shared project first and marked
+* recommended: an invitation that waits, else a workspace when there is none, else connecting
+* the project here, else inviting a teammate to it. Inviting is offered where they own or
+* administer a workspace; joining or creating one stays reachable, Exit last.
 */
-const menuItems = (status, folder) => [
-	...(status.foundings ?? []).filter((f) => f.expired !== true).map((f) => ({
-		title: `Accept ${f.name} (${f.slug}), founded for you`,
+const menuItems = (status, here) => {
+	const offers = [...(status.foundings ?? []).filter((f) => f.expired !== true).map((f) => ({
+		title: `Accept ${f.name}, founded for you`,
 		value: {
 			kind: "founding",
 			slug: f.slug,
 			name: f.name
 		}
-	})),
-	...status.joinable.map((offer) => ({
-		title: offer.reason === "invite" ? `Accept the invitation to ${offer.name} (${offer.slug})` : `Join ${offer.name} (${offer.slug}), which your email domain admits`,
+	})), ...status.joinable.map((offer) => ({
+		title: offer.reason === "invite" ? `Accept the invitation to ${offer.name}` : `Join ${offer.name} (your email domain is admitted)`,
 		value: {
 			kind: offer.reason === "invite" ? "accept" : "domain",
 			slug: offer.slug,
 			name: offer.name
 		}
-	})),
-	...folder === null || status.workspaces.length === 0 ? [] : [{
-		title: `Share ${folder} with a workspace`,
-		value: {
-			kind: "share",
-			folder
-		}
-	}],
-	...status.workspaces.length === 0 ? [] : [{
-		title: "Share a project from this computer…",
-		value: { kind: "browse" }
-	}],
-	...status.workspaces.filter((w) => inviter(w.role)).map((w) => ({
-		title: `Invite someone to ${w.name} (${w.slug})`,
+	}))];
+	const inWorkspace = status.workspaces.length > 0;
+	const canInvite = status.workspaces.some((w) => inviter(w.role));
+	const name = here === null ? "" : NodePath.basename(here.root);
+	const target = status.workspaces.length === 1 ? status.workspaces[0].slug : "the workspace you choose";
+	const connectHere = !inWorkspace || here === null || here.state === "connected" ? [] : [{
+		title: `Connect this project (${name})`,
+		description: here.state === "clone" ? `It is a clone of ${here.project}: it joins that project, nothing new is created.` : `Your team in ${target} sees it and can clone it; the code stays in its repository.`,
 		value: {
-			kind: "invite",
-			slug: w.slug
+			kind: "here",
+			folder: here.root
 		}
-	})),
-	{
-		title: "Create a workspace",
-		value: { kind: "create" }
-	},
-	{
-		title: "Join a workspace by its name",
-		value: { kind: "join" }
-	},
-	{
+	}];
+	const invite = canInvite ? [{
+		title: "Invite a teammate",
+		description: "They get an email with a link; you choose the projects.",
+		value: { kind: "invite" }
+	}] : [];
+	const items = inWorkspace ? [
+		...offers,
+		...here?.state === "connected" ? [...invite, ...connectHere] : [...connectHere, ...invite],
+		{
+			title: "Connect another local project",
+			description: "Pick one of your repositories, or browse for a folder.",
+			value: { kind: "another" }
+		},
+		{
+			title: "Join or create a workspace",
+			value: { kind: "workspace" }
+		}
+	] : [
+		...offers,
+		{
+			title: "Create a workspace",
+			description: "A place for your team's projects; you become its owner.",
+			value: { kind: "create" }
+		},
+		{
+			title: "Join a workspace",
+			description: "By the name in your invitation.",
+			value: { kind: "join" }
+		}
+	];
+	items.push({
 		title: "Connect an editor",
+		description: "So your agents (Claude Code, Codex, Cursor, …) coordinate through Peer.",
 		value: { kind: "editor" }
-	},
-	{
-		title: "Done",
-		value: { kind: "done" }
-	}
-];
+	}, {
+		title: "Exit",
+		value: { kind: "exit" }
+	});
+	const [first, ...rest] = items;
+	return first === void 0 || first.value.kind === "exit" || first.value.kind === "editor" ? items : [{
+		...first,
+		description: first.description === void 0 ? RECOMMENDED : `${RECOMMENDED} · ${first.description}`
+	}, ...rest];
+};
 /**
-* Asks what to do next until the person is done; a step that fails says why and the menu asks
-* again, so one refusal does not end it.
+* Asks what to do next until the person exits; a step that fails says why and the menu asks
+* again, so one refusal does not end it. A connected project ends in what is ready for the team.
 */
 const menu = (ask, steps, io) => gen$1(function* () {
+	let shown = "";
+	const createStep = gen$1(function* () {
+		const name = yield* ask.text("The workspace's name");
+		if (name === null || name.trim() === "") return;
+		yield* steps.create(name);
+		shown = "";
+	});
+	const joinStep = gen$1(function* () {
+		const slug = yield* ask.text("The workspace's short name (as your invitation names it)");
+		if (slug === null || slug.trim() === "") return;
+		yield* steps.join(slug.trim());
+		shown = "";
+	});
 	for (;;) {
 		const status = yield* steps.status;
-		const item = yield* ask.choose("What next?", menuItems(status, status.workspaces.length === 0 ? null : yield* steps.shareable));
-		if (item === null || item.kind === "done") return;
+		const here = yield* steps.here;
+		const context = menuContext(status, here, steps.home).join("\n");
+		if (context !== shown) {
+			yield* io.say(context);
+			shown = context;
+		}
+		const item = yield* ask.choose("What would you like to do?", menuItems(status, here));
+		if (item === null || item.kind === "exit") return;
+		const connect = (folder) => gen$1(function* () {
+			const joined = yield* steps.share(folder);
+			if (joined === null) return;
+			const ready = yield* steps.agentsReady;
+			yield* io.say([
+				"",
+				`✓ Signed in as ${status.email ?? ""}`,
+				`✓ Project "${NodePath.basename(folder)}" connected to ${joined.workspace} (${joined.project})`,
+				ready ? "✓ Agent integration ready" : "· Agent integration not set up yet: choose Connect an editor",
+				"",
+				"Your project is ready for collaboration."
+			].join("\n"));
+			shown = "";
+		});
 		yield* gen$1(function* () {
 			switch (item.kind) {
 				case "accept":
 				case "domain": return yield* steps.join(item.slug);
 				case "founding": return yield* steps.founding(item.slug);
-				case "share": return yield* steps.share(item.folder);
-				case "browse": {
+				case "here": return yield* connect(item.folder);
+				case "another": {
 					const found = yield* steps.repositories;
 					const picked = yield* ask.choose(found.length === 0 ? "No repositories found in the usual folders" : "Which project?", [
 						...found.map((dir) => ({
-							title: dir,
+							title: NodePath.basename(dir),
+							description: shortPath(dir, steps.home),
 							value: dir
 						})),
 						{
 							title: "Browse folders…",
-							value: "browse"
+							value: "\0browse"
 						},
 						{
 							title: "Type a path…",
-							value: "type"
+							value: "\0type"
 						}
 					]);
-					const folder = picked === "browse" ? yield* ask.folder("The project's folder (Enter, then y opens a folder, n chooses it)") : picked === "type" ? yield* ask.text("The project's folder (a path)") : picked;
-					if (folder !== null && folder.trim() !== "") yield* steps.share(folder.trim());
+					const folder = picked === "\0browse" ? yield* ask.folder("The project's folder (Enter, then y opens a folder, n chooses it)") : picked === "\0type" ? yield* ask.text("The project's folder (a path)") : picked;
+					if (folder !== null && folder.trim() !== "") yield* connect(folder.trim());
 					return;
 				}
-				case "editor": return yield* steps.editor;
-				case "create": {
-					const name = yield* ask.text("The workspace's name");
-					if (name !== null && name.trim() !== "") yield* steps.create(name);
+				case "editor":
+					yield* steps.editor;
+					shown = "";
 					return;
-				}
-				case "join": {
-					const slug = yield* ask.text("The workspace's short name (as its invitation names it)");
-					if (slug !== null && slug.trim() !== "") yield* steps.join(slug.trim());
+				case "workspace": {
+					const next = yield* ask.choose("Join or create", [{
+						title: "Join a workspace",
+						description: "By the name in your invitation.",
+						value: "join"
+					}, {
+						title: "Create a workspace",
+						description: "You become its owner.",
+						value: "create"
+					}]);
+					if (next === "create") return yield* createStep;
+					if (next === "join") return yield* joinStep;
 					return;
 				}
+				case "create": return yield* createStep;
+				case "join": return yield* joinStep;
 				case "invite": {
-					const email = yield* ask.text(`Whom to invite to ${item.slug} (their email)`);
+					const slugs = status.workspaces.filter((w) => inviter(w.role)).map((w) => w.slug);
+					const slug = slugs.length === 1 ? slugs[0] : yield* ask.choose("Invite to which workspace?", slugs.map((s) => ({
+						title: s,
+						value: s
+					})));
+					if (slug === null) return;
+					const email = yield* ask.text(`Their email (invited to ${slug})`);
 					if (email === null || email.trim() === "") return;
-					const projects = status.workspaces.find((w) => w.slug === item.slug)?.projects.map((p) => p.project.id) ?? [];
-					const chosen = projects.length === 0 ? [] : yield* ask.pick("Which projects (none chosen: all of them, now and later)", projects);
+					const projects = status.workspaces.find((w) => w.slug === slug)?.projects.map((p) => p.project.id) ?? [];
+					const chosen = projects.length === 0 ? [] : yield* ask.pick("Which projects (none chosen: all, now and later)", projects);
 					if (chosen === null) return;
 					return yield* steps.invite({
 						email,
-						workspace: item.slug,
+						workspace: slug,
 						projects: chosen
 					});
 				}
@@ -28155,7 +28235,7 @@ const share = (input, ask, io, register) => gen$1(function* () {
 	}
 	const place = yield* state.placeOf(folder, { bindByRemote: false });
 	if (place !== null && place.workspace !== "@local") {
-		yield* io.say(`Shared already: ${folder} is project ${place.project} of ${place.workspace}.`);
+		yield* io.say(`Connected already: ${folder} is project ${place.project} of ${place.workspace}.`);
 		return;
 	}
 	const { persisted } = yield* state.read;
@@ -28176,7 +28256,7 @@ const share = (input, ask, io, register) => gen$1(function* () {
 		const what = `${folder} is a clone of ${offered.map(title).join(", ")}`;
 		if (asking) {
 			yield* io.say(`${what}.`);
-			choice = yield* ask.choose("Use it as", [...offered.map((match) => ({
+			choice = yield* ask.choose("Connect it as", [...offered.map((match) => ({
 				title: `the checkout of ${title(match)}`,
 				value: {
 					kind: "bind",
@@ -28219,8 +28299,9 @@ const share = (input, ask, io, register) => gen$1(function* () {
 		return yield* bindTo(projectOf$1(match), match.repository);
 	}
 	const name = input.name?.trim() || NodePath.basename(folder);
+	const shown = shortPath(folder, realpathOrSelf$2(NodeOS.homedir()));
 	if (asking) {
-		if (!(yield* ask.confirm(`Share ${folder} with ${choice.workspace} as project "${name}"? Everyone in ${choice.workspace} sees it and can clone it.`, true))) {
+		if (!(yield* ask.confirm(`Connect ${shown} to ${choice.workspace} as project "${name}"? Everyone in ${choice.workspace} sees it and can clone it; the code stays in its repository.`, true))) {
 			yield* io.say("Nothing changed.");
 			return;
 		}
@@ -28232,7 +28313,7 @@ const share = (input, ask, io, register) => gen$1(function* () {
 		...input.name?.trim() ? { name: input.name.trim() } : {}
 	});
 	const shared = yield* state.placeOf(folder, { bindByRemote: false });
-	yield* io.say(shared === null ? `Shared ${folder} with ${choice.workspace}.` : `Shared ${folder} with ${choice.workspace} as project ${shared.project}.`);
+	yield* io.say(shared === null ? `Connected ${shown} to ${choice.workspace}.` : `Connected ${shown} to ${choice.workspace} as project ${shared.project}.`);
 });
 //#endregion
 //#region src/cli/peerCoreTasks.ts
@@ -28608,12 +28689,34 @@ const runMenu = (stateDir) => gen$1(function* () {
 	const status = workspaces.sync.pipe(hubFailure);
 	yield* menu(menuAsk, {
 		status,
-		shareable: gen$1(function* () {
+		home: NodeOS.homedir(),
+		here: gen$1(function* () {
 			const checkout = yield* repositoryRoot(process.cwd());
 			if (checkout === null) return null;
 			const place = yield* state.placeOf(checkout.root, { bindByRemote: false });
-			return place === null || place.workspace === "@local" ? checkout.root : null;
+			if (place !== null && place.workspace !== "@local") return {
+				root: checkout.root,
+				state: "connected",
+				workspace: place.workspace,
+				project: place.project
+			};
+			const remote = yield* promise(() => remoteOf(checkout.remoteRoot));
+			const { persisted } = yield* state.read;
+			const match = remote === null ? void 0 : matchRepositories(remote, persisted.workspaces.map((w) => w.manifest))[0];
+			return match === void 0 ? {
+				root: checkout.root,
+				state: "new"
+			} : {
+				root: checkout.root,
+				state: "clone",
+				project: `${match.workspace}/${match.project}`
+			};
 		}),
+		agentsReady: gen$1(function* () {
+			const coordination = (yield* status).coordination;
+			const mcp = yield* (yield* McpClients).connected;
+			return coordination.claudeHooks || (coordination.codexHookHomes ?? []).some((home) => home.installed && home.trusted) || mcp.length > 0;
+		}).pipe(orElseSucceed(() => false)),
 		join: (slug) => join({ target: slug }, terminalIo).pipe(flatMap$1((joined) => sayNextStep(joined, terminalIo)), hubFailure),
 		founding: (slug) => workspaces.acceptFounding({ slug }).pipe(andThen(log(`Accepted: ${slug}. You are its owner.`)), hubFailure),
 		create: (name) => create({ name }, terminalIo).pipe(asVoid, hubFailure),
@@ -28630,7 +28733,10 @@ const runMenu = (stateDir) => gen$1(function* () {
 			folder,
 			named: true,
 			yes: false
-		}, shareAsk, terminalIo, registerIn(stateDir))), hubFailure),
+		}, shareAsk, terminalIo, registerIn(stateDir)).pipe(andThen(state.placeOf(folder, { bindByRemote: false })), map$3((place) => place === null || place.workspace === "@local" ? null : {
+			workspace: place.workspace,
+			project: place.project
+		}))), hubFailure),
 		invite: (input) => status.pipe(flatMap$1((now) => invite(input, now, terminalIo)), asVoid, hubFailure),
 		editor: gen$1(function* () {
 			const editor = yield* shareAsk.choose("Connect which editor?", editorChoices(yield* detectedEditors));
@@ -28656,7 +28762,6 @@ const loginCommand = make$62("login", {
 		if (email === void 0 || signedIn !== null && signedIn === email) {
 			if (signedIn === null) return yield* fail("peer core: nobody is signed in; run peer core login <email>.");
 			if (!isTerminal()) return yield* log(`Signed in: ${signedIn}`);
-			yield* log(`Signed in: ${signedIn}`);
 			return yield* runMenu(config.stateDir);
 		}
 		yield* login({
@@ -55267,4 +55372,4 @@ function runCli(root = "t3") {
 //#endregion
 export { runCli };
 
-//# sourceMappingURL=binCli-CwrAHPco.mjs.map
+//# sourceMappingURL=binCli-CO9uk2ZU.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webinson/peer-core",
-  "version": "0.1.975",
+  "version": "0.1.976",
   "description": "Peer's coordination for coding agents without the Peer app: the `peer` command (Peer Core).",
   "license": "MIT",
   "repository": {