@hediet/linkrpc-cli 0.0.3-next.20261022.3 → 0.0.3-next.20261022.5

package/README.md

@@ -9,6 +9,25 @@ interfaces (`hubrpc.defaults`, `hubrpc.directory`, `hubrpc.schemas`) are
 used to discover what the endpoint exposes. Generic RPC commands work with any
 reflected interface; compiled-in views add specialized CLI and TUI renderers.
 
+## Directory discovery and consent
+
+`linkrpc hub ls` first tries directory reads using its current identity and
+capabilities. On `permissionRequired`, it asks the connected hub's approval
+service for short-lived access to `hubrpc.directory::list` on that exact
+directory service, then retries once. Watch mode also requests `watch`;
+schema/member dump modes additionally request `hubrpc.schemas::get`.
+Unsigned connections (`--no-sign`) do not request capabilities.
+
+Timeouts, missing methods, and transport errors never trigger consent. Plain
+output shows inaccessible directories and their errors. `--format json` and
+`--format jsonl` include an `inaccessible` report; legacy `--json` preserves its
+flat array and reports failures on stderr.
+
+Approval is not automatic authorization: the destination must accept the
+issued capability's root. If the connected hub cannot obtain a grant from an
+accepted issuer, discovery still reports that directory as inaccessible.
+No trust roots are added and no service is made public.
+
 ## Daemon-owned endpoints (`hub services`)
 
 `hub services` manages processes and existing connections **through the daemon

package/dist/chunks/{cli-DJREb0Dm.js → cli-B93twHKF.js}

@@ -2239,7 +2239,7 @@ async function lsCommand(channel, opts = {}) {
 	validateLsOptions(opts);
 	const legacyOutput = opts.format === void 0;
 	if (opts.dumpPath !== void 0) {
-		const dump = await createHubDump(channel, { maxDepth: opts.maxDepth });
+		const dump = await createHubDump(channel, opts);
 		const dumpPath = path.resolve(opts.dumpPath);
 		await mkdir(path.dirname(dumpPath), { recursive: true });
 		await writeFile(dumpPath, `${formatJson(dump)}\n`, "utf8");
@@ -2254,9 +2254,38 @@ async function lsCommand(channel, opts = {}) {
 	const state = createLsState(explorer.graphSnapshot, opts);
 	explorer.dispose();
 	const all = state.listings;
-	const output = opts.withMembers ? await addMembers(channel, all, (listing) => listing.discoveredFrom) : all;
-	if (format === "json") return formatJson(legacyOutput ? output : state);
-	return renderTree(output, opts.interfaceId);
+	const output = opts.withMembers ? await addMembers(createSchemaFetcher(channel, opts), all, (listing) => listing.discoveredFrom) : all;
+	if (format === "json") {
+		for (const item of state.inaccessible) opts.log?.(`Inaccessible directory ${item.serviceId || "(root)"}: ${item.reason}`);
+		return formatJson(legacyOutput ? output : state);
+	}
+	return [renderTree(output, opts.interfaceId), ...state.inaccessible.map((item) => `! Inaccessible directory ${item.serviceId || "(root)"}: ${item.reason}`)].join("\n");
+}
+async function requestDirectoryAccess(session, serviceId, options) {
+	const result = await session.requestAccess({
+		consumer: {
+			name: "linkrpc-cli",
+			purpose: `Discover interfaces in ${serviceId}.`
+		},
+		permissions: [{
+			target: {
+				serviceId: { exact: serviceId },
+				interfaceId: { exact: "hubrpc.directory" },
+				members: [{ exact: "list" }, ...options.watch ? [{ exact: "watch" }] : []]
+			},
+			canInvoke: true
+		}, ...options.withMembers || options.dumpPath !== void 0 || options.dumpPatchesPath !== void 0 ? [{
+			target: {
+				serviceId: { exact: serviceId },
+				interfaceId: { exact: "hubrpc.schemas" },
+				members: [{ exact: "get" }]
+			},
+			canInvoke: true
+		}] : []],
+		duration: "shortLived"
+	});
+	if (result.status !== "granted") throw new Error(`Directory access ${result.status}${"reason" in result && result.reason ? `: ${result.reason}` : ""}`);
+	return true;
 }
 function validateLsOptions(opts) {
 	validateSearchExpression(opts.search, "ls");
@@ -2282,6 +2311,8 @@ function validateSearchExpression(search, command) {
 }
 function explorerOptions(opts) {
 	return {
+		unlockGatedDirectory: opts.requestDirectoryAccess,
+		log: opts.log,
 		maxDepth: opts.serviceId === void 0 ? opts.maxDepth ?? DEFAULT_WALK_DEPTH : 0,
 		...opts.interfaceId !== void 0 ? { interfaceId: opts.interfaceId } : {},
 		...opts.interfacePrefix !== void 0 ? { interfaceIdPrefix: opts.interfacePrefix } : {},
@@ -2426,14 +2457,31 @@ function directoryTargetLabel(target) {
 function formatScopes(scopes) {
 	return scopes.length === 0 ? "" : ` via ${scopes.join(", ")}`;
 }
-async function addMembers(channel, listings, getTarget) {
+function createSchemaFetcher(channel, opts) {
+	const approvals = /* @__PURE__ */ new Map();
+	return async (interfaceId, hash, target) => {
+		try {
+			return await fetchSchema(channel, interfaceId, hash, target);
+		} catch (error) {
+			if (typeof error !== "object" || error === null || !("code" in error) || error.code !== ErrorCode.permissionRequired || !target || !opts.requestDirectoryAccess) throw error;
+			let approval = approvals.get(target);
+			if (!approval) {
+				approval = opts.requestDirectoryAccess(target);
+				approvals.set(target, approval);
+			}
+			if (!await approval) throw error;
+			return fetchSchema(channel, interfaceId, hash, target);
+		}
+	};
+}
+async function addMembers(getSchema, listings, getTarget) {
 	const cache = /* @__PURE__ */ new Map();
 	return Promise.all(listings.map(async (listing) => {
 		const target = getTarget(listing);
 		const cacheKey = `${target ?? ""}\0${listing.interfaceId}\0${listing.hash}`;
 		let members = cache.get(cacheKey);
 		if (members === void 0) {
-			members = fetchSchema(channel, listing.interfaceId, listing.hash, target === "" ? void 0 : target).then((schema) => Object.entries(schema.methods).map(([name, method]) => ({
+			members = getSchema(listing.interfaceId, listing.hash, target === "" ? void 0 : target).then((schema) => Object.entries(schema.methods).map(([name, method]) => ({
 				name,
 				kind: method.result === void 0 ? "notification" : "request"
 			})).sort((a, b) => a.name.localeCompare(b.name)));
@@ -2469,14 +2517,14 @@ function createInitialHubDump() {
 	};
 }
 async function createHubDump(channel, opts = {}) {
-	const explorer = new HubDirectoryExplorer(channel, { maxDepth: opts.maxDepth ?? DEFAULT_WALK_DEPTH });
+	const explorer = new HubDirectoryExplorer(channel, explorerOptions(opts));
 	await explorer.explore();
-	const cache = await fetchDumpSchemas(channel, explorer.graphSnapshot);
+	const cache = await fetchDumpSchemas(createSchemaFetcher(channel, opts), explorer.graphSnapshot);
 	const dump = buildHubDump(explorer.graphSnapshot, cache, true);
 	explorer.dispose();
 	return dump;
 }
-async function fetchDumpSchemas(channel, snapshot, cache = {
+async function fetchDumpSchemas(getSchema, snapshot, cache = {
 	schemas: /* @__PURE__ */ new Map(),
 	errors: /* @__PURE__ */ new Map()
 }) {
@@ -2486,7 +2534,7 @@ async function fetchDumpSchemas(channel, snapshot, cache = {
 		cache.errors.delete(hash);
 		const attempts = [];
 		for (const candidate of candidates) try {
-			const schema = await fetchSchema(channel, candidate.interfaceId, hash, candidate.target);
+			const schema = await getSchema(candidate.interfaceId, hash, candidate.target);
 			cache.schemas.set(hash, schema);
 			break;
 		} catch (error) {
@@ -2542,6 +2590,7 @@ function collectSchemaCandidates(snapshot) {
 	return result;
 }
 async function runStreamingLs(channel, opts) {
+	const getSchema = createSchemaFetcher(channel, opts);
 	const explorer = new HubDirectoryExplorer(channel, explorerOptions(opts));
 	const patchMode = opts.dumpPatchesPath !== void 0;
 	const patchPath = patchMode && opts.dumpPatchesPath !== "-" ? path.resolve(opts.dumpPatchesPath) : void 0;
@@ -2565,7 +2614,7 @@ async function runStreamingLs(channel, opts) {
 	const unsubscribe = explorer.subscribe((event) => {
 		queue = queue.then(async () => {
 			if (patchMode) {
-				if (event.type === "settled") await fetchDumpSchemas(channel, event.snapshot, schemaCache);
+				if (event.type === "settled") await fetchDumpSchemas(getSchema, event.snapshot, schemaCache);
 				const schemasComplete = event.snapshot.complete && [...collectSchemaCandidates(event.snapshot).keys()].every((hash) => schemaCache.schemas.has(hash) || schemaCache.errors.has(hash));
 				const next = buildHubDump(event.snapshot, schemaCache, schemasComplete);
 				for (const operation of createJsonPatch(toJsonValue(currentDump), toJsonValue(next))) await writeLine(JSON.stringify(operation));
@@ -8476,7 +8525,7 @@ async function main(rawArgv, executableName = "linkrpc") {
 		}, { autoNegotiatePerCall: true });
 	});
 	program.command("ls").description("List services and interfaces. Walks the bus recursively, following `hubrpc.directory` references.").option("--interface <id>", "filter by interfaceId").option("--interface-prefix <prefix>", "filter by interfaceId prefix").option("--service <id>", "list a single service (no recursion)").option("--service-prefix <prefix>", "filter by serviceId prefix").option("--search <regexp>", "case-insensitive regexp over listings").option("--depth <n>", "max recursion depth (default 5)", (v) => Number.parseInt(v, 10)).option("--with-members", "include request and notification members from interface schemas").option("--json", "legacy flat listing JSON; use --format json for graph state").option("--format <format>", "pretty, json, or jsonl").option("--dump <file>", "write topology and all schemas to one JSON fixture file").option("--dump-patches <file>", "write progressive RFC 6902 operations as JSON Lines; use - for stdout").option("--stream", "legacy patch-log JSONL; use --format jsonl for reconstructable graph state").option("--watch", "continue observing directory changes until interrupted").action(async (opts) => {
-		await withChannel(endpoint, getPrincipalSpec(), async (channel) => {
+		await withChannel(endpoint, getPrincipalSpec(), async (channel, session) => {
 			const format = resolveGraphFormat(opts.format, {
 				json: opts.json === true,
 				stream: opts.stream === true,
@@ -8484,6 +8533,15 @@ async function main(rawArgv, executableName = "linkrpc") {
 			});
 			const legacyOutput = opts.format === void 0 && opts.watch !== true;
 			const out = await lsCommand(channel, {
+				requestDirectoryAccess: session === void 0 ? void 0 : (serviceId) => requestDirectoryAccess(session, serviceId, {
+					watch: opts.watch,
+					withMembers: opts.withMembers,
+					dumpPath: opts.dump,
+					dumpPatchesPath: opts.dumpPatches
+				}),
+				log: (message) => {
+					process.stderr.write(`linkrpc: ${message}\n`);
+				},
 				interfaceId: opts.interface,
 				interfacePrefix: opts.interfacePrefix,
 				serviceId: opts.service,
@@ -8506,6 +8564,9 @@ async function main(rawArgv, executableName = "linkrpc") {
 				maxDepth: typeof opts.depth === "number" && !Number.isNaN(opts.depth) ? opts.depth : void 0
 			});
 			if (out.length > 0) process.stdout.write(out + "\n");
+		}, {
+			requestReflectionAccess: false,
+			autoNegotiatePerCall: false
 		});
 	});
 	if (profile === "hub") {
@@ -9125,7 +9186,7 @@ Batch options:
 				process.once("SIGINT", onSignal);
 				process.once("SIGTERM", onSignal);
 				try {
-					const { runApprovalUi } = await import("./runApprovalUi-CdC5_Qoo.js");
+					const { runApprovalUi } = await import("./runApprovalUi-CNp2DhKG.js");
 					await runApprovalUi({
 						client,
 						signal: stop.signal
@@ -9140,7 +9201,7 @@ Batch options:
 	registerViewCommands(program, (action) => withChannel(endpoint, getPrincipalSpec(), action));
 	program.command("ui").description("Launch the terminal UI (form-based browser of services + methods).").action(async () => {
 		const acquired = await acquireConnection(endpoint);
-		const { runUi } = await import("./runUi-Bb6VATfB.js");
+		const { runUi } = await import("./runUi-B4rV3ZfF.js");
 		try {
 			await runUi({
 				endpoint: acquired.ep,
@@ -9676,4 +9737,4 @@ function safeJson(value) {
 //#endregion
 export { formatCondition as _, formatCommandLegend as a, targetId as b, safeTerminalText as c, ObservablePromise as d, observableValue as f, resolveViewTarget as g, Disposable as h, dispatchHostKey as i, approvalDetailLines as l, derived as m, views as n, hostCommands as o, autorun as p, ViewFrame as r, matchesKey as s, runCli as t, ObservableLazyPromise as u, interfaceTarget as v, matchesTarget as y };
 
-//# sourceMappingURL=cli-DJREb0Dm.js.map
+//# sourceMappingURL=cli-B93twHKF.js.map