omp-onlyne 0.1.0 → 0.3.0

package/src/ui/bootstrap.ts

@@ -17,13 +17,21 @@ import {
 	text as textNode,
 } from "@oh-my-pi/pi-tui";
 import { configPath, normalizeNodeId, normalizeRegion, normalizeServiceUrl, saveConfig, shortNodeId } from "../config.ts";
+import { parseAllowBlock, type AcquirePolicy } from "@onlyne/node-host/acquire";
+import { ensureKeyDir } from "@onlyne/node-host/keys";
 import { startRuntime } from "../runtime.ts";
-import type { OnlyneConfig } from "../types.ts";
+import type { OnlyneConfig } from "@onlyne/node-host/types";
 import { t, type UiTextKey } from "./bootstrap-text.ts";
 
-const FIELDS = ["region", "nodeId", "bind", "keyScope", "pageSize", "contact"] as const;
+const FIELDS = ["region", "nodeId", "bind", "keyScope", "pageSize", "contact", "policy", "allow"] as const;
 type FieldName = (typeof FIELDS)[number];
 
+const POLICIES: ReadonlyArray<{ value: AcquirePolicy; key: UiTextKey }> = [
+	{ value: "all", key: "bootstrap.policy.all" },
+	{ value: "segment", key: "bootstrap.policy.segment" },
+	{ value: "none", key: "bootstrap.policy.none" },
+];
+
 const LABELS: Record<FieldName, UiTextKey> = {
 	region: "bootstrap.field.region",
 	nodeId: "bootstrap.field.nodeId",
@@ -31,6 +39,8 @@ const LABELS: Record<FieldName, UiTextKey> = {
 	keyScope: "bootstrap.field.keyScope",
 	pageSize: "bootstrap.field.pageSize",
 	contact: "bootstrap.field.contact",
+	policy: "bootstrap.field.policy",
+	allow: "bootstrap.field.allow",
 };
 
 const HINTS: Record<FieldName, UiTextKey> = {
@@ -40,6 +50,8 @@ const HINTS: Record<FieldName, UiTextKey> = {
 	keyScope: "bootstrap.hint.keyScope",
 	pageSize: "bootstrap.hint.pageSize",
 	contact: "bootstrap.hint.contact",
+	policy: "bootstrap.hint.policy",
+	allow: "bootstrap.hint.allow",
 };
 
 /** The values the command handler derived from Tern and the saved config. */
@@ -51,6 +63,10 @@ export interface BootstrapDefaults {
 	bind: string;
 	keyScope: string;
 	pageSize: number;
+	/** RFC 0018 §2: the policy this project currently enforces. */
+	policy: AcquirePolicy;
+	/** The allow set as stored, one entry per element. */
+	allow: readonly string[];
 	/** Existing configuration; the draft carries what the form does not edit. */
 	current?: OnlyneConfig;
 }
@@ -96,6 +112,8 @@ export class OnlyneBootstrap implements Component {
 				(defaults.current?.discovery?.seeds ?? []).join(", "),
 				t(HINTS.contact),
 			),
+			policy: this.makeField(t(LABELS.policy), defaults.policy, t(HINTS.policy)),
+			allow: this.makeField(t(LABELS.allow), defaults.allow.join(", "), t(HINTS.allow)),
 		};
 	}
 
@@ -162,6 +180,21 @@ export class OnlyneBootstrap implements Component {
 			this.fail(error instanceof Error ? error.message : String(error));
 			return;
 		}
+		const policy = this.value("policy").toLowerCase();
+		if (policy !== "all" && policy !== "segment" && policy !== "none") {
+			this.fail(t("bootstrap.policyInvalid"));
+			return;
+		}
+		const allow = this.value("allow")
+			.split(/[,\s]+/)
+			.map(entry => entry.trim())
+			.filter(entry => entry.length > 0);
+		for (const entry of allow) {
+			if (parseAllowBlock(entry) === undefined) {
+				this.fail(t("bootstrap.allowInvalid", { value: entry }));
+				return;
+			}
+		}
 		const previous = this.defaults.current;
 		const config: OnlyneConfig = {
 			path: configPath(this.ctx.cwd),
@@ -172,10 +205,15 @@ export class OnlyneBootstrap implements Component {
 				// The form does not edit these; saving must not erase them.
 				...(previous?.node.key_ref === undefined ? {} : { key_ref: previous.node.key_ref }),
 			},
-			server: { bind, ...(previous?.server.public_url === undefined ? {} : { public_url: previous.server.public_url }) },
+			server: {
+				bind,
+				...(previous?.server.port === undefined ? {} : { port: previous.server.port }),
+				...(previous?.server.public_url === undefined ? {} : { public_url: previous.server.public_url }),
+			},
 			threads: { page_size: Number(this.value("pageSize")) },
 			...(seeds.length === 0 ? {} : { discovery: { seeds } }),
 			...(previous?.trust === undefined ? {} : { trust: previous.trust }),
+			acquisition: { policy, allow },
 			...(previous?.language === undefined ? {} : { language: previous.language }),
 		};
 		this.saving = true;
@@ -183,6 +221,14 @@ export class OnlyneBootstrap implements Component {
 		this.changed();
 		let persisted = false;
 		try {
+			if (scope !== "none") {
+				try {
+					await ensureKeyDir(this.ctx.cwd, config.node.id, scope);
+				} catch (error) {
+					this.fail(error instanceof Error ? error.message : String(error));
+					return;
+				}
+			}
 			await saveConfig(config);
 			persisted = true;
 			const runtime = await startRuntime(this.pi, this.ctx);
@@ -249,6 +295,29 @@ export class OnlyneBootstrap implements Component {
 		return node("row", { role: "omp.btn", actions: { click: act }, title: label }, [textNode(label)], act);
 	}
 
+	/** The three values side by side: a policy is chosen, not typed into a free-form field. */
+	private policyRow(): NativeNode {
+		const current = this.value("policy").toLowerCase();
+		return node(
+			"row",
+			{ role: "onlyne.policy", gap: "sm", align: "center" },
+			POLICIES.map(item =>
+				node(
+					"row",
+					{
+						role: "omp.btn",
+						actions: { click: `onlyne.bootstrap.policy.${item.value}` },
+						tone: current === item.value ? "accent" : undefined,
+						title: t("bootstrap.policy.title", { value: item.value }),
+					},
+					[textNode([span(t(item.key), current === item.value ? "accent strong" : "muted")])],
+					item.value,
+				),
+			),
+			"policy-switch",
+		);
+	}
+
 	describe(_cx: DescribeContext): NativeNode {
 		if (this.locale !== getLocale()) {
 			this.locale = getLocale();
@@ -263,6 +332,7 @@ export class OnlyneBootstrap implements Component {
 				body.push(draft.field);
 			} else body.push(this.fieldRow(name));
 			if (name === "region") body.push(node("text", { text: this.regionPreview(), wrap: "word" }));
+			if (name === "policy") body.push(this.policyRow());
 		}
 		if (this.error !== undefined) body.push(node("text", { spans: [span(this.error, "error")], wrap: "word" }));
 		body.push(
@@ -287,6 +357,15 @@ export class OnlyneBootstrap implements Component {
 			this.done();
 			return;
 		}
+		if (act.startsWith("onlyne.bootstrap.policy.")) {
+			const value = act.slice("onlyne.bootstrap.policy.".length);
+			const known = POLICIES.find(item => item.value === value);
+			if (known === undefined) return;
+			this.active = "policy";
+			this.fields.policy.editor.setText(known.value);
+			this.changed();
+			return;
+		}
 		if (act.startsWith("onlyne.bootstrap.field.")) {
 			const name = act.slice("onlyne.bootstrap.field.".length) as FieldName;
 			if (FIELDS.includes(name)) {

package/src/ui/index.ts

@@ -1,8 +1,9 @@
 import type { ExtensionAPI } from "@oh-my-pi/pi-coding-agent";
 import { ConfigError, loadConfig } from "../config.ts";
+import { DEFAULT_ACQUISITION } from "@onlyne/node-host/acquire";
 import { getRuntime, startRuntime } from "../runtime.ts";
 import { detectTernSession } from "../tern.ts";
-import type { OnlyneConfig } from "../types.ts";
+import type { OnlyneConfig } from "@onlyne/node-host/types";
 import { OnlyneBootstrap, type BootstrapDefaults } from "./bootstrap.ts";
 import { OnlyneViewer } from "./viewer.ts";
 import { LOCALES, setLocale, type Locale } from "@onlyne/node-host/i18n";
@@ -70,7 +71,8 @@ export function registerUi(pi: ExtensionAPI): void {
 			try {
 				let runtime = getRuntime();
 				if (command === "init") {
-					const existing = runtime?.config ?? (await loadConfig(ctx.cwd).catch(() => undefined));
+					// Only refuse init if the runtime is actually running; if unstarted or down, allow init to proceed or retry bootstrap.
+					const existing = runtime?.config;
 					if (existing !== undefined) {
 						ctx.ui.notify(t("configured"), "info");
 						return;
@@ -103,6 +105,8 @@ export function registerUi(pi: ExtensionAPI): void {
 						bind: current?.server.bind ?? "127.0.0.1",
 						keyScope: current?.node.key_scope ?? "project",
 						pageSize: current?.threads.page_size ?? 50,
+						policy: current?.acquisition?.policy ?? DEFAULT_ACQUISITION.policy,
+						allow: current?.acquisition?.allow ?? DEFAULT_ACQUISITION.allow,
 						...(current === undefined ? {} : { current }),
 					};
 					await ctx.ui.custom<void>(

package/src/ui/mail-message.ts

@@ -1,10 +1,11 @@
 import type { MessageRenderer } from "@oh-my-pi/pi-coding-agent";
 import { getLocale } from "@onlyne/node-host/i18n";
 import { Markdown, Text, getMarkdownTheme, node, span, text, type Component, type NativeNode, type Theme, type TspSpan } from "@oh-my-pi/pi-tui";
-import type { HistoryMessage, MessageRef, ThreadRef } from "@onlyne/lib";
+import type { HistoryMessage, MessageRef, ThreadRef, WorkRef } from "@onlyne/lib";
 import { shortNodeId } from "../config.ts";
 import { getRuntime, type PluginRuntime } from "../runtime.ts";
 import { conversationPath, messagePath } from "../urls.ts";
+import { workValue } from "../work.ts";
 import { t } from "./bootstrap-text.ts";
 
 export interface OnlyneMessageDetails {
@@ -22,6 +23,7 @@ export interface OnlyneMessageDetails {
 		body: string;
 		relation?: "reply" | "followup";
 		in_reply_to?: MessageRef;
+		work?: WorkRef;
 	};
 }
 
@@ -169,6 +171,7 @@ class MailMessage implements Component {
 			...(mail.in_reply_to === undefined
 				? []
 				: [`${this.theme.fg("muted", `${t("mail.inReplyTo")}:`)} ${mail.in_reply_to.sender}/${mail.in_reply_to.id}`]),
+			...(mail.work === undefined ? [] : [`${this.theme.fg("muted", `${t("mail.work")}:`)} ${workValue(mail.work)}`]),
 			`${this.theme.fg("muted", `${t("mail.delivery")}:`)} ${this.status.delivery}${
 				this.status.consumption === undefined ? "" : t("mail.consumed", { state: this.status.consumption })
 			}`,
@@ -215,6 +218,7 @@ class MailMessage implements Component {
 						k: t("mail.inReplyTo"),
 						v: [span(`${mail.in_reply_to.sender}/${mail.in_reply_to.id}`, "link mono", { href: replyHref })],
 					}]),
+			...(mail.work === undefined ? [] : [{ k: t("mail.work"), v: [span(workValue(mail.work), "mono")] }]),
 			{
 				k: t("mail.delivery"),
 				v: [

package/src/ui/viewer-text.ts

@@ -24,6 +24,7 @@ const en = {
 
 	"send.blocked.empty": "Type a message first.",
 	"send.blocked.noTarget": "Open a thread first, or pick a recipient.",
+	"send.blocked.readOnly": "This thread is read-only here: its owner holds it, so send from a node that owns it.",
 
 	"rail.domain.title": "{label} · nodes {count}",
 	"rail.empty": "no domains",
@@ -36,12 +37,12 @@ const en = {
 	"sidebar.inbox": "✉ Inbox",
 	"sidebar.noKey": "no node key",
 	"thread.closed": "closed",
+	"thread.readOnly": "read-only",
 
 	"key.missing": "this node has no key",
 	"approvals.head": "{node} asks to exchange keys with you",
 	"field.peerFingerprint": "peer fingerprint",
 	"field.ownFingerprint": "local fingerprint",
-	"field.endpoint": "endpoint",
 	"action.accept": "Accept",
 	"approvals.accept.title": "Fingerprints match; approve this exchange",
 	"action.reject": "Reject",
@@ -49,7 +50,15 @@ const en = {
 	"action.details": "Details",
 	"approvals.details.title": "Open this node in the member column",
 
-	"message.reply.title": "#{seq} · click to reply to this one",
+	"message.open.title": "#{seq} · click to read the whole message",
+	"messageDetail.head": "#{seq} · {author} · {time}",
+	"messageDetail.close": "Back to messages",
+	"messageDetail.close.title": "Close the full message",
+	"messageDetail.reply": "Reply",
+	"messageDetail.reply.title": "Answer this message",
+	"messageDetail.target": "Use as recipient",
+	"messageDetail.target.title": "Start a new message to this author",
+	"messageDetail.work": "Work: {value}",
 
 	"composer.reply": "Replying to {node} · {id}",
 	"composer.new": "New message to {node}",
@@ -102,11 +111,14 @@ const en = {
 	"field.fingerprint": "fingerprint",
 	"field.domain": "domain",
 	"field.status": "status",
+	"field.declared": "declared address",
+	"field.observed": "observed address",
 	"field.source": "source",
 	"field.lastSeen": "last seen",
 	"member.fingerprint.none": "not exchanged",
 	"member.source.seed": "connected by address (saved as a seed)",
 	"member.lastSeen.stale": " · record expired",
+	"member.observed.none": "not recorded",
 	"action.useTarget": "Use as recipient",
 	"member.target.title": "Send messages to this node",
 	"action.acceptExchange": "Accept exchange",
@@ -116,6 +128,46 @@ const en = {
 	"verb.revoke": "Revoke",
 	"verb.reject": "Reject",
 
+	"trustpage.open": "Trust rules",
+	"trustpage.open.title": "Acquisition policy, pending peers and the decision record",
+	"trustpage.title": "Trust & acquisition",
+	"trustpage.meta": "{pending} waiting for you · {audit} recorded decisions",
+	"trustpage.policy": "acquisition policy",
+	"trustpage.policy.all": "all: any peer is approved automatically",
+	"trustpage.policy.segment": "segment: only the allow set is approved automatically",
+	"trustpage.policy.none": "none: only a human approves a peer",
+	"trustpage.policy.unknown": "this node has not reported a policy",
+	"trustpage.policy.set": "Set the acquisition policy to {value}",
+	"trustpage.allow": "allowed networks",
+	"trustpage.allow.none": "none: no peer is approved automatically",
+	"trustpage.allowLoopback": "loopback discovery",
+	"trustpage.allowLoopback.on": "on",
+	"trustpage.allowLoopback.off": "off (the default)",
+	"trustpage.edit": "Changes restart this node; trust already established is not touched.",
+	"trustpage.allow.edit": "Edit allow set",
+	"trustpage.allow.edit.title": "Append or remove network/prefix blocks and host names",
+	"trustpage.allow.save": "Save allow set",
+	"trustpage.allow.cancel": "Cancel",
+	"trustpage.allowInvalid": "Not a network/prefix block or host name: {value}",
+	"trustpage.warn.lan":
+		"A private or wide range lets every host inside it exchange keys with this node without asking you first. The set is matched against the address this node observed, not the address a peer declares.",
+	"trustpage.warn.axes":
+		"Discovery and acquisition are separate: discovery excludes loopback by default while acquisition approves only the allow set. Changing one does not change the other.",
+	"trustpage.warn.limits":
+		"Not covered: the real client address behind a reverse proxy, and DNS names that resolve to an address other than the one actually connected.",
+	"trustpage.invited.head": "waiting for your decision",
+	"trustpage.invited.empty": "No peer is waiting for approval.",
+	"trustpage.audit.head": "acquisition record",
+	"trustpage.audit.empty": "No acquisition decision was recorded in this session.",
+	"trustpage.actor.human": "human",
+	"trustpage.actor.agent": "agent",
+	"trustpage.actor.seed": "seed",
+	"trustpage.actor.policy": "policy",
+	"trustpage.override": "human override",
+	"trustpage.seed": "seed pre-authorization",
+	"trustpage.audit.allowed": "allowed",
+	"trustpage.audit.denied": "denied",
+
 	"notice.refreshing": "Refreshing discovery…",
 	"notice.refreshed": "Discovery refreshed.",
 	"notice.refreshFailed": "Refresh failed: {error}",
@@ -131,6 +183,10 @@ const en = {
 	"notice.requestFailed": "Request failed: {error}",
 	"notice.exchangeSent": "Key exchange with {node} submitted; both sides' approval shows in the member column.",
 	"notice.sendFailed": "Send failed: {error}",
+	"notice.policySaved": "Acquisition policy is now {policy}; the node restarted.",
+	"notice.policyFailed": "Policy change failed: {error}",
+	"notice.allowSaved": "Allow set saved; the node restarted.",
+	"notice.allowFailed": "Allow set failed: {error}",
 
 	"outcome.refused": "Not delivered: {error}",
 	"outcome.refused.peer": "the peer refused",
@@ -173,6 +229,7 @@ const zh: Record<ViewerTextKey, string> = {
 
 	"send.blocked.empty": "输入内容后发送",
 	"send.blocked.noTarget": "先打开线程，或选择收件人",
+	"send.blocked.readOnly": "这个线程在此只读：它由所有者托管，请从拥有它的节点发送。",
 
 	"rail.domain.title": "{label} · {count} 节点",
 	"rail.empty": "无域",
@@ -185,12 +242,12 @@ const zh: Record<ViewerTextKey, string> = {
 	"sidebar.inbox": "✉ 收件箱",
 	"sidebar.noKey": "无节点密钥",
 	"thread.closed": "已关闭",
+	"thread.readOnly": "只读",
 
 	"key.missing": "本节点没有密钥",
 	"approvals.head": "{node} 请求与你交换密钥",
 	"field.peerFingerprint": "对方指纹",
 	"field.ownFingerprint": "本机指纹",
-	"field.endpoint": "端点",
 	"action.accept": "同意",
 	"approvals.accept.title": "双方指纹一致，批准这次交换",
 	"action.reject": "拒绝",
@@ -198,7 +255,15 @@ const zh: Record<ViewerTextKey, string> = {
 	"action.details": "查看详情",
 	"approvals.details.title": "在成员栏打开这位节点",
 
-	"message.reply.title": "#{seq} · 点击回复这一条",
+	"message.open.title": "#{seq} · 点击读全文",
+	"messageDetail.head": "#{seq} · {author} · {time}",
+	"messageDetail.close": "返回消息列表",
+	"messageDetail.close.title": "关闭全文",
+	"messageDetail.reply": "回复",
+	"messageDetail.reply.title": "回复这一条",
+	"messageDetail.target": "用作发送目标",
+	"messageDetail.target.title": "给这位作者发一条新消息",
+	"messageDetail.work": "工作单元：{value}",
 
 	"composer.reply": "回复 {node} · {id}",
 	"composer.new": "新消息发送到 {node}",
@@ -251,11 +316,14 @@ const zh: Record<ViewerTextKey, string> = {
 	"field.fingerprint": "指纹",
 	"field.domain": "域",
 	"field.status": "状态",
+	"field.declared": "声明地址",
+	"field.observed": "观测地址",
 	"field.source": "来源",
 	"field.lastSeen": "最后可见",
 	"member.fingerprint.none": "未交换",
 	"member.source.seed": "按地址连接（已存为种子）",
 	"member.lastSeen.stale": " · 记录已过期",
+	"member.observed.none": "未记录",
 	"action.useTarget": "用作发送目标",
 	"member.target.title": "把消息发给这位节点",
 	"action.acceptExchange": "同意交换",
@@ -265,6 +333,46 @@ const zh: Record<ViewerTextKey, string> = {
 	"verb.revoke": "撤销",
 	"verb.reject": "拒绝",
 
+	"trustpage.open": "信任规则",
+	"trustpage.open.title": "获取策略、待批节点与判定记录",
+	"trustpage.title": "信任与获取",
+	"trustpage.meta": "{pending} 个待你确认 · {audit} 条判定记录",
+	"trustpage.policy": "获取策略",
+	"trustpage.policy.all": "all：任意对端都自动批准",
+	"trustpage.policy.segment": "segment：只自动批准允许集合",
+	"trustpage.policy.none": "none：只有人类能批准",
+	"trustpage.policy.unknown": "运行中的节点没有报告策略",
+	"trustpage.policy.set": "把获取策略设为 {value}",
+	"trustpage.allow": "允许集合",
+	"trustpage.allow.none": "空：不对任何对端自动批准",
+	"trustpage.allowLoopback": "回环发现",
+	"trustpage.allowLoopback.on": "开",
+	"trustpage.allowLoopback.off": "关（默认）",
+	"trustpage.edit": "修改会重启本节点；已经建立的信任不受影响。",
+	"trustpage.allow.edit": "修改允许集合",
+	"trustpage.allow.edit.title": "增删 network/prefix 网段与主机名",
+	"trustpage.allow.save": "保存允许集合",
+	"trustpage.allow.cancel": "取消",
+	"trustpage.allowInvalid": "不是 network/prefix 网段或主机名：{value}",
+	"trustpage.warn.lan":
+		"私有网段或过宽的网段会让其中每台主机都能不经你确认与本节点交换密钥。允许集合按本节点观测到的地址判定，不按对端声明地址。",
+	"trustpage.warn.axes":
+		"发现与获取是两条轴：发现默认排除回环，获取只批准允许集合。改一项不会自动改另一项。",
+	"trustpage.warn.limits":
+		"不覆盖：反向代理后的真实客户端地址；DNS 解析结果与实际连接目标不一致的情形。",
+	"trustpage.invited.head": "待你决定",
+	"trustpage.invited.empty": "没有待批准的节点。",
+	"trustpage.audit.head": "获取记录",
+	"trustpage.audit.empty": "本次会话还没有获取判定记录。",
+	"trustpage.actor.human": "人类",
+	"trustpage.actor.agent": "agent",
+	"trustpage.actor.seed": "种子",
+	"trustpage.actor.policy": "策略",
+	"trustpage.override": "人类超控",
+	"trustpage.seed": "种子预授权",
+	"trustpage.audit.allowed": "允许",
+	"trustpage.audit.denied": "拒绝",
+
 	"notice.refreshing": "正在刷新发现…",
 	"notice.refreshed": "发现已刷新。",
 	"notice.refreshFailed": "刷新失败：{error}",
@@ -280,6 +388,10 @@ const zh: Record<ViewerTextKey, string> = {
 	"notice.requestFailed": "请求失败：{error}",
 	"notice.exchangeSent": "已提交与 {node} 的密钥交换，双方批准状态见成员栏。",
 	"notice.sendFailed": "发送失败：{error}",
+	"notice.policySaved": "获取策略已改为 {policy}，节点已重启。",
+	"notice.policyFailed": "修改策略失败：{error}",
+	"notice.allowSaved": "允许集合已保存，节点已重启。",
+	"notice.allowFailed": "修改允许集合失败：{error}",
 
 	"outcome.refused": "未送达：{error}",
 	"outcome.refused.peer": "对方拒绝",