@rexvane/piweb 0.3.16 → 0.3.17

package/scripts/release.mjs

@@ -2,7 +2,8 @@ import fs from "node:fs/promises";
 import { existsSync } from "node:fs";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
-import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
+import { pathToFileURL, fileURLToPath } from "node:url";
 import { assertInstallation, assertLocalPath, readProductionBuild, resolveBuildOutput, RELEASES_DIR, RELEASE_MANIFEST } from "./build-output.mjs";
 import { runCommand } from "./process-runner.mjs";
 import { isMainModule } from "./entrypoint.mjs";
@@ -76,6 +77,21 @@ async function writeReleaseTypeConfig(root, buildDir) {
 	});
 }
 
+/** Run in a fresh process, after install/pull, so cached config/Next modules cannot lie. */
+export async function verifyReleaseConfig(root = process.cwd(), env = process.env) {
+	const installation = assertInstallation(root);
+	const buildDir = resolveBuildOutput(installation, env.PIWEB_BUILD_DIR);
+	if (!buildDir.startsWith(`${RELEASES_DIR}/`)) throw new Error("release requires an isolated build output");
+	const require = createRequire(path.join(installation, "package.json"));
+	const module = await import(pathToFileURL(require.resolve("next/dist/server/config.js")).href);
+	const loadConfig = typeof module.default === "function" ? module.default : module.default.default;
+	const { PHASE_PRODUCTION_BUILD } = require("next/constants");
+	const config = await loadConfig(PHASE_PRODUCTION_BUILD, installation, { silent: true });
+	if (config.distDir !== buildDir || config.typescript?.tsconfigPath !== CONFIG_PATH || config.typescript?.ignoreBuildErrors) {
+		throw new Error("Next config does not honor the isolated release directory/typecheck; refusing to build over the serving output");
+	}
+}
+
 export const PI_PACKAGE = "@earendil-works/pi-coding-agent";
 const PI_AI_PACKAGE = "@earendil-works/pi-ai";
 
@@ -134,7 +150,7 @@ export async function prepareRelease({ root = ROOT, env = process.env, run = run
 		signal?.throwIfAborted();
 		assertInstallation(installation);
 		await writeReleaseTypeConfig(installation, buildDir);
-		await run(process.execPath, [path.join(installation, "scripts", "verify-release-config.mjs")], {
+		await run(process.execPath, [path.join(installation, "scripts", "release.mjs"), "--verify-config"], {
 			cwd: installation, env: childEnv, timeoutMs: 60_000, signal,
 		});
 		await run("npm", ["run", "check"], { cwd: installation, env: childEnv, timeoutMs: 600_000, signal });
@@ -159,15 +175,19 @@ if (isMainModule(import.meta.url)) {
 	process.once("SIGINT", cancel);
 	process.once("SIGTERM", cancel);
 	try {
-		const updatePi = process.argv.length === 3 && process.argv[2] === "--update-pi";
-		if (process.argv.length > 2 && !updatePi) throw new Error("Usage: node scripts/release.mjs [--update-pi]");
-		console.log("[piweb] Checking and building an isolated release; the existing server is not restarted.");
-		if (updatePi) console.log("[piweb] Pi dependency update: use a maintenance window with no active sessions; node_modules is shared.");
-		const release = await prepareRelease({
-			signal: controller.signal,
-			prepare: updatePi ? async (context) => { await installPiUpdate(context); } : undefined,
-		});
-		console.log(`[piweb] Release ready: ${release.buildDir} (${release.buildId}). Restart PiWeb manually when idle to use it.`);
+		if (process.argv.length === 3 && process.argv[2] === "--verify-config") {
+			await verifyReleaseConfig();
+		} else {
+			const updatePi = process.argv.length === 3 && process.argv[2] === "--update-pi";
+			if (process.argv.length > 2 && !updatePi) throw new Error("Usage: node scripts/release.mjs [--update-pi]");
+			console.log("[piweb] Checking and building an isolated release; the existing server is not restarted.");
+			if (updatePi) console.log("[piweb] Pi dependency update: use a maintenance window with no active sessions; node_modules is shared.");
+			const release = await prepareRelease({
+				signal: controller.signal,
+				prepare: updatePi ? async (context) => { await installPiUpdate(context); } : undefined,
+			});
+			console.log(`[piweb] Release ready: ${release.buildDir} (${release.buildId}). Restart PiWeb manually when idle to use it.`);
+		}
 	} catch (error) {
 		console.error(`[piweb] Release failed: ${error instanceof Error ? error.message : error}`);
 		process.exitCode = 1;

package/scripts/verify-package.mjs

@@ -13,15 +13,9 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
-import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { readProductionBuild } from "./build-output.mjs";
 import { isMainModule } from "./entrypoint.mjs";
-import {
-	MANAGED_NIUBASH_ASSETS,
-	NIUBASH_DISTRIBUTION_VERSION,
-	validateManagedNiubashPackage,
-} from "./managed-niubash-assets.mjs";
 
 const DEFAULT_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 
@@ -72,56 +66,9 @@ export function verifyPackedPackage(root, { log = console.log } = {}) {
 	}
 }
 
-/** Pack and inspect one actual OS/CPU package, including every runtime hash and license. */
-export function verifyPackedManagedNiubashPackage(packageRoot, asset, { log = console.log } = {}) {
-	const tmp = fs.mkdtempSync(path.join(os.tmpdir(), `piweb-niubash-pack-${asset.arch}-`));
-	try {
-		const packed = JSON.parse(runNpm(["pack", "--json", "--pack-destination", tmp], { cwd: packageRoot }));
-		const entry = Array.isArray(packed) ? packed[0] : packed;
-		if (!entry?.filename) throw new Error(`npm pack produced no tarball for ${asset.packageName}`);
-		const files = (entry.files ?? []).map((file) => String(file.path).replaceAll("\\", "/").replace(/^package\//, ""));
-		for (const required of [
-			"package.json", "index.cjs", "runtime-manifest.json", "runtime/niu.exe",
-			"runtime/winuxcmd/usr/bin/winuxcmd.exe", "runtime/bundles/oh-my-niu/bundle.toml",
-			"licenses/NIUBASH.txt", "licenses/RUBASH.txt", "licenses/WINUXCMD.txt",
-		]) {
-			if (!files.includes(required)) throw new Error(`${asset.packageName} tarball is missing ${required}`);
-		}
-		const unpacked = path.join(tmp, "unpacked");
-		fs.mkdirSync(unpacked, { recursive: true });
-		run("tar", ["-xzf", entry.filename, "-C", "unpacked"], { cwd: tmp });
-		const installedRoot = path.join(unpacked, "package");
-		const checked = validateManagedNiubashPackage(installedRoot, asset, { allowExtraRuntimeFiles: false });
-		const require = createRequire(path.join(installedRoot, "package.json"));
-		const exported = require(path.join(installedRoot, "index.cjs"));
-		if (exported.packageName !== asset.packageName || exported.arch !== asset.arch
-			|| exported.shellPath !== path.join(installedRoot, "runtime", "niu.exe")) {
-			throw new Error(`${asset.packageName} has an invalid runtime export`);
-		}
-		const bytes = fs.statSync(path.join(tmp, entry.filename)).size;
-		log(`[piweb] ${entry.filename}: ${checked.files} runtime files, ${(bytes / 1024 / 1024).toFixed(1)} MB.`);
-		return { filename: entry.filename, files, bytes, runtimeFiles: checked.files };
-	} finally {
-		fs.rmSync(tmp, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
-	}
-}
-
-export function verifyManagedNiubashPackages(root, { log = console.log } = {}) {
-	const manifest = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf8"));
-	const results = [];
-	for (const asset of Object.values(MANAGED_NIUBASH_ASSETS)) {
-		if (manifest.optionalDependencies?.[asset.packageName] !== NIUBASH_DISTRIBUTION_VERSION) {
-			throw new Error(`PiWeb must use exact optional dependency ${asset.packageName}@${NIUBASH_DISTRIBUTION_VERSION}`);
-		}
-		results.push(verifyPackedManagedNiubashPackage(path.join(root, "platform-packages", asset.directory), asset, { log }));
-	}
-	return results;
-}
-
 if (isMainModule(import.meta.url)) {
 	try {
 		verifyPackedPackage(DEFAULT_ROOT);
-		verifyManagedNiubashPackages(DEFAULT_ROOT);
 	} catch (error) {
 		console.error(`[piweb] ${error instanceof Error ? error.message : error}`);
 		process.exitCode = 1;

package/src/app/api/config/route.ts

@@ -9,10 +9,7 @@ export const dynamic = "force-dynamic";
 export async function GET() {
 	try {
 		const file = path.join(getAgentDir(), "settings.json");
-		const content = await fs.readFile(file, "utf8").catch((error: NodeJS.ErrnoException) => {
-			if (error.code === "ENOENT") return "{}\n";
-			throw error;
-		});
+		const content = await fs.readFile(file, "utf8");
 		return new Response(content, {
 			headers: {
 				"Content-Type": "application/json; charset=utf-8",

package/src/app/api/growth/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
-import { getManaged, growthSnapshot } from "@/lib/agent-manager";
-import { GrowthError, changesBetween, fileContent, filePatch, isAvailable, listTree, readSteps } from "@/lib/growth-service";
+import { getManaged, growthRecord } from "@/lib/agent-manager";
+import { GrowthError, changesBetween, fileContent, filePatch, isAvailable, listTree, readRounds } from "@/lib/growth-service";
 import { BoundaryError, resolveSessionPath, resolveWorkspacePath } from "@/lib/path-security";
 
 export const dynamic = "force-dynamic";
@@ -12,12 +12,12 @@ function status(err: unknown): number {
 }
 
 /**
- * 项目生长（影子仓库快照）只读接口：
- * ?cwd=&session=<jsonl 路径>        本会话的步（省略 session = 工作区全部步）
- * ?cwd=&tree=<hash>&list=1           某一步的文件清单
- * ?cwd=&from=<tree>&to=<tree>&changes=1   两步之间的变更清单
+ * 项目生长（每轮一个 git commit）只读接口：
+ * ?cwd=&session=<jsonl 路径>        本会话的轮次（省略 session = 工作区全部 commit）
+ * ?cwd=&tree=<hash>&list=1           某一轮的文件清单
+ * ?cwd=&from=<tree>&to=<tree>&changes=1   两轮之间的变更清单
  * ?cwd=&from=&to=&path=[&renamedFrom=]    单文件整文件上下文的 unified diff
- * ?cwd=&tree=&path=&content=1        某一步里单文件全文
+ * ?cwd=&tree=&path=&content=1        某一轮里单文件全文
  */
 export async function GET(req: Request) {
 	const url = new URL(req.url);
@@ -29,21 +29,21 @@ export async function GET(req: Request) {
 		if (q("content") === "1") return NextResponse.json({ success: true, data: await fileContent(cwd, q("tree"), q("path")) });
 		if (q("path") !== null) return NextResponse.json({ success: true, data: await filePatch(cwd, q("from"), q("to"), q("path"), q("renamedFrom") ?? undefined) });
 		const available = await isAvailable();
-		if (!available) return NextResponse.json({ success: true, data: { available: false, steps: [] } });
-		return NextResponse.json({ success: true, data: { available: true, steps: await readSteps(cwd, q("session") ?? undefined) } });
+		if (!available) return NextResponse.json({ success: true, data: { available: false, rounds: [] } });
+		return NextResponse.json({ success: true, data: { available: true, rounds: await readRounds(cwd, q("session") ?? undefined) } });
 	} catch (err: any) {
 		return NextResponse.json({ success: false, error: String(err?.message ?? err) }, { status: status(err) });
 	}
 }
 
-/** POST { action: "snapshot", session: <会话 id>, label? }：手动拍一张快照（记步并广播给会话订阅者） */
+/** POST { action: "record", session: <会话 id> }：立即记录，把当前改动提交为「你的修改」（并广播给会话订阅者） */
 export async function POST(req: Request) {
 	try {
-		const body = (await req.json()) as { action?: string; session?: unknown; label?: unknown };
-		if (body.action !== "snapshot") return NextResponse.json({ success: false, error: "unknown action" }, { status: 400 });
+		const body = (await req.json()) as { action?: string; session?: unknown };
+		if (body.action !== "record") return NextResponse.json({ success: false, error: "unknown action" }, { status: 400 });
 		const sessionPath = await resolveSessionPath(String(body.session ?? ""), { allowPending: true });
-		const step = await growthSnapshot(getManaged(sessionPath), typeof body.label === "string" ? body.label : "");
-		return NextResponse.json({ success: true, data: { step } });
+		const round = await growthRecord(getManaged(sessionPath));
+		return NextResponse.json({ success: true, data: { round } });
 	} catch (err: any) {
 		return NextResponse.json({ success: false, error: String(err?.message ?? err) }, { status: err instanceof SyntaxError ? 400 : status(err) });
 	}

package/src/app/api/models/route.ts

@@ -7,6 +7,7 @@ import {
 	CustomProvidersValidationError,
 	discoverModels,
 	listModels,
+	listModelsForPiWeb,
 	loginState,
 	providerUsage,
 	readCustomProviders,
@@ -37,7 +38,7 @@ export async function GET(req: Request) {
 	const full = custom || params.get("full") === "1";
 	try {
 		const customProviders = custom ? await readCustomProviders() : null;
-		const data = await listModels();
+		const data = await (full ? listModels() : listModelsForPiWeb());
 		// 页面挂载只需要选模型用的字段（1300+ 个模型带 api/baseUrl/cost/input 有 400KB）；设置页用 custom=1 拿完整版
 		const models = full
 			? data.models

package/src/app/api/security/route.ts

@@ -1,22 +1,17 @@
 import { NextResponse } from "next/server";
 import type { ProjectTrust } from "@/lib/security-service";
 import { getSecurity, setProjectTrust } from "@/lib/security-service";
-import { reloadLoader, resolveProjectTrust, setProjectTrust as setProjectTrustDecision } from "@/lib/pi";
+import { reloadLoader, setProjectTrust as setProjectTrustDecision } from "@/lib/pi";
 import { reloadSessionsForCwd } from "@/lib/agent-manager";
 import { BoundaryError, resolveWorkspacePath } from "@/lib/path-security";
 
 export const dynamic = "force-dynamic";
 
-export async function GET(req: Request) {
+export async function GET() {
 	try {
-		const params = new URL(req.url).searchParams;
-		if (params.has("cwd")) {
-			const cwd = await resolveWorkspacePath(params.get("cwd"));
-			return NextResponse.json({ success: true, data: resolveProjectTrust(cwd) });
-		}
 		return NextResponse.json({ success: true, data: await getSecurity() });
 	} catch (err: any) {
-		return NextResponse.json({ success: false, error: String(err?.message ?? err) }, { status: err instanceof BoundaryError ? 400 : 500 });
+		return NextResponse.json({ success: false, error: String(err?.message ?? err) }, { status: 500 });
 	}
 }
 

package/src/app/api/update/route.ts

@@ -1,7 +1,6 @@
 import { NextResponse } from "next/server";
 import { checkForUpdate, runUpdate, UpdateBusyError, type UpdateTarget } from "@/lib/update-service";
 import { activeStatus } from "@/lib/agent-manager";
-import { beginMaintenance, RuntimeBusyError } from "@/lib/runtime-activity";
 
 export const dynamic = "force-dynamic";
 
@@ -25,15 +24,10 @@ export async function POST(req: Request) {
 		};
 		// Check before even taking a release lock; rechecked before each mutating step.
 		await assertIdle();
-		const releaseMaintenance = beginMaintenance();
-		try {
-			return NextResponse.json({ success: true, data: await runUpdate(target, { assertIdle }) });
-		} finally {
-			releaseMaintenance();
-		}
+		return NextResponse.json({ success: true, data: await runUpdate(target, { assertIdle }) });
 	} catch (error) {
 		return NextResponse.json({ success: false, error: error instanceof Error ? error.message : String(error) }, {
-			status: error instanceof UpdateBusyError || error instanceof RuntimeBusyError ? 409 : 500,
+			status: error instanceof UpdateBusyError ? 409 : 500,
 		});
 	}
 }