gentle-pi 3.3.0 → 3.5.0

package/lib/gentle-shell-launcher.ts

@@ -0,0 +1,482 @@
+import { join } from "node:path";
+
+// The gentle-shell launcher: pure, side-effect-free functions over injected
+// env/fs/exec. `bin/gentle-shell.mjs` (T2) wires these into the real process,
+// filesystem and child process so this module stays fully unit-testable.
+
+export type LauncherCommand = "home";
+
+// pi's own package-management subcommands (see pi's cli/args.ts printHelp
+// "Commands" list): each is dispatched by pi itself, before pi's own flag
+// parsing, purely on argv[0]. `uninstall` is pi's alias for `remove`.
+export const PI_SUBCOMMANDS = ["install", "remove", "uninstall", "update", "list", "config", "auth"] as const;
+
+export type PiSubcommand = (typeof PI_SUBCOMMANDS)[number];
+
+function isPiSubcommand(token: string): token is PiSubcommand {
+	return (PI_SUBCOMMANDS as readonly string[]).includes(token);
+}
+
+export interface ParsedLauncherArgs {
+	link: boolean;
+	isolated: boolean;
+	home?: string;
+	help: boolean;
+	version: boolean;
+	command?: LauncherCommand;
+	commandArgs: string[];
+	passthrough: string[];
+	// Set when the first passthrough token is one of PI_SUBCOMMANDS (e.g.
+	// `gentle-shell install npm:x`). It stays part of `passthrough` — this
+	// field only tells buildPiInvocation to skip its extension injection, so
+	// pi sees the bare subcommand it expects as argv[0].
+	piSubcommand?: PiSubcommand;
+	error?: string;
+}
+
+// Home-subcommand parsing is deliberately shallow: `home` only counts as the
+// subcommand when it is argv[0], and everything after it is handed over
+// untouched as commandArgs — T2 owns interpreting `home link|isolated|<path>`.
+export function parseLauncherArgs(argv: string[]): ParsedLauncherArgs {
+	if (argv[0] === "home") {
+		return {
+			link: false,
+			isolated: false,
+			home: undefined,
+			help: false,
+			version: false,
+			command: "home",
+			commandArgs: argv.slice(1),
+			passthrough: [],
+			piSubcommand: undefined,
+			error: undefined,
+		};
+	}
+
+	let link = false;
+	let isolated = false;
+	let home: string | undefined;
+	let help = false;
+	let version = false;
+	let error: string | undefined;
+	let piSubcommand: PiSubcommand | undefined;
+	const passthrough: string[] = [];
+
+	for (let i = 0; i < argv.length; i += 1) {
+		const arg = argv[i];
+		if (arg === "--") {
+			const rest = argv.slice(i + 1);
+			if (passthrough.length === 0 && rest.length > 0 && isPiSubcommand(rest[0])) {
+				piSubcommand = rest[0];
+			}
+			passthrough.push(...rest);
+			break;
+		}
+		if (arg === "--link") {
+			link = true;
+			continue;
+		}
+		if (arg === "--isolated") {
+			isolated = true;
+			continue;
+		}
+		if (arg === "--help" || arg === "-h") {
+			help = true;
+			continue;
+		}
+		if (arg === "--version") {
+			version = true;
+			continue;
+		}
+		if (arg.startsWith("--home=")) {
+			const value = arg.slice("--home=".length);
+			if (value.length === 0) {
+				error = "--home requires a non-empty path argument";
+				continue;
+			}
+			home = value;
+			continue;
+		}
+		if (arg === "--home") {
+			const value = argv[i + 1];
+			if (value === undefined || value.length === 0) {
+				error = "--home requires a non-empty path argument";
+				if (value !== undefined) i += 1;
+				continue;
+			}
+			home = value;
+			i += 1;
+			continue;
+		}
+		if (passthrough.length === 0 && isPiSubcommand(arg)) {
+			piSubcommand = arg;
+		}
+		passthrough.push(arg);
+	}
+
+	if (error === undefined) {
+		if (link && isolated) {
+			error = "--link cannot be combined with --isolated";
+		} else if (link && home !== undefined) {
+			error = "--link cannot be combined with --home";
+		} else if (isolated && home !== undefined) {
+			error = "--isolated cannot be combined with --home";
+		}
+	}
+
+	return { link, isolated, home, help, version, command: undefined, commandArgs: [], passthrough, piSubcommand, error };
+}
+
+// --- home resolution -------------------------------------------------------
+
+export type HomeMode = "link" | "isolated" | "path";
+export type HomeSource = "flag" | "config" | "default";
+
+export interface ResolvedHome {
+	mode: HomeMode;
+	dir: string;
+	source: HomeSource;
+}
+
+// A discriminated union instead of a plain `home: string` field: `resolveHome`
+// switches on `mode` rather than re-parsing the raw on-disk string, and the
+// `path` case carries its `dir` explicitly so a "link"/"isolated" string can
+// never be mistaken for a filesystem path at the call site.
+export type LauncherConfig = { mode: "link" } | { mode: "isolated" } | { mode: "path"; dir: string };
+
+export interface ResolveHomeInput {
+	args: ParsedLauncherArgs;
+	env: Record<string, string | undefined>;
+	homedir: string;
+	config: LauncherConfig | undefined;
+}
+
+// Pi Subagents resolves `PI_CODING_AGENT_DIR || ~/.pi/agent`; `--link` reuses
+// that exact home so gentle-shell never diverges from the user's own pi.
+function linkDir(env: Record<string, string | undefined>, homedir: string): string {
+	return env.PI_CODING_AGENT_DIR || join(homedir, ".pi", "agent");
+}
+
+function isolatedDir(env: Record<string, string | undefined>, homedir: string): string {
+	return env.GENTLE_SHELL_HOME || join(homedir, ".gentle-shell", "agent");
+}
+
+export function resolveHome(input: ResolveHomeInput): ResolvedHome {
+	const { args, env, homedir, config } = input;
+
+	if (args.link) return { mode: "link", dir: linkDir(env, homedir), source: "flag" };
+	if (args.isolated) return { mode: "isolated", dir: isolatedDir(env, homedir), source: "flag" };
+	if (args.home !== undefined) return { mode: "path", dir: args.home, source: "flag" };
+
+	if (config !== undefined) {
+		if (config.mode === "link") return { mode: "link", dir: linkDir(env, homedir), source: "config" };
+		if (config.mode === "isolated") return { mode: "isolated", dir: isolatedDir(env, homedir), source: "config" };
+		return { mode: "path", dir: config.dir, source: "config" };
+	}
+
+	return { mode: "isolated", dir: isolatedDir(env, homedir), source: "default" };
+}
+
+export function launcherConfigPath(homedir: string): string {
+	return join(homedir, ".gentle-shell", "config.json");
+}
+
+// Tolerant on purpose: a malformed or foreign config.json must never crash
+// the launcher, it just falls through to the default isolated home.
+//
+// The on-disk shape stays the flat `{ "home": "link" | "isolated" | "<path>" }`
+// documented in the feature scope; only the parsed, in-memory `LauncherConfig`
+// is a discriminated union. Any non-empty string other than the exact literals
+// "link" or "isolated" is treated as a path, including a near-miss like
+// "linked" — this is deliberate: there is no separate "unrecognised mode"
+// error, a typo just resolves to a (probably nonexistent) path instead.
+export function parseLauncherConfig(text: string): LauncherConfig | undefined {
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(text);
+	} catch {
+		return undefined;
+	}
+	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return undefined;
+	const home = (parsed as Record<string, unknown>).home;
+	if (typeof home !== "string" || home.length === 0) return undefined;
+	if (home === "link") return { mode: "link" };
+	if (home === "isolated") return { mode: "isolated" };
+	return { mode: "path", dir: home };
+}
+
+// --- pi runtime resolution ---------------------------------------------------
+
+export type PiRuntimeKind = "env" | "bundled" | "path";
+
+export interface PiRuntime {
+	kind: PiRuntimeKind;
+	command: string;
+	args: string[];
+}
+
+export interface PiRuntimeDeps {
+	env: Record<string, string | undefined>;
+	resolveBundledCli: () => string | undefined;
+	findOnPath: (name: string) => string | undefined;
+	nodeExecPath: string;
+}
+
+export function resolvePiRuntime(deps: PiRuntimeDeps): PiRuntime | undefined {
+	const envOverride = deps.env.GENTLE_SHELL_PI;
+	if (envOverride !== undefined && envOverride.length > 0) return { kind: "env", command: envOverride, args: [] };
+
+	const bundledCliPath = deps.resolveBundledCli();
+	if (bundledCliPath !== undefined) return { kind: "bundled", command: deps.nodeExecPath, args: [bundledCliPath] };
+
+	const onPath = deps.findOnPath("pi");
+	if (onPath !== undefined) return { kind: "path", command: onPath, args: [] };
+
+	return undefined;
+}
+
+export function missingPiMessage(): string {
+	return [
+		"No pi runtime could be found. Pick one of:",
+		"  - Set GENTLE_SHELL_PI to the path of a pi executable.",
+		"  - Install @earendil-works/pi-coding-agent next to gentle-pi (it ships as an optional peer dependency).",
+		"  - Install pi and make sure it is on your PATH.",
+	].join("\n");
+}
+
+// --- pi version gate ---------------------------------------------------------
+
+export const MIN_PI_VERSION = "0.85.1";
+
+export type PiVersionCheck = { ok: true; version: string } | { ok: false; message: string; version?: string };
+
+const VERSION_PATTERN = /v?(\d+)\.(\d+)\.(\d+)/;
+
+function compareVersions(a: readonly [number, number, number], b: readonly [number, number, number]): number {
+	for (let i = 0; i < 3; i += 1) {
+		if (a[i] !== b[i]) return a[i] - b[i];
+	}
+	return 0;
+}
+
+export function checkPiVersion(output: string, minimum: string = MIN_PI_VERSION): PiVersionCheck {
+	const match = VERSION_PATTERN.exec(output);
+	if (!match) {
+		return { ok: false, message: `Could not determine the pi version from "${output.trim()}" (need at least ${minimum}).` };
+	}
+	const version = `${match[1]}.${match[2]}.${match[3]}`;
+	const minimumMatch = VERSION_PATTERN.exec(minimum);
+	if (!minimumMatch) throw new Error(`invalid minimum version "${minimum}"`);
+	const found: [number, number, number] = [Number(match[1]), Number(match[2]), Number(match[3])];
+	const wanted: [number, number, number] = [Number(minimumMatch[1]), Number(minimumMatch[2]), Number(minimumMatch[3])];
+	if (compareVersions(found, wanted) < 0) {
+		return { ok: false, version, message: `pi version ${version} is older than the required minimum ${minimum}.` };
+	}
+	return { ok: true, version };
+}
+
+// --- packaging drift guard -----------------------------------------------------
+
+export interface PackageJsonPeerShape {
+	peerDependencies?: Record<string, string>;
+}
+
+export type PeerVersionPinCheck = { ok: true; pinned: string } | { ok: false; message: string };
+
+// Keeps the MIN_PI_VERSION drift-guard test's failure readable: a missing
+// peerDependencies block, a missing peer entry, or a malformed range must
+// fail with a clear assertion message, not a raw TypeError from indexing an
+// undefined value the way a direct `packageJson.peerDependencies[peerName]`
+// lookup would.
+export function checkPeerVersionPin(packageJson: PackageJsonPeerShape, peerName: string, minVersion: string): PeerVersionPinCheck {
+	const peerDependencies = packageJson.peerDependencies;
+	if (peerDependencies === undefined) {
+		return { ok: false, message: "package.json is missing a peerDependencies block" };
+	}
+	const pinned = peerDependencies[peerName];
+	if (typeof pinned !== "string") {
+		return { ok: false, message: `package.json peerDependencies is missing "${peerName}"` };
+	}
+	if (!/^>=\d+\.\d+\.\d+$/.test(pinned)) {
+		return { ok: false, message: `package.json peerDependencies["${peerName}"] ("${pinned}") is not a simple >=x.y.z range` };
+	}
+	const version = pinned.replace(/^>=/, "");
+	if (version !== minVersion) {
+		return { ok: false, message: `MIN_PI_VERSION ("${minVersion}") does not match the pinned peer range ("${pinned}")` };
+	}
+	return { ok: true, pinned };
+}
+
+// --- settings.json detection ---------------------------------------------------
+
+function packageEntryDeclaresGentlePi(entry: unknown): boolean {
+	const declares = (value: unknown): boolean => typeof value === "string" && (value === "npm:gentle-pi" || value.startsWith("npm:gentle-pi@"));
+	if (declares(entry)) return true;
+	if (entry !== null && typeof entry === "object") return declares((entry as Record<string, unknown>).source);
+	return false;
+}
+
+export function settingsDeclareGentlePi(settingsText: string | undefined): boolean {
+	if (settingsText === undefined) return false;
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(settingsText);
+	} catch {
+		return false;
+	}
+	if (typeof parsed !== "object" || parsed === null) return false;
+	const packages = (parsed as Record<string, unknown>).packages;
+	if (!Array.isArray(packages)) return false;
+	return packages.some(packageEntryDeclaresGentlePi);
+}
+
+// --- pi invocation builder ---------------------------------------------------
+
+export interface BuildPiInvocationInput {
+	runtime: PiRuntime;
+	home: ResolvedHome;
+	packageRoot: string;
+	settingsDeclareGentlePi: boolean;
+	passthrough: string[];
+	// Set when parseLauncherArgs recognised passthrough[0] as one of
+	// PI_SUBCOMMANDS. pi dispatches install/remove/uninstall/update/list/
+	// config/auth on argv[0] before its own flag parsing, so none of the
+	// gentle-pi extension injection below may precede it.
+	piSubcommand?: PiSubcommand;
+	baseEnv: Record<string, string | undefined>;
+}
+
+export interface PiInvocation {
+	command: string;
+	args: string[];
+	env: Record<string, string | undefined>;
+}
+
+// The `-e/--theme/--skill/--prompt-template` injection is skipped when the
+// caller already confirmed the target settings.json declares the package
+// (the `--link` case with a pi-managed install), or when passthrough[0] is
+// one of pi's own subcommands: pi dispatches install/remove/uninstall/
+// update/list/config/auth on argv[0] before it even parses flags, so any
+// injected flag ahead of it stops pi from recognising its subcommand at
+// all — this is exactly the observed 2026-09-22 bug where `gentle-shell
+// install npm:x` opened an interactive pi session instead of running the
+// package manager. Isolated and path homes never declare the package, so
+// callers pass `settingsDeclareGentlePi: false` for those and the
+// injection always happens there, unless a pi subcommand is set.
+export function buildPiInvocation(input: BuildPiInvocationInput): PiInvocation {
+	const args = [...input.runtime.args];
+	if (input.piSubcommand === undefined && !input.settingsDeclareGentlePi) {
+		args.push(
+			"-e",
+			input.packageRoot,
+			"--theme",
+			join(input.packageRoot, "themes"),
+			"--skill",
+			join(input.packageRoot, "skills"),
+			"--prompt-template",
+			join(input.packageRoot, "prompts"),
+		);
+	}
+	args.push(...input.passthrough);
+
+	return {
+		command: input.runtime.command,
+		args,
+		env: { ...input.baseEnv, PI_CODING_AGENT_DIR: input.home.dir, GENTLE_PI_AGENT_HOME: input.home.dir },
+	};
+}
+
+// --- spawn planning ------------------------------------------------------------
+
+// R3-001: `findOnPath` can resolve a PATHEXT candidate such as a .CMD or .BAT
+// shim on win32 (exactly how an npm-installed `pi` lands on PATH), and a
+// GENTLE_SHELL_PI override can point at one too. Current Node releases refuse
+// to spawn a batch file directly without `shell: true` (EINVAL), so both the
+// version probe and the real launch route a batch shim through cmd.exe as one
+// quoted command line instead of spawning it directly.
+const CMD_EXE_SPECIAL_CHARS = /[\s"&|<>^%()]/;
+
+// cmd.exe quoting is deliberately simple, not a full cmd.exe parser: wrap a
+// token in double quotes when it is empty or contains whitespace or any of
+// `"&|<>^%()`, and escape an inner `"` as `\"` — doubling inner quotes is not
+// reliable in cmd.exe, unlike the `\"` convention Node's own Windows spawn
+// helpers use.
+export function quoteForCmdExe(token: string): string {
+	if (token.length > 0 && !CMD_EXE_SPECIAL_CHARS.test(token)) return token;
+	return `"${token.replace(/"/g, '\\"')}"`;
+}
+
+export interface PlanSpawnInput {
+	command: string;
+	args: string[];
+	platform: NodeJS.Platform;
+}
+
+export interface SpawnPlan {
+	command: string;
+	args: string[];
+	shell: boolean;
+}
+
+export function planSpawn(input: PlanSpawnInput): SpawnPlan {
+	const { command, args, platform } = input;
+	if (platform === "win32" && /\.(cmd|bat)$/i.test(command)) {
+		return { command: [command, ...args].map(quoteForCmdExe).join(" "), args: [], shell: true };
+	}
+	return { command, args, shell: false };
+}
+
+// --- reporting ---------------------------------------------------------------
+
+export interface DescribeVersionInput {
+	gentlePiVersion: string;
+	piVersion: string | undefined;
+	home: ResolvedHome;
+}
+
+export function describeVersion(input: DescribeVersionInput): string {
+	return [
+		`gentle-shell ${input.gentlePiVersion}`,
+		`pi ${input.piVersion ?? "not found"}`,
+		`home ${input.home.mode} ${input.home.dir}`,
+	].join("\n");
+}
+
+export function helpText(): string {
+	return [
+		"Usage: gentle-shell [options] [-- pi-args...]",
+		"       gentle-shell home [link|isolated|<path>]",
+		"",
+		"Opens pi with the Gentle Shell package loaded, without touching your",
+		"vanilla pi installation.",
+		"",
+		"Options:",
+		"  --link           Use your existing pi agent home (never edits its settings.json).",
+		"  --isolated       Use the dedicated ~/.gentle-shell/agent home (default).",
+		"  --home <path>    Use a custom agent home directory.",
+		"  --help, -h       Show this help text.",
+		"  --version        Show gentle-shell, pi, and home version information.",
+		"",
+		"Commands:",
+		"  home             Print or persist the effective home mode (link, isolated, or a path).",
+		"",
+		"Managing packages:",
+		"  gentle-shell install npm:<pkg>   Run pi's own 'install' against the resolved home.",
+		"  gentle-shell remove <source>     Run pi's own 'remove' against the resolved home.",
+		"  gentle-shell list                Run pi's own 'list' against the resolved home.",
+		"  gentle-shell update [target]     Run pi's own 'update' against the resolved home.",
+		"  gentle-shell config              Run pi's own 'config' against the resolved home.",
+		"  gentle-shell auth <command>      Run pi's own 'auth' against the resolved home.",
+		"  These run pi's own commands, forwarded verbatim, against the --isolated home",
+		"  (or your own pi home with --link). Running 'gentle-shell install npm:gentle-pi'",
+		"  inside the isolated home is unnecessary: gentle-shell already loads the",
+		"  package itself.",
+		"",
+		"Environment variables:",
+		"  GENTLE_SHELL_PI       Path to the pi executable to run.",
+		"  GENTLE_SHELL_HOME     Directory for the isolated home (default: ~/.gentle-shell/agent).",
+		"  PI_CODING_AGENT_DIR   Directory for the --link home, shared with pi itself.",
+		"",
+		"Every other argument is forwarded to pi unchanged.",
+	].join("\n");
+}

package/lib/inprocess-reviewer.ts

@@ -59,6 +59,13 @@ export interface InProcessReviewerRequest {
 	readonly prompt: Buffer;
 	readonly timeoutMs: number;
 	readonly signal?: AbortSignal;
+	/**
+	 * The live pi session id, threaded from the extension context. Pi's main
+	 * agent loop adds OpenCode attribution headers itself; this side-call must
+	 * carry them itself instead. Absent (or empty) means no attribution header,
+	 * never an invented one and never an error.
+	 */
+	readonly sessionId?: string;
 	/** e.g. "review-risk" — only used to name the routing config key in refusal messages. */
 	readonly routingKey: string;
 }
@@ -126,6 +133,30 @@ function isTextContent(part: { type?: unknown }): part is TextContent {
 	return part.type === "text";
 }
 
+/**
+ * Mirrors pi's main-loop OpenCode attribution condition exactly
+ * (core/provider-attribution.js#getSessionHeaders): the model's provider is
+ * `opencode` or `opencode-go`, or its baseUrl host is `opencode.ai`. Returns
+ * the `{ x-opencode-session, x-opencode-client }` attribution pair, or
+ * undefined when the model is not OpenCode-routed or there is no live session
+ * id — a missing session id is never an error and never invents a header.
+ * The URL parse is guarded: an unparseable baseUrl follows the provider
+ * condition alone.
+ */
+export function openCodeSessionAttributionHeaders(model: Model<Api>, sessionId: string | undefined): ProviderHeaders | undefined {
+	const isOpenCode = model.provider === "opencode"
+		|| model.provider === "opencode-go"
+		|| (() => {
+			try {
+				return new URL(String(model.baseUrl ?? "")).hostname === "opencode.ai";
+			} catch {
+				return false;
+			}
+		})();
+	if (!isOpenCode || typeof sessionId !== "string" || sessionId.length === 0) return undefined;
+	return { "x-opencode-session": sessionId, "x-opencode-client": "pi" };
+}
+
 /**
  * Runs one reviewer completion in-process: resolve the model, authenticate,
  * map the routing thinking label, and complete exactly one frozen prompt as
@@ -168,6 +199,12 @@ export async function runInProcessReviewer(request: InProcessReviewerRequest, de
 		);
 	}
 
+	// Extension side-calls bypass pi's main agent loop, which is where OpenCode
+	// attribution headers are otherwise added, so this completion carries them
+	// itself — as a default beneath the registry's own auth headers, the same
+	// merge order pi's core uses for explicit header sources.
+	const attributionHeaders = openCodeSessionAttributionHeaders(model, request.sessionId);
+
 	// The caller's own signal (if any) and a floor timeout race together:
 	// whichever fires first aborts the completion. The catch branch below
 	// tells them apart by which underlying signal actually fired, never by
@@ -188,7 +225,7 @@ export async function runInProcessReviewer(request: InProcessReviewerRequest, de
 		signal: combinedSignal,
 		timeoutMs: request.timeoutMs,
 		...(auth.apiKey === undefined ? {} : { apiKey: auth.apiKey }),
-		...(auth.headers === undefined ? {} : { headers: auth.headers }),
+		...(auth.headers === undefined && attributionHeaders === undefined ? {} : { headers: attributionHeaders === undefined ? auth.headers : { ...attributionHeaders, ...auth.headers } }),
 		...(reasoning.reasoning === undefined ? {} : { reasoning: reasoning.reasoning }),
 	};
 

package/lib/native-review-cli.ts

@@ -201,7 +201,7 @@ export interface NativeReviewModeRequest {
 // explicit `committedOnly` acknowledgement, exactly like Native START's
 // baseRef/committedOnly pairing, because both select a committed range
 // instead of the ambient working tree.
-export interface NativeReviewAssessRequest {
+export interface NativeReviewAssessRequest extends NativeUntrackedSelection {
 	cwd: string;
 	baseRef?: string;
 	committedOnly?: boolean;
@@ -705,7 +705,11 @@ function isNativeUntrackedPath(value: unknown): value is string {
 		&& value.split("/").every((segment) => segment.length > 0 && segment !== "." && segment !== "..");
 }
 
-function nativeUntrackedSelection(request: NativeUntrackedSelectionRequest): NativeUntrackedSelection {
+export function nativeUntrackedSelection(request: {
+	untrackedScope?: unknown;
+	expectedUntrackedInventory?: unknown;
+	intendedUntracked?: unknown;
+}): NativeUntrackedSelection {
 	const { untrackedScope, expectedUntrackedInventory, intendedUntracked } = request;
 	const declared = untrackedScope !== undefined || expectedUntrackedInventory !== undefined || intendedUntracked !== undefined;
 	if (!declared) return {};
@@ -716,16 +720,19 @@ function nativeUntrackedSelection(request: NativeUntrackedSelectionRequest): Nat
 	) {
 		throw new TypeError("Native untracked selection must declare one scope, one inventory digest, and unique repository-relative paths");
 	}
-	if (untrackedScope === NATIVE_UNTRACKED_SCOPE.EXCLUDE && (intendedUntracked?.length ?? 0) > 0) {
+	// The guard above establishes the array and element types for both typed
+	// native requests and untyped facade input.
+	const paths = intendedUntracked as readonly string[] | undefined;
+	if (untrackedScope === NATIVE_UNTRACKED_SCOPE.EXCLUDE && (paths?.length ?? 0) > 0) {
 		throw new TypeError("Native exclude untracked selection cannot include paths");
 	}
-	if (untrackedScope === NATIVE_UNTRACKED_SCOPE.SELECT && (intendedUntracked?.length ?? 0) === 0) {
+	if (untrackedScope === NATIVE_UNTRACKED_SCOPE.SELECT && (paths?.length ?? 0) === 0) {
 		throw new TypeError("Native select untracked selection requires at least one path");
 	}
 	return {
 		untrackedScope,
 		expectedUntrackedInventory,
-		intendedUntracked: intendedUntracked === undefined ? undefined : [...intendedUntracked],
+		intendedUntracked: paths === undefined ? undefined : [...paths],
 	};
 }
 
@@ -1018,6 +1025,13 @@ export const NATIVE_CLI_CONTRACTS = Object.freeze({
 	// and hint remain dark because neither is proven to reach the negotiated
 	// START path Pi consumes.
 	"3.4.0": Object.freeze({ start: true, finalize: true, validate: true, bindSdd: true, status: true, inventory: true, reclaim: true, recover: true, abandon: true, quarantineLegacy: true, reconcileAuthority: true, repairLegacyAlias: true, mode: true, riskEvidence: false, hint: false, delivery: true }),
+	// v3.5.0 repeats 3.4.0: the published provider contract bundle is
+	// byte-identical at 1.2.0, both binaries advertise capabilities/v2.6
+	// with only build-identity differences, and no review-integration schema
+	// changed. The v2 preflight failure identity fix does not change the
+	// closed START/STATUS fields this row negotiates. riskEvidence and hint
+	// remain dark; neither is proven to reach Pi's negotiated START path.
+	"3.5.0": Object.freeze({ start: true, finalize: true, validate: true, bindSdd: true, status: true, inventory: true, reclaim: true, recover: true, abandon: true, quarantineLegacy: true, reconcileAuthority: true, repairLegacyAlias: true, mode: true, riskEvidence: false, hint: false, delivery: true }),
 });
 
 export interface NativeReviewProcessDiagnostics {
@@ -1102,8 +1116,19 @@ function decodeSelectedLenses(value: unknown, riskLevel: string, lensesRequired:
 function enumString(value: unknown, allowed: readonly string[]): string { const parsed = stringValue(value); if (!allowed.includes(parsed)) throw new Error("unsupported enum"); return parsed; }
 const NATIVE_DIAGNOSTIC_TEXT_LIMIT = 4_096;
 
-function sanitizeNativeDiagnosticText(value: string, limit = NATIVE_DIAGNOSTIC_TEXT_LIMIT): string {
-	const normalized = value
+function sanitizeNativeDiagnosticText(value: string, limit = NATIVE_DIAGNOSTIC_TEXT_LIMIT, operation?: NativeReviewOperation): string {
+	// ASSESS diagnostics are projected into a public verification plan. Retain
+	// native guidance, not local paths or environment assignment values.
+	const input = operation === NATIVE_REVIEW_OPERATION.ASSESS
+		? value
+			.replace(/(?<![\w-])[a-z_][a-z0-9_]*=(?:"[^"\r\n]*"|'[^'\r\n]*'|[^\s]+)/gi, "[REDACTED ENV]")
+			.replace(/--(?:password|token|secret|authorization|cookie|private[_-]key|access[_-]token|[a-z0-9_-]+[_-]token|api[_-]?key)[ \t]+(?:"[^"\r\n]*"|'[^'\r\n]*'|[^\s]+)/gi, "[REDACTED CREDENTIAL]")
+			// Quoted paths have a clear boundary. For an unquoted path, the
+			// remaining line is ambiguous (spaces may belong to the filename).
+			// Redact that suffix rather than leak trailing path components.
+			.replace(/"(?:[A-Za-z]:[\\/]|\/)[^"\r\n]*"|'(?:[A-Za-z]:[\\/]|\/)[^'\r\n]*'|(?:[A-Za-z]:[\\/]|\/)[^\r\n]*/g, "[REDACTED PATH]")
+		: value;
+	const normalized = input
 		.replace(/\x1b](?:[^\x07\x1b]|\x1b(?!\\))*?(?:\x07|\x1b\\)/g, "[REDACTED CONTROL]")
 		.replace(/\x1b[PX^_][\s\S]*?\x1b\\/g, "[REDACTED CONTROL]")
 		.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "[REDACTED CONTROL]")
@@ -1137,7 +1162,7 @@ export function sanitizeForeignNativeReviewDiagnostics(value: unknown): NativeRe
 			timed_out: booleanValue(raw.timed_out),
 			output_limit_exceeded: booleanValue(raw.output_limit_exceeded),
 			...(maxBufferBytes === undefined ? {} : { max_buffer_bytes: maxBufferBytes, configuration_hint: configurationHint! }),
-			...(raw.stderr === undefined ? {} : { stderr: sanitizeNativeDiagnosticText(stringValue(raw.stderr)) }),
+			...(raw.stderr === undefined ? {} : { stderr: sanitizeNativeDiagnosticText(stringValue(raw.stderr), NATIVE_DIAGNOSTIC_TEXT_LIMIT, operation) }),
 		};
 	} catch { return undefined; }
 }
@@ -1154,7 +1179,7 @@ function nativeProcessDiagnostics(operation: NativeReviewOperation, code: Native
 		...(code === NATIVE_REVIEW_ERROR_CODE.OUTPUT_LIMIT && maxBufferBytes !== undefined
 			? { max_buffer_bytes: maxBufferBytes, configuration_hint: NATIVE_REVIEW_MAX_BUFFER_CONFIGURATION_HINT }
 			: {}),
-		...(result?.stderr.trim() ? { stderr: sanitizeNativeDiagnosticText(result.stderr) } : {}),
+		...(result?.stderr.trim() ? { stderr: sanitizeNativeDiagnosticText(result.stderr, NATIVE_DIAGNOSTIC_TEXT_LIMIT, operation) } : {}),
 	};
 }
 
@@ -2535,6 +2560,7 @@ export class NativeReviewCliV216 implements NativeReviewCli {
 	// rejects -- callers (the `gentle_review` tool's `assess` operation) fail
 	// closed to `high`.
 	async assess(request: NativeReviewAssessRequest): Promise<ReviewAssessmentV1> {
+		const selection = nativeUntrackedSelection(request);
 		if (request.baseRef !== undefined && !isCanonicalProcessString(request.baseRef)) throw new TypeError("Native ASSESS baseRef must be a non-empty, trimmed, NUL-free string");
 		if (request.baseRef !== undefined && request.committedOnly !== true) throw new TypeError("Native ASSESS baseRef requires explicit committedOnly acknowledgement");
 		if (request.baseRef === undefined && request.committedOnly !== undefined) throw new TypeError("Native ASSESS committedOnly requires an explicit baseRef");
@@ -2542,7 +2568,7 @@ export class NativeReviewCliV216 implements NativeReviewCli {
 		const execution = await this.invoke(
 			NATIVE_REVIEW_OPERATION.ASSESS,
 			cwd,
-			["review", "assess", "--cwd", cwd, ...(request.baseRef === undefined ? [] : ["--base-ref", request.baseRef, "--committed-only"]), "--json"],
+			["review", "assess", "--cwd", cwd, ...(request.baseRef === undefined ? [] : ["--base-ref", request.baseRef, "--committed-only"]), ...nativeUntrackedSelectionArguments(selection), "--json"],
 			false,
 			request.signal,
 			this.executablePath(NATIVE_REVIEW_OPERATION.ASSESS, false),