ultimate-pi 0.19.1 → 0.20.0

package/.pi/lib/harness-lens/clients/anchored-edit-autopatch.ts

@@ -0,0 +1,158 @@
+import * as nodeFs from "node:fs";
+import { AnchorStateManager } from "../../harness-anchored-edit/anchor-state.js";
+import { EditExecutor } from "../../harness-anchored-edit/edit-executor.js";
+import { splitAnchor } from "../../harness-anchored-edit/line-protocol.js";
+import type { AnchoredEdit } from "../../harness-anchored-edit/types.js";
+import { tryCorrectIndentationMismatchFromContent } from "./edit-autopatch.js";
+import { retargetReplacementIndentation } from "./indent-retarget.js";
+
+function leadingIndent(line: string): string {
+	return line.match(/^[\t ]*/)?.[0] ?? "";
+}
+
+function isIndentationOnlyChange(before: string, after: string): boolean {
+	const beforeLines = before.replace(/\r\n/g, "\n").split("\n");
+	const afterLines = after.replace(/\r\n/g, "\n").split("\n");
+	if (beforeLines.length !== afterLines.length) return false;
+	return beforeLines.every(
+		(line, index) => line.trim() === afterLines[index].trim(),
+	);
+}
+
+type AnchoredEditInput = {
+	edits?: AnchoredEdit[];
+};
+
+export function isAnchoredEditToolInput(
+	editInput: unknown,
+): editInput is AnchoredEditInput {
+	if (!editInput || typeof editInput !== "object") return false;
+	const edits = (editInput as AnchoredEditInput).edits;
+	if (!Array.isArray(edits) || edits.length === 0) return false;
+	return typeof edits[0]?.anchor === "string";
+}
+
+/**
+ * Indentation-only correction for harness anchored edit.text before apply.
+ */
+export function applyAnchoredEditAutopatch(
+	filePath: string,
+	editInput: AnchoredEditInput,
+	taskId: string,
+): { block: true; reason: string } | undefined {
+	const edits = editInput.edits;
+	if (!edits?.length) return undefined;
+
+	let crlfContent: string;
+	try {
+		crlfContent = nodeFs.readFileSync(filePath, "utf-8").replace(/\r\n/g, "\n");
+	} catch {
+		return undefined;
+	}
+
+	const lines = crlfContent.split("\n");
+	const lineAnchors = AnchorStateManager.reconcile(filePath, lines, taskId);
+	const executor = new EditExecutor();
+	const { resolvedEdits, failedEdits } = executor.resolveEdits(
+		edits,
+		lines,
+		lineAnchors,
+	);
+	if (failedEdits.length > 0) return undefined;
+
+	const corrected: Array<{
+		label: string;
+		original: string;
+		corrected: string;
+		indentationOnly: boolean;
+		apply: (value: string) => void;
+	}> = [];
+
+	for (const { lineIdx, endIdx, edit } of resolvedEdits) {
+		const editType = edit.edit_type ?? "replace";
+		const text = edit.text ?? "";
+		if (!text.trim()) continue;
+
+		let referenceBlock: string;
+		if (editType === "replace") {
+			referenceBlock = lines.slice(lineIdx, endIdx + 1).join("\n");
+		} else {
+			referenceBlock = lines[lineIdx] ?? "";
+		}
+
+		const correctedText = tryCorrectIndentationMismatchFromContent(
+			text,
+			crlfContent,
+		);
+		if (correctedText === undefined) {
+			const refIndent = leadingIndent(referenceBlock.split("\n")[0] ?? "");
+			const textIndent = leadingIndent(text.split("\n")[0] ?? "");
+			if (
+				refIndent !== textIndent &&
+				isIndentationOnlyChange(
+					textIndent + text.trimStart(),
+					refIndent + text.trimStart(),
+				)
+			) {
+				const retargeted = retargetReplacementIndentation(
+					text,
+					textIndent + text.trimStart(),
+					refIndent + text.trimStart(),
+				);
+				if (retargeted !== undefined) {
+					corrected.push({
+						label: `edits anchor ${splitAnchor(edit.anchor).anchor}`,
+						original: text,
+						corrected: retargeted,
+						indentationOnly: true,
+						apply: (value) => {
+							edit.text = value;
+						},
+					});
+				}
+			}
+			continue;
+		}
+
+		if (correctedText !== text) {
+			const retargeted = retargetReplacementIndentation(
+				text,
+				text,
+				correctedText,
+			);
+			corrected.push({
+				label: `edits anchor ${splitAnchor(edit.anchor).anchor}`,
+				original: text,
+				corrected: retargeted ?? correctedText,
+				indentationOnly: isIndentationOnlyChange(text, correctedText),
+				apply: (value) => {
+					edit.text = value;
+				},
+			});
+		}
+	}
+
+	if (corrected.length === 0) return undefined;
+
+	const unsafe = corrected.filter((entry) => !entry.indentationOnly);
+	if (unsafe.length > 0) {
+		const details = unsafe
+			.map(({ label, original }) => {
+				const preview = original.trimStart().slice(0, 60).replace(/\n/g, "↵");
+				return `${label} ("${preview}…") cannot be auto-patched (not indentation-only).`;
+			})
+			.join("\n");
+		return {
+			block: true,
+			reason:
+				`🔄 RETRYABLE — Indentation mismatch on anchored edit text\n\n` +
+				`${details}\n\n` +
+				`Next action: re-read the relevant section, then retry with text matching file indentation.`,
+		};
+	}
+
+	for (const entry of corrected) {
+		entry.apply(entry.corrected);
+	}
+	return undefined;
+}

package/.pi/lib/harness-lens/index.ts

@@ -7,6 +7,11 @@ import * as nodeFs from "node:fs";
 import * as path from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { isToolCallEventType } from "@earendil-works/pi-coding-agent";
+import { anchoredEditTaskId } from "../harness-anchored-edit/task-id.js";
+import {
+	applyAnchoredEditAutopatch,
+	isAnchoredEditToolInput,
+} from "./clients/anchored-edit-autopatch.js";
 import {
 	tryCorrectIndentationMismatch,
 	tryCorrectIndentationMismatchFromContent,
@@ -496,13 +501,25 @@ export default function harnessLensExtension(pi: ExtensionAPI): void {
 				event as Parameters<typeof isToolCallEventType>[1],
 			)
 		) {
-			const editInput = (event as { input?: unknown }).input as {
-				oldText?: string;
-				newText?: string;
-				edits?: Array<{ oldText?: string; newText?: string }>;
-			};
-			const block = applyEditAutopatch(filePath, editInput);
-			if (block) return block;
+			const editInput = (event as { input?: unknown }).input;
+			if (isAnchoredEditToolInput(editInput)) {
+				const block = applyAnchoredEditAutopatch(
+					filePath,
+					editInput,
+					anchoredEditTaskId({
+						sessionId: (ctx as { sessionId?: string }).sessionId,
+					}),
+				);
+				if (block) return block;
+			} else {
+				const legacyInput = editInput as {
+					oldText?: string;
+					newText?: string;
+					edits?: Array<{ oldText?: string; newText?: string }>;
+				};
+				const block = applyEditAutopatch(filePath, legacyInput);
+				if (block) return block;
+			}
 		}
 	});
 

package/.pi/lib/harness-subagents-bridge.ts

@@ -14,7 +14,7 @@ import {
 	type SpawnAuthForward,
 } from "../../vendor/pi-subagents/src/subagents.js";
 import { subagentGovernanceExtensionPath } from "../extensions/subagent-governance.js";
-import { getAgentKind } from "./agents-policy.mjs";
+import { getAgentKind, resolveExtensionBundlePaths } from "./agents-policy.mjs";
 import {
 	delegationEnvFromBundle,
 	mintSubagentDelegation,
@@ -35,10 +35,6 @@ import {
 	recordSpawnStart,
 } from "./harness-spawn-budget.js";
 import { parseSpawnContextFromTask } from "./harness-spawn-parse.js";
-import {
-	getRememberedSessionWebArtifactDir,
-	resolveWebArtifactScope,
-} from "./harness-web/artifacts.js";
 import {
 	isUsableApiKey,
 	resolveConcreteSubagentModel,
@@ -47,6 +43,10 @@ import {
 	inferPhaseForPrecheck,
 	precheckHarnessSubagentSpawn,
 } from "./harness-subagent-precheck.js";
+import {
+	getRememberedSessionWebArtifactDir,
+	resolveWebArtifactScope,
+} from "./harness-web/artifacts.js";
 
 const spawnBudget = createSpawnBudgetState();
 let lastSessionId = "harness";
@@ -126,6 +126,8 @@ export function createHarnessSubagentsExtension(
 		packageRoot,
 		subprocessGovernanceExtensionPath: governanceExtPath,
 		harnessSubprocessExtensionPath: governanceExtPath,
+		resolveExtensionBundlePaths: (bundleName) =>
+			resolveExtensionBundlePaths(packageRoot, bundleName),
 		resolveSubprocessEnv: (task, agent) => {
 			const projectRoot = process.cwd();
 			const base: Record<string, string> = {

package/.pi/prompts/harness-steer.md

@@ -19,7 +19,7 @@ Thin orchestrator for the **steer loop** (ADR 0044). Run only after `/harness-re
 2. Update `artifacts/steer-state.yaml` (`attempt`, `max_attempts`, `active: true`).
 3. Set policy phase to **execute** before spawning executor (required for mutating tools).
 4. One `ask_user` steer gate unless `run-context.steer_approved` is already true.
-5. Spawn **`harness/running/executor`** with `HarnessSpawnContext.mode: repair` and `repair_brief_path: artifacts/repair-brief.yaml`.
+5. Spawn **`harness/running/executor`** with `HarnessSpawnContext.mode: repair` and `repair_brief_path: artifacts/repair-brief.yaml`. Repair uses the same hash-anchored `read`/`edit`, batching, and pre-handoff verification rules as `/harness-run` (ADR 0051).
 6. Optional: `node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" gate --save` after repair to refresh baseline (ADR 0044).
 7. `next_command`: **`/harness-review`** (always re-verify; tiered adversary on attempts 2+ per practice-map).
 

package/.pi/scripts/harness-anchored-edit-smoke.mjs

@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+/**
+ * Smoke test for native anchored edit apply (no Pi oldText shim).
+ */
+import { createRequire } from "node:module";
+import { mkdtempSync, readFileSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const root = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
+const require = createRequire(join(root, "package.json"));
+
+const { applyAnchoredEditsToFile } = await import(
+	join(root, ".pi/lib/harness-anchored-edit/apply-anchored-edits.ts")
+);
+const { hashLinesStateful } = await import(
+	join(root, ".pi/lib/harness-anchored-edit/anchor-state.ts")
+);
+
+const dir = mkdtempSync(join(tmpdir(), "anchored-smoke-"));
+const file = join(dir, "t.ts");
+writeFileSync(file, "line one\nline two\n");
+const plain = readFileSync(file, "utf8");
+const hashed = hashLinesStateful(file, plain, "smoke");
+const line2 = hashed.split("\n").find((l) => l.includes("line two"));
+if (!line2) {
+	console.error("smoke FAIL: no anchor line");
+	process.exit(1);
+}
+const result = await applyAnchoredEditsToFile(
+	file,
+	[{ anchor: line2, text: "line TWO", edit_type: "replace" }],
+	"smoke",
+);
+if (!result.ok) {
+	console.error("smoke FAIL:", result.error);
+	process.exit(1);
+}
+const out = readFileSync(file, "utf8");
+if (!out.includes("line TWO")) {
+	console.error("smoke FAIL: file not updated:", out);
+	process.exit(1);
+}
+console.log("harness-anchored-edit-smoke OK");

package/.pi/scripts/harness-verify.mjs

@@ -207,6 +207,59 @@ async function checkHarnessLens(pkgJson) {
 	ok("no harness-lens UPSTREAM_PIN.md");
 }
 
+async function checkHarnessAnchoredEdit(pkgJson) {
+	if (!pkgJson.files?.includes(".pi/lib/harness-anchored-edit")) {
+		fail(
+			'package.json "files" must include .pi/lib/harness-anchored-edit',
+		);
+	}
+	ok('package.json files includes .pi/lib/harness-anchored-edit');
+
+	const resolvePath = join(
+		ROOT,
+		".pi",
+		"lib",
+		"harness-anchored-edit",
+		"resolve-to-pi-edit.ts",
+	);
+	if (await fileExists(resolvePath)) {
+		fail("resolve-to-pi-edit.ts must not exist (native anchored apply)");
+	}
+
+	const applyPath = join(
+		ROOT,
+		".pi",
+		"lib",
+		"harness-anchored-edit",
+		"apply-anchored-edits.ts",
+	);
+	if (!(await fileExists(applyPath))) {
+		fail("missing .pi/lib/harness-anchored-edit/apply-anchored-edits.ts");
+	}
+
+	const extPath = join(ROOT, ".pi", "extensions", "harness-anchored-edit.ts");
+	if (!(await fileExists(extPath))) {
+		fail("missing .pi/extensions/harness-anchored-edit.ts");
+	}
+	const extSrc = await readFile(extPath, "utf8");
+	if (extSrc.includes("HARNESS_ANCHORED_EDIT")) {
+		fail("harness-anchored-edit must not gate on HARNESS_ANCHORED_EDIT");
+	}
+	if (extSrc.includes("createEditTool")) {
+		fail("harness-anchored-edit must not delegate to createEditTool");
+	}
+	if (extSrc.includes("resolveAnchoredInputToPiEdit")) {
+		fail("harness-anchored-edit must not use resolveAnchoredInputToPiEdit");
+	}
+	if (extSrc.includes('pi.on("tool_call"')) {
+		fail("harness-anchored-edit must not mutate edit input on tool_call");
+	}
+	if (!extSrc.includes("applyAnchoredEditsToFile")) {
+		fail("harness-anchored-edit must call applyAnchoredEditsToFile");
+	}
+	ok("harness-anchored-edit first-class contract");
+}
+
 async function checkSentruxGate() {
 	await checkSentruxRules();
 
@@ -278,6 +331,7 @@ async function main() {
 		await readFile(join(ROOT, "package.json"), "utf-8"),
 	);
 	await checkHarnessLens(pkgJson);
+	await checkHarnessAnchoredEdit(pkgJson);
 
 	if (!pkgJson.files?.includes("vendor/pi-subagents")) {
 		fail(
@@ -408,6 +462,19 @@ async function main() {
 	}
 	ok("agents.policy.yaml present");
 
+	const policyYaml = await readFile(AGENTS_POLICY, "utf8");
+	if (!/^\s+extension_bundle:\s+executor/m.test(policyYaml)) {
+		fail("agents.policy.yaml kinds.executor must set extension_bundle: executor");
+	}
+	if (
+		/harness\/running\/executor:[\s\S]*?extensions:\s+true/m.test(policyYaml)
+	) {
+		fail(
+			"harness/running/executor must not set extensions: true (use kind extension_bundle)",
+		);
+	}
+	ok("executor extension_bundle policy");
+
 	if (!(await fileExists(AGENTS_MANIFEST))) {
 		fail(
 			"missing .pi/harness/agents.manifest.json — run node \"$UP_PKG/.pi/scripts/harness-agents-manifest.mjs\" --write",

package/.pi/scripts/run-tests.mjs

@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+import { readdirSync } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+
+const TEST_DIR = 'test';
+
+const NODE_ONLY_TESTS = [
+	'harness-verify.test.mjs',
+	'harness-ask-user.test.mjs',
+	'harness-subagents-loader.test.mjs',
+	'harness-subagent-precheck.test.mjs',
+	'sentrux-rules-sync.test.mjs',
+	'harness-budget-guard.test.mjs',
+];
+
+const DEFAULT_SUITE_EXCLUDES = new Set([
+	'graphify-kb-updater.test.mjs',
+	'harness-artifact-gate.test.mjs',
+	'harness-spawn-critical-path.test.mjs',
+	'harness-yaml.test.mjs',
+	'plan-debate-lanes.test.mjs',
+]);
+
+function listTests() {
+	const entries = readdirSync(TEST_DIR, { withFileTypes: true });
+	const files = entries.filter((entry) => entry.isFile()).map((entry) => entry.name);
+	const nodeOnlySet = new Set(NODE_ONLY_TESTS);
+
+	const nodeTests = NODE_ONLY_TESTS.filter((name) => files.includes(name)).map((name) => `${TEST_DIR}/${name}`);
+	const tsxTests = files
+		.filter(
+			(name) =>
+				(name.endsWith('.test.mjs') || name.endsWith('.test.ts')) &&
+				!name.endsWith('.integration.test.ts') &&
+				!nodeOnlySet.has(name) &&
+				!DEFAULT_SUITE_EXCLUDES.has(name),
+		)
+		.map((name) => `${TEST_DIR}/${name}`)
+		.sort();
+
+	return { nodeTests, tsxTests };
+}
+
+function run(cmd, args) {
+	const result = spawnSync(cmd, args, { stdio: 'inherit' });
+	if (result.error) {
+		throw result.error;
+	}
+	if (result.status !== 0) {
+		process.exit(result.status ?? 1);
+	}
+}
+
+const { nodeTests, tsxTests } = listTests();
+
+if (nodeTests.length > 0) {
+	run('node', ['--test', ...nodeTests]);
+}
+
+run('node', ['.pi/harness/evals/smoke/smoke-harness-plan.mjs', '--fixture']);
+
+if (tsxTests.length > 0) {
+	run('npx', ['-y', 'tsx', '--test', ...tsxTests]);
+}

package/CHANGELOG.md

@@ -9,6 +9,12 @@ All notable changes to this project are documented in this file.
 - **Harness lens:** Integrate selected pi-lens capabilities through a harness-owned extension, store lens state under `.pi/harness/.lens`, and route lens findings through harness PostHog telemetry instead of standalone lens health/telemetry surfaces.
 - **Graphify KB updater:** Productize conservative daily discovery/promotion with explicit repo/release taxonomy, allowlist source-class gates, operator review queue reporting, scheduler smoke validation, and safe Graphify refresh controls.
 
+## [v0.20.0] — 2026-05-26
+
+### ✨ Features
+
+- **Harness:** Add hash-anchored executor edit flow.
+
 ## [v0.19.1] — 2026-05-26
 
 ### 🔧 Chores

package/THIRD_PARTY_NOTICES.md

@@ -1,3 +1,10 @@
+## Dirac hash-anchored edit (vendored subset)
+
+- **Project:** https://github.com/dirac-run/dirac
+- **License:** Apache-2.0
+- **Location:** [`.pi/lib/harness-anchored-edit/`](.pi/lib/harness-anchored-edit/) (anchor state, line protocol, edit resolve/apply)
+- **Integration:** [`.pi/extensions/harness-anchored-edit.ts`](.pi/extensions/harness-anchored-edit.ts) — first-class harness `read`/`edit` (always on when harness extensions load). harness-lens autopatches anchored `edit.text` at `tool_call`; native apply via `applyAnchoredEditsToFile`.
+
 ## pi-vcc (vendored)
 
 - **Project:** https://github.com/sting8k/pi-vcc

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ultimate-pi",
-	"version": "0.19.1",
+	"version": "0.20.0",
 	"description": "Ultimate AI coding harness for pi.dev — extensible skills, Obsidian wiki knowledge layer, compressed context, deterministic output",
 	"keywords": [
 		"pi-package",
@@ -59,6 +59,7 @@
 		".pi/harness/web-heuristic-angles.yaml",
 		".pi/harness/web-heuristic-angles.json",
 		".pi/lib/harness-lens",
+		".pi/lib/harness-anchored-edit",
 		".pi/harness/README.md",
 		".pi/npm/package.json",
 		".pi/npm/.gitignore",
@@ -81,13 +82,12 @@
 		"check:ts": "tsc -p tsconfig.check.json",
 		"vendor:sync-vcc": "bash .pi/scripts/vendor-sync-pi-vcc.sh",
 		"vendor:sync-subagents": "bash .pi/scripts/vendor-sync-pi-subagents.sh",
-		"release": "bash .pi/scripts/release.sh",
 		"lint": "biome check",
 		"lint:fix": "biome check --fix",
 		"format": "biome format --write",
 		"format:check": "biome format",
 		"prepare": "lefthook install",
-		"test": "node --test test/harness-verify.test.mjs test/harness-ask-user.test.mjs test/harness-subagents-loader.test.mjs test/harness-subagent-precheck.test.mjs test/sentrux-rules-sync.test.mjs test/harness-budget-guard.test.mjs && node .pi/harness/evals/smoke/smoke-harness-plan.mjs --fixture && npx -y tsx --test test/harness-web-cache.test.mjs test/harness-web-artifacts.test.mjs test/harness-subagent-auth.test.mjs test/posthog-client.test.mjs test/harness-agt-policy-load.test.mjs test/harness-agt-policy-matrix.test.mjs test/harness-agt-policy-parity.test.mjs test/harness-agt-packaging.test.mjs test/harness-tool-call-hook-chain.test.mjs test/harness-vcc-settings.test.ts test/harness-run-context-postrun.test.mjs test/harness-tool-payload.test.mjs test/harness-live-widget-status.test.ts test/harness-project-toggle-tui.test.ts test/harness-plan-phase-policy.test.mjs test/harness-context-mode-policy.test.mjs test/harness-subprocess-bootstrap.test.mjs test/harness-subagent-policy.test.mjs test/harness-subagent-precheck-topology.test.mjs test/plan-approval-readiness.test.mjs test/harness-spawn-budget.test.mjs test/harness-spawn-parse.test.mjs test/harness-schema-validate.test.mjs test/harness-turn-routing.test.mjs test/harness-budget-enforce.test.mjs test/harness-submit-policy.test.mjs test/harness-project-agents-policy.test.mjs test/plan-approval-format.test.mjs test/plan-approval-dialog.test.mjs test/plan-approval-sync.test.mjs test/plan-create-plan.test.mjs test/plan-review-format.test.mjs test/debate-plan-phase.test.mjs test/plan-debate-eligibility.test.mjs test/plan-messenger-gate.test.mjs test/plan-debate-lane-apply.test.mjs test/review-integrity-revise-handoff.test.mjs test/harness-plan-revise-reset.test.mjs",
+		"test": "node .pi/scripts/run-tests.mjs",
 		"test:vcc": "npx -y tsx --test vendor/pi-vcc/tests/*.test.ts",
 		"harness:sentrux-bootstrap": "node .pi/scripts/harness-sentrux-bootstrap.mjs",
 		"harness:sentrux-sync": "node .pi/scripts/sentrux-rules-sync.mjs --force",
@@ -111,6 +111,7 @@
 		"ajv": "^8.17.1",
 		"ajv-formats": "^3.0.1",
 		"croner": "^9.0.0",
+		"diff": "^8.0.4",
 		"jimp": "^1.6.1",
 		"minimatch": "^10.2.5",
 		"nanoid": "^5.1.5",

package/vendor/pi-subagents/src/agents.ts

@@ -19,6 +19,11 @@ export interface AgentConfig {
 	thinking?: string;
 	maxTurns?: number;
 	extensionsOff?: boolean;
+	/** Curated subprocess extensions (agents.policy.yaml `extension_bundle`). */
+	extensionBundle?: string;
+	extensionsFull?: boolean;
+	/** When true, subprocess uses --no-builtin-tools so extension read/edit replace builtins. */
+	noBuiltinTools?: boolean;
 	skillsOff?: boolean;
 	systemPrompt: string;
 	source: AgentSource;

package/vendor/pi-subagents/src/subagents.ts

@@ -46,6 +46,10 @@ export interface HarnessSubagentsOptions {
 	subprocessGovernanceExtensionPath?: string;
 	/** @deprecated Use subprocessGovernanceExtensionPath */
 	harnessSubprocessExtensionPath?: string;
+	/** Resolve curated `-e` extension paths for agents.policy `extension_bundle`. */
+	resolveExtensionBundlePaths?: (
+		bundleName: string,
+	) => string[];
 	/** Extra env vars per subprocess (e.g. HARNESS_RUN_ID, HARNESS_RUN_DIR). */
 	resolveSubprocessEnv?: (
 		task: string,
@@ -453,13 +457,28 @@ function buildAgentArgs(
 		agent.extensionsOff &&
 		(subagentsOptions?.subprocessGovernanceExtensionPath ??
 			subagentsOptions?.harnessSubprocessExtensionPath);
-	if (agent.extensionsOff) {
+	const bundlePaths =
+		agent.extensionBundle && subagentsOptions?.resolveExtensionBundlePaths
+			? subagentsOptions.resolveExtensionBundlePaths(agent.extensionBundle)
+			: [];
+
+	if (agent.extensionBundle && bundlePaths.length > 0) {
+		args.push("--no-extensions");
+		for (const extPath of bundlePaths) {
+			args.push("-e", extPath);
+		}
+		if (agent.skillsOff) args.push("--no-skills");
+	} else if (agent.extensionsOff) {
 		args.push("--no-extensions");
 		if (governanceExt) args.push("-e", governanceExt);
 		if (agent.skillsOff) args.push("--no-skills");
 	}
-	if (agent.tools?.length) args.push("--tools", agent.tools.join(","));
-	else if (agent.extensionsOff) args.push("--no-tools");
+	if (agent.tools?.length) {
+		args.push("--tools", agent.tools.join(","));
+		if (agent.noBuiltinTools) args.push("--no-builtin-tools");
+	} else if (agent.extensionsOff || agent.extensionBundle) {
+		args.push("--no-tools");
+	}
 	return args;
 }