agent-purge 0.2.7 → 0.2.9

package/web/server.mjs

@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 import { detect } from "../lib/detect.mjs";
 import { oneshots } from "../backends/index.mjs";
 import { createStore } from "../lib/personas.mjs";
-import { MODES, armedOf, dshProfilesOf, loadState, patchState, setArmed, setDefault, setPersona, setPiAuto, setDshProfile } from "../lib/state.mjs";
+import { MODES, armedOf, dshProfilesOf, loadState, patchState, setArmed, setDefault, setPersona, setPiAuto, setOmpAuto, setDshProfile } from "../lib/state.mjs";
 import { install, status as persistStatus, uninstall } from "../lib/persist.mjs";
 import { plans, summary as armorSummary } from "../lib/armor.mjs";
 import { installShim, shimStatus, uninstallShim } from "../lib/shim.mjs";
@@ -31,7 +31,14 @@ const matrix = JSON.parse(readFileSync(join(ROOT, "matrix.json"), "utf8"));
 const store = createStore(DATA);
 
 export function serveWeb(port = 7788) {
-	const server = createServer(handle);
+	// handle 是 async：任何异常都在这里收口，否则请求会挂着不响应
+	const server = createServer((req, res) => {
+		handle(req, res).catch((e) => {
+			try {
+				send(res, 500, { error: `服务端错误: ${e.message}` });
+			} catch {}
+		});
+	});
 	server.on("error", (e) => {
 		// 端口被旧实例占着的时候，--detach 是静默的 → 这里必须说人话，否则用户看到的是旧 UI
 		if (e.code === "EADDRINUSE") {
@@ -51,11 +58,16 @@ async function handle(req, res) {
 	const url = new URL(req.url, "http://127.0.0.1");
 	const p = url.pathname;
 
+	// 防 CSRF：本机 Web 页面能 POST 就能写配置/改人设；跨站页面用 text/plain 也能发“简单请求”。
+	// 只放同源：Origin 的 host 必须和本次请求的 Host 完全一致（端口不同也挡住）。
+	if (isMutating(req.method) && !sameOrigin(req)) return send(res, 403, { error: "只接受本机同源请求" });
+
 	if (req.method === "GET" && (p === "/" || p === "/index.html")) return html(res);
 	if (req.method === "GET" && p === "/api/state") return send(res, 200, await state(url.searchParams.get("versions") === "1"));
 	if (req.method === "GET" && p === "/api/armor") return send(res, 200, armorState());
 	if (req.method === "POST" && p === "/api/defaults") return send(res, 200, saveDefaults(await body(req)));
 	if (req.method === "POST" && p === "/api/pi-auto") return send(res, 200, { piAuto: setPiAuto(DATA, (await body(req)).on === true) });
+	if (req.method === "POST" && p === "/api/omp-auto") return send(res, 200, { ompAuto: setOmpAuto(DATA, (await body(req)).on === true) });
 	if (req.method === "POST" && p === "/api/dsh-profile") return send(res, 200, saveDshProfile(await body(req)));
 	if (req.method === "POST" && p === "/api/persona") return send(res, 200, savePersona(await body(req)));
 	if (req.method === "DELETE" && p === "/api/persona") return send(res, 200, deletePersona(url.searchParams.get("id")));
@@ -144,6 +156,7 @@ async function state(withVersions) {
 		dshAll: DSH_PROFILES,
 		modes: MODES,
 		piAuto: st.piAuto === true,
+		ompAuto: st.ompAuto === true,
 		shimDir: shimStatus()[0]?.dir ?? null,
 		slashes: slashes,
 	};
@@ -228,7 +241,8 @@ function savePersona(payload) {
 function deletePersona(id) {
 	if (!id) return { error: "缺少 id" };
 	if (store.list().length <= 1) return { error: "至少保留一个 persona" };
-	store.remove(id); // remove 内部会处理“删的就是 active”的指针改道
+	if (!store.read(id)) return { error: "找不到这个 persona" };
+	if (!store.remove(id)) return { error: "非法 persona id" };
 	return { ok: true, active: store.activeId() };
 }
 
@@ -251,6 +265,7 @@ function usePersona(payload) {
 
 /** 全局总开关：所有 harness × 选定通道一次折腾完（= `agent-purge 注册 --all` / `disarm --all`）*/
 function applyArmAll(payload) {
+	if (!payload.action) return { error: "缺少 action" };
 	const { action } = payload;
 	const channel = payload.channel ?? "all";
 	const verb = verbOf(action);
@@ -310,6 +325,7 @@ function verbOf(action) {
 
 /** 裸命令接管（shim）、/purge（slash）、常驻（install）：Web 上一个开关全部搞定 */
 function applyArm(payload) {
+	if (!payload.action) return { error: "缺少 action" };
 	const { harness, channel, action } = payload;
 	const id = payload.persona ?? store.activeId();
 	if (!store.read(id)) return { error: "没有可用 persona" };
@@ -363,21 +379,57 @@ function armChannel(harness, channel, verb, id) {
 	return { error: `未知通道: ${channel}` };
 }
 
-const send = (res, code, obj) => res.writeHead(code, { "content-type": "application/json; charset=utf-8" }).end(JSON.stringify(obj));
+const send = (res, code, obj) =>
+	res.writeHead(code, { "content-type": "application/json; charset=utf-8", "cache-control": "no-store" }).end(JSON.stringify(obj));
 const html = (res) =>
 	res
 		.writeHead(200, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" })
 		.end(readFileSync(join(ROOT, "web", "ui.html"), "utf8"));
 
+function isMutating(method) {
+	return method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE";
+}
+
+/** 浏览器跨站请求会带 Origin；curl/脚本没有，放行。有 Origin 就必须和 Host 同源。 */
+function sameOrigin(req) {
+	// 先看浏览器声明的跨站属性：没有 Origin 的跨站请求（部分 fetch 场景）也要挡住
+	const site = req.headers["sec-fetch-site"];
+	if (site && site !== "same-origin" && site !== "none") return false;
+	const origin = req.headers.origin;
+	if (!origin) return true;
+	try {
+		const u = new URL(origin);
+		const loopback = u.hostname === "127.0.0.1" || u.hostname === "localhost" || u.hostname === "::1" || u.hostname === "[::1]";
+		return loopback && u.host.toLowerCase() === String(req.headers.host ?? "").toLowerCase();
+	} catch {
+		return false;
+	}
+}
+
 function body(req) {
 	return new Promise((resolve) => {
 		let raw = "";
-		req.on("data", (c) => (raw += c));
+		let size = 0;
+		let done = false;
+		const finish = (value) => {
+			if (done) return;
+			done = true;
+			resolve(value);
+		};
+		req.on("data", (c) => {
+			size += c.length;
+			// 本机也不该接无上限的 body：一个坏页面能靠大 POST 把内存吃光
+			if (size > 2 * 1024 * 1024) {
+				req.destroy();
+				return finish({});
+			}
+			raw += c;
+		});
 		req.on("end", () => {
 			try {
-				resolve(JSON.parse(raw || "{}"));
+				finish(JSON.parse(raw || "{}"));
 			} catch {
-				resolve({});
+				finish({});
 			}
 		});
 	});

package/web/ui.html

@@ -567,8 +567,8 @@ const ARM_INFO = {
 shim:    { name: "接管裸命令", desc: (h) => h?.id === "pi"
   ? "PATH 最前放个同名壳：敲 pi 就注入。想要“裸启动也带人设”，开这个。"
   : `往 PATH 前置一个同名小壳：直接敲 ${h?.id || "<harness>"} 也是接管版。` },
-slash:   { name: "会话内热切", desc: (h) => h?.id === "pi"
-  ? "写 pi 扩展，只挂 /purge：不敲 /purge 就原样跑，动手才改写。"
+slash:   { name: "会话内热切", desc: (h) => h?.id === "pi" || h?.id === "omp"
+  ? `写 ${h.id} 扩展，只挂 /purge：不敲 /purge 就原样跑，动手才改写。`
   : "写 harness 自己支持的扩展/命令，会话里 /purge 切换。" },
   install: { name: "配置文件常驻", desc: () => "写进 harness 自己的指令文件：连别人启动、GUI 里点开都生效。" },
 };
@@ -688,7 +688,7 @@ function renderOverview() {
   const hid = S.defaults.harness;
   const h = S.harnesses.find((x) => x.id === hid) || S.harnesses[0];
   const persona = S.personas.find((p) => p.id === (selPersona || S.persona)) || S.personas[0];
-  const hot = S.harnesses.filter((h) => (h.armed || []).length).map((h) => h.id + "(" + h.armed.join("/") + (h.id === "pi" && S.piAuto ? "+裸启动" : "") + ")");
+  const hot = S.harnesses.filter((h) => (h.armed || []).length).map((h) => h.id + "(" + h.armed.join("/") + (((h.id === "pi" && S.piAuto) || (h.id === "omp" && S.ompAuto)) ? "+裸启动" : "") + ")");
 
   const why = mode === "off"
     ? "总电源关着 —— 下面写的都只是配置，实际一条都不会注入。"
@@ -704,7 +704,7 @@ function renderOverview() {
           const say = (c) => c === "shim"
             ? (h.id === "pi" ? "敲 pi 会注入（PATH 刚加的前置壳）" : "敲 " + h.id + " 会注入（PATH 前置壳）")
             : c === "slash"
-              ? (h.id === "pi" ? (S.piAuto ? "裸敲 pi 也注入（扩展常驻）" : "裸敲 pi 不注入，只有会话里 /purge 才改写") : "会话里 /purge 展开成用户消息")
+              ? (h.id === "pi" || h.id === "omp" ? ((h.id === "pi" ? S.piAuto : S.ompAuto) ? `裸敲 ${h.id} 也注入（扩展常驻）` : `裸敲 ${h.id} 不注入，只有会话里 /purge 才改写`) : "会话里 /purge 展开成用户消息")
               : "改了它的配置文件，连别人启动的也生效";
           return chans.map(say).join("；") + "。";
         })()
@@ -812,6 +812,13 @@ function harnessCard(h) {
       <small class="${smallCls}" ${path && !why ? `title="${esc(path)}"` : ""}>${esc(smallText)}</small></span></button>`;
   }).join("");
 
+  // omp 的裸启动注入靠扩展常驻（ompAuto）；只有扩展已装（slash 已武装）才给这个开关
+  const ompAutoBtn = h.id === "omp" && h.armed?.includes("slash")
+    ? `<button class="chan ${S.ompAuto ? "on" : ""}" data-ompauto="${S.ompAuto ? "off" : "on"}" type="button" title="扩展常驻，不改 PATH：开关写在 state.json 的 ompAuto">
+      <span class="dot"></span><span><b>裸命令接管${S.ompAuto ? " · 开" : ""}</b>
+      <small>${S.ompAuto ? "扩展常驻：敲 omp 就注入（每次启动）" : "关着：只有 /purge 或 agent-purge omp 才注入"}</small></span></button>`
+    : "";
+
   const notes = []
     // 卡片上的徽章已经写了“SYS 通过/部分通过”，同义的行就不再重复
     .concat((row?.warnings || []).filter((w) => !/^(sys|user) (通过|部分通过|未通过)$/.test(w)))
@@ -856,7 +863,7 @@ function harnessCard(h) {
       <span><k>home</k>${esc(h.home || "—")}${h.homeExists === false ? "（不存在）" : ""}</span>
     </div>
     ${notes.length ? `<div class="hnote">${notes.map(esc).join("<br>")}</div>` : ""}
-    <div class="chans">${chans}</div>
+    <div class="chans">${chans}${ompAutoBtn}</div>
     ${profileRow}
   </div>`;
 }
@@ -1047,11 +1054,13 @@ $("#hpick").addEventListener("click", (e) => {
   selHarness = b.dataset.hpick; renderHarness();
 });
 $("#hsel").addEventListener("click", async (e) => {
-  const b = e.target.closest("[data-piauto]"); if (!b) return;
+  const b = e.target.closest("[data-piauto], [data-ompauto]"); if (!b) return;
+  const isPi = Boolean(b.dataset.piauto);
+  const want = (isPi ? b.dataset.piauto : b.dataset.ompauto) === "on";
   await withBusy(b, async () => {
     try {
-      await api("/api/pi-auto", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ on: b.dataset.piauto === "on" }) });
-      toast("裸启动自动注入 → " + (b.dataset.piauto === "on" ? "开" : "关"));
+      await api(isPi ? "/api/pi-auto" : "/api/omp-auto", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ on: want }) });
+      toast((isPi ? "pi" : "omp") + " 裸启动自动注入 → " + (want ? "开" : "关"));
       await load();
     } catch (err) { toast("失败：" + err.message, true); }
   });