@iowarp/clio-coder 0.4.4 → 0.4.6

package/src/cli/config-inspect.ts

@@ -11,7 +11,7 @@
  * everything reports the same columns.
  */
 
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { basename, join } from "node:path";
 import type { ClioSettings } from "../core/config.js";
 import { resolvePackageRoot } from "../core/package-root.js";
@@ -32,8 +32,9 @@ import {
 	readHookSources,
 	readPersistedHookReceipts,
 } from "../domains/middleware/index.js";
-import { classifyProjectPreload } from "../domains/prompts/preload.js";
+import { selectProjectPreload } from "../domains/prompts/preload.js";
 import { defaultScopedResourceRoots } from "../domains/resources/common-loader.js";
+import { createSafetyPolicyEngine } from "../domains/safety/policy-engine.js";
 import { ceilChars } from "../domains/session/context-accounting.js";
 import { capturedHookSourcesFor } from "../entry/extension-hook-sources.js";
 
@@ -120,9 +121,9 @@ function inspectClioMd(cwd: string, graph: CustomizationGraph): void {
 	if (loaded.files.length === 0) return;
 	try {
 		const promptContext = renderPromptContext(cwd);
-		const preload = classifyProjectPreload({ hasClioMd: promptContext.clioMd !== null, text: promptContext.text });
-		for (const [index, file] of loaded.files.entries()) {
-			const text = readFileSync(file.path, "utf8");
+		const preload = selectProjectPreload(promptContext, null).classification;
+		for (const [index, file] of promptContext.handbookSources.entries()) {
+			const text = file.source;
 			graph.entries.push({
 				category: "clio-md",
 				id: basename(file.path),
@@ -130,15 +131,19 @@ function inspectClioMd(cwd: string, graph: CustomizationGraph): void {
 				sourcePath: file.path,
 				hash: shortHash(text),
 				trust: "trusted",
-				precedence: loaded.files.length === 1 ? "single" : "layer",
+				precedence: promptContext.handbookSources.length === 1 ? "single" : "layer",
 				reloadClass: "next-turn",
 				contextCostTokens: ceilChars(text.length),
 				detail: {
 					layer: index + 1,
-					layers: loaded.files.length,
+					layers: promptContext.handbookSources.length,
 					preload: preload.label,
 					preloadChars: preload.chars,
 					preloadLines: preload.lines,
+					preloadIncludedChars: preload.includedChars ?? 0,
+					preloadIncludedLines: preload.includedLines ?? 0,
+					preloadSourceIncludedChars: preload.sources?.[index]?.includedChars ?? 0,
+					preloadSourceHash: preload.sources?.[index]?.contentHash ?? "",
 					...(preload.nearLimit ? { preloadNearLimit: true } : {}),
 				},
 			});
@@ -367,6 +372,18 @@ function inspectResourceRoots(cwd: string, graph: CustomizationGraph): void {
 function inspectSafetyAndMemory(cwd: string, graph: CustomizationGraph): void {
 	try {
 		const layered = readLayeredSettings(cwd);
+		const metadata = createSafetyPolicyEngine({ cwd }).metadata();
+		graph.entries.push({
+			category: "safety",
+			id: "safety.policy",
+			scope: "effective",
+			reloadClass: "next-turn",
+			trust: metadata.workspaceTrustVerdict === "trusted" ? "trusted" : "untrusted",
+			precedence: "single",
+			...(metadata.projectPolicyPath === null ? {} : { sourcePath: metadata.projectPolicyPath }),
+			detail: { ...metadata },
+		});
+
 		graph.entries.push({
 			category: "safety",
 			id: "safety.autonomy",

package/src/cli/config-trust.ts

@@ -0,0 +1,62 @@
+import {
+	captureProjectSurface,
+	type ProjectTrustSurface,
+	recordProjectSurfaceTrust,
+	revokeProjectSurfaceTrust,
+} from "../core/workspace-trust.js";
+import { printError } from "./shared.js";
+
+const SURFACES: ReadonlyArray<ProjectTrustSurface> = ["safety", "hooks", "settings"];
+
+/** Review is read-only. Approval names the digest the operator reviewed, so edits cannot borrow stale consent. */
+export function runConfigTrustCommand(args: ReadonlyArray<string>, cwd = process.cwd()): number {
+	const surface = args[0] as ProjectTrustSurface | undefined;
+	if (surface === undefined || !SURFACES.includes(surface)) {
+		printError("usage: clio-coder config trust safety|hooks|settings [--json | --hash SHA256 | --revoke]");
+		return 2;
+	}
+	const rest = args.slice(1);
+	const preview = rest.length === 0 || (rest.length === 1 && rest[0] === "--json");
+	const revoke = rest.length === 1 && rest[0] === "--revoke";
+	const approve = rest.length === 2 && rest[0] === "--hash" && /^[a-f0-9]{64}$/.test(rest[1] ?? "");
+	if (!preview && !revoke && !approve) {
+		printError("trust expects --json, --revoke, or --hash followed by the full reviewed SHA-256 digest");
+		return 2;
+	}
+	try {
+		if (revoke) {
+			revokeProjectSurfaceTrust(cwd, surface);
+			process.stdout.write(
+				`Project ${surface} trust revoked. Restart to reload settings and safety; project hooks stop before their next execution.\n`,
+			);
+			return 0;
+		}
+		const snapshot = captureProjectSurface(cwd, surface);
+		if (preview) {
+			// JSON escapes terminal control sequences in repository-controlled text.
+			process.stdout.write(`${JSON.stringify(snapshot, null, 2)}\n`);
+			if (rest[0] !== "--json" && snapshot.contentHash !== null && snapshot.files.some((file) => file.text !== null)) {
+				process.stdout.write(
+					`Review the captured files above. Approve exactly these bytes with:\nclio-coder config trust ${surface} --hash ${snapshot.contentHash}\n`,
+				);
+			}
+			return 0;
+		}
+		if (snapshot.contentHash === null || !snapshot.files.some((file) => file.text !== null)) {
+			printError(`no readable project ${surface} files to approve`);
+			return 1;
+		}
+		if (snapshot.contentHash !== rest[1]) {
+			printError(`project ${surface} changed since review; inspect it again before approving`);
+			return 1;
+		}
+		recordProjectSurfaceTrust(snapshot.workspaceRoot, surface, snapshot.contentHash);
+		process.stdout.write(
+			`Project ${surface} approved for ${snapshot.workspaceRoot} at ${snapshot.contentHash}. Restart to reload settings and safety; reload extensions to register newly approved hooks.\n`,
+		);
+		return 0;
+	} catch (error) {
+		printError(error instanceof Error ? error.message : String(error));
+		return 1;
+	}
+}

package/src/cli/config.ts

@@ -1,7 +1,9 @@
 import { buildCustomizationGraph, type CustomizationEntry } from "./config-inspect.js";
+import { runConfigTrustCommand } from "./config-trust.js";
 import { printError } from "./shared.js";
 
 const HELP = `clio-coder config inspect [--json]
+clio-coder config trust safety|hooks|settings [--json | --hash SHA256 | --revoke]
 
 Print the effective-customization graph: what settings, context files, rules,
 skills, prompts, agents, fleets, extensions, safety, memory, hooks, and the operator
@@ -10,6 +12,10 @@ context cost. Read-only; nothing is created.
 
 This is the "why is Clio behaving this way" surface. Parse the --json form in
 scripts instead of the table.
+
+Trust previews show the captured project files and their digest. Approve only
+the reviewed digest with --hash, or remove a surface's approval with --revoke.
+Settings and safety reload on restart; project hooks also check trust before execution.
 `;
 
 function renderText(cwd: string): string {
@@ -37,6 +43,7 @@ function renderText(cwd: string): string {
 			const precedence = entry.precedence ? `, ${entry.precedence}` : "";
 			out.push(`  ${entry.id}  [${entry.scope}${precedence}, reload:${entry.reloadClass}${hash}${cost}]`);
 			if (entry.sourcePath) out.push(`    from ${entry.sourcePath}`);
+			if (entry.id === "safety.policy" && entry.detail !== undefined) out.push(`    ${JSON.stringify(entry.detail)}`);
 		}
 		out.push("");
 	}
@@ -56,6 +63,7 @@ export function runConfigCommand(args: ReadonlyArray<string> = []): number {
 	}
 	const positional = args.filter((arg) => !arg.startsWith("-"));
 	const sub = positional[0] ?? "inspect";
+	if (sub === "trust") return runConfigTrustCommand(args.slice(1));
 	if (sub !== "inspect") {
 		printError(`unknown config subcommand: ${sub}`);
 		process.stderr.write(HELP);

package/src/cli/configure-editor.ts

@@ -0,0 +1,51 @@
+import { existsSync, readFileSync } from "node:fs";
+import { parse } from "yaml";
+import { SettingsValidationError, settingsPath, validateSettings, withSettingsLock } from "../core/config.js";
+import { DEFAULT_SETTINGS_YAML } from "../core/defaults.js";
+import { editTextExternally, resolveExternalEditor } from "../core/external-editor.js";
+import { safeResourceWrite } from "../core/safe-resource-write.js";
+import type { ConfigurePrompts } from "./configure-prompts.js";
+
+/** Edit a draft, validate it, then replace the file only if it has not changed meanwhile. */
+export async function editSettings(prompts: ConfigurePrompts): Promise<boolean> {
+	const file = settingsPath();
+	const original = existsSync(file) ? readFileSync(file, "utf8") : null;
+	let draft = original ?? DEFAULT_SETTINGS_YAML;
+	const editor = resolveExternalEditor();
+	for (;;) {
+		const result = editTextExternally(draft, editor, ".yaml");
+		if (!result.ok || result.text === undefined) throw new Error(result.error ?? "Editor did not return a draft");
+		draft = `${result.text}\n`;
+		if (draft === original) {
+			prompts.output.write("Settings unchanged.\n");
+			return false;
+		}
+		try {
+			const validated = validateSettings(parse(draft));
+			if (validated.issues.length) throw new SettingsValidationError(validated.issues);
+		} catch (error) {
+			prompts.output.write(`${error instanceof Error ? error.message : String(error)}\n`);
+			if (
+				(await prompts.choose("Invalid draft", ["Return to editor", "Discard draft"], "Return to editor")) ===
+				"Return to editor"
+			)
+				continue;
+			return false;
+		}
+		const choice = await prompts.choose(
+			"Save validated settings?",
+			["Save", "Return to editor", "Discard draft"],
+			"Save",
+		);
+		if (choice === "Return to editor") continue;
+		if (choice !== "Save") return false;
+		withSettingsLock(() => {
+			const current = existsSync(file) ? readFileSync(file, "utf8") : null;
+			if (current !== original)
+				throw new Error("Settings changed while the editor was open. Reopen the editor to keep those changes.");
+			safeResourceWrite(file, draft, { encoding: "utf8", mode: 0o644, backup: original !== null });
+		});
+		prompts.output.write(`Settings saved to ${file}${original === null ? "" : `; previous file: ${file}.bak`}\n`);
+		return true;
+	}
+}

package/src/cli/configure-interop.ts

@@ -48,7 +48,7 @@ export interface InteropReviewStreams {
 
 export interface InteropReviewIo {
 	/** Readline interface for the numbered fallback. Null means nothing can answer. */
-	rl: ReturnType<typeof createInterface> | null;
+	rl: Pick<ReturnType<typeof createInterface>, "question"> | null;
 	streams?: InteropReviewStreams;
 	/** Rail to draw on when the caller already owns one. */
 	presenter?: LifecyclePresenter;

package/src/cli/configure-oauth.ts

@@ -15,7 +15,7 @@ import { promptOAuthSelection } from "./oauth-select.js";
 import { credentialWriteFailed, printError, printOk } from "./shared.js";
 
 export async function loginOAuthRuntime(
-	rl: ReturnType<typeof createInterface>,
+	rl: Pick<ReturnType<typeof createInterface>, "question">,
 	runtime: RuntimeDescriptor,
 ): Promise<boolean> {
 	const auth = openAuthStorage();