@webinson/peer-core 0.1.977 → 0.1.978

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.977 of Peer Local (https://github.com/SemanS/peer-app, branch `peer`), based on T3 Code.
+Version 0.1.978 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-BD8xnLcs.mjs");
+		const { runCli } = await import("./binCli-B32nSvwp.mjs");
 		runCli(npmPeerBin ? "peer" : "t3");
 	}
 }

package/dist/{binCli-BD8xnLcs.mjs → binCli-B32nSvwp.mjs}

@@ -27680,6 +27680,22 @@ const connectEditor = (id, stateDir, io) => gen$1(function* () {
 		stateDir
 	}, io);
 });
+/** The way out of `connectEditor`: Peer's hooks out of Claude Code or Codex, the MCP entry out of the rest. */
+const disconnectEditor = (id, io) => gen$1(function* () {
+	if (id === "claude" || id === "codex") {
+		const status = yield* (yield* PeerAdapters).setCoordination(id === "claude" ? { claudeHooks: false } : { codexHooks: false });
+		return yield* sayHooks(status, {
+			claude: id === "claude",
+			codex: id === "codex",
+			install: false
+		}, io);
+	}
+	const answer = yield* (yield* McpClients).disconnect({
+		client: id,
+		scope: "user"
+	});
+	yield* io.say(answer.outcome === "manual" ? `${answer.path} is not plain JSON, so Peer left it alone. Remove this entry by hand:\n${answer.entry}` : answer.outcome === "unchanged" ? `${editorTitle(id)} had no Peer entry in ${answer.path}.` : `Disconnected ${editorTitle(id)}: removed Peer's entry from ${answer.path}.`);
+});
 //#endregion
 //#region src/cli/joinLink.ts
 /**
@@ -27999,11 +28015,13 @@ async function findRepositories(home, limit = 25) {
 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) => {
+/** The lines above the menu: who, which workspace, the project here, and the editors connected. */
+const menuContext = (status, here, editors) => {
 	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"}`);
+	if (here !== null) lines.push(`Project: ${NodePath.basename(here.root)} · ${here.state === "connected" ? `Connected${here.project === NodePath.basename(here.root) ? "" : ` as ${here.workspace}/${here.project}`}` : here.state === "clone" ? `Clone of ${here.project}, not connected` : "Not connected"}`);
+	const connected = editors.filter((e) => e.connected);
+	lines.push(connected.length === 0 ? "Editors: none connected yet" : ["Editors:", ...connected.map((e) => `  ✓ ${e.title}`)].join("\n"));
 	return lines;
 };
 /**
@@ -28012,7 +28030,7 @@ const menuContext = (status, here, home) => {
 * 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, here) => {
+const menuItems = (status, here, editors = []) => {
 	const offers = [...(status.foundings ?? []).filter((f) => f.expired !== true).map((f) => ({
 		title: `Accept ${f.name}, founded for you`,
 		value: {
@@ -28054,9 +28072,19 @@ const menuItems = (status, here) => {
 		description: "The app: tasks, agents and who works on what.",
 		value: { kind: "open" }
 	}];
+	const launch = here?.state === "connected" ? editors.filter((e) => e.connected && e.launchable).map((e) => ({
+		title: `Open ${e.title}`,
+		description: `In ${NodePath.basename(here.root)}, with Peer coordinating its agents.`,
+		value: {
+			kind: "launch",
+			editor: e.id,
+			folder: here.root
+		}
+	})) : [];
 	const items = inWorkspace ? [
 		...offers,
 		...here?.state === "connected" ? [
+			...launch,
 			...invite,
 			...work,
 			...connectHere
@@ -28087,7 +28115,11 @@ const menuItems = (status, here) => {
 			value: { kind: "join" }
 		}
 	];
-	items.push({
+	items.push(editors.some((e) => e.connected) ? {
+		title: "Manage integrations",
+		description: "Connect or disconnect editors and agents.",
+		value: { kind: "editor" }
+	} : {
 		title: "Connect an editor",
 		description: "So your agents (Claude Code, Codex, Cursor, …) coordinate through Peer.",
 		value: { kind: "editor" }
@@ -28122,21 +28154,30 @@ const menu = (ask, steps, io) => gen$1(function* () {
 	for (;;) {
 		const status = yield* steps.status;
 		const here = yield* steps.here;
-		const context = menuContext(status, here, steps.home).join("\n");
+		const editors = yield* steps.editors;
+		const editorsConnected = editors.some((e) => e.connected);
+		const context = menuContext(status, here, editors).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 item = yield* ask.choose("What would you like to do?", menuItems(status, here, editors));
+		if (item === null || item.kind === "exit") return { editorsConnected };
+		if (item.kind === "launch") return {
+			editorsConnected,
+			launch: {
+				editor: item.editor,
+				folder: item.folder
+			}
+		};
 		if (item.kind === "open") {
-			if (yield* steps.openPeer.pipe(as(true), catch_((error) => io.say(String(error.message).replace(/^peer core: /, "")).pipe(as(false))))) return;
+			if (yield* steps.openPeer.pipe(as(true), catch_((error) => io.say(String(error.message).replace(/^peer core: /, "")).pipe(as(false))))) return { editorsConnected: false };
 			continue;
 		}
 		const connect = (folder) => gen$1(function* () {
 			const joined = yield* steps.share(folder);
 			if (joined === null) return;
-			const ready = yield* steps.agentsReady;
+			const ready = (yield* steps.editors).some((e) => e.connected);
 			yield* io.say([
 				"",
 				`✓ Signed in as ${status.email ?? ""}`,
@@ -28174,10 +28215,19 @@ const menu = (ask, steps, io) => gen$1(function* () {
 					if (folder !== null && folder.trim() !== "") yield* connect(folder.trim());
 					return;
 				}
-				case "editor":
-					yield* steps.editor;
+				case "editor": {
+					const id = yield* ask.choose("Which editor or agent?", editors.map((e) => ({
+						title: `${e.connected ? "✓ " : "  "}${e.title}`,
+						description: e.connected ? "Connected: choose it to disconnect" : "Connect it",
+						value: e.id
+					})));
+					const chosen = editors.find((e) => e.id === id);
+					if (chosen === void 0) return;
+					if (!chosen.connected) yield* steps.connectEditor(chosen.id);
+					else if (yield* ask.confirm(`Disconnect ${chosen.title} from Peer?`, false)) yield* steps.disconnectEditor(chosen.id);
 					shown = "";
 					return;
+				}
 				case "workspace": {
 					const next = yield* ask.choose("Join or create", [{
 						title: "Join a workspace",
@@ -28732,7 +28782,7 @@ const runMenu = (stateDir) => gen$1(function* () {
 	const workspaces = yield* PeerWorkspaces;
 	const state = yield* PeerState;
 	const status = workspaces.sync.pipe(hubFailure);
-	yield* menu(menuAsk, {
+	return yield* menu(menuAsk, {
 		status,
 		home: NodeOS.homedir(),
 		here: gen$1(function* () {
@@ -28757,11 +28807,17 @@ const runMenu = (stateDir) => gen$1(function* () {
 				project: `${match.workspace}/${match.project}`
 			};
 		}),
-		agentsReady: gen$1(function* () {
+		editors: 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)),
+			const env = yield* Environment;
+			return EDITORS.map((id) => ({
+				id,
+				title: editorTitle(id),
+				connected: id === "claude" ? coordination.claudeHooks : id === "codex" ? (coordination.codexHookHomes ?? []).some((home) => home.installed) : mcp.includes(id),
+				launchable: (id === "claude" || id === "codex") && onPath(id, env.PATH)
+			}));
+		}).pipe(orElseSucceed(() => [])),
 		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),
@@ -28814,10 +28870,8 @@ const runMenu = (stateDir) => gen$1(function* () {
 			if (opener !== void 0) yield* launch(PEER_DOWNLOAD);
 			return yield* fail(`peer core: the Peer app is not installed here${opener === void 0 ? "" : "; its download page is open"}: ${PEER_DOWNLOAD}`);
 		}),
-		editor: gen$1(function* () {
-			const editor = yield* shareAsk.choose("Connect which editor?", editorChoices(yield* detectedEditors));
-			if (editor !== null) yield* connectEditor(editor, stateDir, terminalIo);
-		}).pipe(hubFailure)
+		connectEditor: (id) => connectEditor(id, stateDir, terminalIo).pipe(hubFailure),
+		disconnectEditor: (id) => disconnectEditor(id, terminalIo).pipe(hubFailure)
 	}, terminalIo);
 });
 const registerIn = (stateDir) => (path, name) => tryPromise({
@@ -28832,12 +28886,15 @@ const loginCommand = make$62("login", {
 }).pipe(withDescription("Sign this computer's Peer in to its Peer Hub; on a terminal, then a menu: create or join a workspace, share, invite."), withHandler((flags) => gen$1(function* () {
 	const config = yield* resolveConfig(flags);
 	yield* refuseWhileRunning(config.stateDir);
-	yield* gen$1(function* () {
+	const end = yield* gen$1(function* () {
 		const signedIn = (yield* (yield* PeerState).read).persisted.email;
 		const email = getOrUndefined(flags.email)?.trim();
 		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}`);
+			if (!isTerminal()) {
+				yield* log(`Signed in: ${signedIn}`);
+				return;
+			}
 			return yield* runMenu(config.stateDir);
 		}
 		yield* login({
@@ -28845,9 +28902,41 @@ const loginCommand = make$62("login", {
 			...isSome(flags.code) ? { code: flags.code.value } : {},
 			...isSome(flags.hub) ? { hub: flags.hub.value } : {}
 		}, terminalIo);
-		if (isTerminal()) yield* runMenu(config.stateDir);
+		return isTerminal() ? yield* runMenu(config.stateDir) : void 0;
 	}).pipe(hubFailure, provide(layer$107.pipe(provideMerge(oneShotLayer(config)))));
+	if (end !== void 0) yield* afterMenu(end, config, flags);
 })));
+/** Whether `command` is an executable in one of `path`'s folders. */
+const onPath = (command, path) => (path ?? "").split(NodePath.delimiter).some((dir) => {
+	try {
+		NodeFS.accessSync(NodePath.join(dir, command), NodeFS.constants.X_OK);
+		return true;
+	} catch {
+		return false;
+	}
+});
+/**
+* After the menu, with its state written and closed: Peer Core keeps coordinating when an editor
+* is connected and no Peer runs (the hooks only talk to a running Peer), and the editor the
+* person chose starts in the project, in this terminal.
+*/
+const afterMenu = (end, config, flags) => gen$1(function* () {
+	if ((end.editorsConnected || end.launch !== void 0) && (yield* ownerOf(config.stateDir)) === null) {
+		yield* serveDetached(config, flags);
+		yield* log("Peer Core coordinates your agents in the background; peer core stop ends it.");
+	}
+	const launch = end.launch;
+	if (launch === void 0) return;
+	yield* log(`Starting ${editorTitle(launch.editor)} in ${launch.folder}…`);
+	if ((yield* callback((resume) => {
+		const child = NodeChildProcess.spawn(launch.editor, [], {
+			cwd: launch.folder,
+			stdio: "inherit"
+		});
+		child.once("error", () => resume(succeed$1(127)));
+		child.once("exit", (exit) => resume(succeed$1(exit ?? 0)));
+	})) === 127) return yield* fail(`peer core: could not start ${launch.editor}; is it installed?`);
+});
 const createCommand = make$62("create", {
 	...authLocationFlags,
 	name: String$2("name").pipe(withDescription$2("The workspace's name.")),
@@ -55448,4 +55537,4 @@ function runCli(root = "t3") {
 //#endregion
 export { runCli };
 
-//# sourceMappingURL=binCli-BD8xnLcs.mjs.map
+//# sourceMappingURL=binCli-B32nSvwp.mjs.map

package/package.json

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